change jobid from int to string

Author: lee218llnl

src/STAT.C

@@ -640,7 +640,12 @@ StatError_t parseArgs(StatArgs_t *statArgs, STAT_FrontEnd *statFrontEnd, int arg
             statFrontEnd->setProcsPerNode(atoi(optarg));
             break;
         case 'j':
-            statFrontEnd->setJobId(atoi(optarg));
+            statError = statFrontEnd->setJobId(optarg);
+            if (statError != STAT_OK)
+            {
+                statFrontEnd->printMsg(statError, __FILE__, __LINE__, "Failed to set job ID\n");
+                return statError;
+            }
             break;
         case 'r':
             statArgs->nRetries = atoi(optarg);

src/STAT.i

@@ -226,8 +226,8 @@ class STAT_FrontEnd
         unsigned int getLauncherPid();
         unsigned int getNumApplProcs();
         unsigned int getNumApplNodes();
-        void setJobId(unsigned int jobId);
-        unsigned int getJobId();
+        StatError_t setJobId(const char *jobId);
+        char *getJobId();
         void setNDaemonsPerNode(unsigned int nDaemonsPerNode);
         unsigned int getNDaemonsPerNode();
         const char *getApplExe();

src/STAT_FrontEnd.C

@@ -234,7 +234,7 @@ STAT_FrontEnd::STAT_FrontEnd()
     launcherArgc_ = 1;
     topologySize_ = 0;
     logging_ = 0;
-    jobId_ = 0;
+    jobId_ = NULL;
     launcherArgv_ = NULL;
     applExe_ = NULL;
     remoteNode_ = NULL;
@@ -1813,10 +1813,10 @@ StatError_t STAT_FrontEnd::createOutputDir()
     /* Create run-specific results directory with a unique name */
     for (fileNameCount = 0; fileNameCount < STAT_MAX_FILENAME_ID; fileNameCount++)
     {
-        if (jobId_ == 0)
+        if (jobId_ == NULL)
             snprintf(outDir_, BUFSIZE, "%s/%s.%04d", resultsDirectory, applExe_, fileNameCount);
         else
-            snprintf(outDir_, BUFSIZE, "%s/%s.%d.%04d", resultsDirectory, applExe_, jobId_, fileNameCount);
+            snprintf(outDir_, BUFSIZE, "%s/%s.%s.%04d", resultsDirectory, applExe_, jobId_, fileNameCount);
         intRet = mkdir(outDir_, S_IRUSR | S_IWUSR | S_IXUSR);
         if (intRet == 0)
             break;
@@ -1829,10 +1829,10 @@ StatError_t STAT_FrontEnd::createOutputDir()
     printMsg(STAT_LOG_MESSAGE, __FILE__, __LINE__, "Output directory %s created\n", outDir_);
 
     /* Generate the file prefix for output files */
-    if (jobId_ == 0)
+    if (jobId_ == NULL)
         snprintf(filePrefix_, BUFSIZE, "%s.%04d", applExe_, fileNameCount);
     else
-        snprintf(filePrefix_, BUFSIZE, "%s.%d.%04d", applExe_, jobId_, fileNameCount);
+        snprintf(filePrefix_, BUFSIZE, "%s.%s.%04d", applExe_, jobId_, fileNameCount);
     printMsg(STAT_LOG_MESSAGE, __FILE__, __LINE__, "Generated file prefix: %s\n", outDir_);
 
     return STAT_OK;
@@ -3626,13 +3626,25 @@ unsigned int STAT_FrontEnd::getNumApplNodes()
 }
 
 
-void STAT_FrontEnd::setJobId(unsigned int jobId)
+StatError_t STAT_FrontEnd::setJobId(const char *jobId)
 {
-    jobId_ = jobId;
+    if (jobId != NULL)
+    {
+        printMsg(STAT_LOG_MESSAGE, __FILE__, __LINE__, "Setting job ID to %s\n", jobId);
+        if (jobId_ != NULL)
+            free(jobId_);
+        jobId_ = strdup(jobId);
+        if (jobId_ == NULL)
+        {
+            printMsg(STAT_ALLOCATE_ERROR, __FILE__, __LINE__, "%s: Failed to set job ID path with strdup() to %s\n", strerror(errno), jobId);
+            return STAT_ALLOCATE_ERROR;
+        }
+    }
+    return STAT_OK;
 }
 
 
-unsigned int STAT_FrontEnd::getJobId()
+const char *STAT_FrontEnd::getJobId()
 {
     return jobId_;
 }

src/STAT_FrontEnd.h

@@ -468,13 +468,13 @@ class STAT_FrontEnd
             directory. This is helpful for example to associate a STAT run with
             a particular batch job ID.
         */
-        void setJobId(unsigned int jobId);
+        StatError_t setJobId(const char *jobId);
 
         //! Gets the job ID
         /*!
             \return the job ID
         */
-        unsigned int getJobId();
+        const char *getJobId();
 
         //! Set the number of daemons per node
         /*!
@@ -946,14 +946,14 @@ class STAT_FrontEnd
         unsigned int topologySize_;                         /*!< the size of the MRNet topology */
         unsigned int logging_;                              /*!< the logging level */
         unsigned int nDaemonsPerNode_;                      /*!< the number of daemons per node */
-        int jobId_;                                         /*!< the batch job ID */
         int mrnetOutputLevel_;                              /*!< the MRNet output level */
         char **launcherArgv_;                               /*!< the job launch arguments */
         char *toolDaemonExe_;                               /*!< the path to the STATD daemon executable */
         char *applExe_;                                     /*!< the name of the application executable */
         char *filterPath_;                                  /*!< the path to the STAT_FilterDefinitions.so filter file */
         char *remoteNode_;                                  /*!< the hostname of the remote node running the job launcher */
         char *nodeListFile_;                                /*!< the file to containing the nodelist */
+        char *jobId_;                                       /*!< the batch job ID */
         char lastDotFileName_[BUFSIZE];                     /*!< the path to the last generated .dot file */
         char outDir_[BUFSIZE];                              /*!< the output directory */
         char logOutDir_[BUFSIZE];                           /*!< the directory for log files */