MonetDB: default - Use an enum for the client record mode value.

[Sjoerd Mullender]

Changeset: 3093d2243ac7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3093d2243ac7
Modified Files:
        monetdb5/mal/mal_client.h
        monetdb5/mal/mal_private.h
        monetdb5/mal/mal_session.c
Branch: default
Log Message:

Use an enum for the client record mode value.
I like enums.  Plus, gdb knows what they are.


diffs (64 lines):

diff --git a/monetdb5/mal/mal_client.h b/monetdb5/mal/mal_client.h
--- a/monetdb5/mal/mal_client.h
+++ b/monetdb5/mal/mal_client.h
@@ -18,10 +18,12 @@
 #define CONSOLE     0
 #define isAdministrator(X) (X==mal_clients)
 
-#define FREECLIENT     0
-#define FINISHCLIENT   1   
-#define RUNCLIENT              2
-#define BLOCKCLIENT     3
+enum clientmode {
+       FREECLIENT,
+       FINISHCLIENT,
+       RUNCLIENT,
+       BLOCKCLIENT
+};
 
 #define PROCESSTIMEOUT  2   /* seconds */
 
@@ -125,7 +127,7 @@ typedef struct CLIENT {
        int debug;
        void  *mdb;            /* context upon suspend */
        str    history;        /* where to keep console history */
-       short  mode;           /* FREECLIENT..BLOCKED */
+       enum clientmode mode;  /* FREECLIENT..BLOCKED */
        /*
         * Client records are organized into a two-level dependency tree,
         * where children may be created to deal with parallel processing
diff --git a/monetdb5/mal/mal_private.h b/monetdb5/mal/mal_private.h
--- a/monetdb5/mal/mal_private.h
+++ b/monetdb5/mal/mal_private.h
@@ -12,8 +12,8 @@
 #error this file should not be included outside its source directory
 #endif
 
-#ifdef FREECLIENT
-/* FREECLIENT is defined in the same file as Client */
+#ifdef _MAL_CLIENT_H_
+/* _MAL_CLIENT_H_ is defined in the same file as Client */
 __hidden void MCexitClient(Client c)
        __attribute__((__visibility__("hidden")));
 __hidden int MCreadClient(Client c)
diff --git a/monetdb5/mal/mal_session.c b/monetdb5/mal/mal_session.c
--- a/monetdb5/mal/mal_session.c
+++ b/monetdb5/mal/mal_session.c
@@ -422,7 +422,7 @@ MSserveClient(void *dummy)
                c->glb = newGlobalStack(MAXGLOBALS + mb->vsize);
        if (c->glb == NULL) {
                showException(c->fdout, MAL, "serveClient", MAL_MALLOC_FAIL);
-               c->mode = FINISHCLIENT + 1; /* == RUNCLIENT */
+               c->mode = RUNCLIENT;
        } else {
                c->glb->stktop = mb->vtop;
                c->glb->blk = mb;
@@ -432,7 +432,7 @@ MSserveClient(void *dummy)
                msg = defaultScenario(c);
        if (msg) {
                showException(c->fdout, MAL, "serveClient", "could not 
initialize default scenario");
-               c->mode = FINISHCLIENT + 1; /* == RUNCLIENT */
+               c->mode = RUNCLIENT;
                GDKfree(msg);
        } else {
                do {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list