czmq-ffi-gen 0.13.0-x86-mingw32 → 0.14.1-x86-mingw32

data/lib/czmq-ffi-gen/czmq/ffi/ztimerset.rb

@@ -132,7 +132,7 @@ module CZMQ
         result
       end
 
-      # Set timer interval. Returns 0 if OK, -1 on failure.                                    
+      # Set timer interval. Returns 0 if OK, -1 on failure.
       # This method is slow, canceling the timer and adding a new one yield better performance.
       #
       # @param timer_id [Integer, #to_int, #to_i]
@@ -148,7 +148,7 @@ module CZMQ
       end
 
       # Reset timer to start interval counting from current time. Returns 0 if OK, -1 on failure.
-      # This method is slow, canceling the timer and adding a new one yield better performance.  
+      # This method is slow, canceling the timer and adding a new one yield better performance.
       #
       # @param timer_id [Integer, #to_int, #to_i]
       # @return [Integer]
@@ -160,9 +160,9 @@ module CZMQ
         result
       end
 
-      # Return the time until the next interval.                        
+      # Return the time until the next interval.
       # Should be used as timeout parameter for the zpoller wait method.
-      # The timeout is in msec.                                         
+      # The timeout is in msec.
       #
       # @return [Integer]
       def timeout()
@@ -173,8 +173,8 @@ module CZMQ
       end
 
       # Invoke callback function of all timers which their interval has elapsed.
-      # Should be call after zpoller wait method.                               
-      # Returns 0 if OK, -1 on failure.                                         
+      # Should be call after zpoller wait method.
+      # Returns 0 if OK, -1 on failure.
       #
       # @return [Integer]
       def execute()

data/lib/czmq-ffi-gen/czmq/ffi/ztrie.rb

@@ -76,7 +76,7 @@ module CZMQ
       # Create a new callback of the following type:
       # Callback function for ztrie_node to destroy node data.
       #     typedef void (ztrie_destroy_data_fn) (
-      #         void **data);                     
+      #         void **data);
       #
       # @note WARNING: If your Ruby code doesn't retain a reference to the
       #   FFI::Function object after passing it to a C function call,
@@ -107,9 +107,9 @@ module CZMQ
         result
       end
 
-      # Inserts a new route into the tree and attaches the data. Returns -1     
+      # Inserts a new route into the tree and attaches the data. Returns -1
       # if the route already exists, otherwise 0. This method takes ownership of
-      # the provided data if a destroy_data_fn is provided.                     
+      # the provided data if a destroy_data_fn is provided.
       #
       # @param path [String, #to_s, nil]
       # @param data [::FFI::Pointer, #to_ptr]
@@ -123,8 +123,8 @@ module CZMQ
       end
 
       # Removes a route from the trie and destroys its data. Returns -1 if the
-      # route does not exists, otherwise 0.                                   
-      # the start of the list call zlist_first (). Advances the cursor.       
+      # route does not exists, otherwise 0.
+      # the start of the list call zlist_first (). Advances the cursor.
       #
       # @param path [String, #to_s, nil]
       # @return [Integer]
@@ -147,8 +147,8 @@ module CZMQ
       end
 
       # Returns the data of a matched route from last ztrie_matches. If the path
-      # did not match, returns NULL. Do not delete the data as it's owned by    
-      # ztrie.                                                                  
+      # did not match, returns NULL. Do not delete the data as it's owned by
+      # ztrie.
       #
       # @return [::FFI::Pointer]
       def hit_data()
@@ -168,9 +168,9 @@ module CZMQ
         result
       end
 
-      # Returns the parameters of a matched route with named regexes from last   
+      # Returns the parameters of a matched route with named regexes from last
       # ztrie_matches. If the path did not match or the route did not contain any
-      # named regexes, returns NULL.                                             
+      # named regexes, returns NULL.
       #
       # @return [Zhashx]
       def hit_parameters()
@@ -182,7 +182,7 @@ module CZMQ
       end
 
       # Returns the asterisk matched part of a route, if there has been no match
-      # or no asterisk match, returns NULL.                                     
+      # or no asterisk match, returns NULL.
       #
       # @return [String]
       def hit_asterisk_match()

data/lib/czmq-ffi-gen/czmq/ffi/zuuid.rb

@@ -110,7 +110,7 @@ module CZMQ
       end
 
       # Set UUID to new supplied string value skipping '-' and '{' '}'
-      # optional delimiters. Return 0 if OK, else returns -1.         
+      # optional delimiters. Return 0 if OK, else returns -1.
       #
       # @param source [String, #to_s, nil]
       # @return [Integer]
@@ -152,8 +152,8 @@ module CZMQ
       end
 
       # Return UUID in the canonical string format: 8-4-4-4-12, in lower
-      # case. Caller does not modify or free returned value. See        
-      # http://en.wikipedia.org/wiki/Universally_unique_identifier      
+      # case. Caller does not modify or free returned value. See
+      # http://en.wikipedia.org/wiki/Universally_unique_identifier
       #
       # @return [String]
       def str_canonical()
@@ -197,7 +197,7 @@ module CZMQ
       end
 
       # Make copy of UUID object; if uuid is null, or memory was exhausted,
-      # returns null.                                                      
+      # returns null.
       #
       # @return [Zuuid]
       def dup()

data/lib/czmq-ffi-gen/gem_version.rb

@@ -1,5 +1,5 @@
 module CZMQ
   module FFI
-    GEM_VERSION = "0.13.0"
+    GEM_VERSION = "0.14.1"
   end
 end

data/lib/czmq-ffi-gen/vendor.rb

@@ -1,5 +1,13 @@
 base_dir = File.expand_path(File.join(__dir__, "..", ".."))
 vendor_bin_dir = File.join(base_dir, "vendor", "local", "bin")
 if File.exist?(vendor_bin_dir)
-  ENV["PATH"] = [vendor_bin_dir, ENV["PATH"]].join(File::PATH_SEPARATOR)
+  # On Windows, RubyInstaller2 uses kernel32's SetDefaultDllDirectories
+  # and AddDllDirectory, which disables the lookup of DLLs in the PATH, see
+  # https://github.com/oneclick/rubyinstaller2/wiki/For-gem-developers#dll-loading
+  begin
+    require 'ruby_installer'
+    RubyInstaller::Runtime.add_dll_directory vendor_bin_dir
+  rescue LoadError
+    ENV["PATH"] = [vendor_bin_dir, ENV["PATH"]].join(File::PATH_SEPARATOR)
+  end
 end

data/vendor/local/include/czmq_library.h

@@ -1,13 +1,13 @@
 /*  =========================================================================
     czmq - generated layer of public API
 
-    Copyright (c) the Contributors as noted in the AUTHORS file.       
-    This file is part of CZMQ, the high-level C binding for 0MQ:       
-    http://czmq.zeromq.org.                                            
-                                                                       
+    Copyright (c) the Contributors as noted in the AUTHORS file.
+    This file is part of CZMQ, the high-level C binding for 0MQ:
+    http://czmq.zeromq.org.
+
     This Source Code Form is subject to the terms of the Mozilla Public
     License, v. 2.0. If a copy of the MPL was not distributed with this
-    file, You can obtain one at http://mozilla.org/MPL/2.0/.           
+    file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ################################################################################
 #  THIS FILE IS 100% GENERATED BY ZPROJECT; DO NOT EDIT EXCEPT EXPERIMENTALLY  #
@@ -52,7 +52,7 @@
 #   define CZMQ_PRIVATE
 #else
 #   define CZMQ_EXPORT
-#   if (defined __GNUC__ && __GNUC__ >= 4) || defined __INTEL_COMPILER
+#   if (defined __GNUC__ && __GNUC__ >= 4 && !defined __CYGWIN__) || defined __INTEL_COMPILER
 #       define CZMQ_PRIVATE __attribute__ ((visibility ("hidden")))
 #   else
 #       define CZMQ_PRIVATE
@@ -105,6 +105,8 @@ typedef struct _zsock_t zsock_t;
 #define ZSOCK_T_DEFINED
 typedef struct _zstr_t zstr_t;
 #define ZSTR_T_DEFINED
+typedef struct _zsys_t zsys_t;
+#define ZSYS_T_DEFINED
 typedef struct _zuuid_t zuuid_t;
 #define ZUUID_T_DEFINED
 typedef struct _zauth_t zauth_t;
@@ -119,10 +121,10 @@ typedef struct _zproxy_t zproxy_t;
 #define ZPROXY_T_DEFINED
 typedef struct _zrex_t zrex_t;
 #define ZREX_T_DEFINED
-typedef struct _zsys_t zsys_t;
-#define ZSYS_T_DEFINED
 //  Draft classes are by default not built in stable releases
 #ifdef CZMQ_BUILD_DRAFT_API
+typedef struct _zargs_t zargs_t;
+#define ZARGS_T_DEFINED
 typedef struct _zproc_t zproc_t;
 #define ZPROC_T_DEFINED
 typedef struct _ztimerset_t ztimerset_t;
@@ -155,6 +157,7 @@ typedef struct _ztrie_t ztrie_t;
 #include "zpoller.h"
 #include "zsock.h"
 #include "zstr.h"
+#include "zsys.h"
 #include "zuuid.h"
 #include "zauth.h"
 #include "zbeacon.h"
@@ -162,13 +165,19 @@ typedef struct _ztrie_t ztrie_t;
 #include "zmonitor.h"
 #include "zproxy.h"
 #include "zrex.h"
-#include "zsys.h"
 #ifdef CZMQ_BUILD_DRAFT_API
+#include "zargs.h"
 #include "zproc.h"
 #include "ztimerset.h"
 #include "ztrie.h"
 #endif // CZMQ_BUILD_DRAFT_API
 
+#ifdef CZMQ_BUILD_DRAFT_API
+//  Self test for private classes
+CZMQ_EXPORT void
+    czmq_private_selftest (bool verbose);
+#endif // CZMQ_BUILD_DRAFT_API
+
 #endif
 /*
 ################################################################################

data/vendor/local/include/czmq_prelude.h

@@ -17,7 +17,8 @@
 //- Establish the compiler and computer system ------------------------------
 /*
  *  Defines zero or more of these symbols, for use in any non-portable
- *  code:
+ *  code (for pre-defined values see e.g. build-system headers as well
+ *  as output of GNU C preprocessor via `cpp -dM < /dev/null`):
  *
  *  __WINDOWS__         Microsoft C/C++ with Windows calls
  *  __MSDOS__           System is MS-DOS (set if __WINDOWS__ set)
@@ -164,7 +165,7 @@
 #elif (defined (Mips))
 #   define __UTYPE_MIPS
 #   define __UNIX__
-#elif (defined (FreeBSD) || defined (__FreeBSD__))
+#elif (defined (FreeBSD) || defined (__FreeBSD__) || defined (__FreeBSD_kernel__))
 #   define __UTYPE_FREEBSD
 #   define __UNIX__
 #elif (defined (NetBSD) || defined (__NetBSD__))
@@ -193,10 +194,12 @@
 #elif (defined (sinix))
 #   define __UTYPE_SINIX
 #   define __UNIX__
-#elif (defined (SOLARIS) || defined (__SVR4)) || defined (SVR4)
+#elif (defined (SOLARIS) || defined (__SVR4) || defined (SVR4) || defined (__SVR4__) || defined (__svr4) || defined (svr4) || defined (__svr4__))
+    // Note: this rule and below should match legacy SunOS and Solaris
+    // on builds without the GNU toolchain; with one you get __UTYPE_GNU
 #   define __UTYPE_SUNSOLARIS
 #   define __UNIX__
-#elif (defined (SUNOS) || defined (SUN) || defined (sun))
+#elif (defined (SUNOS) || defined (SUN) || defined (sun) || defined (__sun) || defined (__sun__))
 #   define __UTYPE_SUNOS
 #   define __UNIX__
 #elif (defined (__USLC__) || defined (UnixWare))
@@ -419,21 +422,89 @@ typedef struct {
 
 #define streq(s1,s2)    (!strcmp ((s1), (s2)))
 #define strneq(s1,s2)   (strcmp ((s1), (s2)))
-
-//  Provide random number from 0..(num-1)
-//  Note that (at least in Solaris) while rand() returns an int limited by
-//  RAND_MAX, random() returns a 32-bit value all filled with random bits.
-#if (defined (__WINDOWS__)) || (defined (__UTYPE_IBMAIX)) \
+#define freen(x) do {free(x); x = NULL;} while(0)
+
+//  randof(num) : Provide random number from 0..(num-1)
+//  ASSUMES that "num" itself is at most an int (bit size no more than float
+//  on the host platform), and non-negative; may be a "function()" token.
+//  For practical reasons, "num" should be under 50M or so.
+//  The math libraries on different platforms and capabilities in HW are a
+//  nightmare. Seems we have to drown the code in casts to have reasonable
+//  results... Also note that the 32-bit float has a hard time representing
+//  values close to UINT32_MAX that we had before, so now limit to UINT16_MAX.
+//  Platforms where RAND_MAX is comparable to even signed INT32_MAX were
+//  rigged with problems here: even if the code used double-precision, the
+//  corner-case factors (divident close to INT32_MAX and close to divisor)
+//  were too close to 1.0, so the final product was "num" rather than "num-1".
+//  Finally note that on some platforms RAND_MAX can be smallish, like 32767,
+//  so we should use it if small enough.
+
+//  Precision for our calculations impacts the MAX values we can use below
+//  Still, say UINT64_MAX is overkill. But smaller MAXes can yield better
+//  distribution of values with e.g. double.
+#if !defined (ZSYS_RANDOF_FLT)
+#   define  ZSYS_RANDOF_FLT float
+#endif // ZSYS_RANDOF_FLT is defined by caller... trust them or explode later
+
+// Implementations vary... Note that many will get __UTYPE_GNU nowadays.
+#if !defined (ZSYS_RANDOF_FUNC)
+# if defined (ZSYS_RANDOF_FUNC_BITS)
+#  undef ZSYS_RANDOF_FUNC_BITS
+# endif
+# if (defined (__WINDOWS__)) || (defined (__UTYPE_IBMAIX)) \
  || (defined (__UTYPE_HPUX)) || (defined (__UTYPE_SUNOS)) || (defined (__UTYPE_SOLARIS))
-#   define randof(num)  (int) ((float) (num) * rand () / (RAND_MAX + 1.0))
-#else
-# if defined(RAND_MAX)
-#   define randof(num)  (int) ((float) (num) * (random () % RAND_MAX) / (RAND_MAX + 1.0))
+#   define  ZSYS_RANDOF_FUNC    rand
+#   define  ZSYS_RANDOF_FUNC_BITS 15
 # else
-#   define randof(num)  (int) ((float) (num) * (uint32_t)random () / (UINT32_MAX + 1.0))
+#   define  ZSYS_RANDOF_FUNC    random
+#   define  ZSYS_RANDOF_FUNC_BITS 32
+# endif
+#endif // ZSYS_RANDOF_FUNC is defined by caller... trust them or explode later
+
+//  Limits below were experimented for 32-bit floats on x86 with test_randof
+//  Due to discrete rounding, greater values caused collisions with the
+//  fraction s_randof_factor() defined below returning 1.0.
+#if !defined (ZSYS_RANDOF_MAX)
+# if (ZSYS_RANDOF_FUNC_BITS >= 26)
+    // Assume that random() is at least 32-bit as it is on most platforms
+#       define  ZSYS_RANDOF_MAX (UINT32_MAX>>6)
+# else
+#  if defined (RAND_MAX)
+#   if (RAND_MAX > (UINT32_MAX>>6))
+#       define  ZSYS_RANDOF_MAX (UINT32_MAX>>6)
+#   else // RAND_MAX is small enough to not overflow our calculations
+#       define  ZSYS_RANDOF_MAX RAND_MAX
+#   endif
+#  else // No RAND_MAX - use a smaller safer limit, but with values too discrete
+#       define  ZSYS_RANDOF_MAX INT16_MAX
+#  endif
+# endif // not random()
+#endif // ZSYS_RANDOF_MAX is defined by caller... trust them or explode later
+
+#define s_randof_factor()   (ZSYS_RANDOF_FLT)( (ZSYS_RANDOF_FLT)(ZSYS_RANDOF_FUNC() % (ZSYS_RANDOF_MAX - 1)) / ( (ZSYS_RANDOF_FLT)(ZSYS_RANDOF_MAX) ) )
+
+// Supplement the limited spectrum of ZSYS_RANDOF_MAX by stacking more random()s
+// Note this can still be too little for very large "num" > ZSYS_RANDOF_MAX
+// but we'd need a real randof() function to handle stacking in that case.
+// Fuzziness added below (division by slightly more than a whole number) solves
+// this wonderfully even for "num" ranges twice as big as the ZSYS_RANDOF_MAX.
+#if (ZSYS_RANDOF_MAX > UINT16_MAX)
+#   define randof(num)  (int) ( (ZSYS_RANDOF_FLT)(num) * s_randof_factor() / ( 1.0 + s_randof_factor() / 100.0 ) )
+#else // boost dispersion
+# if (ZSYS_RANDOF_MAX > INT16_MAX)
+#   define randof(num)  (int) ( (ZSYS_RANDOF_FLT)(num) * ( s_randof_factor() + s_randof_factor() ) / ( 2.0 + s_randof_factor() / 2.0 ) )
+# else
+#  if (ZSYS_RANDOF_MAX > UINT8_MAX)
+#   define randof(num)  (int) ( (ZSYS_RANDOF_FLT)(num) * ( s_randof_factor() + s_randof_factor() + s_randof_factor() + s_randof_factor() ) / ( 4.0 + s_randof_factor() * 10.0 ) )
+#  else
+#   define randof(num)  (int) ( (ZSYS_RANDOF_FLT)(num) * ( s_randof_factor() + s_randof_factor() + s_randof_factor() + s_randof_factor() + s_randof_factor() + s_randof_factor() ) / ( 6.0 + s_randof_factor() * 100.0 ) )
+#  endif
 # endif
 #endif
 
+// That's it about the randof() macro definition...
+
+
 // Windows MSVS doesn't have stdbool
 #if (defined (_MSC_VER))
 #   if (!defined (__cplusplus) && (!defined (true)))
@@ -496,6 +567,18 @@ typedef intptr_t ssize_t;
 #   if (!defined (PRId64))
 #       define PRId64   "I64d"
 #   endif
+#   if (!defined (PRIi8))
+#       define PRIi8    "i"
+#   endif
+#   if (!defined (PRIi16))
+#       define PRIi16   "i"
+#   endif
+#   if (!defined (PRIi32))
+#       define PRIi32   "i"
+#   endif
+#   if (!defined (PRIi64))
+#       define PRIi64   "I64i"
+#   endif
 #   if (!defined (PRIu8))
 #       define PRIu8    "u"
 #   endif
@@ -512,7 +595,7 @@ typedef intptr_t ssize_t;
     //  MSVC does not support C99's va_copy so we use a regular assignment
 #       define va_copy(dest,src) (dest) = (src)
 #   endif
-#elif (defined (__UTYPE_OSX))
+#elif (defined (__UTYPE_OSX) || defined (__OpenBSD__))
     typedef unsigned long ulong;
     typedef unsigned int uint;
     //  This fixes header-order dependence problem with some Linux versions
@@ -571,7 +654,9 @@ typedef int SOCKET;
 #   define closesocket      close
 #   define INVALID_SOCKET   -1
 #   define SOCKET_ERROR     -1
-#   define O_BINARY         0
+#   if !defined O_BINARY
+#       define O_BINARY      0
+#   endif
 #endif
 
 //- Include non-portable header files based on platform.h -------------------
@@ -580,6 +665,9 @@ typedef int SOCKET;
 #   include <linux/wireless.h>
 //  This would normally come from net/if.h
 unsigned int if_nametoindex (const char *ifname);
+char *if_indextoname (unsigned int ifindex, char *ifname);
+//  32 on Linux, 256 on Windows, pick largest to avoid overflows
+#   define IF_NAMESIZE 256
 #else
 #   if defined (HAVE_NET_IF_H)
 #       include <net/if.h>

data/vendor/local/include/zactor.h

@@ -1,5 +1,5 @@
 /*  =========================================================================
-    zactor - actor 
+    zactor - actor
 
     Copyright (c) the Contributors as noted in the AUTHORS file.
     This file is part of CZMQ, the high-level C binding for 0MQ:
@@ -23,6 +23,8 @@ extern "C" {
 //  @interface
 //  This is a stable class, and may not change except for emergencies. It
 //  is provided in stable builds.
+//  This class has draft methods, which may change over time. They are not
+//  in stable releases, by default. Use --enable-drafts to enable.
 // Actors get a pipe and arguments from caller
 typedef void (zactor_fn) (
     zsock_t *pipe, void *args);
@@ -36,13 +38,13 @@ CZMQ_EXPORT void
     zactor_destroy (zactor_t **self_p);
 
 //  Send a zmsg message to the actor, take ownership of the message
-//  and destroy when it has been sent.                             
+//  and destroy when it has been sent.
 CZMQ_EXPORT int
     zactor_send (zactor_t *self, zmsg_t **msg_p);
 
-//  Receive a zmsg message from the actor. Returns NULL if the actor 
+//  Receive a zmsg message from the actor. Returns NULL if the actor
 //  was interrupted before the message could be received, or if there
-//  was a timeout on the actor.                                      
+//  was a timeout on the actor.
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT zmsg_t *
     zactor_recv (zactor_t *self);
@@ -52,13 +54,13 @@ CZMQ_EXPORT bool
     zactor_is (void *self);
 
 //  Probe the supplied reference. If it looks like a zactor_t instance,
-//  return the underlying libzmq actor handle; else if it looks like   
-//  a libzmq actor handle, return the supplied value.                  
+//  return the underlying libzmq actor handle; else if it looks like
+//  a libzmq actor handle, return the supplied value.
 CZMQ_EXPORT void *
     zactor_resolve (void *self);
 
 //  Return the actor's zsock handle. Use this when you absolutely need
-//  to work with the zsock instance rather than the actor.            
+//  to work with the zsock instance rather than the actor.
 CZMQ_EXPORT zsock_t *
     zactor_sock (zactor_t *self);
 
@@ -66,6 +68,22 @@ CZMQ_EXPORT zsock_t *
 CZMQ_EXPORT void
     zactor_test (bool verbose);
 
+#ifdef CZMQ_BUILD_DRAFT_API
+// Function to be called on zactor_destroy. Default behavior is to send zmsg_t with string "$TERM" in a first frame.
+//
+// An example - to send $KTHXBAI string
+//
+//     if (zstr_send (self->pipe, "$KTHXBAI") == 0)
+//         zsock_wait (self->pipe);
+typedef void (zactor_destructor_fn) (
+    zactor_t *self);
+
+//  *** Draft method, for development use, may change without warning ***
+//  Change default destructor by custom function. Actor MUST be able to handle new message instead of default $TERM.
+CZMQ_EXPORT void
+    zactor_set_destructor (zactor_t *self, zactor_destructor_fn destructor);
+
+#endif // CZMQ_BUILD_DRAFT_API
 //  @end