MonetDB: default - Avoid deadlock when memory is short.

[Sjoerd Mullender]

Changeset: 26e3a3be0f67 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=26e3a3be0f67
Modified Files:
        gdk/gdk_utils.c
Branch: default
Log Message:

Avoid deadlock when memory is short.


diffs (23 lines):

diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -697,19 +697,15 @@ GDKmemfail(str s, size_t len)
           }
         */
 
-       gdk_set_lock(GDKthreadLock, "GDKmemfail");
        THRprintf(GDKstdout, "#%s(" SZFMT ") fails, try to free up space 
[memory in use=" SZFMT ",virtual memory in use=" SZFMT "]\n", s, len, 
GDKmem_inuse(), GDKvm_cursize());
        GDKmemdump();
 /*     GDKdebug |= 4;  avoid debugging output */
-       gdk_unset_lock(GDKthreadLock, "GDKmemfail");
 
        BBPtrim(BBPTRIM_ALL);
 
-       gdk_set_lock(GDKthreadLock, "GDKmemfail");
        GDKdebug = MIN(GDKdebug, bak);
        THRprintf(GDKstdout, "#%s(" SZFMT ") result [mem=" SZFMT ",vm=" SZFMT 
"]\n", s, len, GDKmem_inuse(), GDKvm_cursize());
        GDKmemdump();
-       gdk_unset_lock(GDKthreadLock, "GDKmemfail");
 }
 
 /* the blocksize is stored in the ssize_t before it. Negative size <=>
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list