iodine 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64ac0b2791f462e844e87fc8ac734eadfe63fc0e
-  data.tar.gz: 98cf990b7b2583ac858d701af47c7d06646c1187
+  metadata.gz: c4de811f5a2734382cc86765e77dcecf4b997fc6
+  data.tar.gz: 55422a643eab1c3cc0b3b18048521dc0aeac463b
 SHA512:
-  metadata.gz: d7a2d254f85b61feff50144af508cb03e26164277698042e82b69d7dfb02c2c9b750f73d9a95dd1fcb09bb82a18f8a850b792d7b7e698d7cc066f715347ef513
-  data.tar.gz: d1f6642043e29fe7f61727531e120ad7b4027711bf7be2f8fc9d9fe7f39b0ec03ca8fbe1bb664869c85bb27dbd911d98b0f86fcce8d7226b8a224db431875e87
+  metadata.gz: 59195e229155fc2ae56e240767a2707d6936758d4a3cfb999343856a753ffcd93ad2c82922a245f13ef95f32c968edaf49af504b64cc5b3152b6fa94bde4f1f5
+  data.tar.gz: a875bc77077fcfd0c1ca8d6d4d5fd6c9e53ff5759d578461f343af6ab226b3b26b1b5228765e4c156a37516338f802c1f3207040ac286e775d69b24758af92d2

data/CHANGELOG.md

@@ -8,6 +8,12 @@ Please notice that this change log contains changes for upcoming releases as wel
 
 ***
 
+#### Change log v.0.3.4
+
+**Fix**: (`sock`, `facil`, bscrypt) Add missing `static` keywords to prevent state collisions with other libraries.
+
+***
+
 #### Change log v.0.3.3
 
 **Update**: Now using `facil.io` v.0.4.1

data/ext/iodine/bscrypt-common.h

@@ -27,8 +27,10 @@ Environment - you can safely ignore this part... probably.
 
 /* check for unix support */
 #if __has_include(<unistd.h>) && __has_include(<pthread.h>)
+#ifndef HAS_UNIX_FEATURES
 #define HAS_UNIX_FEATURES
 #endif
+#endif
 
 /* include intrinsics if supported */
 #if __has_include(<x86intrin.h>)
@@ -40,8 +42,13 @@ and: https://software.intel.com/sites/landingpage/IntrinsicsGuide/
 */
 #endif /* __has_include(<x86intrin.h>) */
 
+#elif defined(__unix__) || defined(__linux__) || defined(__APPLE__)
+#ifndef HAS_UNIX_FEATURES
+#define HAS_UNIX_FEATURES
 #endif
 
+#endif /* __has_include */
+
 // clang-format off
 #if !defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__)
 #   if defined(__has_include)

data/ext/iodine/defer.c

@@ -273,6 +273,9 @@ inline static void reap_children(void) {
  */
 int defer_perform_in_fork(unsigned int process_count,
                           unsigned int thread_count) {
+  if (forked_pool)
+    return -1; /* we're already running inside an active `fork` */
+
   struct sigaction act, old, old_term, old_pipe;
   pid_t *pids = NULL;
   int ret = 0;

data/ext/iodine/facil.c

@@ -469,7 +469,7 @@ typedef struct {
 
 #define prot2timer(protocol) (*((timer_protocol_s *)(protocol)))
 
-const char *timer_protocol_name = "timer protocol __facil_internal__";
+static const char *timer_protocol_name = "timer protocol __facil_internal__";
 
 static void timer_on_data(intptr_t uuid, protocol_s *protocol) {
   prot2timer(protocol).task(prot2timer(protocol).arg);

data/ext/iodine/http1_response.c

@@ -1,3 +1,9 @@
+/*
+Copyright: Boaz Segev, 2016-2017
+License: MIT
+
+Feel free to copy, use and enjoy according to the license provided.
+*/
 #include "spnlock.inc"
 
 #include "http1_response.h"

data/ext/iodine/http1_response.h

@@ -1,6 +1,11 @@
 #ifndef H_HTTP1_RESPONSE_H
 #define H_HTTP1_RESPONSE_H
+/*
+Copyright: Boaz Segev, 2016-2017
+License: MIT
 
+Feel free to copy, use and enjoy according to the license provided.
+*/
 #include "http1.h"
 
 /* *****************************************************************************

data/ext/iodine/http_response.c

@@ -1,3 +1,9 @@
+/*
+Copyright: Boaz Segev, 2016-2017
+License: MIT
+
+Feel free to copy, use and enjoy according to the license provided.
+*/
 #include "base64.h"
 #include "http.h"
 #include "http1_response.h"

data/ext/iodine/http_response.h

@@ -1,6 +1,11 @@
 #ifndef H_HTTP_RESPONSE_H
 #define H_HTTP_RESPONSE_H
+/*
+Copyright: Boaz Segev, 2016-2017
+License: MIT
 
+Feel free to copy, use and enjoy according to the license provided.
+*/
 #include "http_request.h"
 #include <stdio.h>
 #include <time.h>

data/ext/iodine/misc.h

@@ -39,17 +39,15 @@ typedef struct {
 } fdump_s;
 
 /**
-Allocates memory and dumps the whole file into the
-memory allocated.
-Remember
-to call `free` when done.
+Allocates memory and dumps the whole file into the memory allocated.
 
-Returns the number of bytes allocated. On error,
-returns 0 and sets the
-container pointer to NULL.
+!!!: Remember to call `free` when done.
 
-This function has some Unix specific properties that
-resolve links and user
+Returns the number of bytes allocated.
+
+On error, returns 0 and sets the container pointer to NULL.
+
+This function has some Unix specific properties that resolve links and user
 folder referencing.
 */
 fdump_s *bscrypt_fdump(const char *file_path, size_t size_limit);

data/ext/iodine/sha1.c

@@ -51,7 +51,7 @@ Useful Macros - Not all of them are used here, but it's a copy-paste convenience
           (((i)&0xFF00000000000000ULL) >> 56);                                 \
   } while (0);
 
-const uint8_t sha1_padding[64] = {0x80, 0};
+static const uint8_t sha1_padding[64] = {0x80, 0};
 
 #ifdef __BIG_ENDIAN__
 /** Converts a 4 byte string to a uint32_t word. careful with alignment! */

data/ext/iodine/sha2.c

@@ -81,7 +81,7 @@ Useful Macros
 SHA-2 hashing
 */
 
-const uint8_t sha2_padding[128] = {0x80, 0};
+static const uint8_t sha2_padding[128] = {0x80, 0};
 
 /* SHA-224 and SHA-256 constants */
 static uint32_t sha2_256_words[] = {
@@ -814,8 +814,9 @@ void bscrypt_test_sha2(void) {
   return;
   goto error;
 error:
-  fprintf(stderr, ":\n--- bscrypt SHA-2 Test FAILED!\ntype: "
-                  "%s (%d)\nstring %s\nexpected:\n",
+  fprintf(stderr,
+          ":\n--- bscrypt SHA-2 Test FAILED!\ntype: "
+          "%s (%d)\nstring %s\nexpected:\n",
           sha2_variant_names[s.type], s.type, str);
   while (*expect)
     fprintf(stderr, "%02x", *(expect++) & 0xFF);

data/ext/iodine/sock.c

@@ -102,7 +102,7 @@ typedef struct packet_s {
   sock_buffer_s buffer;
 } packet_s;
 
-struct {
+static struct {
   packet_s *next;
   spn_lock_i lock;
   uint8_t init;
@@ -200,7 +200,7 @@ static ssize_t sock_default_hooks_flush(intptr_t uuid) {
   return (((void)(uuid)), 0);
 }
 
-sock_rw_hook_s sock_default_hooks = {
+static sock_rw_hook_s sock_default_hooks = {
     .read = sock_default_hooks_read,
     .write = sock_default_hooks_write,
     .flush = sock_default_hooks_flush,

data/ext/iodine/spnlock.inc

@@ -1,5 +1,11 @@
 #ifndef H_SPNLOCK_H
 #define H_SPNLOCK_H
+/*
+Copyright: Boaz Segev, 2016-2017
+License: MIT
+
+Feel free to copy, use and enjoy according to the license provided.
+*/
 /* *****************************************************************************
 spinlock / sync for tasks
 ***************************************************************************** */

data/lib/iodine/version.rb

@@ -1,3 +1,3 @@
 module Iodine
-  VERSION = '0.3.3'.freeze
+  VERSION = '0.3.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iodine
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-27 00:00:00.000000000 Z
+date: 2017-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack