hermann 0.23.0.242-java → 0.23.0.261-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 715896bb3f1ca4df3d5d05a24697606eb0d219ca
-  data.tar.gz: 18e6d31572fcf45e2f91065a032d2273c617adda
+  metadata.gz: 4e715e03945fb7ad01ee7609fcfbb4a989c8d027
+  data.tar.gz: a3400c46397d2b7d32506642b800c48a76cfe77d
 SHA512:
-  metadata.gz: 43d22cb06fe0afe4afec0a20cee94b97ebe1698143038a1e36361dfa45226938a2db96cf6cb54bce9fa5c0c6445a3855409050b6d6ebe9adb46278ff48569e46
-  data.tar.gz: c939700ce7d662f39210e02c389ae900d11ac57742ce5cb5d593ee17bded4a645341b094d94fe66c46eb526c92f8970ec32c23546bb7eb22817875b02dcb3b24
+  metadata.gz: 3ae5da59e45c4023cdf13168333244fa74255e4d134dd18203c4c6009f77a874c49e3099acb312fc43e6042a740133e26f4a5e22d7e9110c1e06571681125a56
+  data.tar.gz: 88a5d35ab6dc52d850f0bfc794222cacb82bb361ff1f260c121ae7fd678e9e2d54c8f25b39768c25ff1ff2fff796938890dd6f635031ab1c3dcd5bfe104485c4

data/ext/hermann/extconf.rb

@@ -147,6 +147,8 @@ dir_config('rdkafka', HEADER_DIRS, LIB_DIRS)
 $LOCAL_LIBS << File.join(librdkafka.path, 'lib', 'librdkafka.a')
 
 have_header('ruby/thread.h')
+have_header('ruby/intern.h')
+have_func('rb_thread_blocking_region')
 have_func('rb_thread_call_without_gvl')
 
 create_makefile('hermann/hermann_lib')

data/ext/hermann/hermann_lib.c

@@ -337,7 +337,7 @@ void consumer_init_kafka(HermannInstanceConfig* config) {
 
 // Ruby gem extensions
 
-#if defined(RB_THREAD_BLOCKING_REGION) || defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
+#if defined(HAVE_RB_THREAD_BLOCKING_REGION) || defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
 /* NOTE: We only need this method defined if RB_THREAD_BLOCKING_REGION is
  * defined, otherwise it's unused
  */
@@ -396,8 +396,8 @@ static void consumer_consume_loop(HermannInstanceConfig* consumerConfig) {
 	TRACER("\n");
 
 	while (consumerConfig->run) {
-#ifdef RB_THREAD_BLOCKING_REGION
-		msg = rb_thread_blocking_region(consumer_recv_msg,
+#ifdef HAVE_RB_THREAD_BLOCKING_REGION
+		msg = (rd_kafka_message_t *) rb_thread_blocking_region((rb_blocking_function_t *) consumer_recv_msg,
 				consumerConfig,
 				consumer_consume_stop_callback,
 				consumerConfig);
@@ -762,6 +762,9 @@ static void consumer_free(void *p) {
 		rd_kafka_destroy(config->rk);
 	}
 
+	free(config->topic);
+	free(config->brokers);
+
 	// clean up the struct
 	free(config);
 }
@@ -837,8 +840,8 @@ static VALUE consumer_initialize(VALUE self,
 	partitionNo = FIX2INT(partition);
 	Data_Get_Struct(self, HermannInstanceConfig, consumerConfig);
 
-	consumerConfig->topic = topicPtr;
-	consumerConfig->brokers = brokersPtr;
+	consumerConfig->topic = strdup(topicPtr);
+	consumerConfig->brokers = strdup(brokersPtr);
 	consumerConfig->partition = partitionNo;
 	consumerConfig->run = 1;
 	consumerConfig->exit_eof = 0;

data/ext/hermann/hermann_lib.h

@@ -36,6 +36,10 @@
 #include <ruby/thread.h>
 #endif
 
+#ifdef HAVE_RUBY_INTERN_H
+#include <ruby/intern.h>
+#endif
+
 #include <ctype.h>
 #include <signal.h>
 #include <string.h>

data/lib/hermann/java.rb

@@ -1,6 +1,7 @@
 module Hermann
   require 'java'
   require 'hermann_jars'
+  require 'concurrent'
 
   module JavaUtil
     include_package 'java.util'

data/lib/hermann/provider/java_producer.rb

@@ -1,6 +1,5 @@
-require 'hermann'
-require 'concurrent'
 require 'json'
+require 'hermann'
 require 'hermann/errors'
 
 module Hermann

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hermann
 version: !ruby/object:Gem::Version
-  version: 0.23.0.242
+  version: 0.23.0.261
 platform: java
 authors:
 - R. Tyler Croy
@@ -10,20 +10,20 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
+  name: json
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 1.8.2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 1.8.2
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -40,6 +40,20 @@ dependencies:
         version: 0.3.4
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: jar-dependencies
   version_requirements: !ruby/object:Gem::Requirement