Changeset 39436

Timestamp:

Mar 6, 2016, 2:01:29 PM (10 years ago)

Author:

eugene

Message:

add option for manual uniquer

Location:

branches/eam_branches/ohana.20160226/src/relastro

Files:

• include/relastro.h (modified) (1 diff)
• src/args.c (modified) (1 diff)
• src/load_catalogs.c (modified) (1 diff)

branches/eam_branches/ohana.20160226/src/relastro/include/relastro.h

@@ -259 +259 @@
 int    REGION_HOST_ID;
 int    PARALLEL_REGIONS_MANUAL;
+char  *MANUAL_UNIQUER;
 
 int          HOST_ID;

branches/eam_branches/ohana.20160226/src/relastro/src/args.c

@@ -51 +51 @@
     remove_argument (N, &argc, argv);
     RELASTRO_OP = OP_UPDATE_OFFSETS;
+  }
+
+  // elements needed for parallel regions / parallel images
+  MANUAL_UNIQUER = NULL;
+  if ((N = get_argument (argc, argv, "-manual-uniquer"))) {
+    remove_argument (N, &argc, argv);
+    MANUAL_UNIQUER = strcreate (argv[N]);
+    remove_argument (N, &argc, argv);
   }
 

branches/eam_branches/ohana.20160226/src/relastro/src/load_catalogs.c

@@ -142 +142 @@
   int TIME = time(NULL);
   int PID = getpid();
-  snprintf (uniquer, 12, "%05d.%05d", PID, TIME % 100000);
+
+  if (PARALLEL_MANUAL && MANUAL_UNIQUER) {
+    snprintf (uniquer, 12, "%11s", MANUAL_UNIQUER);
+  } else {
+    snprintf (uniquer, 12, "%05d.%05d", PID, TIME % 100000);
+  }
 
   // load the list of hosts