Merge pull request #770 from eeff/eeff/2.1

Pick error code NEU_ERR_LICENSE_BAD_CLOCK to v2.1.0

include/neuron/errcodes.h

@@ -83,6 +83,7 @@ typedef enum {
     NEU_ERR_LICENSE_DISABLED  = 2403,
     NEU_ERR_LICENSE_MAX_NODES = 2404,
     NEU_ERR_LICENSE_MAX_TAGS  = 2405,
+    NEU_ERR_LICENSE_BAD_CLOCK = 2407,
 
     // common error codes for plugins
     NEU_ERR_PLUGIN_READ_FAILURE            = 3000,

include/neuron/utils/async_queue.h

@@ -41,5 +41,6 @@ int  neu_async_queue_pop(neu_async_queue_t *q, uint64_t key, void **elem);
 
 void neu_async_queue_remove(neu_async_queue_t *q, neu_async_queue_filter filter,
                             void *filter_elem);
+void neu_async_queue_clean(neu_async_queue_t *q);
 
 #endif

src/adapter/driver/driver.c

@@ -290,6 +290,12 @@ void neu_adapter_driver_write_tag(neu_adapter_driver_t *driver,
             free(tag);
             return;
         }
+        if (tag->type == NEU_TYPE_FLOAT || tag->type == NEU_TYPE_DOUBLE) {
+            if (cmd->value.type == NEU_TYPE_INT64) {
+                cmd->value.value.d64 = (double) cmd->value.value.u64;
+            }
+        }
+
         switch (tag->type) {
         case NEU_TYPE_BOOL:
         case NEU_TYPE_DOUBLE:

src/base/neu_plugin_common.c

@@ -20,6 +20,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 
 #include "errcodes.h"
 #include "plugin.h"
@@ -31,6 +32,7 @@ void neu_plugin_common_init(neu_plugin_common_t *common)
     common->magic      = NEU_PLUGIN_MAGIC_NUMBER;
     common->link_state = NEU_NODE_LINK_STATE_DISCONNECTED;
     common->tag_size   = 0;
+    common->timestamp  = time(NULL) * 1000; // don't need much precision at init
 }
 
 bool neu_plugin_common_check(neu_plugin_t *plugin)

src/utils/async_queue.c

@@ -160,4 +160,18 @@ void neu_async_queue_remove(neu_async_queue_t *q, neu_async_queue_filter filter,
         }
     }
     nng_mtx_unlock(q->mtx);
+}
+
+void neu_async_queue_clean(neu_async_queue_t *q)
+{
+    element *el = NULL, *tmp = NULL;
+
+    nng_mtx_lock(q->mtx);
+    DL_FOREACH_SAFE(q->list, el, tmp)
+    {
+        DL_DELETE(q->list, el);
+        q->free_fn(el->data);
+        free(el);
+    }
+    nng_mtx_unlock(q->mtx);
 }

version

@@ -1 +1 @@
-2.1.4
+2.1.6