Code tweaks and an additional unit test

- The Histogram `record` method now has an optional `count` parameter.
- A new unit test for the above change.
- The HdrHistogram `record` method is now `recordValue`.
- The HdrHistogram `sizeOfEquivalentValueRange` and `resetInternalCounters` methods are removed.

Author: jschlight

Histogram.js

@@ -6,9 +6,13 @@ class Histogram extends HdrHistogram {
         super(min, max, sigDigits);
     }
 
-    record (value) {
+    record (value, count) {
         if (isNumber(value)) {
-            return super.record(value);
+          if (typeof count === 'undefined') {
+            return super.recordValue(value);
+          } else {
+            return super.recordValues(value, count);
+          }
         } else {
             return false;
         }
@@ -19,7 +23,7 @@ class Histogram extends HdrHistogram {
     }
 
     static decode (encoded) {
-        let histogram = new Histogram (1, 10); // values here are immaterial
+        let histogram = new Histogram (1, 10); // the values here are immaterial
         histogram.setEncoded(encoded);
         return histogram;
     }

binding-src/binding-util/napi-ingress.cc

@@ -1,4 +1,5 @@
 // © Copyright 2020 Simply Inspired Software, Inc., dba inspiredware
+// Released under The MIT License — https://en.wikipedia.org/wiki/MIT_License
 
 #include "napi-ingress.h"
 #include <napi.h>

binding-src/binding-util/napi-ingress.h

@@ -1,4 +1,5 @@
 // © Copyright 2020 Simply Inspired Software, Inc., dba inspiredware
+// Released under The MIT License — https://en.wikipedia.org/wiki/MIT_License
 
 #include <napi.h>
 using namespace Napi;

binding-src/binding.cc

@@ -1,6 +1,7 @@
-// 2020-06-16T17:09:23.639-07:00 binding (GenerateInitFiles)
+// 2020-06-26T15:58:56.777-07:00 binding (GenerateInitFiles)
 // © Copyright 2020 Simply Inspired Software, Inc., dba inspiredware
-// Created by the inspiredware automated binding generator — www.inspiredware.com
+// Released under the MIT License — https://en.wikipedia.org/wiki/MIT_License
+// Created by the inspiredware automated binding generator — https://inspiredware.com
 
 #include <napi.h>
 #include "binding/hdr_histogram.h"

binding-src/binding/hdr_histogram.cc

@@ -1,6 +1,7 @@
-// 2020-06-16T17:09:23.251-07:00 binding hdr_histogram.c (GenerateDefinitions)
+// 2020-06-26T15:58:56.322-07:00 binding hdr_histogram.c (GenerateDefinitions)
 // © Copyright 2020 Simply Inspired Software, Inc., dba inspiredware
-// Created by the inspiredware automated binding generator — www.inspiredware.com
+// Released under the MIT License — https://en.wikipedia.org/wiki/MIT_License
+// Created by the inspiredware automated binding generator — https://inspiredware.com
 
 #include "hdr_histogram.h"
 #include "napi-ingress.h"
@@ -66,7 +67,7 @@ Napi::Value HdrHistogram::recordCorrectedValuesAtomic (const Napi::CallbackInfo&
   return jsRetVal;
 }
 
-Napi::Value HdrHistogram::record (const Napi::CallbackInfo& info) {
+Napi::Value HdrHistogram::recordValue (const Napi::CallbackInfo& info) {
   Napi::Env env = info.Env();
   long long value = getInt64<long long> (info[0]);
   _Bool retVal = hdr_record_value (histogram, value);
@@ -186,14 +187,6 @@ Napi::Value HdrHistogram::nextNonEquivalentValue (const Napi::CallbackInfo& info
   return jsRetVal;
 }
 
-Napi::Value HdrHistogram::sizeOfEquivalentValueRange (const Napi::CallbackInfo& info) {
-  Napi::Env env = info.Env();
-  long long value = getInt64<long long> (info[0]);
-  long long retVal = hdr_size_of_equivalent_value_range (histogram, value);
-  Napi::Value jsRetVal = Number::New (env, retVal);
-  return jsRetVal;
-}
-
 Napi::Value HdrHistogram::percentile (const Napi::CallbackInfo& info) {
   Napi::Env env = info.Env();
   double percentile = getDouble<double> (info[0]);
@@ -216,13 +209,6 @@ Napi::Value HdrHistogram::reset (const Napi::CallbackInfo& info) {
   return jsRetVal;
 }
 
-Napi::Value HdrHistogram::resetInternalCounters (const Napi::CallbackInfo& info) {
-  Napi::Env env = info.Env();
-  hdr_reset_internal_counters (histogram);
-  Napi::Value jsRetVal = env.Undefined();
-  return jsRetVal;
-}
-
 Napi::Value HdrHistogram::getEncoded (const Napi::CallbackInfo& info) {
   Napi::Env env = info.Env();
   char * encoded = NULL;
@@ -288,18 +274,16 @@ Napi::Function HdrHistogram::GetClassDef (Napi::Env env) { // static
     InstanceMethod ("recordCorrectedValueAtomic", &HdrHistogram::recordCorrectedValueAtomic),
     InstanceMethod ("recordCorrectedValues", &HdrHistogram::recordCorrectedValues),
     InstanceMethod ("recordCorrectedValuesAtomic", &HdrHistogram::recordCorrectedValuesAtomic),
-    InstanceMethod ("record", &HdrHistogram::record),
+    InstanceMethod ("recordValue", &HdrHistogram::recordValue),
     InstanceMethod ("recordAtomic", &HdrHistogram::recordAtomic),
     InstanceMethod ("recordValues", &HdrHistogram::recordValues),
     InstanceMethod ("recordValuesAtomic", &HdrHistogram::recordValuesAtomic),
     InstanceMethod ("reset", &HdrHistogram::reset),
-    InstanceMethod ("resetInternalCounters", &HdrHistogram::resetInternalCounters),
     InstanceMethod ("stddev", &HdrHistogram::stddev),
     InstanceMethod ("percentile", &HdrHistogram::percentile),
     InstanceMethod ("valuesAreEquivalent", &HdrHistogram::valuesAreEquivalent),
     InstanceMethod ("nextNonEquivalentValue", &HdrHistogram::nextNonEquivalentValue),
     InstanceMethod ("medianEquivalentValue", &HdrHistogram::medianEquivalentValue),
-    InstanceMethod ("sizeOfEquivalentValueRange", &HdrHistogram::sizeOfEquivalentValueRange),
     InstanceMethod ("getEncoded", &HdrHistogram::getEncoded),
     InstanceMethod ("setEncoded", &HdrHistogram::setEncoded),
     InstanceAccessor ("highestTrackableValue", &HdrHistogram::getHighestTrackableValue, nullptr, napi_default),

binding-src/binding/hdr_histogram.h

@@ -1,6 +1,7 @@
-// 2020-06-16T17:09:22.946-07:00 binding hdr_histogram.c (GenerateDeclarations)
+// 2020-06-26T15:58:55.941-07:00 binding hdr_histogram.c (GenerateDeclarations)
 // © Copyright 2020 Simply Inspired Software, Inc., dba inspiredware
-// Created by the inspiredware automated binding generator — www.inspiredware.com
+// Released under the MIT License — https://en.wikipedia.org/wiki/MIT_License
+// Created by the inspiredware automated binding generator — https://inspiredware.com
 
 #include <napi.h>
 #include <hdr_histogram.h> // from the origin library
@@ -18,7 +19,7 @@ class HdrHistogram : public Napi::ObjectWrap<HdrHistogram> {
   Napi::Value recordCorrectedValueAtomic (const Napi::CallbackInfo& info);
   Napi::Value recordCorrectedValues (const Napi::CallbackInfo& info);
   Napi::Value recordCorrectedValuesAtomic (const Napi::CallbackInfo& info);
-  Napi::Value record (const Napi::CallbackInfo& info);
+  Napi::Value recordValue (const Napi::CallbackInfo& info);
   Napi::Value recordAtomic (const Napi::CallbackInfo& info);
   Napi::Value recordValues (const Napi::CallbackInfo& info);
   Napi::Value recordValuesAtomic (const Napi::CallbackInfo& info);
@@ -33,11 +34,9 @@ class HdrHistogram : public Napi::ObjectWrap<HdrHistogram> {
   Napi::Value medianEquivalentValue (const Napi::CallbackInfo& info);
   Napi::Value min (const Napi::CallbackInfo& info);
   Napi::Value nextNonEquivalentValue (const Napi::CallbackInfo& info);
-  Napi::Value sizeOfEquivalentValueRange (const Napi::CallbackInfo& info);
   Napi::Value percentile (const Napi::CallbackInfo& info);
   Napi::Value getMemorySize (const Napi::CallbackInfo& info);
   Napi::Value reset (const Napi::CallbackInfo& info);
-  Napi::Value resetInternalCounters (const Napi::CallbackInfo& info);
 
   Napi::Value getEncoded (const Napi::CallbackInfo& info);
   Napi::Value getHighestTrackableValue (const Napi::CallbackInfo& info);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-hdr-histogram-napi",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "A lightweight N-API wrapper for the HdrHistogram_c library",
   "author": "Jim Schlight <[email protected]>",
   "license": "MIT",

test/test.js

@@ -122,6 +122,26 @@ test('properties', (t) => {
   t.end()
 })
 
+test('record values', (t) => {
+  const instance = new Histogram(1, 100)
+  t.ok(instance.record(10, 3))
+  t.equal(instance.min(), 10, 'min is correct')
+  t.equal(instance.max(), 10, 'max is correct')
+  t.equal(instance.mean(), 10, 'mean is correct')
+  t.equal(instance.totalCount, 3, 'metotalCountan is correct')
+  t.ok(instance.record(30, 3))
+  t.equal(instance.min(), 10, 'min is correct')
+  t.equal(instance.max(), 30, 'max is correct')
+  t.equal(instance.mean(), 20, 'mean is correct')
+  t.equal(instance.totalCount, 6, 'metotalCountan is correct')
+  t.ok(instance.record(40, 6))
+  t.equal(instance.min(), 10, 'min is correct')
+  t.equal(instance.max(), 40, 'max is correct')
+  t.equal(instance.mean(), 30, 'mean is correct')
+  t.equal(instance.totalCount, 12, 'metotalCountan is correct')
+  t.end()
+})
+
 test('percentile', (t) => {
   const instance = new Histogram(1, 100)
   t.ok(instance.record(42))