Replace report_name with report_path (#126)

- replace MAX_REPORT_PATH_LEN with MAX_FILEPATH_LEN
- fixes segfault with long filepath

Author: pramodk

coreneuron/utils/reports/nrnreport.cpp

@@ -64,14 +64,14 @@ class ReportEvent : public DiscreteEvent {
   private:
     double dt;
     double step;
-    char report_name[MAX_REPORT_NAME_LEN];
+    char report_path[MAX_FILEPATH_LEN];
     std::vector<int> gids_to_report;
     double tstart;
 
   public:
     ReportEvent(double dt, double tstart, VarsToReport& filtered_gids, const char* name)
         : dt(dt), tstart(tstart) {
-        strcpy(report_name, name);
+        strcpy(report_path, name);
         VarsToReport::iterator it;
         nrn_assert(filtered_gids.size());
         step = tstart / dt;
@@ -88,7 +88,7 @@ class ReportEvent : public DiscreteEvent {
 #pragma omp critical
         {
             // each thread needs to know its own step
-            records_nrec(step, gids_to_report.size(), &gids_to_report[0], report_name);
+            records_nrec(step, gids_to_report.size(), &gids_to_report[0], report_path);
             send(t + dt, nc, nt);
             step++;
         }

coreneuron/utils/reports/nrnreport.h

@@ -39,8 +39,9 @@
 #include <string>
 #include <vector>
 #include <set>
+
 #define MAX_REPORT_NAME_LEN 256
-#define MAX_REPORT_PATH_LEN 512
+#define MAX_FILEPATH_LEN 4096
 
 namespace coreneuron {
 // name of the variable in mod file that is used to indicate which synapse
@@ -54,7 +55,7 @@ enum ReportType { SomaReport, CompartmentReport, SynapseReport };
 
 struct ReportConfiguration {
     char name[MAX_REPORT_NAME_LEN];         // name of the report
-    char output_path[MAX_REPORT_PATH_LEN];  // full path of the report
+    char output_path[MAX_FILEPATH_LEN];     // full path of the report
     char target_name[MAX_REPORT_NAME_LEN];  // target of the report
     char mech_name[MAX_REPORT_NAME_LEN];    // mechanism name
     char var_name[MAX_REPORT_NAME_LEN];     // variable name

coreneuron/utils/reports/report_configuration_parser.cpp

@@ -36,8 +36,6 @@
 #include <vector>
 #include <string.h>
 
-#define MAX_LINE_LENGTH 4096
-
 namespace coreneuron {
 
 /*
@@ -63,7 +61,7 @@ std::vector<ReportConfiguration> create_report_configurations(const char* conf_f
     std::vector<ReportConfiguration> reports;
     int num_reports = 0;
     char report_on[MAX_REPORT_NAME_LEN] = "";
-    char raw_line[MAX_LINE_LENGTH] = "";
+    char raw_line[MAX_FILEPATH_LEN] = "";
     int is_soma;
     int* gids;
 
@@ -74,14 +72,14 @@ std::vector<ReportConfiguration> create_report_configurations(const char* conf_f
         abort();
     }
 
-    fgets(raw_line, MAX_LINE_LENGTH, fp);
+    fgets(raw_line, MAX_FILEPATH_LEN, fp);
     sscanf(raw_line, "%d\n", &num_reports);
     for (int i = 0; i < num_reports; i++) {
         reports.push_back(ReportConfiguration());
         ReportConfiguration& report = reports[reports.size() - 1];
         // mechansim id registered in coreneuron
         report.mech_id = -1;
-        fgets(raw_line, MAX_LINE_LENGTH, fp);
+        fgets(raw_line, MAX_FILEPATH_LEN, fp);
         sscanf(raw_line, "\n%s %s %s %s %s %s %d %lf %lf %lf %d\n", report.name, report.target_name,
                report.type_str, report_on, report.unit, report.format, &is_soma, &report.report_dt,
                &report.start, &report.stop, &report.num_gids);
@@ -108,7 +106,7 @@ std::vector<ReportConfiguration> create_report_configurations(const char* conf_f
             gids = (int*)calloc(report.num_gids, sizeof(int));
             fread(gids, sizeof(int), report.num_gids, fp);
             // extra new line
-            fgets(raw_line, MAX_LINE_LENGTH, fp);
+            fgets(raw_line, MAX_FILEPATH_LEN, fp);
             for (int i = 0; i < report.num_gids; i++) {
                 report.target.insert(gids[i]);
             }