MonetDB: strheapvacuum - use GDKstrdup instead

[svetlin]

Changeset: 540647428fcd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/540647428fcd
Modified Files:
        gdk/gdk_bbp.c
        sql/backends/monet5/sql.c
Branch: strheapvacuum
Log Message:

use GDKstrdup instead


diffs (51 lines):

diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -1394,7 +1394,6 @@ BBPmanager(void *dummy)
                }
                BBPtrim(false);
                BBPcallbacks();
-               MT_sleep_ms(1000);
                if (GDKexiting())
                        return;
        }
@@ -4352,10 +4351,10 @@ should_call(gdk_callback *cb)
 static void
 BBPcallbacks(void)
 {
-       gdk_callback *next = NULL;
+       gdk_callback *next = callback_list.head;
 
        MT_lock_set(&(callback_list.lock));
-       while ((next=callback_list.head)) {
+       while (next) {
                if(should_call(next))
                        do_callback(next);
                next = next->next;
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -5137,10 +5137,10 @@ static gdk_return
 str_column_vacuum_callback_args_free(int argc, void *argv[])
 {
        (void) argc;
-       // free up sname, tname, cname
-       GDKfree(argv[1]);
-       GDKfree(argv[2]);
-       GDKfree(argv[3]);
+       // free up sname, tname, cname. First pointer points to sqlstore so 
leave it.
+       GDKfree(argv[1]); // sname
+       GDKfree(argv[2]); // tname
+       GDKfree(argv[3]); // cname
        return GDK_SUCCEED;
 }
 
@@ -5170,7 +5170,7 @@ SQLstr_column_auto_vacuum(Client cntxt, 
        if ((c = mvc_bind_column(m, t, cname)) == NULL)
                throw(SQL, "sql.str_column_auto_vacuum", SQLSTATE(42S22) 
"Column not found %s.%s",sname,tname);
 
-       void *argv[4] = {m->store, strdup(sname), strdup(tname), strdup(cname)};
+       void *argv[4] = {m->store, GDKstrdup(sname), GDKstrdup(tname), 
GDKstrdup(cname)};
 
        gdk_return res;
        if((res = gdk_add_callback("str_column_vacuum", 
str_column_vacuum_callback, 4, argv, interval)) != GDK_SUCCEED) {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list