Changeset 125 for trunk/src

Timestamp:

09/19/06 10:16:37 (18 years ago)

Author:

bas

Message:

pbs_python:

• Functions pbs_rescreserve and pbs_rescrelease now works

Location:

trunk/src

Files:

• pbs.py (modified) (2 diffs)
• pbs_python.h (modified) (3 diffs)
• pbs_wrap.c (modified) (12 diffs)

trunk/src/pbs.py

@@ -310 +310 @@
 _pbs.batch_status_swigregister(batch_statusPtr)
 
+RESOURCE_T_NULL = _pbs.RESOURCE_T_NULL
+RESOURCE_T_ALL = _pbs.RESOURCE_T_ALL
 
 avail = _pbs.avail
@@ -326 +328 @@
 
 pbs_disconnect = _pbs.pbs_disconnect
-
-pbs_geterrmsg = _pbs.pbs_geterrmsg
 
 pbs_holdjob = _pbs.pbs_holdjob

trunk/src/pbs_python.h

@@ -279 +279 @@
 };
 
-/* Resource Reservation Information */
-typedef int     resource_t;     /* resource reservation handle */
-
-#define RESOURCE_T_NULL         (resource_t)0
-#define RESOURCE_T_ALL          (resource_t)-1
+#define RESOURCE_T_NULL         0
+#define RESOURCE_T_ALL          -1
 
 extern int
@@ -309 +306 @@
 extern int pbs_disconnect(int connect);
 
+/*  Replaced by a python function. No need to wrap it HvB
 extern char * pbs_geterrmsg(int connect);
+*/
 
 extern int pbs_holdjob(int connect, char *job_id, char *hold_type, 
@@ -330 +329 @@
         int *OUTPUT, int *OUTPUT, int *OUTPUT);
 
-extern int pbs_rescreserve(int connect, char **IN, int nresc, resource_t *phandle);
-
-extern int pbs_rescrelease(int connect, resource_t rhandle);
+extern int pbs_rescreserve(int connect, char **IN, int nresc, int *OUTPUT);
+
+extern int pbs_rescrelease(int connect, int resource_id);
 
 extern int pbs_rerunjob(int connect, char *job_id, char *extend);

trunk/src/pbs_wrap.c

@@ -1349 +1349 @@
 #include "log.h"
 
-#define SARA_DEBUG 0
+#define SARA_DEBUG 1
 
 //extern int pbs_errno;
@@ -1690 +1690 @@
 int pbs_deljob(int,char *,char *);
 int pbs_disconnect(int);
-char *pbs_geterrmsg(int);
 int pbs_holdjob(int,char *,char *,char *);
 char *pbs_locjob(int,char *,char *);
@@ -1718 +1717 @@
 
 
-int pbs_rescreserve(int,char **,int,resource_t *);
-int pbs_rescrelease(int,resource_t);
+int pbs_rescreserve(int,char **,int,int *);
+int pbs_rescrelease(int,int);
 int pbs_rerunjob(int,char *,char *);
 int pbs_rlsjob(int,char *,char *,char *);
@@ -2905 +2904 @@
 
 
-static PyObject *_wrap_pbs_geterrmsg(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
-    int arg1 ;
-    char *result;
-    PyObject * obj0 = 0 ;
-    
-    if(!PyArg_ParseTuple(args,(char *)"O:pbs_geterrmsg",&obj0)) goto fail;
-    {
-        arg1 = (int)(SWIG_As_int(obj0)); 
-        if (SWIG_arg_fail(1)) SWIG_fail;
-    }
-    result = (char *)pbs_geterrmsg(arg1);
-    
-    resultobj = SWIG_FromCharPtr(result);
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
 static PyObject *_wrap_pbs_holdjob(PyObject *self, PyObject *args) {
     PyObject *resultobj;
@@ -3304 +3283 @@
     char **arg2 = (char **) 0 ;
     int arg3 ;
-    resource_t *arg4 = (resource_t *) 0 ;
+    int *arg4 = (int *) 0 ;
     int result;
+    int temp4 ;
+    int res4 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
-    PyObject * obj3 = 0 ;
-    
-    if(!PyArg_ParseTuple(args,(char *)"OOOO:pbs_rescreserve",&obj0,&obj1,&obj2,&obj3)) goto fail;
+    
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
+    if(!PyArg_ParseTuple(args,(char *)"OOO:pbs_rescreserve",&obj0,&obj1,&obj2)) goto fail;
     {
         arg1 = (int)(SWIG_As_int(obj0)); 
@@ -3354 +3335 @@
         if (SWIG_arg_fail(3)) SWIG_fail;
     }
-    SWIG_Python_ConvertPtr(obj3, (void **)&arg4, SWIGTYPE_p_int, SWIG_POINTER_EXCEPTION | 0);
-    if (SWIG_arg_fail(4)) SWIG_fail;
     result = (int)pbs_rescreserve(arg1,arg2,arg3,arg4);
     
@@ -3361 +3340 @@
         resultobj = SWIG_From_int((int)(result)); 
     }
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, 0)));
     {
         free( (char *) arg2);
@@ -3376 +3357 @@
     PyObject *resultobj;
     int arg1 ;
-    resource_t arg2 ;
+    int arg2 ;
     int result;
     PyObject * obj0 = 0 ;
@@ -3387 +3368 @@
     }
     {
-        arg2 = (resource_t)(SWIG_As_int(obj1)); 
+        arg2 = (int)(SWIG_As_int(obj1)); 
         if (SWIG_arg_fail(2)) SWIG_fail;
     }
@@ -4972 +4953 @@
          { (char *)"pbs_deljob", _wrap_pbs_deljob, METH_VARARGS, NULL},
          { (char *)"pbs_disconnect", _wrap_pbs_disconnect, METH_VARARGS, NULL},
-         { (char *)"pbs_geterrmsg", _wrap_pbs_geterrmsg, METH_VARARGS, NULL},
          { (char *)"pbs_holdjob", _wrap_pbs_holdjob, METH_VARARGS, NULL},
          { (char *)"pbs_locjob", _wrap_pbs_locjob, METH_VARARGS, NULL},
@@ -5028 +5008 @@
 static swig_type_info _swigt__p_long[] = {{"_p_long", 0, "long *", 0, 0, 0, 0},{"_p_long", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__ptrdiff_t[] = {{"_ptrdiff_t", 0, "ptrdiff_t", 0, 0, 0, 0},{"_ptrdiff_t", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
-static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *|resource_t *", 0, 0, 0, 0},{"_p_int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *", 0, 0, 0, 0},{"_p_int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 
 static swig_type_info *swig_types_initial[] = {
@@ -5806 +5786 @@
         PyDict_SetItemString(d,"DFLT", SWIG_From_int((int)(DFLT))); 
     }
+    {
+        PyDict_SetItemString(d,"RESOURCE_T_NULL", SWIG_From_int((int)(0))); 
+    }
+    {
+        PyDict_SetItemString(d,"RESOURCE_T_ALL", SWIG_From_int((int)(-1))); 
+    }
     PyDict_SetItemString(d,(char*)"cvar", SWIG_globals);
     SWIG_addvarlink(SWIG_globals,(char*)"pbs_errno",_wrap_pbs_errno_get, _wrap_pbs_errno_set);