Changeset: 1e3d8903c8b7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1e3d8903c8b7
Modified Files:
Branch: default
Log Message:
Merge
diffs (66 lines):
diff -r abed75cbed36 -r 1e3d8903c8b7
MonetDB5/src/optimizer/opt_garbageCollector.mx
--- a/MonetDB5/src/optimizer/opt_garbageCollector.mx Thu Sep 16 17:29:31
2010 +0200
+++ b/MonetDB5/src/optimizer/opt_garbageCollector.mx Thu Sep 16 17:30:12
2010 +0200
@@ -224,7 +224,6 @@
pushInstruction(mb, old[i]);
getInstrPtr(mb,0)->gc |= GARBAGECONTROL;
GDKfree(old);
- GDKfree(span);
OPTDEBUGgarbageCollector{
int k;
mnstr_printf(cntxt->fdout, "#Garbage collected BAT variables
\n");
@@ -234,6 +233,7 @@
getBeginLifespan(span,k), getLastUpdate(span,k),
getEndLifespan(span,k));
mnstr_printf(cntxt->fdout, "End of GCoptimizer\n");
}
+ GDKfree(span);
DEBUGoptimizers
mnstr_printf(cntxt->fdout,"#opt_garbagecollector: %d variables
reset\n",actions);
diff -r abed75cbed36 -r 1e3d8903c8b7 clients/src/mapiclient/stethoscope.c
--- a/clients/src/mapiclient/stethoscope.c Thu Sep 16 17:29:31 2010 +0200
+++ b/clients/src/mapiclient/stethoscope.c Thu Sep 16 17:30:12 2010 +0200
@@ -444,23 +444,28 @@
free(walk);
} else {
/* fork runner threads for all alternatives */
- walk = thds = malloc(sizeof(wthread));
i = 1;
- if (*alts != NULL) while (1) {
- walk->tid = i++;
- walk->uri = *alts;
- walk->user = user;
- walk->pass = password;
- walk->argc = argc - a;
- walk->argv = &argv[a];
- walk->s = NULL;
- pthread_create(&walk->id, NULL, &doProfile, walk);
- alts++;
- if (*alts == NULL)
- break;
- walk = walk->next = malloc(sizeof(wthread));
+ if (*alts != NULL) {
+ walk = thds = malloc(sizeof(wthread));
+ while (1) {
+ walk->tid = i++;
+ walk->uri = *alts;
+ walk->user = user;
+ walk->pass = password;
+ walk->argc = argc - a;
+ walk->argv = &argv[a];
+ walk->s = NULL;
+ pthread_create(&walk->id, NULL, &doProfile,
walk);
+ alts++;
+ if (*alts == NULL)
+ break;
+ walk = walk->next = malloc(sizeof(wthread));
+ }
+ walk->next = NULL;
+ } else {
+ fprintf(stderr, "%s: no databases found for '%s'\n",
+ argv[0], dbname);
}
- walk->next = NULL;
free(oalts);
for (walk = thds; walk != NULL; walk = walk->next) {
pthread_join(walk->id, NULL);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
