semian 0.7.1 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d7a8e836a1f026b0dc5afcf4454f9949fcb44e0
-  data.tar.gz: 68858abd9489ecb207656472ff910a7f6ad824ce
+  metadata.gz: a4701f3daa0b3ff3ed0f7a2a60ae025d023a4b2c
+  data.tar.gz: 464b2d490be5404dbabd1ed50d15b84e5bdd7e11
 SHA512:
-  metadata.gz: 1cacd63d08f2fc3b7f42509295b3735ed8948c9185a8a236af5be737226e89dbf7614eec29f6f7d3d26cce5e05f66a6ef3a550b5081c1e0736575427702b912b
-  data.tar.gz: f736999b06d706947b2ba81170c4fbd1f5b6d2fa909c4058d60806e918cea1bad5d6757726929feb1f8fa382d8a013f9ac6827527067dff6cb886a27c3e282e7
+  metadata.gz: 65122ec1d4ef4c7cb337ac00d4f8838d38b6ac8777b1e4a64d52b2381cb0b9938fa1cc85da3e6fabc88aa98c7e48cde73c253d090597fdb3ddf1b0f5f4399734
+  data.tar.gz: 545e6a6b3350bf4e06156945d84c5a89d2d57dc75d7e0a3dc83cbe385b8ba8a5a8585c21cc85bb9328591ecce027b0cc522772be221dcf72304f3c0769dbb402

data/ext/semian/resource.c

@@ -63,7 +63,12 @@ semian_resource_acquire(int argc, VALUE *argv, VALUE self)
     }
   }
 
-  return rb_ensure(rb_yield, self, cleanup_semian_resource_acquire, self);
+  VALUE wait_time = Qnil;
+  if (res.wait_time >= 0) {
+    wait_time = LONG2NUM(res.wait_time);
+  }
+
+  return rb_ensure(rb_yield, wait_time, cleanup_semian_resource_acquire, self);
 }
 
 VALUE
@@ -219,6 +224,7 @@ semian_resource_initialize(VALUE self, VALUE id, VALUE tickets, VALUE quota, VAL
   ms_to_timespec(c_timeout * 1000, &res->timeout);
   res->name = strdup(c_id_str);
   res->quota = c_quota;
+  res->wait_time = -1;
 
   // Initialize the semaphore set
   initialize_semaphore_set(res, c_id_str, c_permissions, c_tickets, c_quota);

data/ext/semian/resource.h

@@ -10,6 +10,7 @@ Functions here are associated with rubyland operations.
 #include "sysv_semaphores.h"
 
 // Ruby variables
+ID id_wait_time;
 ID id_timeout;
 int system_max_semaphore_count;
 

data/ext/semian/semian.c

@@ -53,6 +53,7 @@ void Init_semian()
   rb_define_method(cResource, "reset_registered_workers!", semian_resource_reset_workers, 0);
   rb_define_method(cResource, "unregister_worker", semian_resource_unregister_worker, 0);
 
+  id_wait_time = rb_intern("wait_time");
   id_timeout = rb_intern("timeout");
 
   if (semctl(0, 0, SEM_INFO, &info_buf) == -1) {

data/ext/semian/sysv_semaphores.c

@@ -1,4 +1,5 @@
 #include "sysv_semaphores.h"
+#include <time.h>
 
 static key_t
 generate_key(const char *name);
@@ -12,6 +13,9 @@ wait_for_new_semaphore_set(key_t key, long permissions);
 static void
 initialize_new_semaphore_values(int sem_id, long permissions);
 
+static long
+diff_timespec_ms(struct timespec *end, struct timespec *begin);
+
 // Generate string rep for sem indices for debugging puproses
 static const char *SEMINDEX_STRING[] = {
     FOREACH_SEMINDEX(GENERATE_STRING)
@@ -59,9 +63,23 @@ initialize_semaphore_set(semian_resource_t* res, const char* id_str, long permis
     rb_raise(eInternal, "error incrementing registered workers, errno: %d (%s)", errno, strerror(errno));
   }
 
+  int state = 0;
   sem_meta_lock(res->sem_id); // Sets otime for the first time by acquiring the sem lock
-  configure_tickets(res->sem_id, tickets,  quota);
+
+  configure_tickets_args_t configure_tickets_args = (configure_tickets_args_t){
+    .sem_id = res->sem_id,
+    .tickets = tickets,
+    .quota = quota,
+  };
+  rb_protect(
+    configure_tickets,
+    (VALUE)&configure_tickets_args,
+    &state);
+
   sem_meta_unlock(res->sem_id);
+  if (state) {
+    rb_jump_tag(state);
+  }
 }
 
 void
@@ -142,12 +160,21 @@ acquire_semaphore(void *p)
 {
   semian_resource_t *res = (semian_resource_t *) p;
   res->error = 0;
+  res->wait_time = -1;
 #ifdef DEBUG
   print_sem_vals(res->sem_id);
 #endif
+
+  struct timespec begin, end;
+  int benchmark_result = clock_gettime(CLOCK_MONOTONIC, &begin);
   if (perform_semop(res->sem_id, SI_SEM_TICKETS, -1, SEM_UNDO, &res->timeout) == -1) {
     res->error = errno;
   }
+  if (benchmark_result == 0) {
+    if (clock_gettime(CLOCK_MONOTONIC, &end) == 0) {
+      res->wait_time = diff_timespec_ms(&end, &begin);
+    }
+  }
   return NULL;
 }
 
@@ -211,7 +238,7 @@ wait_for_new_semaphore_set(key_t key, long permissions)
   for (i = 0; i < ((INTERNAL_TIMEOUT * MICROSECONDS_IN_SECOND) / INIT_WAIT); i++) {
 
     if (semctl(sem_id, 0, IPC_STAT, sem_opts) == -1) {
-      raise_semian_syscall_error("semget()", errno);
+      raise_semian_syscall_error("semctl()", errno);
     }
 
     // If a semop has been performed by someone else, the values must be initialized
@@ -231,3 +258,11 @@ wait_for_new_semaphore_set(key_t key, long permissions)
 
   return sem_id;
 }
+
+static long
+diff_timespec_ms(struct timespec *end, struct timespec *begin)
+{
+  long end_ms = (end->tv_sec * 1e3) + (end->tv_nsec / 1e6);
+  long begin_ms = (begin->tv_sec * 1e3) + (begin->tv_nsec / 1e6);
+  return end_ms - begin_ms;
+}

data/ext/semian/tickets.c

@@ -2,20 +2,19 @@
 
 // Update the ticket count for static ticket tracking
 static VALUE
-update_ticket_count(update_ticket_count_t *tc);
+update_ticket_count(int sem_id, int count);
 
 static int
 calculate_quota_tickets(int sem_id, double quota);
 
 // Must be called with the semaphore meta lock already acquired
-void
-configure_tickets(int sem_id, int tickets, double quota)
+VALUE
+configure_tickets(VALUE value)
 {
-  int state = 0;
-  update_ticket_count_t tc;
+  configure_tickets_args_t *args = (configure_tickets_args_t *)value;
 
-  if (quota > 0) {
-    tickets = calculate_quota_tickets(sem_id, quota);
+  if (args->quota > 0) {
+    args->tickets = calculate_quota_tickets(args->sem_id, args->quota);
   }
 
   /*
@@ -23,10 +22,10 @@ configure_tickets(int sem_id, int tickets, double quota)
     We need to throw an error if we set it to 0 during initialization.
     Otherwise, we back out of here completely.
   */
-  if (get_sem_val(sem_id, SI_SEM_CONFIGURED_TICKETS) == 0 && tickets == 0) {
+  if (get_sem_val(args->sem_id, SI_SEM_CONFIGURED_TICKETS) == 0 && args->tickets == 0) {
     rb_raise(eSyscall, "More than 0 tickets must be specified when initializing semaphore");
-  } else if (tickets == 0) {
-    return;
+  } else if (args->tickets == 0) {
+    return Qnil;
   }
 
   /*
@@ -34,31 +33,26 @@ configure_tickets(int sem_id, int tickets, double quota)
      count, we need to resize the count. We do this by adding the delta of
      (tickets - current_configured_tickets) to the semaphore value.
   */
-  if (get_sem_val(sem_id, SI_SEM_CONFIGURED_TICKETS) != tickets) {
-
-    tc.sem_id = sem_id;
-    tc.tickets = tickets;
-    rb_protect((VALUE (*)(VALUE)) update_ticket_count, (VALUE) &tc, &state);
-
-    if (state) {
-      rb_jump_tag(state);
-    }
+  if (get_sem_val(args->sem_id, SI_SEM_CONFIGURED_TICKETS) != args->tickets) {
+    update_ticket_count(args->sem_id, args->tickets);
   }
+
+  return Qnil;
 }
 
 static VALUE
-update_ticket_count(update_ticket_count_t *tc)
+update_ticket_count(int sem_id, int tickets)
 {
   short delta;
   struct timespec ts = { 0 };
   ts.tv_sec = INTERNAL_TIMEOUT;
 
-  delta = tc->tickets - get_sem_val(tc->sem_id, SI_SEM_CONFIGURED_TICKETS);
+  delta = tickets - get_sem_val(sem_id, SI_SEM_CONFIGURED_TICKETS);
 
 #ifdef DEBUG
-  print_sem_vals(tc->sem_id);
+  print_sem_vals(sem_id);
 #endif
-  if (perform_semop(tc->sem_id, SI_SEM_TICKETS, delta, 0, &ts) == -1) {
+  if (perform_semop(sem_id, SI_SEM_TICKETS, delta, 0, &ts) == -1) {
     if (delta < 0 && errno == EAGAIN) {
       rb_raise(eTimeout, "timeout while trying to update ticket count");
     } else {
@@ -66,7 +60,7 @@ update_ticket_count(update_ticket_count_t *tc)
     }
   }
 
-  if (semctl(tc->sem_id, SI_SEM_CONFIGURED_TICKETS, SETVAL, tc->tickets) == -1) {
+  if (semctl(sem_id, SI_SEM_CONFIGURED_TICKETS, SETVAL, tickets) == -1) {
     rb_raise(eInternal, "error configuring ticket count, errno: %d (%s)", errno, strerror(errno));
   }
 

data/ext/semian/tickets.h

@@ -7,7 +7,7 @@ For logic specific to manipulating semian ticket counts
 #include "sysv_semaphores.h"
 
 // Set initial ticket values upon resource creation
-void
-configure_tickets(int sem_id, int tickets, double quota);
+VALUE
+configure_tickets(VALUE);
 
 #endif // SEMIAN_TICKETS_H

data/ext/semian/types.h

@@ -20,11 +20,11 @@ union semun {
                              (Linux-specific) */
 };
 
-// To update the ticket count
 typedef struct {
   int sem_id;
   int tickets;
-} update_ticket_count_t;
+  double quota;
+} configure_tickets_args_t;
 
 // Internal semaphore structure
 typedef struct {
@@ -35,6 +35,7 @@ typedef struct {
   uint64_t key;
   char *strkey;
   char *name;
+  long wait_time;
 } semian_resource_t;
 
 #endif // SEMIAN_TYPES_H

data/lib/semian/circuit_breaker.rb

@@ -113,7 +113,7 @@ module Semian
       str = "[#{self.class.name}] State transition from #{@state.value} to #{new_state}."
       str << " success_count=#{@successes.value} error_count=#{@errors.size}"
       str << " success_count_threshold=#{@success_count_threshold} error_count_threshold=#{@error_count_threshold}"
-      str << " error_timeout=#{@error_timeout} error_last_at=\"#{@error_last_at}\""
+      str << " error_timeout=#{@error_timeout} error_last_at=\"#{@errors.last}\""
       Semian.logger.info(str)
     end
   end

data/lib/semian/net_http.rb

@@ -43,15 +43,6 @@ module Semian
       ::SystemCallError, # includes ::Errno::EINVAL, ::Errno::ECONNRESET, ::Errno::ECONNREFUSED, ::Errno::ETIMEDOUT, and more
     ].freeze # Net::HTTP can throw many different errors, this tries to capture most of them
 
-    # The naked methods are exposed as `raw_query` and `raw_connect` for instrumentation purpose
-    def self.included(base)
-      base.send(:alias_method, :raw_transport_request, :transport_request)
-      base.send(:remove_method, :transport_request)
-
-      base.send(:alias_method, :raw_connect, :connect)
-      base.send(:remove_method, :connect)
-    end
-
     class << self
       attr_accessor :exceptions
       attr_reader :semian_configuration
@@ -88,26 +79,26 @@ module Semian
     end
 
     def connect
-      return raw_connect if disabled?
-      acquire_semian_resource(adapter: :http, scope: :connection) { raw_connect }
+      return super if disabled?
+      acquire_semian_resource(adapter: :http, scope: :connection) { super }
     end
 
-    def transport_request(req, &block)
-      return raw_transport_request(req, &block) if disabled?
+    def transport_request(*)
+      return super if disabled?
       acquire_semian_resource(adapter: :http, scope: :query) do
-        res = raw_transport_request(req, &block)
-        handle_error_responses(res)
-        res
+        handle_error_responses(super)
       end
     end
 
     private
 
-    def handle_error_responses(res)
-      return unless raw_semian_options.fetch(:open_circuit_server_errors, false)
-      semian_resource.mark_failed(res) if res.is_a?(::Net::HTTPServerError)
+    def handle_error_responses(result)
+      if raw_semian_options.fetch(:open_circuit_server_errors, false)
+        semian_resource.mark_failed(result) if result.is_a?(::Net::HTTPServerError)
+      end
+      result
     end
   end
 end
 
-Net::HTTP.include(Semian::NetHTTP)
+Net::HTTP.prepend(Semian::NetHTTP)

data/lib/semian/protected_resource.rb

@@ -46,8 +46,8 @@ module Semian
       if @bulkhead.nil?
         yield self
       else
-        @bulkhead.acquire(timeout: timeout) do
-          Semian.notify(:success, self, scope, adapter)
+        @bulkhead.acquire(timeout: timeout) do |wait_time|
+          Semian.notify(:success, self, scope, adapter, wait_time)
           yield self
         end
       end

data/lib/semian/resource.rb

@@ -28,7 +28,8 @@ module Semian
     end
 
     def acquire(*)
-      yield self
+      wait_time = 0
+      yield wait_time
     end
 
     def count

data/lib/semian/version.rb

@@ -1,3 +1,3 @@
 module Semian
-  VERSION = '0.7.1'
+  VERSION = '0.7.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semian
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.4
 platform: ruby
 authors:
 - Scott Francis
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -179,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Bulkheading for Ruby with SysV semaphores