test2 for easy debug & job library improvements

Makefile

@@ -24,6 +24,15 @@ test: test-clean
 	ninja -C build/_test
 	cd build/_test ; env LD_LIBRARY_PATH="$$(pwd)"/build G_DEBUG=fatal-criticals yes | timeout 30 ./ymp-test --allow-oem --ask
 
+test2:
+	valac --pkg ymp test/test2.vala -C  --pkg array --pkg jobs \
+	    --pkg ymp --vapidir=src/vapi -C -X -g3
+	mv test/test2.c build/test2.c
+	gcc -o build/test2 build/test2.c `pkgconf --cflags --libs ymp` \
+	    -Lbuild -Isrc/include -Ibuild -Lbuild -g3 \
+	    -Wl,--copy-dt-needed-entries -lgobject-2.0
+	env LD_LIBRARY_PATH="$$(pwd)"/build ./build/test2 --allow-oem
+
 install:
 	DESTDIR=$(DESTDIR) ninja -C build install
 

src/ccode/job.c

@@ -2,6 +2,7 @@
 #include <stdlib.h>
 #include <pthread.h>
 #include <string.h>
+#include <stdarg.h>
 
 #include <jobs.h>
 
@@ -19,7 +20,7 @@ void* worker_thread(void* arg) {
         int i;
         for (i = 0; i < j->max; ++i) {
             if (j->jobs[i].callback != NULL) {
-                j->jobs[i].callback((void*)j->jobs[i].args);
+                j->jobs[i].callback((void*)j->jobs[i].ctx, (void*)j->jobs[i].args);
                 j->finished++;
                 j->current--;
                 j->jobs[i].callback = NULL;
@@ -38,13 +39,13 @@ void jobs_unref(jobs *j) {
     free(j);
 }
 
-void jobs_add(jobs* j, void (*callback)(void*), void* args, ...) {
+void jobs_add(jobs* j, void (*callback)(void*, ...), void* ctx, void* args, ...) {
     pthread_mutex_lock(&j->mutex);
     if (j->total < j->max) {
         job new_job;
         new_job.callback = callback;
-        new_job.args = malloc(sizeof(args));
         new_job.args = args;
+        new_job.ctx = ctx;
         new_job.id = j->total;
         j->jobs[j->total++] = new_job;
         j->current++;

src/include/jobs.h

@@ -1,8 +1,9 @@
 #include <pthread.h>
 
 typedef struct _job {
-    void (*callback)(void*);
+    void (*callback)(void*,...);
     void* args;
+    void* ctx;
     int id;
 } job;
 
@@ -20,6 +21,6 @@ typedef struct _jobs {
 #define MAX_JOB 1024
 
 void jobs_unref(jobs *j);
-void jobs_add(jobs* j, void (*callback)(void*), void* args, ...);
+void jobs_add(jobs* j, void (*callback)(void*,...),  void* ctx, void* args, ...);
 void jobs_run(jobs* j);
 jobs* jobs_new();

src/vapi/jobs.vapi

@@ -15,6 +15,6 @@ public class jobs {
     public int total;
 
     public void unref ();
-    public void add (void* callback, void* args);
+    public void add (void* callback, void* args, ...);
     public void run ();
 }

test/test2.vala

@@ -0,0 +1,22 @@
+public class test {
+    public test(){}
+    public void p(string message){
+        stdout.printf(message);
+    }
+
+}
+
+public void test2(string message){
+    stdout.printf(message);
+}
+
+int main(string[] args){
+    jobs j = new jobs();
+    test t = new test();
+    t.p("Hello World\n");
+    j.add((void*)t.p, t, "Hello World\n");
+    j.add((void*)test2, "Hello World\n");
+    j.run();
+    ymp_init(args);
+    return 0;
+}