Changeset: fdcc521bccbf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fdcc521bccbf
Removed Files:
monetdb5/modules/kernel/alarm.h
Modified Files:
monetdb5/modules/kernel/Makefile.ag
monetdb5/modules/kernel/alarm.c
Branch: Oct2014
Log Message:
Removed unnecessary file alarm.h.
diffs (84 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
@@ -28,7 +28,7 @@ lib_kernel = {
NOINST
SOURCES = \
aggr.c \
- alarm.c alarm.h \
+ alarm.c \
algebra.c algebra.h \
bat5.c bat5.h \
batcolor.c batcolor.h \
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
@@ -32,7 +32,8 @@
* the cpu clock.They return an integer and string, respectively.
*/
#include "monetdb_config.h"
-#include "alarm.h"
+#include "mal.h"
+#include <signal.h>
#include <time.h>
#ifdef WIN32
@@ -55,6 +56,14 @@ alarm_export str ALARMctime(str *res);
alarm_export str ALARMepoch(int *res);
alarm_export str ALARMtime(int *res);
+#define MAXtimer 200
+
+typedef struct {
+ str action; /* MIL action (as a string) */
+ MT_Sema sema; /* barrier */
+ time_t alarm_time; /* time when the alarm goes off */
+} monet_timer_t;
+
static monet_timer_t timer[MAXtimer];
static int timerTop = 0;
diff --git a/monetdb5/modules/kernel/alarm.h b/monetdb5/modules/kernel/alarm.h
deleted file mode 100644
--- a/monetdb5/modules/kernel/alarm.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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://www.monetdb.org/Legal/MonetDBLicense
- *
- * 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-2014 MonetDB B.V.
- * All Rights Reserved.
- */
-
-/*
- * @* Implementation
- * @+ The Clock Interrupt Generator
- * A clock event generator, called @%timer@, has been added to the database
kernel.
- * It accepts a message @%CLKalarm(sec, usec)@, which generates an alarm
- * after the time indicated.
- * The timer maintains a small stack of timing events sorted in priority of
firing.
- * The top contains the next timer event to go off.
- * The timer is disabled when no timer events are outstanding.
- */
-#include <mal.h>
-#include <signal.h>
-#define MAXtimer 200
-
-typedef struct {
- str action; /* MIL action (as a string) */
- MT_Sema sema; /* barrier */
- time_t alarm_time; /* time when the alarm goes off */
-} monet_timer_t;
-
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
