slyphon-zookeeper 0.8.4 → 0.9.0

data/ext/zkrb_wrapper.h

@@ -0,0 +1,330 @@
+#ifndef ZKRB_WRAPPER_H
+#define ZKRB_WRAPPER_H
+#if 0
+
+  AUTOGENERATED BY generate_gvl_code.rb 
+
+#endif
+
+#include "ruby.h"
+#include "c-client-src/zookeeper.h"
+#include "zkrb_wrapper_compat.h"
+#include "dbg.h"
+
+#define ZKRB_FAIL -1
+
+typedef struct {
+  zhandle_t *zh;
+  int rc;
+} zkrb_zoo_recv_timeout_args_t;
+
+typedef struct {
+  zhandle_t *zh;
+  int rc;
+} zkrb_zoo_state_args_t;
+
+typedef struct {
+  zhandle_t *zh;
+  const char *path;
+  const char *value;
+  int valuelen;
+  const struct ACL_vector *acl;
+  int flags;
+  string_completion_t completion;
+  const void *data;
+  int rc;
+} zkrb_zoo_acreate_args_t;
+
+typedef struct {
+  zhandle_t *zh;
+  const char *path;
+  int version;
+  void_completion_t completion;
+  const void *data;
+  int rc;
+} zkrb_zoo_adelete_args_t;
+
+typedef struct {
+  zhandle_t *zh;
+  const char *path;
+  int watch;
+  stat_completion_t completion;
+  const void *data;
+  int rc;
+} zkrb_zoo_aexists_args_t;
+
+typedef struct {
+  zhandle_t *zh;
+  const char *path;
+  watcher_fn watcher;
+  void* watcherCtx;
+  stat_completion_t completion;
+  const void *data;
+  int rc;
+} zkrb_zoo_awexists_args_t;
+
+typedef struct {
+  zhandle_t *zh;
+  const char *path;
+  int watch;
+  data_completion_t completion;
+  const void *data;
+  int rc;
+} zkrb_zoo_aget_args_t;
+
+typedef struct {
+  zhandle_t *zh;
+  const char *path;
+  watcher_fn watcher;
+  void* watcherCtx;
+  data_completion_t completion;
+  const void *data;
+  int rc;
+} zkrb_zoo_awget_args_t;
+
+typedef struct {
+  zhandle_t *zh;
+  const char *path;
+  const char *buffer;
+  int buflen;
+  int version;
+  stat_completion_t completion;
+  const void *data;
+  int rc;
+} zkrb_zoo_aset_args_t;
+
+typedef struct {
+  zhandle_t *zh;
+  const char *path;
+  int watch;
+  strings_completion_t completion;
+  const void *data;
+  int rc;
+} zkrb_zoo_aget_children_args_t;
+
+typedef struct {
+  zhandle_t *zh;
+  const char *path;
+  watcher_fn watcher;
+  void* watcherCtx;
+  strings_completion_t completion;
+  const void *data;
+  int rc;
+} zkrb_zoo_awget_children_args_t;
+
+typedef struct {
+  zhandle_t *zh;
+  const char *path;
+  int watch;
+  strings_stat_completion_t completion;
+  const void *data;
+  int rc;
+} zkrb_zoo_aget_children2_args_t;
+
+typedef struct {
+  zhandle_t *zh;
+  const char *path;
+  watcher_fn watcher;
+  void* watcherCtx;
+  strings_stat_completion_t completion;
+  const void *data;
+  int rc;
+} zkrb_zoo_awget_children2_args_t;
+
+typedef struct {
+  zhandle_t *zh;
+  const char *path;
+  string_completion_t completion;
+  const void *data;
+  int rc;
+} zkrb_zoo_async_args_t;
+
+typedef struct {
+  zhandle_t *zh;
+  const char *path;
+  acl_completion_t completion;
+  const void *data;
+  int rc;
+} zkrb_zoo_aget_acl_args_t;
+
+typedef struct {
+  zhandle_t *zh;
+  const char *path;
+  int version;
+  struct ACL_vector *acl;
+  void_completion_t completion;
+  const void *data;
+  int rc;
+} zkrb_zoo_aset_acl_args_t;
+
+typedef struct {
+  zhandle_t *zh;
+  const char* scheme;
+  const char* cert;
+  int certLen;
+  void_completion_t completion;
+  const void *data;
+  int rc;
+} zkrb_zoo_add_auth_args_t;
+
+typedef struct {
+  zhandle_t *zh;
+  const char *path;
+  const char *value;
+  int valuelen;
+  const struct ACL_vector *acl;
+  int flags;
+  char *path_buffer;
+  int path_buffer_len;
+  int rc;
+} zkrb_zoo_create_args_t;
+
+typedef struct {
+  zhandle_t *zh;
+  const char *path;
+  int version;
+  int rc;
+} zkrb_zoo_delete_args_t;
+
+typedef struct {
+  zhandle_t *zh;
+  const char *path;
+  int watch;
+  struct Stat *stat;
+  int rc;
+} zkrb_zoo_exists_args_t;
+
+typedef struct {
+  zhandle_t *zh;
+  const char *path;
+  watcher_fn watcher;
+  void* watcherCtx;
+  struct Stat *stat;
+  int rc;
+} zkrb_zoo_wexists_args_t;
+
+typedef struct {
+  zhandle_t *zh;
+  const char *path;
+  int watch;
+  char *buffer;
+  int* buffer_len;
+  struct Stat *stat;
+  int rc;
+} zkrb_zoo_get_args_t;
+
+typedef struct {
+  zhandle_t *zh;
+  const char *path;
+  watcher_fn watcher;
+  void* watcherCtx;
+  char *buffer;
+  int* buffer_len;
+  struct Stat *stat;
+  int rc;
+} zkrb_zoo_wget_args_t;
+
+typedef struct {
+  zhandle_t *zh;
+  const char *path;
+  const char *buffer;
+  int buflen;
+  int version;
+  int rc;
+} zkrb_zoo_set_args_t;
+
+typedef struct {
+  zhandle_t *zh;
+  const char *path;
+  const char *buffer;
+  int buflen;
+  int version;
+  struct Stat *stat;
+  int rc;
+} zkrb_zoo_set2_args_t;
+
+typedef struct {
+  zhandle_t *zh;
+  const char *path;
+  int watch;
+  struct String_vector *strings;
+  int rc;
+} zkrb_zoo_get_children_args_t;
+
+typedef struct {
+  zhandle_t *zh;
+  const char *path;
+  watcher_fn watcher;
+  void* watcherCtx;
+  struct String_vector *strings;
+  int rc;
+} zkrb_zoo_wget_children_args_t;
+
+typedef struct {
+  zhandle_t *zh;
+  const char *path;
+  int watch;
+  struct String_vector *strings;
+  struct Stat *stat;
+  int rc;
+} zkrb_zoo_get_children2_args_t;
+
+typedef struct {
+  zhandle_t *zh;
+  const char *path;
+  watcher_fn watcher;
+  void* watcherCtx;
+  struct String_vector *strings;
+  struct Stat *stat;
+  int rc;
+} zkrb_zoo_wget_children2_args_t;
+
+typedef struct {
+  zhandle_t *zh;
+  const char *path;
+  struct ACL_vector *acl;
+  struct Stat *stat;
+  int rc;
+} zkrb_zoo_get_acl_args_t;
+
+typedef struct {
+  zhandle_t *zh;
+  const char *path;
+  int version;
+  const struct ACL_vector *acl;
+  int rc;
+} zkrb_zoo_set_acl_args_t;
+
+int zkrb_call_zoo_recv_timeout(zhandle_t *zh);
+int zkrb_call_zoo_state(zhandle_t *zh);
+int zkrb_call_zoo_acreate(zhandle_t *zh, const char *path, const char *value, int valuelen, const struct ACL_vector *acl, int flags, string_completion_t completion, const void *data);
+int zkrb_call_zoo_adelete(zhandle_t *zh, const char *path, int version, void_completion_t completion, const void *data);
+int zkrb_call_zoo_aexists(zhandle_t *zh, const char *path, int watch, stat_completion_t completion, const void *data);
+int zkrb_call_zoo_awexists(zhandle_t *zh, const char *path, watcher_fn watcher, void* watcherCtx, stat_completion_t completion, const void *data);
+int zkrb_call_zoo_aget(zhandle_t *zh, const char *path, int watch, data_completion_t completion, const void *data);
+int zkrb_call_zoo_awget(zhandle_t *zh, const char *path, watcher_fn watcher, void* watcherCtx, data_completion_t completion, const void *data);
+int zkrb_call_zoo_aset(zhandle_t *zh, const char *path, const char *buffer, int buflen, int version, stat_completion_t completion, const void *data);
+int zkrb_call_zoo_aget_children(zhandle_t *zh, const char *path, int watch, strings_completion_t completion, const void *data);
+int zkrb_call_zoo_awget_children(zhandle_t *zh, const char *path, watcher_fn watcher, void* watcherCtx, strings_completion_t completion, const void *data);
+int zkrb_call_zoo_aget_children2(zhandle_t *zh, const char *path, int watch, strings_stat_completion_t completion, const void *data);
+int zkrb_call_zoo_awget_children2(zhandle_t *zh, const char *path, watcher_fn watcher, void* watcherCtx, strings_stat_completion_t completion, const void *data);
+int zkrb_call_zoo_async(zhandle_t *zh, const char *path, string_completion_t completion, const void *data);
+int zkrb_call_zoo_aget_acl(zhandle_t *zh, const char *path, acl_completion_t completion, const void *data);
+int zkrb_call_zoo_aset_acl(zhandle_t *zh, const char *path, int version, struct ACL_vector *acl, void_completion_t completion, const void *data);
+int zkrb_call_zoo_add_auth(zhandle_t *zh, const char* scheme, const char* cert, int certLen, void_completion_t completion, const void *data);
+int zkrb_call_zoo_create(zhandle_t *zh, const char *path, const char *value, int valuelen, const struct ACL_vector *acl, int flags, char *path_buffer, int path_buffer_len);
+int zkrb_call_zoo_delete(zhandle_t *zh, const char *path, int version);
+int zkrb_call_zoo_exists(zhandle_t *zh, const char *path, int watch, struct Stat *stat);
+int zkrb_call_zoo_wexists(zhandle_t *zh, const char *path, watcher_fn watcher, void* watcherCtx, struct Stat *stat);
+int zkrb_call_zoo_get(zhandle_t *zh, const char *path, int watch, char *buffer, int* buffer_len, struct Stat *stat);
+int zkrb_call_zoo_wget(zhandle_t *zh, const char *path, watcher_fn watcher, void* watcherCtx, char *buffer, int* buffer_len, struct Stat *stat);
+int zkrb_call_zoo_set(zhandle_t *zh, const char *path, const char *buffer, int buflen, int version);
+int zkrb_call_zoo_set2(zhandle_t *zh, const char *path, const char *buffer, int buflen, int version, struct Stat *stat);
+int zkrb_call_zoo_get_children(zhandle_t *zh, const char *path, int watch, struct String_vector *strings);
+int zkrb_call_zoo_wget_children(zhandle_t *zh, const char *path, watcher_fn watcher, void* watcherCtx, struct String_vector *strings);
+int zkrb_call_zoo_get_children2(zhandle_t *zh, const char *path, int watch, struct String_vector *strings, struct Stat *stat);
+int zkrb_call_zoo_wget_children2(zhandle_t *zh, const char *path, watcher_fn watcher, void* watcherCtx, struct String_vector *strings, struct Stat *stat);
+int zkrb_call_zoo_get_acl(zhandle_t *zh, const char *path, struct ACL_vector *acl, struct Stat *stat);
+int zkrb_call_zoo_set_acl(zhandle_t *zh, const char *path, int version, const struct ACL_vector *acl);
+
+#endif /* ZKRB_WRAPPER_H */

data/ext/zkrb_wrapper_compat.c

@@ -0,0 +1,15 @@
+#include "ruby.h"
+#include "zkrb_wrapper_compat.h"
+
+
+VALUE zkrb_thread_blocking_region(zkrb_blocking_function_t *func, void *data1) {
+
+#ifdef ZKRB_RUBY_187
+  return func(data1);
+#else
+  return rb_thread_blocking_region((rb_blocking_function_t *)func, data1, RUBY_UBF_IO, 0);
+#endif
+
+}
+
+// vim:sts=2:sw=2:et

data/ext/zkrb_wrapper_compat.h

@@ -0,0 +1,11 @@
+#ifndef ZKRB_WRAPPER_COMPAT_H
+#define ZKRB_WRAPPER_COMPAT_H
+
+typedef VALUE zkrb_blocking_function_t(void *);
+typedef void zkrb_unblock_function_t(void *);
+
+// delegates to rb_thread_blocking_region on 1.9.x, always uses UBF_IO
+VALUE zkrb_thread_blocking_region(zkrb_blocking_function_t *func, void *data1);
+
+
+#endif /* ZKRB_WRAPPER_COMPAT_H */

data/ext/zookeeper_c.c

@@ -23,6 +23,7 @@
 #include <inttypes.h>
 
 #include "zookeeper_lib.h"
+#include "zkrb_wrapper.h"
 #include "dbg.h"
 
 static VALUE Zookeeper = Qnil;
@@ -193,35 +194,35 @@ error:
   return Qnil;
 }
 
-#define FETCH_DATA_PTR(x, y)                                            \
-  struct zkrb_instance_data * y;                                        \
-  Data_Get_Struct(rb_iv_get(x, "@_data"), struct zkrb_instance_data, y); \
-  if ((y)->zh == NULL)                                                  \
+#define FETCH_DATA_PTR(X, Y)                                             \
+  struct zkrb_instance_data * Y;                                         \
+  Data_Get_Struct(rb_iv_get(X, "@_data"), struct zkrb_instance_data, Y); \
+  if ((Y)->zh == NULL)                                                   \
     rb_raise(rb_eRuntimeError, "zookeeper handle is closed")
 
 #define STANDARD_PREAMBLE(self, zk, reqid, path, async, watch, cb_ctx, w_ctx, call_type) \
-  if (TYPE(reqid) != T_FIXNUM && TYPE(reqid) != T_BIGNUM) {             \
-    rb_raise(rb_eTypeError, "reqid must be Fixnum/Bignum");             \
-    return Qnil;                                                        \
-  }                                                                     \
-  Check_Type(path, T_STRING);                                           \
-  struct zkrb_instance_data * zk;                                       \
-  Data_Get_Struct(rb_iv_get(self, "@_data"), struct zkrb_instance_data, zk); \
-  if (!zk->zh)                                                          \
-    rb_raise(rb_eRuntimeError, "zookeeper handle is closed");           \
-  zkrb_calling_context* cb_ctx =                                        \
-    (async != Qfalse && async != Qnil) ?                                \
-       zkrb_calling_context_alloc(NUM2LL(reqid), zk->queue) :           \
-       NULL;                                                            \
-  zkrb_calling_context* w_ctx =                                         \
-    (watch != Qfalse && watch != Qnil) ?                                \
-       zkrb_calling_context_alloc(NUM2LL(reqid), zk->queue) :           \
-       NULL;                                                            \
-  int a  = (async != Qfalse && async != Qnil);                          \
-  int w  = (watch != Qfalse && watch != Qnil);                          \
-  zkrb_call_type call_type;                                             \
-  if (a) { if (w) { call_type = ASYNC_WATCH; } else { call_type = ASYNC; } } \
-    else { if (w) { call_type =  SYNC_WATCH; } else { call_type = SYNC; } }
+  if (TYPE(reqid) != T_FIXNUM && TYPE(reqid) != T_BIGNUM) {                   \
+    rb_raise(rb_eTypeError, "reqid must be Fixnum/Bignum");                   \
+    return Qnil;                                                              \
+  }                                                                           \
+  Check_Type(path, T_STRING);                                                 \
+  struct zkrb_instance_data * zk;                                             \
+  Data_Get_Struct(rb_iv_get(self, "@_data"), struct zkrb_instance_data, zk);  \
+  if (!zk->zh)                                                                \
+    rb_raise(rb_eRuntimeError, "zookeeper handle is closed");                 \
+  zkrb_calling_context* cb_ctx =                                              \
+    (async != Qfalse && async != Qnil) ?                                      \
+       zkrb_calling_context_alloc(NUM2LL(reqid), zk->queue) :                 \
+       NULL;                                                                  \
+  zkrb_calling_context* w_ctx =                                               \
+    (watch != Qfalse && watch != Qnil) ?                                      \
+       zkrb_calling_context_alloc(NUM2LL(reqid), zk->queue) :                 \
+       NULL;                                                                  \
+  int a_  = (async != Qfalse && async != Qnil);                               \
+  int w_  = (watch != Qfalse && watch != Qnil);                               \
+  zkrb_call_type call_type;                                                   \
+  if (a_) { if (w_) { call_type = ASYNC_WATCH; } else { call_type = ASYNC; } } \
+     else { if (w_) { call_type =  SYNC_WATCH; } else { call_type = SYNC; } }
 
 static VALUE method_get_children(VALUE self, VALUE reqid, VALUE path, VALUE async, VALUE watch) {
   STANDARD_PREAMBLE(self, zk, reqid, path, async, watch, data_ctx, watch_ctx, call_type);
@@ -232,19 +233,19 @@ static VALUE method_get_children(VALUE self, VALUE reqid, VALUE path, VALUE asyn
   int rc;
   switch (call_type) {
     case SYNC:
-      rc = zoo_get_children2(zk->zh, RSTRING_PTR(path), 0, &strings, &stat);
+      rc = zkrb_call_zoo_get_children2(zk->zh, RSTRING_PTR(path), 0, &strings, &stat);
       break;
 
     case SYNC_WATCH:
-      rc = zoo_wget_children2(zk->zh, RSTRING_PTR(path), zkrb_state_callback, watch_ctx, &strings, &stat);
+      rc = zkrb_call_zoo_wget_children2(zk->zh, RSTRING_PTR(path), zkrb_state_callback, watch_ctx, &strings, &stat);
       break;
 
     case ASYNC:
-      rc = zoo_aget_children2(zk->zh, RSTRING_PTR(path), 0, zkrb_strings_stat_callback, data_ctx);
+      rc = zkrb_call_zoo_aget_children2(zk->zh, RSTRING_PTR(path), 0, zkrb_strings_stat_callback, data_ctx);
       break;
 
     case ASYNC_WATCH:
-      rc = zoo_awget_children2(zk->zh, RSTRING_PTR(path), zkrb_state_callback, watch_ctx, zkrb_strings_stat_callback, data_ctx);
+      rc = zkrb_call_zoo_awget_children2(zk->zh, RSTRING_PTR(path), zkrb_state_callback, watch_ctx, zkrb_strings_stat_callback, data_ctx);
       break;
   }
 
@@ -265,19 +266,19 @@ static VALUE method_exists(VALUE self, VALUE reqid, VALUE path, VALUE async, VAL
   int rc;
   switch (call_type) {
     case SYNC:
-      rc = zoo_exists(zk->zh, RSTRING_PTR(path), 0, &stat);
+      rc = zkrb_call_zoo_exists(zk->zh, RSTRING_PTR(path), 0, &stat);
       break;
 
     case SYNC_WATCH:
-      rc = zoo_wexists(zk->zh, RSTRING_PTR(path), zkrb_state_callback, watch_ctx, &stat);
+      rc = zkrb_call_zoo_wexists(zk->zh, RSTRING_PTR(path), zkrb_state_callback, watch_ctx, &stat);
       break;
 
     case ASYNC:
-      rc = zoo_aexists(zk->zh, RSTRING_PTR(path), 0, zkrb_stat_callback, data_ctx);
+      rc = zkrb_call_zoo_aexists(zk->zh, RSTRING_PTR(path), 0, zkrb_stat_callback, data_ctx);
       break;
 
     case ASYNC_WATCH:
-      rc = zoo_awexists(zk->zh, RSTRING_PTR(path), zkrb_state_callback, watch_ctx, zkrb_stat_callback, data_ctx);
+      rc = zkrb_call_zoo_awexists(zk->zh, RSTRING_PTR(path), zkrb_state_callback, watch_ctx, zkrb_stat_callback, data_ctx);
       break;
   }
 
@@ -297,7 +298,7 @@ static VALUE method_sync(VALUE self, VALUE reqid, VALUE path) {
 
   STANDARD_PREAMBLE(self, zk, reqid, path, async, watch, data_ctx, watch_ctx, call_type);
 
-  rc = zoo_async(zk->zh, RSTRING_PTR(path), zkrb_string_callback, data_ctx);
+  rc = zkrb_call_zoo_async(zk->zh, RSTRING_PTR(path), zkrb_string_callback, data_ctx);
 
   return INT2FIX(rc);
 }
@@ -319,10 +320,12 @@ static VALUE method_create(VALUE self, VALUE reqid, VALUE path, VALUE data, VALU
   switch (call_type) {
     case SYNC:
       // casting data_len to int is OK as you can only store 1MB in zookeeper
-      rc = zoo_create(zk->zh, RSTRING_PTR(path), data_ptr, (int)data_len, aclptr, FIX2INT(flags), realpath, sizeof(realpath));
+      rc = zkrb_call_zoo_create(zk->zh, RSTRING_PTR(path), data_ptr, (int)data_len, aclptr, FIX2INT(flags), realpath, sizeof(realpath));
+
       break;
     case ASYNC:
-      rc = zoo_acreate(zk->zh, RSTRING_PTR(path), data_ptr, (int)data_len, aclptr, FIX2INT(flags), zkrb_string_callback, data_ctx);
+      rc = zkrb_call_zoo_acreate(zk->zh, RSTRING_PTR(path), data_ptr, (int)data_len, aclptr, FIX2INT(flags), zkrb_string_callback, data_ctx);
+
       break;
     default:
       /* TODO(wickman) raise proper argument error */
@@ -330,6 +333,7 @@ static VALUE method_create(VALUE self, VALUE reqid, VALUE path, VALUE data, VALU
       break;
   }
 
+
   if (aclptr) {
     deallocate_ACL_vector(aclptr);
     free(aclptr);
@@ -351,10 +355,10 @@ static VALUE method_delete(VALUE self, VALUE reqid, VALUE path, VALUE version, V
   int rc = 0;
   switch (call_type) {
     case SYNC:
-      rc = zoo_delete(zk->zh, RSTRING_PTR(path), FIX2INT(version));
+      rc = zkrb_call_zoo_delete(zk->zh, RSTRING_PTR(path), FIX2INT(version));
       break;
     case ASYNC:
-      rc = zoo_adelete(zk->zh, RSTRING_PTR(path), FIX2INT(version), zkrb_void_callback, data_ctx);
+      rc = zkrb_call_zoo_adelete(zk->zh, RSTRING_PTR(path), FIX2INT(version), zkrb_void_callback, data_ctx);
       break;
     default:
       /* TODO(wickman) raise proper argument error */
@@ -379,19 +383,19 @@ static VALUE method_get(VALUE self, VALUE reqid, VALUE path, VALUE async, VALUE
 
   switch (call_type) {
     case SYNC:
-      rc = zoo_get(zk->zh, RSTRING_PTR(path), 0, data, &data_len, &stat);
+      rc = zkrb_call_zoo_get(zk->zh, RSTRING_PTR(path), 0, data, &data_len, &stat);
       break;
 
     case SYNC_WATCH:
-      rc = zoo_wget(zk->zh, RSTRING_PTR(path), zkrb_state_callback, watch_ctx, data, &data_len, &stat);
+      rc = zkrb_call_zoo_wget(zk->zh, RSTRING_PTR(path), zkrb_state_callback, watch_ctx, data, &data_len, &stat);
       break;
 
     case ASYNC:
-      rc = zoo_aget(zk->zh, RSTRING_PTR(path), 0, zkrb_data_callback, data_ctx);
+      rc = zkrb_call_zoo_aget(zk->zh, RSTRING_PTR(path), 0, zkrb_data_callback, data_ctx);
       break;
 
     case ASYNC_WATCH:
-      rc = zoo_awget(zk->zh, RSTRING_PTR(path), zkrb_state_callback, watch_ctx, zkrb_data_callback, data_ctx);
+      rc = zkrb_call_zoo_awget(zk->zh, RSTRING_PTR(path), zkrb_state_callback, watch_ctx, zkrb_data_callback, data_ctx);
       break;
   }
 
@@ -421,10 +425,10 @@ static VALUE method_set(VALUE self, VALUE reqid, VALUE path, VALUE data, VALUE a
   int rc;
   switch (call_type) {
     case SYNC:
-      rc = zoo_set2(zk->zh, RSTRING_PTR(path), data_ptr, (int)data_len, FIX2INT(version), &stat);
+      rc = zkrb_call_zoo_set2(zk->zh, RSTRING_PTR(path), data_ptr, (int)data_len, FIX2INT(version), &stat);
       break;
     case ASYNC:
-      rc = zoo_aset(zk->zh, RSTRING_PTR(path), data_ptr, (int)data_len, FIX2INT(version),
+      rc = zkrb_call_zoo_aset(zk->zh, RSTRING_PTR(path), data_ptr, (int)data_len, FIX2INT(version),
                             zkrb_stat_callback, data_ctx);
       break;
     default:
@@ -449,10 +453,10 @@ static VALUE method_set_acl(VALUE self, VALUE reqid, VALUE path, VALUE acls, VAL
   int rc;
   switch (call_type) {
     case SYNC:
-      rc = zoo_set_acl(zk->zh, RSTRING_PTR(path), FIX2INT(version), aclptr);
+      rc = zkrb_call_zoo_set_acl(zk->zh, RSTRING_PTR(path), FIX2INT(version), aclptr);
       break;
     case ASYNC:
-      rc = zoo_aset_acl(zk->zh, RSTRING_PTR(path), FIX2INT(version), aclptr, zkrb_void_callback, data_ctx);
+      rc = zkrb_call_zoo_aset_acl(zk->zh, RSTRING_PTR(path), FIX2INT(version), aclptr, zkrb_void_callback, data_ctx);
       break;
     default:
       /* TODO(wickman) raise proper argument error */
@@ -476,10 +480,10 @@ static VALUE method_get_acl(VALUE self, VALUE reqid, VALUE path, VALUE async) {
   int rc;
   switch (call_type) {
     case SYNC:
-      rc = zoo_get_acl(zk->zh, RSTRING_PTR(path), &acls, &stat);
+      rc = zkrb_call_zoo_get_acl(zk->zh, RSTRING_PTR(path), &acls, &stat);
       break;
     case ASYNC:
-      rc = zoo_aget_acl(zk->zh, RSTRING_PTR(path), zkrb_acl_callback, data_ctx);
+      rc = zkrb_call_zoo_aget_acl(zk->zh, RSTRING_PTR(path), zkrb_acl_callback, data_ctx);
       break;
     default:
       /* TODO(wickman) raise proper argument error */