Changeset: 8a8069aac9e3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8a8069aac9e3
Modified Files:
monetdb5/modules/mal/sysmon.c
Branch: Apr2019
Log Message:
Simplify code a little.
diffs (39 lines):
diff --git a/monetdb5/modules/mal/sysmon.c b/monetdb5/modules/mal/sysmon.c
--- a/monetdb5/modules/mal/sysmon.c
+++ b/monetdb5/modules/mal/sysmon.c
@@ -36,7 +36,6 @@ SYSMONqueue(Client cntxt, MalBlkPtr mb,
(void) cntxt;
(void) mb;
- MT_lock_set(&mal_delayLock);
tag = COLnew(0, TYPE_lng, 256, TRANSIENT);
user = COLnew(0, TYPE_str, 256, TRANSIENT);
started = COLnew(0, TYPE_timestamp, 256, TRANSIENT);
@@ -46,18 +45,18 @@ SYSMONqueue(Client cntxt, MalBlkPtr mb,
oids = COLnew(0, TYPE_oid, 256, TRANSIENT);
query = COLnew(0, TYPE_str, 256, TRANSIENT);
if ( tag == NULL || user == NULL || query == NULL || started == NULL ||
estimate == NULL || progress == NULL || activity == NULL || oids == NULL){
- if (tag) BBPunfix(tag->batCacheid);
- if (user) BBPunfix(user->batCacheid);
- if (query) BBPunfix(query->batCacheid);
- if (activity) BBPunfix(activity->batCacheid);
- if (started) BBPunfix(started->batCacheid);
- if (estimate) BBPunfix(estimate->batCacheid);
- if (progress) BBPunfix(progress->batCacheid);
- if (oids) BBPunfix(oids->batCacheid);
- MT_lock_unset(&mal_delayLock);
+ BBPreclaim(tag);
+ BBPreclaim(user);
+ BBPreclaim(query);
+ BBPreclaim(activity);
+ BBPreclaim(started);
+ BBPreclaim(estimate);
+ BBPreclaim(progress);
+ BBPreclaim(oids);
throw(MAL, "SYSMONqueue", SQLSTATE(HY001) MAL_MALLOC_FAIL);
}
+ MT_lock_set(&mal_delayLock);
for ( i = 0; i< qtop; i++)
if( QRYqueue[i].query && (QRYqueue[i].cntxt->idx == 0 ||
QRYqueue[i].cntxt->user == cntxt->user)) {
now= (lng) time(0);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
