Changeset: adcf92db94dc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=adcf92db94dc
Modified Files:
monetdb5/modules/kernel/Makefile.ag
monetdb5/modules/kernel/alarm.c
Branch: headless
Log Message:
Fix Makefile and alarm
diffs (92 lines):
diff --git a/monetdb5/modules/kernel/Makefile.ag
b/monetdb5/modules/kernel/Makefile.ag
--- a/monetdb5/modules/kernel/Makefile.ag
+++ b/monetdb5/modules/kernel/Makefile.ag
@@ -38,9 +38,11 @@
# aggr_bge_prod.mx \
# aggr_bge_sum.mx \
# aggr.mx \
- alarm.c\
+ alarm.c \
# algebra.mx \
# array.mx \
+# group.mx \
+# logger.c \
column.h.mx \
column.c.mx \
colcalc.h.mx \
@@ -58,9 +60,7 @@
colstr.c \
calc.h.mx \
calc.c.mx \
-# group.mx \
lock.c \
-# logger.c \
microbenchmark.h.mx \
microbenchmark.c.mx \
mmath.h.mx \
diff --git a/monetdb5/modules/kernel/alarm.c b/monetdb5/modules/kernel/alarm.c
--- a/monetdb5/modules/kernel/alarm.c
+++ b/monetdb5/modules/kernel/alarm.c
@@ -17,27 +17,6 @@
* All Rights Reserved.
*/
-/*
- * /*
- * * The contents of this file are subject to the MonetDB Public License
- * * Version 1.1 (the "License"); you may not use this file except in
- * * compliance with the License. You may obtain a copy of the License at
- * * http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
- * *
- * * Software distributed under the License is distributed on an "AS IS"
- * * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * * License for the specific language governing rights and limitations
- * * under the License.
- * *
- * * The Original Code is the MonetDB Database System.
- * *
- * * The Initial Developer of the Original Code is CWI.
- * * Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
- * * Copyright August 2008-2011 MonetDB B.V.
- * * All Rights Reserved.
- * */
- *
- */
/* Author(s) M.L. Kersten, P. Boncz
* Timers and Timed Interrupts
* This module handles various signaling/timer functionalities.
@@ -242,15 +221,21 @@
* ctime is actually thread-safe.
*/
int
-CMDtimers(BAT **retval)
+CMDtimers(COL **retval, COL **def)
{
char buf[27];
int k;
- *retval = BATnew(TYPE_str, TYPE_str, timerTop);
+ *retval = COLnew(TYPE_str, timerTop);
if (*retval == NULL)
return GDK_FAIL;
- BATroles(*retval, "alarm", "action");
+ *def = COLnew(TYPE_str, timerTop);
+ if (*def == NULL){
+ CBPreleaseref(*retval);
+ return GDK_FAIL;
+ }
+ COLname(*retval, "alarm_action");
+ COLname(*def, "alarm_definition");
for (k = 0; k < timerTop; k++) {
time_t t = timer[k].alarm_time;
@@ -263,7 +248,8 @@
strncpy(buf, ctime(&t), sizeof(buf));
#endif
#endif
- BUNins(*retval, buf, timer[k].action ? timer[k].action :
"barrier", FALSE);
+ BUNappend(*def, buf, FALSE);
+ BUNappend(*retval, timer[k].action ? timer[k].action :
"barrier", FALSE);
}
return GDK_SUCCEED;
}
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
