postfix_status_line 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79c92235629b68393a9634f1fcd9e260a2b7efc3
-  data.tar.gz: c2796079c6c105b893dd2b2455151b564558c390
+  metadata.gz: df9ab0374f13af0d782be989d057f95a6aa474ed
+  data.tar.gz: 768d579c879a6b5209405143775bc7f0ad79e027
 SHA512:
-  metadata.gz: 275c97db7c00e8006ef01f4f992ec046fd35cb5090bf5562ef7b503b320abe599e0ae6e2f9aa96faa04b34c230fe21e8f223a332145e6a52f1d5445d3c83fe5c
-  data.tar.gz: 5eb060a7c8202d70633fc4a60ba068d610240a780e3c145db0d2b4c5c8b71ff4a8fa4ddac99a5b6e0f080e17727d546888f9b9595d2f8a9c8f52f7592656797e
+  metadata.gz: 980943454a02e5151a986a2795d834bdb095018b876856951ec474d1db7d0dcfd3c8e59e816240737331b9d3fff502a3678bc369a2f3aa02bfca22a02259af04
+  data.tar.gz: b7153669aa950d74f1c0bb3e7ad4fd5874d974a98810beeeed41dd3840a882150bde2c5d1559a0b96b626f518a52e931fe88da8b1f19c1182faf05d2961d2e1f

data/README.md

@@ -50,3 +50,86 @@ PostfixStatusLine.parse(status_line)
 ```ruby
 PostfixStatusLine.parse(status_line, hash: true)
 ```
+
+### Parse time
+
+```ruby
+PostfixStatusLine.parse(status_line, parse_time: true)
+```
+
+## Benchmark (on EC2/t2.micro)
+
+### Script
+
+```ruby
+#!/usr/bin/env ruby
+require 'benchmark'
+require 'postfix_status_line'
+
+it = 5
+n = 500000
+
+status_lines = "Feb 27 09:02:37 MyHOSTNAME postfix/smtp[26490]: D53A72713E5: to=<myemail@bellsouth.net>, relay=gateway-f1.isp.att.net[204.127.217.16]:25, delay=0.57, delays=0.11/0.03/0.23/0.19, dsn=2.0.0, status=sent (250 ok ; id=20120227140036M0700qer4ne)"
+
+{
+  psl: {mask: false},
+  psl_m: {},
+  psl_h: {hash: true},
+  psl_t: {parse_time: true},
+}.each do |name, options|
+  Benchmark.bm(20, ">sec/prs:", ">prs/sec:") do |x|
+    rs = []
+
+    it.times do |i|
+      i += 1
+
+      rs << x.report("#{Time.now.strftime('%X')} #{name}(#{i}):") do
+        for i in 1..n
+          PostfixStatusLine.parse(status_lines, options)
+        end
+      end
+    end
+
+    pps = rs.inject(&:+) / it / n
+    tp = Benchmark::Tms.new(1/pps.utime, 1/pps.stime, 1/pps.cutime, 1/pps.cstime, 1/pps.real)
+    [pps, tp]
+  end
+end
+```
+
+### Result
+
+```
+                           user     system      total        real
+02:26:06 psl(1):       2.810000   0.000000   2.810000 (  2.807900)
+02:26:09 psl(2):       2.820000   0.000000   2.820000 (  2.819920)
+02:26:12 psl(3):       2.810000   0.000000   2.810000 (  2.809408)
+02:26:14 psl(4):       2.810000   0.000000   2.810000 (  2.810345)
+02:26:17 psl(5):       2.800000   0.000000   2.800000 (  2.802439)
+>sec/prs:              0.000006   0.000000   0.000006 (  0.000006)
+>prs/sec:            177935.943060        Inf        Inf (177935.783843)
+                           user     system      total        real
+02:26:20 psl_m(1):     2.940000   0.000000   2.940000 (  2.942580)
+02:26:23 psl_m(2):     2.880000   0.000000   2.880000 (  2.879812)
+02:26:26 psl_m(3):     2.900000   0.000000   2.900000 (  2.900414)
+02:26:29 psl_m(4):     2.840000   0.000000   2.840000 (  2.836515)
+02:26:32 psl_m(5):     2.790000   0.000000   2.790000 (  2.792500)
+>sec/prs:              0.000006   0.000000   0.000006 (  0.000006)
+>prs/sec:            174216.027875        Inf        Inf (174193.923151)
+                           user     system      total        real
+02:26:34 psl_h(1):     4.990000   0.000000   4.990000 (  4.987470)
+02:26:39 psl_h(2):     5.000000   0.000000   5.000000 (  4.999526)
+02:26:44 psl_h(3):     4.950000   0.000000   4.950000 (  4.944881)
+02:26:49 psl_h(4):     5.030000   0.000000   5.030000 (  5.033834)
+02:26:54 psl_h(5):     5.010000   0.000000   5.010000 (  5.031988)
+>sec/prs:              0.000010   0.000000   0.000010 (  0.000010)
+>prs/sec:            100080.064051        Inf        Inf (100009.204039)
+                           user     system      total        real
+02:26:59 psl_t(1):     4.060000   0.340000   4.400000 (  4.397266)
+02:27:04 psl_t(2):     3.900000   0.320000   4.220000 (  4.226741)
+02:27:08 psl_t(3):     3.750000   0.380000   4.130000 (  4.125684)
+02:27:12 psl_t(4):     3.830000   0.280000   4.110000 (  4.097343)
+02:27:16 psl_t(5):     3.770000   0.320000   4.090000 (  4.097630)
+>sec/prs:              0.000008   0.000001   0.000008 (  0.000008)
+>prs/sec:            129466.597618 1524390.243902        Inf (119362.140704)
+```

data/ext/postfix_status_line_core.c

@@ -37,6 +37,16 @@ static bool digest_sha512(char *str, char *salt, size_t salt_len, char buf[]) {
 }
 #endif // HAVE_OPENSSL_SHA_H
 
+static bool rb_value_to_bool(VALUE v_value) {
+  switch (TYPE(v_value)) {
+  case T_FALSE:
+  case T_NIL:
+    return false;
+  default:
+    return true;
+  }
+}
+
 static char *split(char **orig_str, const char *delim, size_t delim_len) {
   char *str = *orig_str;
   char *ptr = strstr((const char *) str, delim);
@@ -283,22 +293,66 @@ static void split_line2(char *str, bool mask, VALUE hash, bool include_hash, cha
   }
 }
 
-static VALUE rb_postfix_status_line_parse(VALUE self, VALUE v_str, VALUE v_mask, VALUE v_hash, VALUE v_salt) {
+static int get_year() {
+  time_t now = time(NULL);
+
+  if (now == -1) {
+    return -1;
+  }
+
+  struct tm *t = localtime(&now);
+
+  if (t == NULL) {
+    return -1;
+  }
+
+  return t->tm_year;
+}
+
+static void put_epoch(char *time_str, VALUE hash) {
+  time_t ts;
+  struct tm parsed;
+
+  if (strptime(time_str, "%b %d %H:%M:%S", &parsed) == NULL) {
+    return;
+  }
+
+  int this_year = get_year();
+
+  if (this_year == -1) {
+    return;
+  }
+
+  parsed.tm_year = this_year;
+  parsed.tm_isdst = 0;
+
+  ts = mktime(&parsed);
+
+  if (ts == -1) {
+    return;
+  }
+
+  rb_hash_aset(hash, rb_str_new2("epoch"), LONG2NUM(ts));
+}
+
+static VALUE rb_postfix_status_line_parse(VALUE self, VALUE v_str, VALUE v_mask, VALUE v_hash, VALUE v_salt, VALUE v_parse_time) {
   Check_Type(v_str, T_STRING);
 
   char *str = RSTRING_PTR(v_str);
   size_t len = RSTRING_LEN(v_str);
-  bool mask = true;
+
+  if (len < 1) {
+    return Qnil;
+  }
+
+  bool mask = rb_value_to_bool(v_mask);
+  bool parse_time = rb_value_to_bool(v_parse_time);
 
   bool include_hash = false;
   char *salt = NULL;
   size_t salt_len = -1;
 
-  switch (TYPE(v_hash)) {
-  case T_FALSE:
-  case T_NIL:
-    break;
-  default:
+if (rb_value_to_bool(v_hash)) {
 #ifdef HAVE_OPENSSL_SHA_H
     include_hash = true;
 
@@ -312,16 +366,6 @@ static VALUE rb_postfix_status_line_parse(VALUE self, VALUE v_str, VALUE v_mask,
 #endif // HAVE_OPENSSL_SHA_H
   }
 
-  switch (TYPE(v_mask)) {
-  case T_FALSE:
-  case T_NIL:
-    mask = false;
-  }
-
-  if (len < 1) {
-    return Qnil;
-  }
-
   char buf[len + 1];
   strncpy(buf, str, len);
   buf[len] = '\0';
@@ -338,6 +382,10 @@ static VALUE rb_postfix_status_line_parse(VALUE self, VALUE v_str, VALUE v_mask,
   rb_hash_aset(hash, rb_str_new2("process"), rb_str_new2(process));
   rb_hash_aset(hash, rb_str_new2("queue_id"), rb_str_new2(queue_id));
 
+  if (parse_time) {
+    put_epoch(tm, hash);
+  }
+
   split_line2(attrs, mask, hash, include_hash, salt, salt_len);
 
   return hash;
@@ -346,5 +394,5 @@ static VALUE rb_postfix_status_line_parse(VALUE self, VALUE v_str, VALUE v_mask,
 void Init_postfix_status_line_core() {
   VALUE rb_mPostfixStatusLine = rb_define_module("PostfixStatusLine");
   VALUE rb_mPostfixStatusLineCore = rb_define_module_under(rb_mPostfixStatusLine, "Core");
-  rb_define_module_function(rb_mPostfixStatusLineCore, "parse", rb_postfix_status_line_parse, 4);
+  rb_define_module_function(rb_mPostfixStatusLineCore, "parse", rb_postfix_status_line_parse, 5);
 }

data/ext/postfix_status_line_core.h

@@ -1,7 +1,12 @@
 #ifndef __POSTFIX_STATUS_LINE_CORE_H__
 #define __POSTFIX_STATUS_LINE_CORE_H__
 
+#ifndef _XOPEN_SOURCE
+#define _XOPEN_SOURCE
+#endif
+
 #include <stdbool.h>
+#include <time.h>
 
 #ifdef HAVE_OPENSSL_SHA_H
 #include <openssl/sha.h>

data/lib/postfix_status_line.rb

@@ -6,7 +6,8 @@ module PostfixStatusLine
     mask = options.has_key?(:mask) ? options[:mask] : true
     hash = options[:hash]
     salt = options[:salt]
-    PostfixStatusLine::Core.parse(str, mask, hash, salt)
+    parse_time = options[:parse_time]
+    PostfixStatusLine::Core.parse(str, mask, hash, salt, parse_time)
   end
   module_function :parse
 end

data/lib/postfix_status_line/version.rb

@@ -1,3 +1,3 @@
 module PostfixStatusLine
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postfix_status_line
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-26 00:00:00.000000000 Z
+date: 2015-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler