lwtarantool 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab63cfa8741750b2251ba60df2ac2a7fd993776f
-  data.tar.gz: 8d7bfe89af4560f6e4669e6dbe75a6279a9a9d1d
+  metadata.gz: 840c16fb6c833ca1e15ac1bf0fa66ffe6cac3e8f
+  data.tar.gz: 179d4af7160d0c4d4313444da922832c93ef70c9
 SHA512:
-  metadata.gz: 8a8573ef486d4bb5e45c8fe3f864a7b42448823de3d9bdec26538554c4b89649a4a74a3fc52946f43d6b92be930e599e1e900ced3f17b955f6d6a3dd16e93a23
-  data.tar.gz: 6011994dee0bf850ab0c013d87a3d7c0a7bbbfbc6617de09b9b884a25cee6cd4cb3bbd7ecf4e5acae403763571d8cdc533bb7bc9fe8ab9b7ba5e3851a6778da0
+  metadata.gz: f194dcb042b4c5c2e3c27a1e70087f6fcf634802976575436e78042b0e637337d4079ad9cab298bc377c3604ef26084097dd5cbbf3b436319557742e2e9f49ed
+  data.tar.gz: 699ee21bcc77d952efa4bbbd4abe31c3268ef61c04ae2cd1f62030b6b56dc7a74843d121e25566e96bff38e98a2dd1de7c4a07b091b4e329ffcba5a269710328

data/ext/lwtarantool/conn.c

@@ -68,26 +68,26 @@ static void
 lwt_conn_raise_error(lwt_conn_t *conn) {
   switch(tnt_error(conn->tnt)) {
     case TNT_EMEMORY:
-      rb_raise(rb_eNoMemError, tnt_strerror(conn->tnt));
+      rb_raise(rb_eNoMemError, "%s", tnt_strerror(conn->tnt));
       break;
     case TNT_ERESOLVE:
-      rb_raise(lwt_eResolvError, tnt_strerror(conn->tnt));
+      rb_raise(lwt_eResolvError, "%s", tnt_strerror(conn->tnt));
       break;
     case TNT_ETMOUT:
-      rb_raise(lwt_eTimeoutError, tnt_strerror(conn->tnt));
+      rb_raise(lwt_eTimeoutError, "%s", tnt_strerror(conn->tnt));
       break;
     case TNT_ELOGIN:
-      rb_raise(lwt_eLoginError, tnt_strerror(conn->tnt));
+      rb_raise(lwt_eLoginError, "%s", tnt_strerror(conn->tnt));
       break;
     case TNT_ESYSTEM:
-      rb_raise(lwt_eSystemError, tnt_strerror(conn->tnt));
+      rb_raise(lwt_eSystemError, "%s", tnt_strerror(conn->tnt));
       break;
     case TNT_EBIG:
-      rb_raise(lwt_eTooLargeRequestError, tnt_strerror(conn->tnt));
+      rb_raise(lwt_eTooLargeRequestError, "%s", tnt_strerror(conn->tnt));
       break;
     case TNT_EFAIL:
     default:
-      rb_raise(lwt_eUnknownError, tnt_strerror(conn->tnt));
+      rb_raise(lwt_eUnknownError, "%s", tnt_strerror(conn->tnt));
       break;
   }
 }
@@ -114,6 +114,48 @@ lwt_conn_disconnect(VALUE self) {
   return Qtrue;
 }
 
+void
+_lwt_conn_set_num_option(VALUE args, const char *option, lwt_conn_t *conn, enum tnt_opt_type tnt_opt) {
+  VALUE val;
+
+  val = rb_hash_aref(args, ID2SYM(rb_intern(option)));
+
+  if (TYPE(val) == T_NIL)
+    return;
+
+  if (TYPE(val) != T_FIXNUM)
+    rb_raise(rb_eArgError, "%s must be an Integer", option);
+
+  if (tnt_set(conn->tnt, tnt_opt, rb_fix2uint(val)) != 0)
+    rb_raise(rb_eArgError, "invalid %s value", option);
+}
+
+void
+_lwt_conn_set_timeval_option(VALUE args, const char *option, lwt_conn_t *conn, enum tnt_opt_type tnt_opt) {
+  VALUE val;
+  double timeout_sec, timeout_usec;
+  struct timeval tnt_opt_val;
+
+  val = rb_hash_aref(args, ID2SYM(rb_intern(option)));
+
+  if (TYPE(val) == T_NIL)
+    return;
+
+  if (TYPE(val) != T_FIXNUM && TYPE(val) != T_FLOAT)
+    rb_raise(rb_eArgError, "%s must be an Integer", option);
+
+  timeout_usec = modf(rb_num2dbl(val), &timeout_sec);
+
+  if (timeout_sec < 0)
+    rb_raise(rb_eArgError, "%s < 0", option);
+
+  tnt_opt_val.tv_sec = (unsigned long) timeout_sec;
+  tnt_opt_val.tv_usec = (unsigned long) (timeout_usec * 1000000);
+
+  if (tnt_set(conn->tnt, tnt_opt, &tnt_opt_val) != 0)
+    rb_raise(rb_eArgError, "invalid %s value", option);
+}
+
 /**
  * Document-class: LWTarantool::Connection
  *
@@ -123,6 +165,8 @@ lwt_conn_disconnect(VALUE self) {
  * @option args [String] :url The tarantool address
  * @option args [Integer] :recv_buf_size Receive buffer size (unknown effect)
  * @option args [Integer] :send_buf_size Send buffer size (maximum request size)
+ * @option args [Integer] :connect_timeout Timeout for establish tcp connection to Tarantool
+ * @option args [Integer] :open_timeout The same as connect_timeout
  *
  * @example
  *   LWTarantool::Connection.new(url: 'tcp://127.0.0.1:3301')
@@ -148,25 +192,14 @@ lwt_conn_initialize(VALUE self, VALUE args) {
   if (TYPE(args) != T_HASH)
     rb_raise(rb_eArgError, "args must be a Hash");
 
-  // handle recv_buf_size option
-  val = rb_hash_aref(args, ID2SYM(rb_intern( "recv_buf_size")));
-  if (TYPE(val) != T_NIL) {
-    if (TYPE(val) != T_FIXNUM)
-      rb_raise(rb_eArgError, "recv_buf_size must be an Integer");
-
-    if (tnt_set(conn->tnt, TNT_OPT_RECV_BUF, rb_fix2uint(val)) != 0)
-      rb_raise(rb_eArgError, "invalid recv_buf_size value");
-  }
+  _lwt_conn_set_num_option(args, "recv_buf_size", conn, TNT_OPT_RECV_BUF);
+  _lwt_conn_set_num_option(args, "send_buf_size", conn, TNT_OPT_SEND_BUF);
+  _lwt_conn_set_timeval_option(args, "connect_timeout", conn, TNT_OPT_TMOUT_CONNECT);
+  _lwt_conn_set_timeval_option(args, "open_timeout", conn, TNT_OPT_TMOUT_CONNECT);
 
-  // handle send_buf_size option
-  val = rb_hash_aref(args, ID2SYM(rb_intern( "send_buf_size")));
-  if (TYPE(val) != T_NIL) {
-    if (TYPE(val) != T_FIXNUM)
-      rb_raise(rb_eArgError, "send_buf_size must be an Integer");
-
-    if (tnt_set(conn->tnt, TNT_OPT_SEND_BUF, rb_fix2uint(val)) != 0)
-      rb_raise(rb_eArgError, "invalid send_buf_size value");
-  }
+  // TODO: How should we process a partial read/write before timeout?
+  //_lwt_conn_set_timeval_option(args, "receive_timeout", conn, TNT_OPT_TMOUT_RECV);
+  //_lwt_conn_set_timeval_option(args, "send_timeout", conn, TNT_OPT_TMOUT_SEND);
 
   // handle url option
   val = rb_hash_aref(args, ID2SYM(rb_intern( "url")));
@@ -244,17 +277,26 @@ lwt_conn_read(VALUE self) {
   int rc = conn->tnt->read_reply(conn->tnt, reply);
   //printf("sync: %d, code: %d, err: %d, errno: %d, strerr: %s\n", rc, reply->sync, reply->code, tnt_error(conn->tnt), tnt_errno(conn->tnt), tnt_strerror(conn->tnt));
 
-  if (rc == 1)
+  if (rc == 1) {
+    tnt_reply_free(reply);
     return Qnil;
+  }
 
-  if (rc == -1)
+  if (rc == -1) {
+    tnt_reply_free(reply);
     lwt_conn_raise_error(conn);
+  }
 
-  if (rc != 0)
+  if (rc != 0) {
+    tnt_reply_free(reply);
     rb_raise( lwt_eUnknownError, "read_reply() return code %d", rc);
+  }
 
-  if (st_delete(conn->requests, &reply->sync, &req) != 1)
-    rb_raise(lwt_eSyncError, "Bad sync id %lu in tarantool reply", reply->sync);
+  if (st_delete(conn->requests, &reply->sync, &req) != 1) {
+    int sync = reply->sync;
+    tnt_reply_free(reply);
+    rb_raise(lwt_eSyncError, "Bad sync id %lu in tarantool reply", sync);
+  }
 
   lwt_request_add_reply( req, reply);
 

data/ext/lwtarantool/request.c

@@ -3,6 +3,18 @@
 
 static VALUE rClass;
 
+static void
+lwt_request_dealloc(lwt_request_t *req) {
+  if (req == NULL)
+    return;
+
+  if (req->reply == NULL)
+    return;
+
+  tnt_reply_free(req->reply);
+}
+
+
 VALUE
 lwt_request_create( VALUE conn, uint64_t id) {
   VALUE self;
@@ -11,7 +23,7 @@ lwt_request_create( VALUE conn, uint64_t id) {
   req = ZALLOC(lwt_request_t);
   req->id = id;
 
-  self = Data_Wrap_Struct( rClass, NULL, NULL, req);
+  self = Data_Wrap_Struct( rClass, NULL, lwt_request_dealloc, req);
   rb_iv_set(self, "@conn", conn);
 
   //printf("Create request %p, reply: %p\n", req, req->reply);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lwtarantool
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Alexander Golovko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-20 00:00:00.000000000 Z
+date: 2019-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack