MonetDB: default - Simplify THRnew() calling sequence.

[Sjoerd Mullender]

Changeset: 8ba80313a007 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8ba80313a007
Modified Files:
        clients/Tests/exports.stable.out
        gdk/gdk.h
        gdk/gdk_utils.c
        monetdb5/mal/mal_client.c
        monetdb5/mal/mal_dataflow.c
        monetdb5/modules/mal/tablet.c
Branch: default
Log Message:

Simplify THRnew() calling sequence.
It was always called with MT_getpid() as first argument, so push that
into THRnew.


diffs (77 lines):

diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -307,7 +307,7 @@ Thread THRget(int tid);
 void *THRgetdata(int);
 int THRgettid(void);
 int THRhighwater(void);
-Thread THRnew(MT_Id pid, str name);
+Thread THRnew(str name);
 int THRprintf(stream *s, _In_z_ _Printf_format_string_ const char *format, 
...) __attribute__((__format__(__printf__, 2, 3)));
 void THRsetdata(int, ptr);
 int TMabort(void);
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -2423,7 +2423,7 @@ gdk_export ThreadRec GDKthreads[THREADS]
 
 gdk_export int THRgettid(void);
 gdk_export Thread THRget(int tid);
-gdk_export Thread THRnew(MT_Id pid, str name);
+gdk_export Thread THRnew(str name);
 gdk_export void THRdel(Thread t);
 gdk_export void THRsetdata(int, ptr);
 gdk_export void *THRgetdata(int);
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -1781,11 +1781,12 @@ GDK_find_thread(MT_Id pid)
 }
 
 Thread
-THRnew(MT_Id pid, str name)
+THRnew(str name)
 {
        int tid = 0;
        Thread t;
        Thread s;
+       MT_Id pid = MT_getpid();
 
        MT_lock_set(&GDKthreadLock, "THRnew");
        s = GDK_find_thread(pid);
diff --git a/monetdb5/mal/mal_client.c b/monetdb5/mal/mal_client.c
--- a/monetdb5/mal/mal_client.c
+++ b/monetdb5/mal/mal_client.c
@@ -270,7 +270,7 @@ MCinitClientThread(Client c)
 
        snprintf(cname, 11, OIDFMT, c->user);
        cname[11] = '\0';
-       t = THRnew(MT_getpid(), cname);
+       t = THRnew(cname);
        if (t == 0) {
                showException(c->fdout, MAL, "initClientThread",
                                "Failed to initialize client");
diff --git a/monetdb5/mal/mal_dataflow.c b/monetdb5/mal/mal_dataflow.c
--- a/monetdb5/mal/mal_dataflow.c
+++ b/monetdb5/mal/mal_dataflow.c
@@ -817,7 +817,7 @@ runDFLOWworker(void *t)
        int i, local = 0, last = 0;
        long usec = 0;
 
-       thr = THRnew(MT_getpid(), "DFLOWworker");
+       thr = THRnew("DFLOWworker");
 
        GDKsetbuf(GDKmalloc(GDKMAXERRLEN)); /* where to leave errors */
        GDKerrbuf[0] = 0;
diff --git a/monetdb5/modules/mal/tablet.c b/monetdb5/modules/mal/tablet.c
--- a/monetdb5/modules/mal/tablet.c
+++ b/monetdb5/modules/mal/tablet.c
@@ -1200,7 +1200,7 @@ SQLworker(void *arg)
        lng t0;
        Thread thr;
 
-       thr = THRnew(MT_getpid(), "SQLworker");
+       thr = THRnew("SQLworker");
        GDKsetbuf(GDKmalloc(GDKMAXERRLEN));     /* where to leave errors */
        GDKerrbuf[0] = 0;
        task->errbuf = GDKerrbuf;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list