Changeset 123

Timestamp:

09/13/06 11:19:14 (18 years ago)

Author:

bas

Message:

pbs_python:

• pbs_rescquery() now works

Location:

trunk

Files:

• CHANGES (modified) (1 diff)
• src/pbs.py (modified) (1 diff)
• src/pbs_ifl.h (modified) (1 diff)
• src/pbs_python.h (modified) (2 diffs)
• src/pbs_wrap.c (modified) (10 diffs)

trunk/CHANGES

@@ -1 @@
-=========== Version 2.9.1
+=========== Version 2.9.2
+        - The function pbs_rescquery() did not work. Fixed it
+
         - Fixed a bug in new_rack_pbsmon.py. Counting of serial
           nodes was wrong and state down has topmost priority

trunk/src/pbs.py

@@ -555 +555 @@
   Returns the pbs python interface version as a string. 
   """
-  return '2.9.0'
+  return '2.9.2-beta'
 
 # A useful dict with error codes to text

trunk/src/pbs_ifl.h

@@ -346 +346 @@
                         /* see pbs_connect(3B)                        */
 
-extern char avail(int connect, char *resc);
+extern char * avail(int connect, char *resc);
 
 extern int pbs_asyrunjob(int c, char *jobid, char *location, char *extend);

trunk/src/pbs_python.h

@@ -292 +292 @@
                         /* see pbs_connect(3B)                        */
 
-extern char avail(int connect, char *resc);
+extern char * avail(int connect, char *resc);
 
 extern int pbs_asyrunjob(int c, char *jobid, char *location, char *extend);
@@ -327 +327 @@
 extern int pbs_orderjob (int connect, char *job1, char *job2, char *extend);
 
-extern int pbs_rescquery(int connect, char **IN, int nresc, int *avail,
-        int *alloc, int *resv, int *down);
+extern int pbs_rescquery(int connect, char **IN, int nresc, int *OUTPUT,
+        int *INPUT, int *INPUT, int *INPUT);
 
 extern int pbs_rescreserve(int connect, char **IN, int nresc, resource_t *phandle);

trunk/src/pbs_wrap.c

@@ -1359 +1359 @@
   if (PyList_Check(src))
     return(PyList_Size(src));
-  else {
-
-    /* check if valid NULL pointer */
-    if ( PyString_Check(src) ) {
-      if ( ! strcmp(PyString_AsString(src), "NULL") )
-        return(0);
-    }
-    else
-      return(-1);
-
-  } // end else
+
+  /* check if valid NULL pointer */
+  if ( PyString_Check(src) ) {
+    if ( ! strcmp(PyString_AsString(src), "NULL") )
+      return(0);
+  }
+  return(-1);
+
 } // end Get_List_Size()
 
@@ -1460 +1457 @@
    char *errmsg;
 
-   errmsg = pbse_to_txt();
+   errmsg = pbse_to_txt(pbs_errno);
    if (SARA_DEBUG)
    {
@@ -1685 +1682 @@
 }
 
-char avail(int,char *);
-
-SWIGINTERNSHORT PyObject*
-  SWIG_From_char(char c) 
-{ 
-  return PyString_FromStringAndSize(&c,1);
-}
-
+char *avail(int,char *);
 int pbs_asyrunjob(int,char *,char *,char *);
 int pbs_alterjob(int,char *,struct attrl *,char *);
@@ -1708 +1698 @@
 int pbs_orderjob(int,char *,char *,char *);
 int pbs_rescquery(int,char **,int,int *,int *,int *,int *);
+
+SWIGINTERN PyObject*
+t_output_helper(PyObject* target, PyObject* o) {
+  if (!target) {
+    target = o;
+  } else if (target == Py_None) {  
+    Py_DECREF(target);
+    target = o;
+  } else {
+    if (!PyList_Check(target)) {
+      PyObject *o2 = target;
+      target = PyList_New(1);
+      PyList_SetItem(target, 0, o2);
+    }
+    PyList_Append(target,o);
+    }
+  return target;
+}
+
+
 int pbs_rescreserve(int,char **,int,resource_t *);
 int pbs_rescrelease(int,resource_t);
@@ -2648 +2658 @@
     int arg1 ;
     char *arg2 = (char *) 0 ;
-    char result;
+    char *result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -2660 +2670 @@
         SWIG_arg_fail(2);SWIG_fail;
     }
-    result = (char)avail(arg1,arg2);
-    
-    {
-        resultobj = SWIG_From_char((char)(result)); 
-    }
+    result = (char *)avail(arg1,arg2);
+    
+    resultobj = SWIG_FromCharPtr(result);
     return resultobj;
     fail:
@@ -3207 +3215 @@
     int *arg7 = (int *) 0 ;
     int result;
+    int temp4 ;
+    int res4 = 0 ;
+    int temp5 ;
+    int res5 = 0 ;
+    int temp6 ;
+    int res6 = 0 ;
+    int temp7 ;
+    int res7 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -3213 +3229 @@
     PyObject * obj4 = 0 ;
     PyObject * obj5 = 0 ;
-    PyObject * obj6 = 0 ;
-    
-    if(!PyArg_ParseTuple(args,(char *)"OOOOOOO:pbs_rescquery",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
+    if(!PyArg_ParseTuple(args,(char *)"OOOOOO:pbs_rescquery",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     {
         arg1 = (int)(SWIG_As_int(obj0)); 
@@ -3258 +3274 @@
         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;
-    SWIG_Python_ConvertPtr(obj4, (void **)&arg5, SWIGTYPE_p_int, SWIG_POINTER_EXCEPTION | 0);
-    if (SWIG_arg_fail(5)) SWIG_fail;
-    SWIG_Python_ConvertPtr(obj5, (void **)&arg6, SWIGTYPE_p_int, SWIG_POINTER_EXCEPTION | 0);
-    if (SWIG_arg_fail(6)) SWIG_fail;
-    SWIG_Python_ConvertPtr(obj6, (void **)&arg7, SWIGTYPE_p_int, SWIG_POINTER_EXCEPTION | 0);
-    if (SWIG_arg_fail(7)) SWIG_fail;
+    {
+        if (!(SWIG_ConvertPtr(obj3,(void **)(&arg5),SWIGTYPE_p_int,0) != -1)) {
+            temp5 = SWIG_As_int(obj3);
+            if (SWIG_arg_fail(5)) SWIG_fail;
+            arg5 = &temp5;
+            res5 = SWIG_NEWOBJ;
+        }
+    }
+    {
+        if (!(SWIG_ConvertPtr(obj4,(void **)(&arg6),SWIGTYPE_p_int,0) != -1)) {
+            temp6 = SWIG_As_int(obj4);
+            if (SWIG_arg_fail(6)) SWIG_fail;
+            arg6 = &temp6;
+            res6 = SWIG_NEWOBJ;
+        }
+    }
+    {
+        if (!(SWIG_ConvertPtr(obj5,(void **)(&arg7),SWIGTYPE_p_int,0) != -1)) {
+            temp7 = SWIG_As_int(obj5);
+            if (SWIG_arg_fail(7)) SWIG_fail;
+            arg7 = &temp7;
+            res7 = SWIG_NEWOBJ;
+        }
+    }
     result = (int)pbs_rescquery(arg1,arg2,arg3,arg4,arg5,arg6,arg7);
     
@@ -3271 +3303 @@
         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);