Changeset 16 for trunk/pbs_drmaa

Timestamp:

04/21/11 18:28:03 (14 years ago)

Author:

mmamonski

Message:

painfull copy/paste bug

Location:

trunk/pbs_drmaa

Files:

• job.c (modified) (1 diff)
• submit.c (modified) (4 diffs)
• util.c (modified) (1 diff)

trunk/pbs_drmaa/job.c

@@ -193 +193 @@
                 conn_lock = fsd_mutex_lock( &self->session->drm_connection_mutex );
 retry:
+
 #ifdef PBS_PROFESSIONAL
                 status = pbs_statjob( session->pbs_conn, self->job_id, NULL, NULL );

trunk/pbs_drmaa/submit.c

@@ -179 +179 @@
                                 self->destination_queue, NULL );
 
-                fsd_log_info(("pbs_submit() =%s", job_id));
+                fsd_log_info(("pbs_submit(%s, %s) =%s", self->script_filename, self->destination_queue, job_id));
 
                 if( job_id == NULL )
@@ -590 +590 @@
                 const char *native_specification )
 {
+        fsd_log_enter(( "({native_specification=%s})", native_specification ));
+
         if( native_specification == NULL )
                 native_specification = self->job_template->get_attr(
@@ -614 +616 @@
                                                         arg, native_specification);
 
-                                                case 'h' :
-                                                        pbs_attr->set_attr( pbs_attr, "Hold_Types" , arg );
-                                                        break;
-
                                         opt = arg[1];
 
@@ -671 +669 @@
                                                 case 'q' :
                                                         self->destination_queue = fsd_strdup( arg );
+                                                        fsd_log_debug(("self->destination_queue = %s", self->destination_queue));
                                                         break;
                                                 case 'r' :

trunk/pbs_drmaa/util.c

@@ -84 +84 @@
 
         _pbs_errno = pbs_errno;
-        /*
-         * Gathering error messages differ between PBS forks.
-         * - OpenPBS - ...
-         * - Torque - pbse_to_txt takes PBS error code (stored in pbs_errno)
-         *  and returns corresponding error message.
-         * - PBS Pro - stores errno of last operation inside pbs_errno variable;
-         *  pbse_to_txt always return NULL.
-         * All of them define pbs_geterrmsg which returns last error message
-         * for given connection.
-         */
-        /* XXX: PBSPro has some link problems with pbse_to_txt function */
-#if PBS_PROFESSIONAL_NO_LOG
+
+#ifndef PBS_PROFESSIONAL_NO_LOG
         message = pbse_to_txt( pbs_errno );
 #else
         message = "pbs error";
 #endif
-
 
         fsd_errno = pbsdrmaa_map_pbs_errno( _pbs_errno );