staf4ruby 0.1.1 → 0.1.2

data/Rakefile

@@ -32,8 +32,8 @@ CLOBBER.include('lib/*.{o,so}')
 
 gem_spec = Gem::Specification.new do |s|
   s.name=%q{staf4ruby}
-  s.version="0.1.1"
-  s.date=%q{2014-01-17}
+  s.version="0.1.2"
+  s.date=%q{2014-04-29}
   s.authors=["Alan Somers"]
   s.email=%q{asomers@gmail.com}
   s.extensions="ext/extconf.rb"

data/ext/extconf.rb

@@ -8,10 +8,21 @@
 
 require 'mkmf'
 
+# 2.0-only
+have_header('ruby/thread.h') && have_func('rb_thread_call_without_gvl', 'ruby/thread.h')
+
+# 1.9-only
+have_func('rb_thread_blocking_region')
+
+unless find_header("STAF.h", "/usr/staf/include", "/usr/local/staf/include",
+                   "C:/STAF/include")
+  abort "Cannot find STAF.h"
+end
+unless find_library('STAF', 'STAFRegister', "/usr/staf/lib",
+                    "/usr/local/staf/lib", "C:/STAF/lib")
+  abort "Cannot find libSTAF"
+end
 $CFLAGS += " -g3 -O0 -Wall -Werror"
-$INCFLAGS << " " <<
-  "-I/usr/local/staf/include"
-  $LDFLAGS += " -L/usr/local/staf/lib -lSTAF"
 
 puts "Using INCFLAGS='#{$INCFLAGS}'"
 

data/ext/staf4ruby_ext.c

@@ -1,4 +1,4 @@
-/* vim: ts=8,sw=8,noexpandtab */
+/* vim: set ts=8 sw=8 noexpandtab */
 /*****************************************************************************
  * Copyright (c) 2013 Spectra Logic corp
  * All rights reserved. This program and the accompanying materials
@@ -16,10 +16,30 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <errno.h>
+
+#include <ruby.h>
+
+#ifdef HAVE_RUBY_THREAD_H
+#include <ruby/thread.h>
+#endif
+
+/*
+ * STAF must be included after Ruby to prevent this error on Windows7:
+ * #error "ws2tcpip.h is not compatible with winsock.h.  Include winsock2.h
+ * instead"
+ */
 #include <STAF.h>
 #include <STAFString.h>
 
-#include <ruby.h>
+#ifndef HAVE_RB_THREAD_CALL_WITHOUT_GVL
+#ifdef HAVE_RB_THREAD_BLOCKING_REGION
+
+/* emulate rb_thread_call_without_gvl with rb_thread_blocking_region */
+#define rb_thread_call_without_gvl(func, data1, ubf, data2) \
+  rb_thread_blocking_region((rb_blocking_function_t *)func, data1, ubf, data2)
+
+#endif /* ! HAVE_RB_THREAD_BLOCKING_REGION */
+#endif /* ! HAVE_RB_THREAD_CALL_WITHOUT_GVL */
 
 /* Global data */
 VALUE rb_mStaf;
@@ -38,7 +58,7 @@ typedef struct {
 
 /***************************** Private C Methods *****************************/
 
-static VALUE
+static void*
 rb_STAFSubmit_blocking(void* data)
 {
 	staf_submit_args_t* args = (staf_submit_args_t*)data;
@@ -46,10 +66,8 @@ rb_STAFSubmit_blocking(void* data)
 	*(args->rc) = STAFSubmit2(args->handle, args->syncOption,
 			args->machine, args->service, args->request,
 			args->requestLength, args->result, args->resultLen);
-	if (*(args->result) == NULL)
-		*(args->result) = "";
 
-	return (Qnil);
+	return (void*)(Qnil);
 }
 
 static void
@@ -127,12 +145,12 @@ rb_STAFSubmit(VALUE rb_self, VALUE rb_handle, VALUE rb_syncOption, VALUE rb_mach
 	args.result = &result;
 	args.resultLen = &resultLen;
 
-	rb_thread_blocking_region(rb_STAFSubmit_blocking, (void*) &args,
-				  rb_STAFCancel, (void*) NULL);
+	rb_thread_call_without_gvl(rb_STAFSubmit_blocking, (void*) &args,
+				   rb_STAFCancel, (void*) NULL);
 
 	rb_result = rb_ary_new3(3, UINT2NUM(rc), rb_str_new(result, resultLen),
 				UINT2NUM(resultLen));
-	if (result != NULL && *result != '\0')
+	if (result != NULL)
 		STAFFree(args.handle, result);
 	return (rb_result);
 }

data/test/test.rb

@@ -77,7 +77,7 @@ module Staf
     def test_os_name
       result = @handle.submit("local", "var", "resolve string {STAF/Config/OS/Name}")
       assert_equal(STAFResult::Ok, result.rc)
-      known_os_names = ["FreeBSD", "Linux"]
+      known_os_names = ["FreeBSD", "Linux", "Win7"]
       assert known_os_names.include?(result.result)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: staf4ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-17 00:00:00.000000000Z
+date: 2014-04-29 00:00:00.000000000Z
 dependencies: []
 description: Ruby interface to the STAF C APIs.
 email: asomers@gmail.com