DrQueueRubyBindings 0.4.1 → 0.4.2

data/ext/extconf.rb

@@ -29,7 +29,7 @@ elsif RUBY_PLATFORM =~ /irix6/i
 end
 
 if File.directory? "drqueue"
-  Dir::chdir 'drqueue'
+  Dir::chdir 'drqueue/src'
   # try to do a Git pull
   if xsystem('git pull') == false
     puts 'Git pull failed'
@@ -41,7 +41,7 @@ else
     puts 'Git clone failed'
     exit 1
   end
-  Dir::chdir 'drqueue'
+  Dir::chdir 'drqueue/src'
 end
 
 # try to build libdrqueue
@@ -49,22 +49,22 @@ if xsystem('scons universal_binary=true build_drqman=false libdrqueue') == false
   puts 'libdrqueue build failed'
   exit 1
 end
-Dir::chdir '..'
+Dir::chdir '../..'
 
 # create swig wrapper
 puts 'generating swig interface file'
-puts 'swig -ruby -Idrqueue/ -Idrqueue/libdrqueue -D'+rb_os+' -Wall -autorename libdrqueue_ruby.i'
-xsystem('swig -ruby -Idrqueue/ -Idrqueue/libdrqueue -D'+rb_os+' -Wall -autorename libdrqueue_ruby.i')
+puts 'swig -ruby -Idrqueue/src/ -Idrqueue/src/libdrqueue -D'+rb_os+' -Wall -autorename libdrqueue_ruby.i'
+xsystem('swig -ruby -Idrqueue/src/ -Idrqueue/src/libdrqueue -D'+rb_os+' -Wall -autorename libdrqueue_ruby.i')
 puts 'look for output in mkmf.log'
 
 # build for os
 $CFLAGS += ' -D'+rb_os
 
 # include the headers
-$CFLAGS += ' -Idrqueue/ -Idrqueue/libdrqueue'
+$CFLAGS += ' -Idrqueue/src/ -Idrqueue/src/libdrqueue'
 
 # path to the drqueue lib
-$LOCAL_LIBS += 'drqueue/libdrqueue/libdrqueue.a'
+$LOCAL_LIBS += 'drqueue/src/libdrqueue/libdrqueue.a'
 
 # create the makefile
 create_makefile('drqueue')

data/ext/libdrqueue_ruby.i

@@ -34,7 +34,7 @@ slaves. Also provides access to all data structures of DrQueue."
 
 
 // Tell SWIG to keep track of mappings between C/C++ structs/classes
-//%trackobjects;
+%trackobjects;
 
 
 %include "typemaps.i"
@@ -127,10 +127,11 @@ typedef unsigned char uint8_t;
 // these methods generate new objects
 %newobject *::request_job_list;
 %newobject *::request_computer_list;
-
+%newobject *::request_job_xfer;
 
 // JOB
 %extend job {
+  %newobject job;
 	job ()
 	{
 		struct job *j;
@@ -145,6 +146,7 @@ typedef unsigned char uint8_t;
 
 	~job ()
 	{
+	  SWIG_RubyRemoveTracking(self);
 		job_init(self);
 		//free (self);
 		job_frame_info_free (self);
@@ -175,6 +177,7 @@ typedef unsigned char uint8_t;
 		return variable->value;
 	}
 
+  %newobject request_frame_list;
 	VALUE request_frame_list (int who)
 	{
 		VALUE l = rb_ary_new();
@@ -516,6 +519,7 @@ typedef unsigned char uint8_t;
 			return (VALUE)NULL;
 		}
 	}
+
 	%newobject get_pool;
 	struct pool *get_pool (int n)
 	{
@@ -601,6 +605,7 @@ typedef unsigned char uint8_t;
 
 // struct pool
 %extend pool {
+  %newobject pool;
   pool (char *name)
   {
     struct pool *p;
@@ -616,14 +621,15 @@ typedef unsigned char uint8_t;
 
   ~pool ()
   {
-    //free (self);
-    computer_pool_free (self);
+    free (self);
+    //computer_pool_free (self);
   }
 }
 
 
 // COMPUTER
 %extend computer {
+  %newobject computer;
 	computer ()
 	{
 		struct computer *c;
@@ -642,15 +648,16 @@ typedef unsigned char uint8_t;
 		computer_free (self);
 	}
 
+  %newobject list_pools;
   VALUE list_pools (void)
   {
     VALUE l = rb_ary_new();
-	int npools = self->limits.npools;
+    int npools = self->limits.npools;
 
     if ((self->limits.pool.ptr = (struct pool *) computer_pool_attach_shared_memory(&self->limits)) == (void*)-1) {
     	rb_raise(rb_eException,drerrno_str());
     	return (VALUE)NULL;
-	}
+    }
 
     int i;
     for (i=0;i<npools;i++) {

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: DrQueueRubyBindings
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Andreas Schroeder