Changeset 33870 for branches/eam_branches/ipp-20120405/Ohana

Timestamp:

May 16, 2012, 4:16:48 PM (14 years ago)

Author:

eugene

Message:

move max path length to dvo.h and rename DVO_MAX_PATH

Location:

branches/eam_branches/ipp-20120405/Ohana/src/opihi/dvo

Files:

• dvo_host_utils.c (modified) (4 diffs)
• hosts.c (modified) (2 diffs)
• remote.c (modified) (1 diff)

branches/eam_branches/ipp-20120405/Ohana/src/opihi/dvo/dvo_host_utils.c

@@ -4 +4 @@
 # define PARALLEL_MANUAL 0
 # define PARALLEL_SERIAL 0
-# define MAX_PATH_LENGTH 1024
+# define DVO_MAX_PATH 1024
 
 int HostTableLaunchJobs (HostTable *table, char *basecmd, char *options) {
@@ -17 +17 @@
 
     // ensure that the paths are absolute path names
-    char *tmppath = abspath (table->hosts[i].pathname, MAX_PATH_LENGTH);
+    char *tmppath = abspath (table->hosts[i].pathname, DVO_MAX_PATH);
     free (table->hosts[i].pathname);
     table->hosts[i].pathname = tmppath;
@@ -23 +23 @@
     // need to save the results filename with the uniquer
     // XXX a bit of a waste (but only 1024 * 60 bytes or so
-    ALLOCATE (table->hosts[i].results, char, MAX_PATH_LENGTH);
-    snprintf (table->hosts[i].results, MAX_PATH_LENGTH, "%s/dvo.results.%s.fits", table->hosts[i].pathname, uniquer);
+    ALLOCATE (table->hosts[i].results, char, DVO_MAX_PATH);
+    snprintf (table->hosts[i].results, DVO_MAX_PATH, "%s/dvo.results.%s.fits", table->hosts[i].pathname, uniquer);
 
-    char commandBase[MAX_PATH_LENGTH];
-    snprintf (commandBase, MAX_PATH_LENGTH, "dvo.command.%s.txt", uniquer);
-    char *commandFile = abspath(commandBase, MAX_PATH_LENGTH);
+    char commandBase[DVO_MAX_PATH];
+    snprintf (commandBase, DVO_MAX_PATH, "dvo.command.%s.txt", uniquer);
+    char *commandFile = abspath(commandBase, DVO_MAX_PATH);
 
     FILE *f = fopen (commandFile, "w");
@@ -86 +86 @@
   }
 
-  char *CATDIR = abspath (tmppath, MAX_PATH_LENGTH);
+  char *CATDIR = abspath (tmppath, DVO_MAX_PATH);
   if (!CATDIR) {
     gprint (GP_ERR, "failed to make an absolute path from %s (too long)\n", tmppath);

branches/eam_branches/ipp-20120405/Ohana/src/opihi/dvo/hosts.c

@@ -1 +1 @@
 # include "dvoshell.h"
 # include <glob.h>
-# define MAX_PATH_LENGTH 1024
+# define DVO_MAX_PATH 1024
 
 // functions to manage the remote hosts
@@ -59 +59 @@
     for (i = 0; i < table->Nhosts; i++) {
       pglob.gl_offs = 0;
-      char name[MAX_PATH_LENGTH];
-      snprintf (name, MAX_PATH_LENGTH, "%s/dvo.results.%05d.*.fits", table->hosts[i].pathname, PID);
+      char name[DVO_MAX_PATH];
+      snprintf (name, DVO_MAX_PATH, "%s/dvo.results.%05d.*.fits", table->hosts[i].pathname, PID);
       if (VERBOSE) gprint (GP_ERR, "checking %s\n", name);
       glob (name, 0, NULL, &pglob);

branches/eam_branches/ipp-20120405/Ohana/src/opihi/dvo/remote.c

@@ -1 +1 @@
 # include "dvoshell.h"
 # include <glob.h>
-# define MAX_PATH_LENGTH 1024
+# define DVO_MAX_PATH 1024
 
 // functions to manage the remote hosts