About to move to CPP

Makefile

@@ -1,15 +1,22 @@
 
 CC=gcc
 CFLAGS=$(shell pbs-config --cflags) -I/usr/lib/jvm/java-1.7.0-openjdk.x86_64/include/ -I/usr/lib/jvm/java-1.7.0-openjdk.x86_64/include/linux
+LIBS=$(shell pbs-config --libs) -ldrmaa
 
-LIBNAME=libdrmaa.so
+LIBNAME=lib/libjdrmaa.so
 
-compile: drmaa_wrap.c drmaa.i
-	$(CC) $(CFLAGS) -fPIC -c drmaa_wrap.c
-	$(CC) -shared drmaa_wrap.o -o $(LIBNAME)
+all: clean lib javac
 
-drmaa_wrap.c: drmaa.i
-	swig -java $(CFLAGS) -outdir swigjava drmaa.i
+javac: jdrmaa_wrap.c
+	javac jdrmaa/*.java
+	javac test/*.java
+
+lib: jdrmaa_wrap.c jdrmaa.i
+	$(CC) $(CFLAGS) $(LIBS) -fPIC -c jdrmaa_wrap.c
+	$(CC) $(LIBS) -shared jdrmaa_wrap.o -o $(LIBNAME)
+
+jdrmaa_wrap.c: jdrmaa.i
+	swig -java -package jdrmaa -outdir jdrmaa $(CFLAGS) jdrmaa.i
 
 clean:
-	rm drmaa_wrap.c drmaa_wrap.o *.so swigjava/*
+	rm -f jdrmaa_wrap.c jdrmaa_wrap.o $(LIBNAME) jdrmaa/* test/*.class

drmaa_impl_stolen.h

@@ -36,11 +36,6 @@ typedef struct drmaa_session_s drmaa_session_t;
 
 typedef struct drmaa_job_s drmaa_job_t;
 
-/** Mutex for accessing @ref drmaa_session global variable. */
-extern pthread_mutex_t drmaa_session_mutex;
-extern drmaa_session_t *drmaa_session;
-
-
 /** DRMAA session data. */
 
 struct drmaa_session_s

jdrmaa.h

@@ -0,0 +1,47 @@
+#include <drmaa.h>
+
+class JobTemplate{
+	drmaa_job_template_t *jt;
+
+	JobTemplate(){
+		drmaa_allocate_job_template(&jt,NULL,0);
+	}
+
+	~JobTemplate(){
+		drmaa_delete_job_template(jt,NULL,0);
+	}
+
+	int set_attribute(const char *name, const char *value){
+		return drmaa_set_attribute(jt, name, value, NULL, 0);
+	}
+
+	char *get_attribute(const char *name){
+                int reason;
+                char *retval;
+                retval = malloc(1024*sizeof(char));
+                reason = drmaa_get_attribute(jt,name,retval,1024,NULL,0);
+                return retval;
+        }
+
+	int set_vector_attribute(const char *name, const char *value[]){
+           return drmaa_set_vector_attribute($self,name,value,NULL,0);
+        }
+
+	/*
+ *         drmaa_attr_values_t *get_vector_attribute(const char *name){
+ *                         drmaa_attr_values_t *values;
+ *                                         drmaa_get_vector_attribute($self,name,&values,NULL,0);
+ *                                                         return values;
+ *                                                                 }
+ *      */
+
+	char *start(){
+                int reason;
+                char *retval;
+                retval = malloc(256*sizeof(char));
+                reason = drmaa_run_job(retval, 256, $self, NULL, 0);
+                return retval;
+        }
+
+
+};

jdrmaa.i

@@ -0,0 +1,72 @@
+%module jdrmaa
+%include "typemaps.i"
+%{
+#include "drmaa_impl_stolen.h"
+#include <drmaa.h>
+%}
+
+
+
+%ignore drmaa_allocate_job_template;
+%ignore drmaa_delete_job_template;
+%ignore drmaa_set_attribute;
+%ignore drmaa_get_attribute;
+%ignore drmaa_set_vector_attribute;
+%ignore drmaa_get_vector_attribute;
+%ignore drmaa_run_job;
+
+%include "drmaa_impl_stolen.h"
+%include <drmaa.h>
+
+%extend drmaa_job_template_s {
+        drmaa_job_template_s(){
+                drmaa_job_template_t *jt;
+                drmaa_allocate_job_template(&jt,NULL,0);
+                return jt;
+        }
+
+        ~drmma_job_template_s(){
+                drmaa_delete_job_template($self,NULL,0);
+        }
+
+        int set_attribute(const char *name, const char *value){
+            return drmaa_set_attribute($self, name, value, NULL, 0);
+        }
+
+
+        char *get_attribute(const char *name){
+                int reason;
+                char *retval;
+                retval = malloc(1024*sizeof(char));
+                reason = drmaa_get_attribute($self,name,retval,1024,NULL,0);
+                return retval;
+        }
+
+        int set_vector_attribute(const char *name, const char *value[]){
+           return drmaa_set_vector_attribute($self,name,value,NULL,0);
+        }
+
+        drmaa_attr_values_t *get_vector_attribute(const char *name){
+                drmaa_attr_values_t *values;
+                drmaa_get_vector_attribute($self,name,&values,NULL,0);
+                return values;
+        }
+
+        char *start(){
+                int reason;
+                char *retval;
+                retval = malloc(256*sizeof(char));
+                reason = drmaa_run_job(retval, 256, $self, NULL, 0);
+                return retval;
+        }
+};
+
+drmaa_attr_names_t foo_get_attribute_names(){
+        int reason;
+        drmaa_attr_names_t *retval;
+        reason = drmaa_get_attribute_names(&retval,NULL,0);
+        return retval;
+}
+
+%extend drmaa_attr_names_s {
+}

test/Test.java

@@ -1,7 +1,19 @@
- public class Test {
+package test;
+
+import jdrmaa.*;
+
+public class Test {
    public static void main(String argv[]) {
-     System.loadLibrary("drmaa");
-     //System.out.println(example.getMy_variable());
+	System.loadLibrary("jdrmaa");
+     jdrmaa.drmaa_init(null,null,0);
+
+     drmaa_job_template_s myTemplate = new drmaa_job_template_s();
+     myTemplate.set_attribute("drmaa_remote_command","/tmp/test.sh");
+     myTemplate.set_attribute("drmaa_job_name","Job Submit from DRMAA");
+     System.out.println(myTemplate.get_attribute("drmaa_job_name"));
+     System.out.println(myTemplate.start());
+
+	//System.out.println(example.getMy_variable());
      //System.out.println(example.fact(5));
      //System.out.println(example.get_time());
    }