journald-native 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62f14b24b4e9636244fd45956b5aa2804748099f
-  data.tar.gz: a373cd433f9a905a0c4e1310a42979b50b6f06cb
+  metadata.gz: f07112165499f340a1a856b2f5eb952ab67512c3
+  data.tar.gz: 084815636014a24e2cc2500853b15b2aba90f713
 SHA512:
-  metadata.gz: 3df15346ea9c39be6bff77310c24e26e03bb23f654d21f15388c8785d09532b88ac47f7cb0ff939dece01535a18d20785790f9faf245044bb9d1258c5509808d
-  data.tar.gz: 34326f6563d13d955da83995d16345a2c385d4f2d87fefee4a248087e703c7c61b8dfb05e4df273db880d4638f6a752abccae058f6b143542efc4cf62588d00c
+  metadata.gz: 846465074f639a88087fa6a7b164a7c177c49877fa7b0115392917fd5f229c0860450a7632cacda6c835518bba766fbc98260fa2c45a7f2cef403853283c02c5
+  data.tar.gz: 27e0430e831019f557f68e715a9bf60b9902c108617a103481a3251d514d66f3acc79620cc8dcb1a06be94c3003e83cd4fd3c405ff6a36ba8f5c80ad692809ef

data/ext/journald_native/CMakeLists.txt

@@ -1,3 +1,5 @@
+# dummy cmake file for CLion
+
 cmake_minimum_required(VERSION 2.8.4)
 project(journald_native)
 

data/ext/journald_native/journald_native.cpp

@@ -7,6 +7,9 @@
 
 namespace journald_native {
 
+namespace {
+
+/* aux */
 // just a short alias for ruby_raisable_call()
 template <typename Func, typename... Args>
 inline auto r(Func f, Args... args) -> decltype(f(args...))
@@ -14,91 +17,39 @@ inline auto r(Func f, Args... args) -> decltype(f(args...))
     return ruby_exception_wrapper::ruby_raisable_call(f, args...);
 }
 
-/* initializers */
-inline void init_constants(VALUE module);
-inline void init_methods(VALUE module);
-
-/* methods */
-VALUE native_print(VALUE self, VALUE priority, VALUE message);
-VALUE native_send(int argc, VALUE* argv, VALUE self);
-VALUE native_perror(VALUE self, VALUE message);
-inline VALUE native_print_impl(VALUE v_self, VALUE v_priority, VALUE v_message);
-inline VALUE native_send_impl(int argc, VALUE* argv, VALUE self);
-inline VALUE native_perror_impl(VALUE v_self, VALUE v_message);
-
-/* aux */
-std::string create_safe_string(VALUE string); // throws ruby exceptions
-
-/* initializers */
-void init_modules()
-{
-    // no nontrivial destructors during initialization, no need for ruby catch
-
-    VALUE mJournald = rb_define_module("Journald");
-    VALUE mNative   = rb_define_module_under(mJournald, "Native");
-
-    init_constants(mJournald); // add constants to Journald
-    init_methods(mNative);     // add methods to Journald::Native
-}
-
-inline void init_constants(VALUE module)
+// Remove zeros from the string
+std::string create_safe_string(VALUE v_string)
 {
-    rb_define_const(module, "LOG_EMERG",   INT2NUM(LOG_EMERG));    /* system is unusable */
-    rb_define_const(module, "LOG_ALERT",   INT2NUM(LOG_ALERT));    /* action must be taken immediately */
-    rb_define_const(module, "LOG_CRIT",    INT2NUM(LOG_CRIT));     /* critical conditions */
-    rb_define_const(module, "LOG_ERR",     INT2NUM(LOG_ERR));      /* error conditions */
-    rb_define_const(module, "LOG_WARNING", INT2NUM(LOG_WARNING));  /* warning conditions */
-    rb_define_const(module, "LOG_NOTICE",  INT2NUM(LOG_NOTICE));   /* normal but significant condition */
-    rb_define_const(module, "LOG_INFO",    INT2NUM(LOG_INFO));     /* informational */
-    rb_define_const(module, "LOG_DEBUG",   INT2NUM(LOG_DEBUG));    /* debug-level messages */
-}
+    /* convert to string */
+    r(rb_string_value, &v_string);
 
-inline void init_methods(VALUE module)
-{
-    rb_define_singleton_method(module, "print",  RUBY_METHOD_FUNC(native_print),  2);
-    rb_define_singleton_method(module, "send",   RUBY_METHOD_FUNC(native_send),  -1); /* -1 to pass as C array */
-    rb_define_singleton_method(module, "perror", RUBY_METHOD_FUNC(native_perror), 1);
-}
+    char*  str = (char *)RSTRING_PTR(v_string);
+    size_t len = (size_t)RSTRING_LEN(v_string);
 
-VALUE native_print(VALUE v_self, VALUE v_priority, VALUE v_message)
-{
-    try {
-        return native_print_impl(v_self, v_priority, v_message);
-    } catch(ruby_exception_wrapper::RbWrappedException &e) {
-        rb_exc_raise(e.getRubyException());
-    }
-}
+    std::string safe_str;
+    safe_str.reserve(len);
 
-VALUE native_send(int argc, VALUE* argv, VALUE v_self)
-{
-    try {
-        return native_send_impl(argc, argv, v_self);
-    } catch(ruby_exception_wrapper::RbWrappedException &e) {
-        rb_exc_raise(e.getRubyException());
+    for (size_t i = 0; i < len; i++) {
+        if (str[i]) {
+            safe_str += str[i];
+        }
     }
-}
 
-VALUE native_perror(VALUE v_self, VALUE v_message)
-{
-    try {
-        return native_perror_impl(v_self, v_message);
-    } catch(ruby_exception_wrapper::RbWrappedException &e) {
-        rb_exc_raise(e.getRubyException());
-    }
+    return safe_str;
 }
 
 /* methods */
-inline VALUE native_print_impl(VALUE v_self, VALUE v_priority, VALUE v_message)
+inline VALUE native_print(VALUE v_self, VALUE v_priority, VALUE v_message)
 {
     int  priority = NUM2INT(v_priority);
-    auto message  = create_safe_string(v_message); // ruby exception here
+    auto message  = create_safe_string(v_message);
 
     int  result   = sd_journal_print(priority, "%s", message.c_str());
 
     return INT2NUM(result);
 }
 
-inline VALUE native_send_impl(int argc, VALUE* argv, VALUE v_self)
+inline VALUE native_send(int argc, VALUE* argv, VALUE v_self)
 {
     auto msgs = std::make_unique<iovec[]>((size_t)argc);
 
@@ -114,36 +65,57 @@ inline VALUE native_send_impl(int argc, VALUE* argv, VALUE v_self)
     return INT2NUM(result);
 }
 
-inline VALUE native_perror_impl(VALUE v_self, VALUE v_message)
+inline VALUE native_perror(VALUE v_self, VALUE v_message)
 {
-    auto message = create_safe_string(v_message); // ruby exception here
+    auto message = create_safe_string(v_message);
 
     int  result  = sd_journal_perror(message.c_str());
 
     return INT2NUM(result);
 }
 
-/**
- * Remove zeros from the string
- */
-std::string create_safe_string(VALUE v_string)
+VALUE is_dummy(VALUE v_self = Qnil)
 {
-    /* convert to string */
-    r(rb_string_value, &v_string);
+    constexpr VALUE dummy = JOURNALD_NATIVE_SD_JOURNAL_DUMMY ? Qtrue : Qfalse;
+    return dummy;
+}
 
-    char*  str = (char *)RSTRING_PTR(v_string);
-    size_t len = (size_t)RSTRING_LEN(v_string);
+/* initializers */
+inline void init_journald(VALUE module)
+{
+    rb_define_const(module, "LOG_EMERG",   INT2NUM(LOG_EMERG));    /* system is unusable */
+    rb_define_const(module, "LOG_ALERT",   INT2NUM(LOG_ALERT));    /* action must be taken immediately */
+    rb_define_const(module, "LOG_CRIT",    INT2NUM(LOG_CRIT));     /* critical conditions */
+    rb_define_const(module, "LOG_ERR",     INT2NUM(LOG_ERR));      /* error conditions */
+    rb_define_const(module, "LOG_WARNING", INT2NUM(LOG_WARNING));  /* warning conditions */
+    rb_define_const(module, "LOG_NOTICE",  INT2NUM(LOG_NOTICE));   /* normal but significant condition */
+    rb_define_const(module, "LOG_INFO",    INT2NUM(LOG_INFO));     /* informational */
+    rb_define_const(module, "LOG_DEBUG",   INT2NUM(LOG_DEBUG));    /* debug-level messages */
+}
 
-    std::string safe_str;
-    safe_str.reserve(len);
+inline void init_native(VALUE module)
+{
+    // methods
+    rb_define_singleton_method(module, "print",  RXW_WRAPPED_METHOD_FUNC(native_print, VALUE, VALUE, VALUE),  2);
+    rb_define_singleton_method(module, "send",   RXW_WRAPPED_METHOD_FUNC(native_send, int, VALUE*, VALUE),   -1); /* -1 to pass as C array */
+    rb_define_singleton_method(module, "perror", RXW_WRAPPED_METHOD_FUNC(native_perror, VALUE, VALUE),        1);
+
+    // dummy detection
+    rb_define_const(module, "IS_DUMMY", is_dummy());
+    rb_define_singleton_method(module, "dummy?", RUBY_METHOD_FUNC(is_dummy), 0);
+}
 
-    for (size_t i = 0; i < len; i++) {
-        if (str[i]) {
-            safe_str += str[i];
-        }
-    }
+} // private namespace
 
-    return safe_str;
+void init_modules()
+{
+    // no nontrivial destructors during initialization, no need for ruby catch
+
+    VALUE mJournald = rb_define_module("Journald");
+    VALUE mNative   = rb_define_module_under(mJournald, "Native");
+
+    init_journald(mJournald); // add constants to Journald
+    init_native(mNative);     // add methods to Journald::Native
 }
 
 }

data/ext/journald_native/ruby_exception_wrapper.h

@@ -9,6 +9,10 @@
 
 #include "cpp14shiv.h" // make this c++14 code c++11 compatible; remove for c++14
 
+// wrap functions, prototype required, i.e. RXW_WRAPPED_METHOD_FUNC(native_send, int, VALUE*, VALUE)
+// functions can be inline
+#define RXW_WRAPPED_METHOD_FUNC(method, ...) ((VALUE (*)(ANYARGS))::ruby_exception_wrapper::method_wrapper_call<decltype(&method), method, __VA_ARGS__>)
+
 namespace ruby_exception_wrapper {
 
     class RbWrappedException: public std::exception {
@@ -22,7 +26,7 @@ namespace ruby_exception_wrapper {
     VALUE rethrow_as_cpp(VALUE put_exception_here_ptr, VALUE exception);
 
     namespace {
-        // do real call of function from template for func with params
+        // do real call of function from template
         template <typename FuncPointer, typename... Args>
         inline VALUE call_wrapper_tuple_impl(FuncPointer& fp, Args... args)
         {
@@ -86,6 +90,16 @@ namespace ruby_exception_wrapper {
         return result;
     }
 
+    template <typename Func, Func func, typename... Args>
+    VALUE method_wrapper_call(Args... args)
+    {
+        try {
+            return func(args...);
+        } catch(RbWrappedException &e) {
+            rb_exc_raise(e.getRubyException());
+        }
+    }
+
 }
 
 #endif

data/ext/journald_native/sd_journal.h

@@ -3,6 +3,8 @@
 
 #ifdef __linux__
 
+    #define JOURNALD_NATIVE_SD_JOURNAL_DUMMY false
+
     /* do the real stuff */
 
     #include "extconf.h"
@@ -32,6 +34,8 @@
 
 #else
 
+    #define JOURNALD_NATIVE_SD_JOURNAL_DUMMY true
+
     #warning Compiling dummy version of the gem for non-Linux OS
 
     #include "sd_journal_dummy.h"

data/lib/journald/native/version.rb

@@ -1,5 +1,5 @@
 module Journald
   module Native
-    VERSION = '1.0.4'
+    VERSION = '1.0.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: journald-native
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Anton Smirnov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: systemd-journal logging native lib wrapper