fix_lsload_py

Author: liubo

examples/lsload.py

@@ -1,26 +1,19 @@
 from pythonlsf import lsf
-import ctypes
-import platform
 
 def printHostInfo():
     if lsf.lsb_init("test") > 0:
         return -1;
 
     intp_nhosts = lsf.new_intp()
     lsf.intp_assign(intp_nhosts, 0) 
-    hostsdata = lsf.ls_load(None, intp_nhosts, 0, None)
+    all_lsload_data = lsf.ls_load_py(None, intp_nhosts, 0, None)
     nhosts = lsf.intp_value(intp_nhosts)
-    all_lsload_data = lsf.hostLoadArray_frompointer(hostsdata)
 
     print("{} hosts in the cluster.".format(nhosts))
 
     for i in range(nhosts) :
         host = all_lsload_data[i]
-        if platform.system() == 'Windows':
-            print('No.{} host name : {}'.format(i, host.hostName))
-        else:
-            hostname = ctypes.cast( host.hostName, ctypes.c_char_p)
-            print('No.{} host name : {}'.format(i, hostname.value))
+        print('No.{} host name : {}'.format(i, host.hostName))
 
     return 0
 

pythonlsf/lsf.i

@@ -415,6 +415,36 @@ PyObject * get_host_load(char *resreq, int index) {
     return result;
 }
 
+PyObject * ls_load_py(char *resreq, int *numhosts, int options, char *fromhost) {
+
+    struct hostLoad * hosts = NULL; 
+    int i = 0, j = 0;
+
+    hosts = ls_load(resreq, numhosts, options, fromhost); 
+
+    if (hosts == NULL) { 
+        ls_perror("ls_load_py"); 
+        exit(-1); 
+    }
+
+    /* Python3 can not handle dirty string.*/
+    for (i = 0; i < *numhosts; i++) {
+        int size_string = sizeof(hosts[i].hostName);
+        int len_string  = strlen(hosts[i].hostName);
+        for ( j = len_string; j < size_string; j++) hosts[i].hostName[j] = 0;
+    }
+
+    PyObject * result = PyList_New(*numhosts);
+    for (i = 0; i < *numhosts; i++) {
+        PyObject *o = SWIG_NewPointerObj(SWIG_as_voidptr(&hosts[i]),
+                                         SWIGTYPE_p_hostLoad, 0 |  0 );
+        PyList_SetItem(result,i,o);
+    }
+
+    return result;
+}
+
+
 PyObject * get_queue_info_by_name(char** name, int num) {
     struct queueInfoEnt* queueinfo;
     int    numqueues = num;