[Sysfence-commit] sysfence/parseopt lex.c,1.8,1.9 lex.h,1.5,1.6
Status: Alpha
Brought to you by:
emes
Menu
▾
▴
[Sysfence-commit] sysfence/parseopt lex.c,1.8,1.9 lex.h,1.5,1.6
|
From: Michal S. <em...@us...> - 2004-05-10 13:53:26
|
Update of /cvsroot/sysfence/sysfence/parseopt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27040/parseopt Modified Files: lex.c lex.h Log Message: + added new tokens for fs and processes Index: lex.h =================================================================== RCS file: /cvsroot/sysfence/sysfence/parseopt/lex.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- lex.h 27 Feb 2004 11:16:07 -0000 1.5 +++ lex.h 10 May 2004 13:53:17 -0000 1.6 @@ -25,6 +25,8 @@ CO_EQ, CO_NEQ, CO_LE, CO_LT, CO_GE, CO_GT, /* logical operators */ LO_OR, LO_AND, + /* list separator */ + LI_SEP, /* keywords */ KW_IF, KW_RUN, KW_LOG, KW_ONCE, KW_STEP, /* block beginning/end */ @@ -33,6 +35,10 @@ ID_LA1, ID_LA5, ID_LA15, ID_MFREE, ID_MUSED, ID_SFREE, ID_SUSED, + ID_FSFREE, ID_FSAVAIL, ID_FSUSED, + ID_NPROC, + /* process states */ + PR_RUN, PR_STOP, PR_SLEEP, PR_UNINT, PR_ZOMBIE, /* values */ VA_INT, VA_SIZ, VA_DBL, VA_STR, /* special token, must be last */ Index: lex.c =================================================================== RCS file: /cvsroot/sysfence/sysfence/parseopt/lex.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- lex.c 27 Feb 2004 11:16:07 -0000 1.8 +++ lex.c 10 May 2004 13:53:17 -0000 1.9 @@ -27,29 +27,41 @@ literal toktrans[] = { /* Tokens table. To extend it, modify MAXREP in lex.h */ - { CO_NEQ, {"!=", "<>", NULL, NULL } }, - { CO_LE, {"<=", "=<", NULL, NULL } }, - { CO_LT, {"<", NULL, NULL, NULL } }, - { CO_GE, {">=", "=>", NULL, NULL } }, - { CO_GT, {">", NULL, NULL, NULL } }, - { CO_EQ, {"=", "==", NULL, NULL } }, - { LO_OR, {"or", "orelse", "||", NULL } }, - { LO_AND, {"and", "andalso", "&&", NULL } }, - { KW_IF, {"if", "when", "on", "rule" } }, - { KW_RUN, {"run", "exec", "execute", "invoke"} }, - { KW_LOG, {"log", NULL, NULL, NULL } }, - { KW_ONCE, {"once", "onlyonce", NULL, NULL } }, - { KW_STEP, {"step", "stepping", NULL, NULL } }, - { BL_BEGIN, {"{", NULL, NULL, NULL } }, - { BL_END, {"}", NULL, NULL, NULL } }, - { ID_LA15, {"la15", "load15", "loadavg15", NULL } }, - { ID_LA5, {"la5", "load5", "loadavg5", NULL } }, - { ID_LA1, {"la1", "load1", "loadavg1", NULL } }, - { ID_MFREE, {"memfree", "freemem", "freememory", NULL } }, - { ID_MUSED, {"memused", "usedmem", "usedmemory", NULL } }, - { ID_SFREE, {"swapfree", "freeswap", NULL, NULL } }, - { ID_SUSED, {"swapused", "usedswap", NULL, NULL } }, - { END, {"\0", NULL, NULL, NULL } } + { CO_NEQ, {"!=", "<>", NULL, NULL } }, + { CO_LE, {"<=", "=<", NULL, NULL } }, + { CO_LT, {"<", NULL, NULL, NULL } }, + { CO_GE, {">=", "=>", NULL, NULL } }, + { CO_GT, {">", NULL, NULL, NULL } }, + { CO_EQ, {"=", "==", NULL, NULL } }, + { LO_OR, {"or", "orelse", "||", NULL } }, + { LO_AND, {"and", "andalso", "&&", NULL } }, + { LI_SEP, {",", "|", NULL, NULL } }, + { KW_IF, {"if", "when", "on", "rule" } }, + { KW_RUN, {"run", "exec", "execute", "invoke" } }, + { KW_LOG, {"log", NULL, NULL, NULL } }, + { KW_ONCE, {"once", "onlyonce", NULL, NULL } }, + { KW_STEP, {"step", "stepping", NULL, NULL } }, + { BL_BEGIN, {"{", NULL, NULL, NULL } }, + { BL_END, {"}", NULL, NULL, NULL } }, + { ID_LA15, {"la15", "load15", "loadavg15", NULL } }, + { ID_LA5, {"la5", "load5", "loadavg5", NULL } }, + { ID_LA1, {"la1", "load1", "loadavg1", NULL } }, + { ID_MFREE, {"memfree", "freemem", "freememory", NULL } }, + { ID_MUSED, {"memused", "usedmem", "usedmemory", NULL } }, + { ID_SFREE, {"swapfree", "freeswap", NULL, NULL } }, + { ID_SUSED, {"swapused", "usedswap", NULL, NULL } }, + { ID_FSFREE, {"spacefree", "freespace", NULL, NULL } }, + { ID_FSAVAIL, {"spaceavail", "availspace", "spaceavailable", "availablespace" } }, + { ID_FSUSED, {"spaceused", "usedspace", NULL, NULL } }, + { ID_NPROC, {"nproc", "numproc", "procnum", "processes" } }, + { PR_RUN, {"run", "running", NULL, NULL } }, + { PR_STOP, {"stop", "stopped", "traced", NULL } }, + { PR_SLEEP, {"sleep", "sleeping", NULL, NULL } }, + { PR_UNINT, {"unint", "io", "uninterruptible", NULL } }, + { PR_ZOMBIE, {"zombie", "defunct", NULL, NULL } }, + { PR_RUN, {"run", "running", NULL, NULL } }, + { PR_RUN, {"run", "running", NULL, NULL } }, + { END, {"\0", NULL, NULL, NULL } } }; unsigned int linenum = 1; @@ -58,33 +70,43 @@ char * tok2string (token t) { switch (t) { - case CO_EQ: return "="; - case CO_NEQ: return "!="; - case CO_LE: return "<="; - case CO_LT: return "<"; - case CO_GE: return ">="; - case CO_GT: return ">"; - case LO_OR: return "or"; - case LO_AND: return "and"; - case KW_IF: return "if"; - case KW_RUN: return "run"; - case KW_LOG: return "log"; - case KW_ONCE: return "once"; - case KW_STEP: return "step"; - case BL_BEGIN: return "{"; - case BL_END: return "}"; - case ID_LA1: return "LA1"; - case ID_LA5: return "LA5"; - case ID_LA15: return "LA15"; - case ID_MFREE: return "MEMFREE"; - case ID_MUSED: return "MEMUSED"; - case ID_SFREE: return "SWAPFREE"; - case ID_SUSED: return "SWAPUSED"; - case VA_INT: return "VA_INT"; - case VA_SIZ: return "VA_SIZ"; - case VA_DBL: return "VA_DBL"; - case VA_STR: return "VA_STR"; - case END: return "END"; + case CO_EQ: return "="; + case CO_NEQ: return "!="; + case CO_LE: return "<="; + case CO_LT: return "<"; + case CO_GE: return ">="; + case CO_GT: return ">"; + case LO_OR: return "or"; + case LO_AND: return "and"; + case LI_SEP: return ","; + case KW_IF: return "if"; + case KW_RUN: return "run"; + case KW_LOG: return "log"; + case KW_ONCE: return "once"; + case KW_STEP: return "step"; + case BL_BEGIN: return "{"; + case BL_END: return "}"; + case ID_LA1: return "LA1"; + case ID_LA5: return "LA5"; + case ID_LA15: return "LA15"; + case ID_MFREE: return "MEMFREE"; + case ID_MUSED: return "MEMUSED"; + case ID_SFREE: return "SWAPFREE"; + case ID_SUSED: return "SWAPUSED"; + case ID_FSFREE: return "SPACEFREE"; + case ID_FSAVAIL: return "SPACEAVAILABLE"; + case ID_FSUSED: return "SPACEUSED"; + case ID_NPROC: return "NPROC"; + case PR_RUN: return "R"; + case PR_STOP: return "T"; + case PR_SLEEP: return "S"; + case PR_UNINT: return "U"; + case PR_ZOMBIE: return "Z"; + case VA_INT: return "VA_INT"; + case VA_SIZ: return "VA_SIZ"; + case VA_DBL: return "VA_DBL"; + case VA_STR: return "VA_STR"; + case END: return "END"; } } #endif |
