koffi 0.9.24 → 0.9.27

package/README.md

@@ -7,6 +7,8 @@
 - [Get started](#get-started)
 - [Tests](#tests)
 - [Benchmarks](#benchmarks)
+  * [atoi results](#atoi-results)
+  * [Raylib results](#raylib-results)
 
 # Introduction
 
@@ -253,33 +255,90 @@ node test.js info debian_x64
 
 # Benchmarks
 
-A basic benchmark based around Raylib is available, in three implementations: with Koffi, with node-ffi and with C code using Raylib (as a shared library).
+At this stage, two benchmarks are implemented:
+* The first one is based around repeated calls to atoi, and has four implementations: one in C++, one calling atoi through an NAPI module, one using Koffi, and one with node-ffi-napi. This is a simple function, thus the JS and FFI overhead is clearly visible.
+* The second one is based around Raylib, and will execute much more heavier functions repeatdly. Also in three versions: Koffi, node-ffi-napi and C code.
 
-In order to run it, go to `koffi/benchmark` and run `build.sh` before doing anything else.
+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 with `time`, e.g. `time ./raylib_c 2000`.
+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`.
 
-Here are some results from 2022-04-15 on my machine (AMD Ryzen™ 7 5800H 16G):
+## atoi results
+
+Here are some results from 2022-04-24 on my Linux machine (AMD® Ryzen™ 7 5800H 16G):
+
+```sh
+$ build/atoi_cc
+Iterations: 20000000
+Time: 0.24s
+
+$ ./atoi_napi.js
+Iterations: 20000000
+Time: 1.10s
+
+$ ./atoi_koffi.js
+Iterations: 20000000
+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
+Iterations: 20000000
+Time: 640.49s
+```
+
+And on my Windows machine (Intel® Core™ i5-4460 16G):
+
+```sh
+$ build\atoi_cc.exe
+Iterations: 20000000
+Time: 0.66s
+
+$ node atoi_napi.js
+Iterations: 20000000
+Time: 3.23s
+
+$ node atoi_koffi.js
+Iterations: 20000000
+Time: 4.81s
+
+$ node atoi_node_ffi.js
+Iterations: 20000000
+Time: 491.99s
+```
+
+## Raylib results
+
+Here are some results from 2022-04-24 on my Linux machine (AMD® Ryzen™ 7 5800H 16G):
 
 ```sh
-$ time ./raylib_c 200
-Iterations: 200
+$ build/raylib_cc
+Iterations: 100
+Time: 4.14s
+
+$ ./raylib_koffi.js
+Iterations: 100
+Time: 6.25s
 
-real    0m8,871s
-user    0m8,792s
-sys     0m0,016s
+$ ./raylib_node_ffi.js
+Iterations: 100
+Time: 27.13s
+```
 
-$ time ./raylib_koffi.js 200
-Iterations: 200
+And on my Windows machine (Intel® Core™ i5-4460 16G):
 
-real    0m13,011s
-user    0m12,923s
-sys     0m0,032s
+```sh
+$ build\raylib_cc.exe
+Iterations: 100
+Time: 10.53s
 
-$ time ./raylib_node_ffi.js 200
-Iterations: 200
+$ node raylib_koffi.js
+Iterations: 100
+Time: 14.60s
 
-real    1m41,523s
-user    1m56,623s
-sys     0m3,731s
+$ node raylib_node_ffi.js
+Iterations: 100
+Time: 44.97s
 ```

package/benchmark/CMakeLists.txt

@@ -0,0 +1,53 @@
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# 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/.
+
+cmake_minimum_required(VERSION 3.12)
+project(koffi C CXX ASM)
+
+find_package(CNoke)
+
+set(CMAKE_CXX_STANDARD 17)
+
+if(NOT TARGET koffi)
+    add_subdirectory(.. koffi)
+endif()
+add_subdirectory(../test test)
+
+# ---- atoi ----
+
+add_executable(atoi_cc atoi_cc.cc ../vendor/libcc/libcc.cc)
+target_include_directories(atoi_cc PRIVATE ..)
+
+if(WIN32)
+    target_compile_definitions(atoi_cc PRIVATE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_DEPRECATE)
+    target_link_libraries(atoi_cc PRIVATE ws2_32)
+endif()
+
+add_node_addon(NAME atoi_napi SOURCES atoi_napi.cc ../vendor/libcc/libcc.cc)
+target_include_directories(atoi_napi PRIVATE .. ../vendor/node-addon-api)
+
+if(WIN32)
+    target_compile_definitions(atoi_napi PRIVATE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_DEPRECATE)
+    target_link_libraries(atoi_napi PRIVATE ws2_32)
+endif()
+
+# ---- Raylib ----
+
+add_executable(raylib_cc atoi_cc.cc ../vendor/libcc/libcc.cc)
+target_include_directories(raylib_cc PRIVATE ..)
+add_dependencies(raylib_cc raylib)
+
+if(WIN32)
+    target_compile_definitions(raylib_cc PRIVATE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_DEPRECATE)
+    target_link_libraries(raylib_cc PRIVATE ws2_32)
+endif()

package/benchmark/atoi_cc.cc

@@ -0,0 +1,59 @@
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// 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/.
+
+#include "../vendor/libcc/libcc.hh"
+
+namespace RG {
+
+static const char * strings[] = {
+    "424242",
+    "foobar",
+    "123456789",
+};
+
+volatile uint64_t sum = 0;
+
+int Main(int argc, char **argv)
+{
+    int iterations = 20000000;
+
+    if (argc >= 2) {
+        if (!ParseInt(argv[1], &iterations))
+            return 1;
+    }
+    LogInfo("Iterations: %1", iterations);
+
+    int64_t start = GetMonotonicTime();
+
+    for (int i = 0; i < iterations; i++) {
+        sum += (uint64_t)atoi(strings[i % RG_LEN(strings)]);
+    }
+
+    // Help prevent optimisation of loop
+    {
+        PushLogFilter([](LogLevel, const char *, const char *, FunctionRef<LogFunc>) {});
+        RG_DEFER { PopLogFilter(); };
+
+        LogInfo("Sum = %1", sum);
+    }
+
+    int64_t time = GetMonotonicTime() - start;
+    LogInfo("Time: %1s", FmtDouble((double)time / 1000.0, 2));
+
+    return 0;
+}
+
+}
+
+// C++ namespaces are stupid
+int main(int argc, char **argv) { return RG::Main(argc, argv); }

package/benchmark/atoi_koffi.js

@@ -0,0 +1,52 @@
+#!/usr/bin/env node
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// 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 strings = [
+    '424242',
+    'foobar',
+    '123456789'
+];
+
+let sum = 0;
+
+main();
+
+function main() {
+    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);
+
+    const atoi = lib.cdecl('atoi', 'int', ['string']);
+
+    let start = performance.now();
+
+    for (let i = 0; i < iterations; i++) {
+        sum += atoi(strings[i % strings.length]);
+    }
+
+    let time = performance.now()- start;
+    console.log('Time:', (time / 1000.0).toFixed(2) + 's');
+}

package/benchmark/atoi_napi.cc

@@ -0,0 +1,68 @@
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// 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/.
+
+#include "vendor/libcc/libcc.hh"
+#include <napi.h>
+
+namespace RG {
+
+template <typename T, typename... Args>
+void ThrowError(Napi::Env env, const char *msg, Args... args)
+{
+    char buf[1024];
+    Fmt(buf, msg, args...);
+
+    auto err = T::New(env, buf);
+    err.ThrowAsJavaScriptException();
+}
+
+static Napi::Value RunAtoi(const Napi::CallbackInfo &info)
+{
+    Napi::Env env = info.Env();
+
+    if (RG_UNLIKELY(info.Length() < 1)) {
+        ThrowError<Napi::TypeError>(env, "Expected 1 argument, got %1", info.Length());
+        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();
+        }
+    }
+
+    int value = atoi(str);
+
+    return Napi::Number::New(env, value);
+}
+
+}
+
+static Napi::Object InitModule(Napi::Env env, Napi::Object exports)
+{
+    using namespace RG;
+
+    exports.Set("atoi", Napi::Function::New(env, RunAtoi));
+
+    return exports;
+}
+
+NODE_API_MODULE(koffi, InitModule);

package/benchmark/atoi_napi.js

@@ -0,0 +1,48 @@
+#!/usr/bin/env node
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// 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 atoi = require('./build/atoi_napi.node');
+
+const strings = [
+    '424242',
+    'foobar',
+    '123456789'
+];
+
+let sum = 0;
+
+main();
+
+function main() {
+    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();
+
+    for (let i = 0; i < iterations; i++) {
+        sum += atoi.atoi(strings[i % strings.length]);
+    }
+
+    let time = performance.now()- start;
+    console.log('Time:', (time / 1000.0).toFixed(2) + 's');
+}

package/benchmark/atoi_node_ffi.js

@@ -0,0 +1,57 @@
+#!/usr/bin/env node
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// 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 ref = require('ref-napi');
+const ffi = require('ffi-napi');
+const struct = require('ref-struct-di')(ref);
+
+const strings = [
+    '424242',
+    'foobar',
+    '123456789'
+];
+
+let sum = 0;
+
+main();
+
+async function main() {
+    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, {
+        atoi: ['int', ['string']]
+    });
+
+    let start = performance.now();
+
+    for (let i = 0; i < iterations; i++) {
+        if (i % 1000000 == 0)
+            await new Promise(resolve => setTimeout(resolve, 0));
+
+        sum += lib.atoi(strings[i % strings.length]);
+    }
+
+    let time = performance.now()- start;
+    console.log('Time:', (time / 1000.0).toFixed(2) + 's');
+}

package/benchmark/{raylib_c.c → raylib_cc.cc}

@@ -11,51 +11,31 @@
 // 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/.
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
+#include "../vendor/libcc/libcc.hh"
 #include "../vendor/raylib/src/raylib.h"
 
-#define STRINGIFY(Value) # Value
+namespace RG {
 
-static int ParseInt(const char *str)
+int Main(int argc, char **argv)
 {
-    char *end;
-    long long value = strtoll(str, &end, 10);
+    int iterations = 100;
 
-    if (end == str || *end) {
-        fprintf(stderr, "Not a valid integer number\n");
-        return -1;
-    }
-    if (value < 1 || value == LLONG_MAX) {
-        fprintf(stderr, "Value must be between 1 and " STRINGIFY(LLONG_MAX) "\n");
-        return -1;
-    }
-
-    return (int)value;
-}
-
-int main(int argc, char **argv)
-{
-    if (argc < 2) {
-        fprintf(stderr, "Missing number of iterations\n");
-        return 1;
+    if (argc >= 2) {
+        if (!ParseInt(argv[1], &iterations))
+            return 1;
     }
-
-    int iterations = ParseInt(argv[1]);
-    if (iterations < 0)
-        return 1;
-    printf("Iterations: %d\n", iterations);
+    LogInfo("Iterations: %1", iterations);
 
     // We need to call InitWindow before using anything else (such as fonts)
-    SetTraceLogLevel(4); // Warnings
-    SetWindowState(0x80); // Hidden
+    SetTraceLogLevel(LOG_WARNING);
+    SetWindowState(FLAG_WINDOW_HIDDEN);
     InitWindow(640, 480, "Raylib Test");
 
     Image img = GenImageColor(800, 600, (Color){ .r = 0, .g = 0, .b = 0, .a = 255 });
     Font font = GetFontDefault();
 
+    int64_t start = GetMonotonicTime();
+
     for (int i = 0; i < iterations; i++) {
         ImageClearBackground(&img, (Color){ .r = 0, .g = 0, .b = 0, .a = 255 });
 
@@ -65,19 +45,27 @@ int main(int argc, char **argv)
 
             double angle = (j * 7) * PI / 180;
             Color color = {
-                .r = 127.5 + 127.5 * sin(angle),
-                .g = 127.5 + 127.5 * sin(angle + PI / 2),
-                .b = 127.5 + 127.5 * sin(angle + PI),
+                .r = (unsigned char)(127.5 + 127.5 * sin(angle)),
+                .g = (unsigned char)(127.5 + 127.5 * sin(angle + PI / 2)),
+                .b = (unsigned char)(127.5 + 127.5 * sin(angle + PI)),
                 .a = 255
             };
             Vector2 pos = {
-                .x = (img.width / 2 - text_width / 2) + j * 0.1 * cos(angle - PI / 2),
-                .y = (img.height / 2 - 16) + j * 0.1 * sin(angle - PI / 2)
+                .x = (float)((img.width / 2 - text_width / 2) + j * 0.1 * cos(angle - PI / 2)),
+                .y = (float)((img.height / 2 - 16) + j * 0.1 * sin(angle - PI / 2))
             };
 
             ImageDrawTextEx(&img, font, text, pos, 10, 1, color);
         }
     }
 
+    int64_t time = GetMonotonicTime() - start;
+    LogInfo("Time: %1s", FmtDouble((double)time / 1000.0, 2));
+
     return 0;
 }
+
+}
+
+// C++ namespaces are stupid
+int main(int argc, char **argv) { return RG::Main(argc, argv); }

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']);
@@ -102,6 +103,8 @@ function main() {
     let img = GenImageColor(800, 600, { r: 0, g: 0, b: 0, a: 255 });
     let font = GetFontDefault();
 
+    let start = performance.now();
+
     for (let i = 0; i < iterations; i++) {
         ImageClearBackground(img, { r: 0, g: 0, b: 0, a: 255 });
 
@@ -124,4 +127,7 @@ function main() {
             ImageDrawTextEx(img, font, text, pos, 10, 1, color);
         }
     }
+
+    let time = performance.now()- start;
+    console.log('Time:', (time / 1000.0).toFixed(2) + 's');
 }

package/benchmark/raylib_node_ffi.js

@@ -16,6 +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 path = require('path');
 
 const Color = struct({
@@ -86,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))
@@ -96,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']],
@@ -119,6 +128,8 @@ function main() {
     let imgp = img.ref();
     let font = r.GetFontDefault();
 
+    let start = performance.now();
+
     for (let i = 0; i < iterations; i++) {
         r.ImageClearBackground(imgp, new Color({ r: 0, g: 0, b: 0, a: 255 }));
 
@@ -141,4 +152,7 @@ function main() {
             r.ImageDrawTextEx(imgp, font, text, pos, 10, 1, color);
         }
     }
+
+    let time = performance.now()- start;
+    console.log('Time:', (time / 1000.0).toFixed(2) + 's');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koffi",
-  "version": "0.9.24",
+  "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",
@@ -35,11 +35,13 @@
   },
   "files": [
     "src",
-    "benchmark",
-    "test/files",
+    "benchmark/CMakeLists.txt",
+    "benchmark/atoi_*",
+    "benchmark/raylib_*",
+    "test/CMakeLists.txt",
+    "test/test.js",
     "test/registry",
     "test/tests",
-    "test/test.js",
     "vendor",
     "LICENSE.txt",
     "README.md",

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

@@ -0,0 +1,115 @@
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# 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/.
+
+cmake_minimum_required(VERSION 3.12)
+project(koffi C CXX)
+
+if(NOT TARGET koffi)
+    add_subdirectory(.. koffi)
+endif()
+
+# ---- Raylib ----
+
+add_library(raylib SHARED
+    ../vendor/raylib/src/rcore.c
+    ../vendor/raylib/src/rshapes.c
+    ../vendor/raylib/src/rtextures.c
+    ../vendor/raylib/src/rtext.c
+    ../vendor/raylib/src/rmodels.c
+    ../vendor/raylib/src/utils.c
+    ../vendor/raylib/src/rglfw.c
+    ../vendor/raylib/src/raudio.c
+)
+set_target_properties(raylib PROPERTIES PREFIX "")
+target_include_directories(raylib PRIVATE ../vendor/raylib/src/external/glfw/include)
+target_compile_definitions(raylib PRIVATE PLATFORM_DESKTOP GRAPHICS_API_OPENGL_21
+                                          BUILD_LIBTYPE_SHARED NDEBUG)
+
+if(MSVC)
+    target_compile_options(raylib PRIVATE /wd4244 /wd4305)
+else()
+    target_compile_options(raylib PRIVATE -Wno-sign-compare -Wno-old-style-declaration
+                                          -Wno-unused-function -Wno-missing-field-initializers
+                                          -Wno-unused-value -Wno-implicit-fallthrough -Wno-stringop-overflow
+                                          -Wno-unused-result)
+endif()
+
+if(WIN32)
+    target_compile_definitions(raylib PRIVATE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_DEPRECATE)
+    target_link_libraries(raylib PRIVATE winmm)
+endif()
+
+if(CMAKE_SYSTEM_NAME MATCHES "BSD")
+    target_include_directories(raylib PRIVATE /usr/local/include)
+endif()
+
+if(APPLE)
+    target_compile_options(raylib PRIVATE -Wno-unknown-warning-option -Wno-macro-redefined)
+    target_compile_definitions(raylib PRIVATE GL_SILENCE_DEPRECATION)
+    set_source_files_properties(../vendor/raylib/src/rglfw.c PROPERTIES COMPILE_FLAGS "-x objective-c")
+    target_link_libraries(raylib PRIVATE "-framework Cocoa" "-framework IOKit" "-framework CoreFoundation" "-framework OpenGL")
+endif()
+
+if(UNIX AND NOT APPLE)
+    set(missing_xlib "")
+
+    find_path(XLIB_INCLUDE_DIRS X11/Xlib.h)
+    if(NOT XLIB_INCLUDE_DIRS)
+        list(APPEND missing_xlib Xlib)
+    endif()
+    find_path(XCURSOR_INCLUDE_DIRS X11/Xcursor/Xcursor.h)
+    if(NOT XCURSOR_INCLUDE_DIRS)
+        list(APPEND missing_xlib Xcursor)
+    endif()
+    find_path(XRANDR_INCLUDE_DIRS X11/extensions/Xrandr.h)
+    if(NOT XRANDR_INCLUDE_DIRS)
+        list(APPEND missing_xlib Xrandr)
+    endif()
+    find_path(XKB_INCLUDE_DIRS X11/XKBlib.h)
+    if(NOT XKB_INCLUDE_DIRS)
+        list(APPEND missing_xlib Xkbcommon)
+    endif()
+    find_path(XINERAMA_INCLUDE_DIRS X11/extensions/Xinerama.h)
+    if(NOT XINERAMA_INCLUDE_DIRS)
+        list(APPEND missing_xlib Xinerama)
+    endif()
+    find_path(XINPUT_INCLUDE_DIRS X11/extensions/XInput2.h)
+    if(NOT XINPUT_INCLUDE_DIRS)
+        list(APPEND missing_xlib XInput2)
+    endif()
+
+    if(missing_xlib)
+        list(JOIN missing_xlib ", " missing_xlib_str)
+        message(FATAL_ERROR "Missing X11 development files: ${missing_xlib_str}")
+    endif()
+
+    target_include_directories(raylib PRIVATE ${XLIB_INCLUDE_DIRS})
+endif()
+
+# ---- SQLite ----
+
+add_library(sqlite3 SHARED ../vendor/sqlite3/sqlite3.c)
+set_target_properties(sqlite3 PROPERTIES PREFIX "")
+
+if(WIN32)
+    target_compile_definitions(sqlite3 PRIVATE SQLITE_API=__declspec\(dllexport\))
+endif()
+
+# ---- Misc ----
+
+add_library(misc SHARED tests/misc.c)
+set_target_properties(misc PROPERTIES PREFIX "")
+
+if(MSVC)
+    target_compile_options(misc PRIVATE /wd4116)
+endif()

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.c

@@ -61,6 +61,17 @@ EXPORT void FillPack3(int a, int b, int c, Pack3 *p)
     p->c = c;
 }
 
+EXPORT Pack3 RetPack3(int a, int b, int c)
+{
+    Pack3 p;
+    
+    p.a = a;
+    p.b = b;
+    p.c = c;
+
+    return p;
+}
+
 EXPORT void FASTCALL AddPack3(int a, int b, int c, Pack3 *p)
 {
     p->a += a;

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');
 
@@ -52,6 +52,7 @@ async function test() {
     let lib = koffi.load(lib_filename);
 
     const FillPack3 = lib.cdecl('FillPack3', 'void', ['int', 'int', 'int', koffi.out(koffi.pointer(Pack3))]);
+    const RetPack3 = lib.cdecl('RetPack3', Pack3, ['int', 'int', 'int']);
     const AddPack3 = lib.fastcall('AddPack3', 'void', ['int', 'int', 'int', koffi.inout(koffi.pointer(Pack3))]);
     const ConcatenateToInt1 = lib.cdecl('ConcatenateToInt1', 'int64_t', Array(12).fill('int8_t'));
     const ConcatenateToInt4 = lib.cdecl('ConcatenateToInt4', 'int64_t', Array(12).fill('int32_t'));
@@ -66,6 +67,9 @@ async function test() {
     FillPack3(1, 2, 3, p);
     assert.deepEqual(p, { a: 1, b: 2, c: 3 });
 
+    let q = RetPack3(6, 9, -12);
+    assert.deepEqual(q, { a: 6, b: 9, c: -12 });
+
     AddPack3(6, 9, -12, p);
     assert.deepEqual(p, { a: 7, b: 11, c: -9 });
 

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');

package/benchmark/build.sh

@@ -1,13 +0,0 @@
-#!/bin/sh -e
-
-cd $(dirname $0)/..
-
-echo "Install all dependencies..."
-npm install
-
-echo "Building dependencies..."
-node ../cnoke/cnoke.js
-node ../cnoke/cnoke.js -C test
-
-echo "Building raylib_c..."
-gcc -O2 -std=gnu99 -Wall -Wl,-rpath,$(realpath $(pwd)/test/build) -fPIC benchmark/raylib_c.c -o benchmark/raylib_c test/build/raylib.so -lm -pthread -ldl