Changeset 49 for trunk

Timestamp:

12/08/11 08:36:40 (13 years ago)

Author:

mmamonski

Message:

on site fixies

Location:

trunk

Files:

• pbs_drmaa/log_reader.c (modified) (2 diffs)
• pbs_drmaa/pbs_attrib.gperf (modified) (2 diffs)
• pbs_drmaa/pbs_attrib.h (modified) (1 diff)
• pbs_drmaa/submit.c (modified) (1 diff)
• test/Makefile (modified) (1 diff)
• test/example.c (modified) (6 diffs)

trunk/pbs_drmaa/log_reader.c

@@ -670 +670 @@
 
         self->current_offset = ftello(self->fhandle);
+        
+        fsd_log_debug(("Closing log  file (offset=%d)", self->current_offset));  
 
         fclose(self->fhandle);
@@ -679 +681 @@
 pbsdrmaa_reopen_log( pbsdrmaa_log_reader_t * self )
 {
+        fsd_log_debug(("Reopening log file: %s (offset=%d)", self->log_path, self->current_offset));  
+
         if ((self->fhandle = fopen(self->log_path,"r")) == NULL)
          {

trunk/pbs_drmaa/pbs_attrib.gperf

@@ -102 +102 @@
 submit_args, t(PBSDRMAA_ATTR_SUBMIT_ARGS)
 mtime, t(PBSDRMAA_ATTR_MTIME)
-pbsdrmaa.node_properties, t(PBSDRMAA_ATTR_NODE_PROPERTIES)
-pbsdrmaa.custom_resources, t(PBSDRMAA_ATTR_CUSTOM_RESOURCES)
+Resource_List.node_properties, t(PBSDRMAA_ATTR_NODE_PROPERTIES)
+Resource_List.custom_resources, t(PBSDRMAA_ATTR_CUSTOM_RESOURCES)
 %%
 #undef t
@@ -215 +215 @@
         { "submit_args", PBSDRMAA_ATTR_SUBMIT_ARGS, false },
         { "mtime", PBSDRMAA_ATTR_MTIME, false },
-        { "pbsdrmaa.node_properties", PBSDRMAA_ATTR_NODE_PROPERTIES, false },
-        { "pbsdrmaa.custom_resources", PBSDRMAA_ATTR_CUSTOM_RESOURCES, false },
+        { "Resource_List.node_properties", PBSDRMAA_ATTR_NODE_PROPERTIES, false }, /* DRMAA extenstions */
+        { "Resource_List.custom_resources", PBSDRMAA_ATTR_CUSTOM_RESOURCES, false },
         
 };

trunk/pbs_drmaa/pbs_attrib.h

@@ -108 +108 @@
         PBSDRMAA_ATTR_HOST,
         PBSDRMAA_ATTR_NODES,
-        PBSDRMAA_ATTR_SOFTWARE,
         PBSDRMAA_ATTR_PROCS,
         PBSDRMAA_ATTR_NCPUS,
+        PBSDRMAA_ATTR_SOFTWARE,
         PBSDRMAA_ATTR_MAIL_POINTS,
         PBSDRMAA_ATTR_OUTPUT_PATH,

trunk/pbs_drmaa/submit.c

@@ -182 +182 @@
                                 char *final_value = NULL;
 
-                                if (!nodes_value)
+                                if (nodes_value)
                                  {
                                         final_value = fsd_asprintf("%s:%s",nodes_value, value);

trunk/test/Makefile

@@ -1 +1 @@
 example : example.c
-        gcc example.c -o example -ldrmaa -ldrmaa_base
+        gcc example.c -o example -ldrmaa -L/opt/drmaa/torque/lib  -I/opt/drmaa/torque/include
       

trunk/test/example.c

@@ -38 +38 @@
 
 #define SEND_MAIL     0
-#define WITH_BULK     0
+#define WITH_BULK     1
 #define EXPORT_ENVS   0
 #define DEBUG         1
-#define N_JOBS        1
+#define N_JOBS        8
 
 #define ERR_LEN      DRMAA_ERROR_STRING_BUFFER
@@ -107 +107 @@
                 printf( "constructing %d\n", i );
                 sprintf( arg, "%d", i );
-                sprintf( job_path, "./test_job" );
+                sprintf( job_path, "/bin/sleep" );
                 argv[0] = job_path;
-                argv[1] = arg;
+                argv[1] = "5";
                 argv[2] = NULL;
                 for( j = 0;  j < 3;  j++ )
@@ -127 +127 @@
 #endif
          }
-
+#if ! WITH_BULK
         for( i = 0;  i < N_JOBS;  i++ )
          {
@@ -145 +145 @@
          }
 
-#if WITH_BULK
-         {
-                char *argv[] = { "./job", "bulk", "$drmaa_incr_ph$", NULL };
+#else
+         {
+                char *argv[] = { "/bin/sleep", "5", "$drmaa_incr_ph$", NULL };
                 char *fds[]  = { "b.$drmaa_incr_ph$.stdin", "b.$drmaa_incr_ph$.stdout",
                         "b.$drmaa_incr_ph$.stderr" };
-                bulk_job = construct_job( argv, fds, WD );
-         }
-        rc = drmaa_run_bulk_jobs( &bulk_job_ids, bulk_job, 1, N_JOBS, 1, err_msg, ERR_LEN );
+                bulk_job = construct_job( argv, fds, "." );
+         }
+        rc = drmaa_run_bulk_jobs( &bulk_job_ids, bulk_job, 1, N_JOBS, 2, err_msg, ERR_LEN );
         if( rc )  drmaa_error("drmaa_run_bulk_jobs");
 
@@ -197 +197 @@
 #endif
         const char *scalar_attrs[] = {
-                DRMAA_WD            , NULL,
                 DRMAA_REMOTE_COMMAND, NULL,
-                DRMAA_JOB_NAME      , NULL,
-                DRMAA_INPUT_PATH    , NULL,
-                DRMAA_OUTPUT_PATH   , NULL,
-                DRMAA_ERROR_PATH    , NULL,
-                DRMAA_NATIVE_SPECIFICATION, "-l host=eeyore,nodes=1 -W x=FLAGS:ADVRES:usecase.0",
                 NULL                , NULL
         };
@@ -222 +216 @@
         int rc;
 
-        scalar_attrs[ 1] = cwd;
-        scalar_attrs[ 3] = argv[0];
-        scalar_attrs[ 5] = "jobname";
-        scalar_attrs[ 7] = fds[0];
-        scalar_attrs[ 9] = fds[1];
-        scalar_attrs[11] = fds[2];
+        scalar_attrs[ 1] = "/bin/sleep";
 
         printf( "allocaing template\n" );