Changeset: 3cc8124c0247 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3cc8124c0247
Modified Files:
sql/backends/monet5/iot/basket.c
sql/backends/monet5/iot/basket.h
sql/backends/monet5/iot/petrinet.c
Branch: iot
Log Message:
Merge changes
diffs (94 lines):
diff --git a/sql/backends/monet5/iot/basket.c b/sql/backends/monet5/iot/basket.c
--- a/sql/backends/monet5/iot/basket.c
+++ b/sql/backends/monet5/iot/basket.c
@@ -35,7 +35,7 @@
#define _DEBUG_BASKET_ if(0)
-str statusname[4] = { "<unknown>", "active", "paused", "locked" };
+str statusname[4] = { "<unknown>", "available", "wait", "locked" };
BasketRec *baskets; /* the global iot catalog */
static int bsktTop = 0, bsktLimit = 0;
@@ -109,7 +109,7 @@ BSKTnewbasket(sql_schema *s, sql_table *
baskets[idx].table_name = GDKstrdup(t->base.name);
baskets[idx].seen = * timestamp_nil;
- baskets[idx].status = BSKTPAUSED;
+ baskets[idx].status = BSKTWAIT;
baskets[idx].count = 0;
for (o = t->columns.set->h; o; o = o->next){
sql_column *col = o->data;
@@ -205,7 +205,7 @@ BSKTactivate(Client cntxt, MalBlkPtr mb,
idx = BSKTlocate(sch, tbl);
if( idx == 0)
throw(SQL,"basket.activate","Stream table %s.%s not
accessible to activate\n",sch,tbl);
- if( baskets[idx].status == BSKTPAUSED){
+ if( baskets[idx].status == BSKTWAIT){
MT_lock_set(&iotLock);
baskets[idx].status = BSKTAVAILABLE;
MT_lock_unset(&iotLock);
@@ -237,13 +237,13 @@ BSKTdeactivate(Client cntxt, MalBlkPtr m
throw(SQL,"basket.activate","Stream table %s.%s not
accessible to deactivate\n",sch,tbl);
if( baskets[idx].status == BSKTAVAILABLE ){
MT_lock_set(&iotLock);
- baskets[idx].status = BSKTPAUSED;
+ baskets[idx].status = BSKTWAIT;
MT_lock_unset(&iotLock);
}
} else {
MT_lock_set(&iotLock);
for( idx =1; idx <bsktTop; idx++)
- baskets[idx].status = BSKTPAUSED;
+ baskets[idx].status = BSKTWAIT;
MT_lock_unset(&iotLock);
}
return MAL_SUCCEED;
diff --git a/sql/backends/monet5/iot/basket.h b/sql/backends/monet5/iot/basket.h
--- a/sql/backends/monet5/iot/basket.h
+++ b/sql/backends/monet5/iot/basket.h
@@ -24,6 +24,19 @@
#include "mal.h"
#include "mal_interpreter.h"
#include "sql.h"
+#include "iot.h"
+
+#ifndef iot_export
+#ifdef WIN32
+#ifndef LIBIOT
+#define iot_export extern __declspec(dllimport)
+#else
+#define iot_export extern __declspec(dllexport)
+#endif
+#else
+#define iot_export extern
+#endif
+#endif
/* #define _DEBUG_DATACELL debug this module */
#define BSKTout GDKout
@@ -58,9 +71,9 @@ typedef struct{
/* individual streams can be paused and restarted */
-#define BSKTAVAILABLE 1
-#define BSKTPAUSED 2
-#define BSKTLOCKED 3
+#define BSKTAVAILABLE 1 /* initialized*/
+#define BSKTWAIT 2 /* waiting for new data */
+#define BSKTLOCKED 3 /* in use for processing */
iot_export BasketRec *baskets;
diff --git a/sql/backends/monet5/iot/petrinet.c
b/sql/backends/monet5/iot/petrinet.c
--- a/sql/backends/monet5/iot/petrinet.c
+++ b/sql/backends/monet5/iot/petrinet.c
@@ -48,7 +48,7 @@
#define MAXPN 200 /* it is the minimum, if we need more space
GDKrealloc */
-static str statusname[6] = { "<unknown>", "active", "paused"};
+static str statusname[6] = { "init", "running", "ready"};
static void
PNstartScheduler(void);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
