koffi 0.9.24 → 0.9.25

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

@@ -11,51 +11,34 @@
 // 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)
-{
-    char *end;
-    long long value = strtoll(str, &end, 10);
-
-    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)
+int Main(int argc, char **argv)
 {
     if (argc < 2) {
-        fprintf(stderr, "Missing number of iterations\n");
+        LogError("Missing number of iterations");
+        LogInfo("Usage: raylib_cc <iterations>");
         return 1;
     }
 
-    int iterations = ParseInt(argv[1]);
-    if (iterations < 0)
+    int iterations = 0;
+    if (!ParseInt(argv[1], &iterations))
         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 +48,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

@@ -102,6 +102,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 +126,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({
@@ -119,6 +120,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 +144,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.25",
   "description": "Fast and simple FFI (foreign function interface) for Node.js",
   "keywords": [
     "foreign",

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

@@ -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/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