Changeset 49 for trunk/pbs_drmaa

Timestamp:

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

Author:

mmamonski

Message:

on site fixies

Location:

trunk/pbs_drmaa

Files:

• log_reader.c (modified) (2 diffs)
• pbs_attrib.gperf (modified) (2 diffs)
• pbs_attrib.h (modified) (1 diff)
• submit.c (modified) (1 diff)

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);