Update of /cvsroot/monetdb/sql/src/backends/monet5 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22125
Modified Files:
monetdb.mx
Log Message:
When using the -w (wait) flag, show the "progress" sortof.
U monetdb.mx
Index: monetdb.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/monetdb.mx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- monetdb.mx 7 Apr 2008 18:42:25 -0000 1.18
+++ monetdb.mx 7 Apr 2008 18:57:14 -0000 1.19
@@ -583,22 +583,24 @@
fflush(f);
if (wait == 1) {
waitstats = NULL;
+ printf("%sing database '%s'... ", type,
stats->dbname);
+ fflush(stdout);
do {
/* don't spinlock, just wait
half a seconds ;) */
MT_sleep_ms(500);
if (waitstats != NULL)
SABAOTHfreeStatus(&waitstats);
if ((e =
SABAOTHgetStatus(&waitstats, stats->dbname)) != MAL_SUCCEED) {
- fprintf(stderr, "%s:
internal error: %s\n", type, e);
+ fprintf(stderr, "\n%s:
internal error: %s\n", type, e);
GDKfree(e);
exit(2);
}
} while (waitstats->state ==
SABdbRunning);
if (waitstats->state == SABdbCrashed) {
- printf("%s: database %s crashed
after shutting down\n",
- type,
stats->dbname);
+ printf("CRASHED after shutting
down!\n");
ret = 1;
}
+ printf("done\n");
SABAOTHfreeStatus(&waitstats);
}
} else if (mode == START && stats->state !=
SABdbRunning) {
@@ -607,13 +609,15 @@
fflush(f);
if (wait == 1) {
waitstats = NULL;
+ printf("%sing database '%s'... ", type,
stats->dbname);
+ fflush(stdout);
do {
/* don't spinlock, just wait
half a seconds ;) */
MT_sleep_ms(500);
if (waitstats != NULL)
SABAOTHfreeStatus(&waitstats);
if ((e =
SABAOTHgetStatus(&waitstats, stats->dbname)) != MAL_SUCCEED) {
- fprintf(stderr, "%s:
internal error: %s\n", type, e);
+ fprintf(stderr, "\n%s:
internal error: %s\n", type, e);
GDKfree(e);
exit(2);
}
@@ -629,10 +633,10 @@
* hence we don't check for
that here */
} while (waitstats->state !=
SABdbCrashed);
if (waitstats->state == SABdbCrashed) {
- printf("%s: database %s crashed
during startup\n",
- type,
stats->dbname);
+ printf("CRASHED during
startup!\n");
ret = 1;
}
+ printf("done\n");
SABAOTHfreeStatus(&waitstats);
}
}
@@ -674,24 +678,27 @@
fflush(f);
if (wait == 1) {
waitstats = NULL;
+ printf("%sing database
'%s'... ",
+ type,
stats->dbname);
+ fflush(stdout);
do {
/* don't
spinlock, just wait half a seconds ;) */
MT_sleep_ms(500);
if (waitstats
!= NULL)
SABAOTHfreeStatus(&waitstats);
if ((e =
SABAOTHgetStatus(&waitstats, stats->dbname)) != MAL_SUCCEED) {
-
fprintf(stderr, "%s: internal error: %s\n", type, e);
+
fprintf(stderr, "\n%s: internal error: %s\n", type, e);
GDKfree(e);
exit(2);
}
} while
(waitstats->state == SABdbRunning);
if (waitstats->state ==
SABdbCrashed) {
- printf("%s:
database %s crashed after shutting down\n",
-
type, stats->dbname);
+ printf("CRASHED
after shutting down!\n");
SABAOTHfreeStatus(&waitstats);
fclose(f);
exit(1);
}
+ printf("done\n");
SABAOTHfreeStatus(&waitstats);
}
} else if (mode == START) {
@@ -700,13 +707,16 @@
fflush(f);
if (wait == 1) {
waitstats = NULL;
+ printf("%sing database
'%s'... ",
+ type,
stats->dbname);
+ fflush(stdout);
do {
/* don't
spinlock, just wait half a seconds ;) */
MT_sleep_ms(500);
if (waitstats
!= NULL)
SABAOTHfreeStatus(&waitstats);
if ((e =
SABAOTHgetStatus(&waitstats, stats->dbname)) != MAL_SUCCEED) {
-
fprintf(stderr, "%s: internal error: %s\n", type, e);
+
fprintf(stderr, "\n%s: internal error: %s\n", type, e);
GDKfree(e);
exit(2);
}
@@ -723,12 +733,12 @@
* we don't
check for that here */
} while
(waitstats->state != SABdbCrashed);
if (waitstats->state ==
SABdbCrashed) {
- printf("%s:
database %s crashed during startup\n",
-
type, stats->dbname);
+ printf("CRASHED
during startup!\n");
SABAOTHfreeStatus(&waitstats);
fclose(f);
exit(1);
}
+ printf("done\n");
SABAOTHfreeStatus(&waitstats);
}
}
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Register now and save $200. Hurry, offer ends at 11:59 p.m.,
Monday, April 7! Use priority code J8TLD2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
