koffi 0.9.26 → 0.9.27

package/README.md

@@ -261,30 +261,30 @@ At this stage, two benchmarks are implemented:
 
 In order to run it, go to `koffi/benchmark` and run `../../cnoke/cnoke.js` (or `node ..\..\cnoke\cnoke.js` on Windows) before doing anything else.
 
-Once this is done, you can execute each implementation, e.g. `build/atoi_cc 20000000` or `./atoi_koffi.js 20000000`.
+Once this is done, you can execute each implementation, e.g. `build/atoi_cc` or `./atoi_koffi.js`. You can optionally define a custom number of iterations, e.g. `./atoi_koffi.js 10000000`.
 
 ## atoi results
 
 Here are some results from 2022-04-24 on my Linux machine (AMD® Ryzen™ 7 5800H 16G):
 
 ```sh
-$ build/atoi_cc 20000000
+$ build/atoi_cc
 Iterations: 20000000
 Time: 0.24s
 
-$ ./atoi_napi.js 20000000
+$ ./atoi_napi.js
 Iterations: 20000000
-Time: 1.56s
+Time: 1.10s
 
-$ ./atoi_koffi.js 20000000
+$ ./atoi_koffi.js
 Iterations: 20000000
-Time: 2.41s
+Time: 2.34s
 
 # Note: the Node-FFI version does a few setTimeout calls to force the GC to run (around 20
 # for the example below), without which Node will consume all memory because the GC never appears
 # to run, or not enough. It's not ideal but on the other hand it counts as another limitation
 # to Node-FFI performance.
-$ ./atoi_node_ffi.js 20000000
+$ ./atoi_node_ffi.js
 Iterations: 20000000
 Time: 640.49s
 ```
@@ -292,19 +292,19 @@ Time: 640.49s
 And on my Windows machine (Intel® Core™ i5-4460 16G):
 
 ```sh
-$ build\atoi_cc.exe 20000000
+$ build\atoi_cc.exe
 Iterations: 20000000
 Time: 0.66s
 
-$ node atoi_napi.js 20000000
+$ node atoi_napi.js
 Iterations: 20000000
-Time: 3.52s
+Time: 3.23s
 
-$ node atoi_koffi.js 20000000
+$ node atoi_koffi.js
 Iterations: 20000000
 Time: 4.81s
 
-$ node atoi_node_ffi.js 20000000
+$ node atoi_node_ffi.js
 Iterations: 20000000
 Time: 491.99s
 ```
@@ -314,15 +314,15 @@ Time: 491.99s
 Here are some results from 2022-04-24 on my Linux machine (AMD® Ryzen™ 7 5800H 16G):
 
 ```sh
-$ build/raylib_cc 100
+$ build/raylib_cc
 Iterations: 100
 Time: 4.14s
 
-$ ./raylib_koffi.js 100
+$ ./raylib_koffi.js
 Iterations: 100
 Time: 6.25s
 
-$ ./raylib_node_ffi.js 100
+$ ./raylib_node_ffi.js
 Iterations: 100
 Time: 27.13s
 ```
@@ -330,15 +330,15 @@ Time: 27.13s
 And on my Windows machine (Intel® Core™ i5-4460 16G):
 
 ```sh
-$ build\raylib_cc.exe 100
+$ build\raylib_cc.exe
 Iterations: 100
 Time: 10.53s
 
-$ node raylib_koffi.js 100
+$ node raylib_koffi.js
 Iterations: 100
 Time: 14.60s
 
-$ node raylib_node_ffi.js 100
+$ node raylib_node_ffi.js
 Iterations: 100
 Time: 44.97s
 ```

package/benchmark/CMakeLists.txt

@@ -18,7 +18,9 @@ find_package(CNoke)
 
 set(CMAKE_CXX_STANDARD 17)
 
-add_subdirectory(.. koffi)
+if(NOT TARGET koffi)
+    add_subdirectory(.. koffi)
+endif()
 add_subdirectory(../test test)
 
 # ---- atoi ----

package/benchmark/atoi_cc.cc

@@ -25,15 +25,12 @@ volatile uint64_t sum = 0;
 
 int Main(int argc, char **argv)
 {
-    if (argc < 2) {
-        LogError("Missing number of iterations");
-        LogInfo("Usage: atoi_cc <iterations>");
-        return 1;
-    }
+    int iterations = 20000000;
 
-    int iterations = 0;
-    if (!ParseInt(argv[1], &iterations))
-        return 1;
+    if (argc >= 2) {
+        if (!ParseInt(argv[1], &iterations))
+            return 1;
+    }
     LogInfo("Iterations: %1", iterations);
 
     int64_t start = GetMonotonicTime();

package/benchmark/atoi_koffi.js

@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program. If not, see https://www.gnu.org/licenses/.
 
-const koffi = require('../build/koffi.node');
+const koffi = require('./build/koffi.node');
 
 const strings = [
     '424242',
@@ -26,14 +26,15 @@ let sum = 0;
 main();
 
 function main() {
-    if (process.argv.length < 3)
-        throw new Error('Missing number of iterations');
-
-    let iterations = parseInt(process.argv[2], 10);
-    if (Number.isNaN(iterations))
-        throw new Error('Not a valid number');
-    if (iterations < 1)
-        throw new Error('Value must be positive');
+    let iterations = 20000000;
+
+    if (process.argv.length >= 3) {
+        iterations = parseInt(process.argv[2], 10);
+        if (Number.isNaN(iterations))
+            throw new Error('Not a valid number');
+        if (iterations < 1)
+            throw new Error('Value must be positive');
+    }
     console.log('Iterations:', iterations);
 
     let lib = koffi.load(process.platform == 'win32' ? 'msvcrt.dll' : null);

package/benchmark/atoi_napi.cc

@@ -30,20 +30,26 @@ static Napi::Value RunAtoi(const Napi::CallbackInfo &info)
 {
     Napi::Env env = info.Env();
 
-    // We want maximum performance here, this is a benchmark
-#if 0
-    if (info.Length() < 1) {
+    if (RG_UNLIKELY(info.Length() < 1)) {
         ThrowError<Napi::TypeError>(env, "Expected 1 argument, got %1", info.Length());
         return env.Null();
     }
-    if (!info[0].IsString()) {
-        ThrowError<Napi::TypeError>(env, "Unexpected value for str, expected string");
-        return env.Null();
+
+    char str[64];
+    {
+        napi_status status = napi_get_value_string_utf8(env, info[0], str, RG_SIZE(str), nullptr);
+
+        if (RG_UNLIKELY(status != napi_ok)) {
+            if (status == napi_string_expected) {
+                ThrowError<Napi::TypeError>(env, "Unexpected value for str, expected string");
+            } else {
+                ThrowError<Napi::TypeError>(env, "Failed to read JS string");
+            }
+            return env.Null();
+        }
     }
-#endif
 
-    std::string name = info[0].As<Napi::String>();
-    int value = atoi(name.c_str());
+    int value = atoi(str);
 
     return Napi::Number::New(env, value);
 }

package/benchmark/atoi_napi.js

@@ -26,14 +26,15 @@ let sum = 0;
 main();
 
 function main() {
-    if (process.argv.length < 3)
-        throw new Error('Missing number of iterations');
-
-    let iterations = parseInt(process.argv[2], 10);
-    if (Number.isNaN(iterations))
-        throw new Error('Not a valid number');
-    if (iterations < 1)
-        throw new Error('Value must be positive');
+    let iterations = 20000000;
+
+    if (process.argv.length >= 3) {
+        iterations = parseInt(process.argv[2], 10);
+        if (Number.isNaN(iterations))
+            throw new Error('Not a valid number');
+        if (iterations < 1)
+            throw new Error('Value must be positive');
+    }
     console.log('Iterations:', iterations);
 
     let start = performance.now();

package/benchmark/atoi_node_ffi.js

@@ -16,7 +16,6 @@
 const ref = require('ref-napi');
 const ffi = require('ffi-napi');
 const struct = require('ref-struct-di')(ref);
-const path = require('path');
 
 const strings = [
     '424242',
@@ -29,14 +28,15 @@ let sum = 0;
 main();
 
 async function main() {
-    if (process.argv.length < 3)
-        throw new Error('Missing number of iterations');
-
-    let iterations = parseInt(process.argv[2], 10);
-    if (Number.isNaN(iterations))
-        throw new Error('Not a valid number');
-    if (iterations < 1)
-        throw new Error('Value must be positive');
+    let iterations = 20000000;
+
+    if (process.argv.length >= 3) {
+        iterations = parseInt(process.argv[2], 10);
+        if (Number.isNaN(iterations))
+            throw new Error('Not a valid number');
+        if (iterations < 1)
+            throw new Error('Value must be positive');
+    }
     console.log('Iterations:', iterations);
 
     const lib = ffi.Library(process.platform == 'win32' ? 'msvcrt.dll' : null, {

package/benchmark/raylib_cc.cc

@@ -18,15 +18,12 @@ namespace RG {
 
 int Main(int argc, char **argv)
 {
-    if (argc < 2) {
-        LogError("Missing number of iterations");
-        LogInfo("Usage: raylib_cc <iterations>");
-        return 1;
-    }
+    int iterations = 100;
 
-    int iterations = 0;
-    if (!ParseInt(argv[1], &iterations))
-        return 1;
+    if (argc >= 2) {
+        if (!ParseInt(argv[1], &iterations))
+            return 1;
+    }
     LogInfo("Iterations: %1", iterations);
 
     // We need to call InitWindow before using anything else (such as fonts)

package/benchmark/raylib_koffi.js

@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program. If not, see https://www.gnu.org/licenses/.
 
-const koffi = require('../build/koffi.node');
+const koffi = require('./build/koffi.node');
 const path = require('path');
 
 const Color = koffi.struct('Color', {
@@ -71,17 +71,18 @@ const Font = koffi.struct('Font', {
 main();
 
 function main() {
-    if (process.argv.length < 3)
-        throw new Error('Missing number of iterations');
-
-    let iterations = parseInt(process.argv[2], 10);
-    if (Number.isNaN(iterations))
-        throw new Error('Not a valid number');
-    if (iterations < 1)
-        throw new Error('Value must be positive');
+    let iterations = 100;
+
+    if (process.argv.length >= 3) {
+        iterations = parseInt(process.argv[2], 10);
+        if (Number.isNaN(iterations))
+            throw new Error('Not a valid number');
+        if (iterations < 1)
+            throw new Error('Value must be positive');
+    }
     console.log('Iterations:', iterations);
 
-    let lib_filename = path.dirname(__filename) + '/../test/build/raylib' + koffi.extension;
+    let lib_filename = path.dirname(__filename) + '/test/build/raylib' + koffi.extension;
     let lib = koffi.load(lib_filename);
 
     const InitWindow = lib.cdecl('InitWindow', 'void', ['int', 'int', 'string']);

package/benchmark/raylib_node_ffi.js

@@ -16,7 +16,7 @@
 const ref = require('ref-napi');
 const ffi = require('ffi-napi');
 const struct = require('ref-struct-di')(ref);
-const koffi = require('../build/koffi.node');
+const koffi = require('./build/koffi.node');
 const path = require('path');
 
 const Color = struct({
@@ -87,8 +87,16 @@ const Font = struct({
 main();
 
 function main() {
-    if (process.argv.length < 3)
-        throw new Error('Missing number of iterations');
+    let iterations = 100;
+
+    if (process.argv.length >= 3) {
+        iterations = parseInt(process.argv[2], 10);
+        if (Number.isNaN(iterations))
+            throw new Error('Not a valid number');
+        if (iterations < 1)
+            throw new Error('Value must be positive');
+    }
+    console.log('Iterations:', iterations);
 
     let iterations = parseInt(process.argv[2], 10);
     if (Number.isNaN(iterations))
@@ -97,7 +105,7 @@ function main() {
         throw new Error('Value must be positive');
     console.log('Iterations:', iterations);
 
-    let lib_filename = path.dirname(__filename) + '/../test/build/raylib' + koffi.extension;
+    let lib_filename = path.dirname(__filename) + '/test/build/raylib' + koffi.extension;
 
     const r = ffi.Library(lib_filename, {
         InitWindow: ['void', ['int', 'int', 'string']],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koffi",
-  "version": "0.9.26",
+  "version": "0.9.27",
   "description": "Fast and simple FFI (foreign function interface) for Node.js",
   "keywords": [
     "foreign",
@@ -23,7 +23,7 @@
   },
   "license": "AGPL-3.0",
   "dependencies": {
-    "cnoke": "^0.9.26"
+    "cnoke": "^1.0.1"
   },
   "devDependencies": {
     "chalk": "^4.1.2",

package/src/ffi.cc

@@ -116,7 +116,7 @@ static Napi::Value CreateStructType(const Napi::CallbackInfo &info)
         if (!member.type)
             return env.Null();
 
-        type->size = AlignLen(type->size, member.type->align) + member.type->size;
+        type->size = (int16_t)(AlignLen(type->size, member.type->align) + member.type->size);
         type->align = std::max(type->align, member.type->align);
 
         type->members.Append(member);

package/test/CMakeLists.txt

@@ -14,6 +14,10 @@
 cmake_minimum_required(VERSION 3.12)
 project(koffi C CXX)
 
+if(NOT TARGET koffi)
+    add_subdirectory(.. koffi)
+endif()
+
 # ---- Raylib ----
 
 add_library(raylib SHARED

package/test/registry/machines.json

@@ -25,9 +25,7 @@
             "Linux ARM32": {
                 "directory": "/home/debian/luigi",
                 "build": {
-                    "Install": "npm install --production --ignore-scripts",
-                    "Build Koffi": "node ../cnoke/cnoke.js",
-                    "Build dependencies": "node ../cnoke/cnoke.js -C test"
+                    "Build": "node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
                     "Test Raylib": "xvfb-run node test/tests/raylib.js",
@@ -64,9 +62,7 @@
             "Linux ARM64": {
                 "directory": "/home/debian/luigi",
                 "build": {
-                    "Install": "npm install --production --ignore-scripts",
-                    "Build Koffi": "node ../cnoke/cnoke.js",
-                    "Build dependencies": "node ../cnoke/cnoke.js -C test"
+                    "Build": "node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
                     "Test Raylib": "xvfb-run node test/tests/raylib.js",
@@ -103,9 +99,7 @@
             "Linux i386": {
                 "directory": "/home/debian/luigi",
                 "build": {
-                    "Install": "npm install --production --ignore-scripts",
-                    "Build Koffi": "node ../cnoke/cnoke.js",
-                    "Build dependencies": "node ../cnoke/cnoke.js -C test"
+                    "Build": "node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
                     "Test Raylib": "xvfb-run node test/tests/raylib.js",
@@ -142,9 +136,7 @@
             "Linux x64": {
                 "directory": "/home/debian/luigi",
                 "build": {
-                    "Install": "npm install --production --ignore-scripts",
-                    "Build Koffi": "node ../cnoke/cnoke.js",
-                    "Build dependencies": "node ../cnoke/cnoke.js -C test"
+                    "Build": "node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
                     "Test Raylib": "xvfb-run node test/tests/raylib.js",
@@ -181,9 +173,7 @@
             "Windows i386": {
                 "directory": "C:/Users/windows/Desktop/luigi32",
                 "build": {
-                    "Install": "C:\\Node32\\node32.cmd npm install --production --ignore-scripts",
-                    "Build Koffi": "C:\\Node32\\node32.cmd node ../cnoke/cnoke.js",
-                    "Build dependencies": "C:\\Node32\\node32.cmd node ../cnoke/cnoke.js -C test"
+                    "Build": "C:\\Node32\\node32.cmd node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
                     "Test Raylib": "seatsh C:\\Node32\\node32.cmd node test/tests/raylib.js",
@@ -195,9 +185,7 @@
             "Windows x64": {
                 "directory": "C:/Users/windows/Desktop/luigi64",
                 "build": {
-                    "Install": "C:\\Node64\\node64.cmd npm install --production --ignore-scripts",
-                    "Build Koffi": "C:\\Node64\\node64.cmd node ../cnoke/cnoke.js",
-                    "Build dependencies": "C:\\Node64\\node64.cmd node ../cnoke/cnoke.js -C test"
+                    "Build": "C:\\Node64\\node64.cmd node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
                     "Test Raylib": "seatsh C:\\Node64\\node64.cmd node test/tests/raylib.js",
@@ -234,9 +222,7 @@
             "FreeBSD x64": {
                 "directory": "/home/freebsd/luigi",
                 "build": {
-                    "Install": "npm install --production --ignore-scripts",
-                    "Build Koffi": "node ../cnoke/cnoke.js",
-                    "Build dependencies": "node ../cnoke/cnoke.js -C test"
+                    "Build": "node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
                     "Test Raylib": "xvfb-run node test/tests/raylib.js",
@@ -273,9 +259,7 @@
             "FreeBSD i386": {
                 "directory": "/home/freebsd/luigi",
                 "build": {
-                    "Install": "npm install --production --ignore-scripts",
-                    "Build Koffi": "node ../cnoke/cnoke.js",
-                    "Build dependencies": "node ../cnoke/cnoke.js -C test"
+                    "Build": "node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
                     "Test Raylib": "xvfb-run node test/tests/raylib.js",
@@ -312,9 +296,7 @@
             "FreeBSD ARM64": {
                 "directory": "/home/freebsd/luigi",
                 "build": {
-                    "Install": "npm install --production --ignore-scripts",
-                    "Build Koffi": "node ../cnoke/cnoke.js",
-                    "Build dependencies": "node ../cnoke/cnoke.js -C test"
+                    "Build": "node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
                     "Test Raylib": "xvfb-run node test/tests/raylib.js",
@@ -351,9 +333,7 @@
             "macOS x64": {
                 "directory": "/Users/macos/luigi",
                 "build": {
-                    "Install": "PATH=/usr/local/bin:/usr/bin:/bin npm install --production --ignore-scripts",
-                    "Build Koffi": "PATH=/usr/local/bin:/usr/bin:/bin SDKROOT=/Library/Developer/CommandLineTools/SDKs/MacOSX11.3.sdk node ../cnoke/cnoke.js",
-                    "Build dependencies": "PATH=/usr/local/bin:/usr/bin:/bin SDKROOT=/Library/Developer/CommandLineTools/SDKs/MacOSX11.3.sdk node ../cnoke/cnoke.js -C test"
+                    "Build": "PATH=/usr/local/bin:/usr/bin:/bin SDKROOT=/Library/Developer/CommandLineTools/SDKs/MacOSX11.3.sdk node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
                     "Test Misc": "PATH=/usr/local/bin:/usr/bin:/bin node test/tests/misc.js",

package/test/tests/misc.js

@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program. If not, see https://www.gnu.org/licenses/.
 
-const koffi = require('../../build/koffi.node');
+const koffi = require('../build/koffi.node');
 const assert = require('assert');
 const path = require('path');
 

package/test/tests/raylib.js

@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program. If not, see https://www.gnu.org/licenses/.
 
-const koffi = require('../../build/koffi.node');
+const koffi = require('../build/koffi.node');
 const crypto = require('crypto');
 const fs = require('fs');
 const os = require('os');

package/test/tests/sqlite.js

@@ -14,7 +14,7 @@
 // along with this program. If not, see https://www.gnu.org/licenses/.
 
 const crypto = require('crypto');
-const koffi = require('../../build/koffi.node');
+const koffi = require('../build/koffi.node');
 const assert = require('assert');
 const fs = require('fs');
 const os = require('os');