Changeset: cdb3af611eb1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cdb3af611eb1
Modified Files:
sql/backends/monet5/datacell/emitter.c
sql/backends/monet5/datacell/receptor.c
Branch: default
Log Message:
Be more verbose in error messages.
diffs (173 lines):
diff --git a/sql/backends/monet5/datacell/emitter.c
b/sql/backends/monet5/datacell/emitter.c
--- a/sql/backends/monet5/datacell/emitter.c
+++ b/sql/backends/monet5/datacell/emitter.c
@@ -84,14 +84,14 @@ EMemitterStartInternal(int *ret, str *tb
BAT *b;
if (EMfind(*tbl))
- throw(MAL, "emitter.new", "Duplicate emitter");
+ throw(MAL, "emitter.new", "Duplicate emitter '%s'",*tbl);
for (em = emAnchor; em; em = em->nxt)
if (em->port == *port)
- throw(MAL, "emitter.new", "Port already in use");
+ throw(MAL, "emitter.new", "Port '%d' already in use",
em->port);
idx = BSKTlocate(*tbl);
if (idx == 0) /* should not happen */
- throw(MAL, "emitter.new", "Basket not found");
+ throw(MAL, "emitter.new", "Basket '%s' not found",*tbl);
em = EMnew(*tbl);
if (em == NULL)
@@ -111,7 +111,7 @@ EMemitterStartInternal(int *ret, str *tb
*/
len = BSKTmemberCount(*tbl);
if (len == 0)
- throw(MAL, "emitter.new", "Group has no members");
+ throw(MAL, "emitter.new", "Group '%s' has no members", *tbl);
em->table.format = GDKzalloc(sizeof(Column) * (len + 1));
em->table.format[0].c[0] = NULL;
@@ -153,7 +153,7 @@ EMemitterStartInternal(int *ret, str *tb
mnstr_printf(EMout, "#Instantiate a new emitter %d fields\n", i);
#endif
if (MT_create_thread(&em->pid, (void (*)(void *))EMstartThread, em,
MT_THR_DETACHED) != 0)
- throw(MAL, "emitter.start", "Emitter initiation failed");
+ throw(MAL, "emitter.start", "Emitter '%s' initiation
failed",em->name);
return MAL_SUCCEED;
}
@@ -168,7 +168,7 @@ str EMemitterPause(int *ret, str *nme)
em = EMfind(*nme);
if (em == NULL)
- throw(MAL, "emitter.pause", "Emitter not defined");
+ throw(MAL, "emitter.pause", "Emitter '%s' not defined",*nme);
em->status = BSKTPAUSE;
@@ -186,7 +186,7 @@ str EMemitterResume(int *ret, str *nme)
(void) ret;
em = EMfind(*nme);
if (em == NULL)
- throw(MAL, "emitter.resume", "Emitter not defined");
+ throw(MAL, "emitter.pause", "Emitter '%s' not defined",*nme);
#ifdef _DEBUG_EMITTER_
mnstr_printf(EMout, "#Resume emitter '%s'\n",*nme);
#endif
@@ -222,7 +222,7 @@ str EMemitterStop(int *ret, str *nme)
em = EMfind(*nme);
if (em == NULL)
- throw(MAL, "emitter.drop", "Emitter not defined");
+ throw(MAL, "emitter.pause", "Emitter '%s' not defined",*nme);
#ifdef _DEBUG_EMITTER_
mnstr_printf(EMout, "#Drop a emitter\n");
#endif
@@ -417,7 +417,7 @@ EMstartThread(Emitter em)
if (MT_create_thread(&em->pid, (void (*)(void
*))EMbody, em, MT_THR_DETACHED) != 0) {
close_stream(em->emitter);
- throw(MAL, "emitter.start", "Process creation
failed");
+ throw(MAL, "emitter.start", "Process '%s'
creation failed",em->name);
}
} else if (em->mode == BSKTACTIVE) {
/* connect the actuator */
diff --git a/sql/backends/monet5/datacell/receptor.c
b/sql/backends/monet5/datacell/receptor.c
--- a/sql/backends/monet5/datacell/receptor.c
+++ b/sql/backends/monet5/datacell/receptor.c
@@ -103,13 +103,13 @@ RCreceptorStartInternal(int *ret, str *t
BAT *b;
if (RCfind(*tbl))
- throw(MAL, "receptor.new", "Duplicate receptor");
+ throw(MAL, "receptor.new", "Duplicate receptor '%s'", *tbl);
idx = BSKTlocate(*tbl);
if (idx == 0) /* should not happen */
throw(MAL, "receptor.new", "Basket '%s' not found", *tbl);
for (rc = rcAnchor; rc; rc = rc->nxt)
if (rc->port == *port)
- throw(MAL, "receptor.new", "Port already in use");
+ throw(MAL, "receptor.new", "Port '%d' already in
use",rc->port);
rc = RCnew(*tbl);
if (rc == 0)
@@ -160,7 +160,7 @@ RCreceptorStartInternal(int *ret, str *t
mnstr_printf(RCout, "#Instantiate a new receptor %d fields\n", j);
#endif
if (MT_create_thread(&rc->pid, (void (*)(void *))RCstartThread, rc,
MT_THR_DETACHED) != 0)
- throw(MAL, "receptor.start", "Receptor initiation failed");
+ throw(MAL, "receptor.start", "Receptor '%s' initiation failed",
rc->name);
(void) ret;
return MAL_SUCCEED;
}
@@ -177,7 +177,7 @@ RCreceptorPause(int *ret, str *nme)
rc = RCfind(*nme);
if (rc == NULL)
- throw(MAL, "receptor.resume", "Receptor not defined");
+ throw(MAL, "receptor.resume", "Receptor '%s' not defined",*nme);
rc->status = BSKTPAUSE;
#ifdef _DEBUG_RECEPTOR_
@@ -194,7 +194,7 @@ RCreceptorResume(int *ret, str *nme)
rc = RCfind(*nme);
if (rc == NULL)
- throw(MAL, "receptor.resume", "Receptor not defined");
+ throw(MAL, "receptor.resume", "Receptor '%s' not defined",*nme);
rc->status = BSKTRUNNING;
#ifdef _DEBUG_RECEPTOR_
@@ -232,7 +232,7 @@ str RCreceptorStop(int *ret, str *nme)
rc = RCfind(*nme);
if (rc == NULL)
- throw(MAL, "receptor.drop", "Receptor not defined");
+ throw(MAL, "receptor.drop", "Receptor '%s' not defined", *nme);
#ifdef _DEBUG_RECEPTOR_
mnstr_printf(RCout, "#Drop a receptor\n");
#endif
@@ -268,14 +268,14 @@ RCscenario(int *ret, str *nme, str *fnam
Receptor rc;
rc = RCfind(*nme);
if (rc == NULL)
- throw(MAL, "receptor.scenario", "Receptor not defined");
+ throw(MAL, "receptor.scenario", "Receptor '%s' not
defined",*nme);
#ifdef _DEBUG_RECEPTOR_
mnstr_printf(RCout, "#Define receptor scenario\n");
#endif
(void) ret;
rc->scenario = GDKstrdup(*fname);
rc->sequence = *seq;
- throw(MAL, "receptor.scenario", "Scenario not yet implemented");
+ throw(MAL, "receptor.scenario", "Scenario '%s' not yet implemented",
*nme);
}
str
@@ -284,14 +284,14 @@ RCgenerator(int *ret, str *nme, str *mod
Receptor rc;
rc = RCfind(*nme);
if (rc == NULL)
- throw(MAL, "receptor.generator", "Receptor not defined");
+ throw(MAL, "receptor.generator", "Receptor '%s' not
defined",*nme);
#ifdef _DEBUG_RECEPTOR_
mnstr_printf(RCout, "#Define receptor generator\n");
#endif
(void) ret;
rc->modnme = GDKstrdup(*modnme);
rc->modnme = GDKstrdup(*fcnnme);
- throw(MAL, "receptor.generator", "Receptor not yet implemented");
+ throw(MAL, "receptor.generator", "Receptor '%s' not yet
implemented",*nme);
}
/*
@@ -683,7 +683,7 @@ RCstartThread(Receptor rc)
shutdown(rc->newsockfd, SHUT_RDWR);
close(rc->newsockfd);
GDKfree(rc);
- throw(MAL, "receptor.start", "Process creation
failed");
+ throw(MAL, "receptor.start", "Process '%s'
creation failed",rc->name);
}
/* ensure the thread took rc->newsockfd */
while (rc->newsockfd > 0)
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
