X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=3e4911bf6c07ca85e4e675b1d3acacec37b24163;hp=7d2424cf3a626e27be056af432300be0911b76b9;hb=d0381117c7bce410b626bc159ab7763fdb022397;hpb=2c679eeb8bbc93220f85403eca6e9380dc624a6a diff --git a/error.h b/error.h index 7d2424cf..3e4911bf 100644 --- a/error.h +++ b/error.h @@ -6,77 +6,10 @@ /** \file error.h list of error messages for all subsystems */ -/** \cond list of all subsystems that support the shiny error facility */ -enum para_subsystem { - SS_CLIENT, - SS_GUI, - SS_TIME, - SS_WAV, - SS_COMPRESS, - SS_CLOSE_ON_FORK, - SS_DAEMON, - SS_DCCP_SEND, - SS_RINGBUFFER, - SS_RECV, - SS_NET, - SS_ORTP_RECV, - SS_CLIENT_COMMON, - SS_AUDIOC, - SS_SCHED, - SS_AUDIOD, - SS_AUDIOD_COMMAND, - SS_EXEC, - SS_STDIN, - SS_STDOUT, - SS_SIGNAL, - SS_STRING, - SS_STAT, - SS_GRAB_CLIENT, - SS_HTTP_RECV, - SS_RECV_COMMON, - SS_FILTER_CHAIN, - SS_OGGDEC, - SS_FILTER, - SS_COMMAND, - SS_RANDOM_SELECTOR, - SS_PLAYLIST_SELECTOR, - SS_CRYPT, - SS_HTTP_SEND, - SS_ORTP_SEND, - SS_AFS_COMMON, - SS_OGG_AFH, - SS_MP3_AFH, - SS_AAC_AFH, - SS_MP3DEC, - SS_AACDEC, - SS_AAC_COMMON, - SS_SERVER, - SS_VSS, - SS_MYSQL_SELECTOR, - SS_IPC, - SS_DCCP, - SS_DCCP_RECV, - SS_FD, - SS_WRITE, - SS_WRITE_COMMON, - SS_ALSA_WRITE, - SS_FILE_WRITE, - SS_OSX_WRITE, - SS_USER_LIST, - SS_CHUNK_QUEUE, - SS_AFS, - SS_OSL, - SS_AFT, - SS_MOOD, - SS_SCORE, - SS_ATTRIBUTE, - SS_BLOB, - SS_PLAYLIST, - SS_SHA1, - SS_RBTREE, - SS_FSCK, - NUM_SS -}; +/** \cond */ + +/* list of all subsystems that use paraslash's error facility */ +DEFINE_ERRLIST_OBJECT_ENUM; /* these do not need error handling (yet) */ #define SERVER_ERRORS @@ -91,9 +24,10 @@ enum para_subsystem { #define RINGBUFFER_ERRORS #define SCORE_ERRORS #define SHA1_ERRORS +#define RECV_ERRORS +#define AFH_COMMON_ERRORS extern const char **para_errlist[]; -/** \endcond */ #define FSCK_ERRORS \ PARA_ERROR(FSCK_SYNTAX, "fsck syntax error"), \ @@ -121,7 +55,6 @@ extern const char **para_errlist[]; PARA_ERROR(BAD_SIZE, "invalid size specified"), \ PARA_ERROR(TRUNC, "failed to truncate file"), \ PARA_ERROR(UNLINK, "failed to remove file"), \ - PARA_ERROR(NOTDIR, "error: not a directory"), \ PARA_ERROR(BAD_TABLE, "table not open"), \ PARA_ERROR(BAD_TABLE_DESC, "invalid table description"), \ PARA_ERROR(RB_KEY_EXISTS, "key already exists in rbtree"), \ @@ -132,9 +65,6 @@ extern const char **para_errlist[]; PARA_ERROR(STAT, "can not stat file"), \ PARA_ERROR(FSTAT, "fstat error"), \ PARA_ERROR(RENAME, "rename failed"), \ - PARA_ERROR(EMPTY, "file empty"), \ - PARA_ERROR(MMAP, "mmap error"), \ - PARA_ERROR(MUNMAP, "munmap failed"), \ PARA_ERROR(WRITE, "write error"), \ PARA_ERROR(LSEEK, "lseek error"), \ PARA_ERROR(BUSY, "table is busy"), \ @@ -152,23 +82,20 @@ extern const char **para_errlist[]; #define AFS_ERRORS \ PARA_ERROR(BAD_TABLE_NAME, "invalid table"), \ PARA_ERROR(INPUT_TOO_LARGE, "input too large for stdin command"), \ - PARA_ERROR(READ, "read error"), \ - PARA_ERROR(ATOL, "failed to convert to long"), \ + PARA_ERROR(AFS_SYNTAX, "afs syntax error"), \ + PARA_ERROR(AFS_SIGNAL, "afs caught deadly signal"), \ + PARA_ERROR(AFS_PARENT_DIED, "fatal: server process terminated"), \ #define MOOD_ERRORS \ PARA_ERROR(MOOD_SYNTAX, "mood syntax error"), \ - PARA_ERROR(MOOD_REGEX, "invalid regular expression"), \ PARA_ERROR(NO_MOOD, "no mood available"), \ PARA_ERROR(MOOD_LOADED, "mood loaded"), \ - PARA_ERROR(MOOD_BUSY, "mood is in use"), \ PARA_ERROR(NOT_ADMISSIBLE, "file is not admussible"), \ #define ATTRIBUTE_ERRORS \ PARA_ERROR(ATTR_SYNTAX, "attribute syntax error"), \ - PARA_ERROR(ATTR_EXISTS, "attribute already exists"), \ - PARA_ERROR(ATTR_TABLE_FULL, "attribute table full"), \ PARA_ERROR(NO_ATTRIBUTES, "no attributes defined yet"), \ #define BLOB_ERRORS \ @@ -177,9 +104,9 @@ extern const char **para_errlist[]; #define PLAYLIST_ERRORS \ - PARA_ERROR(PLAYLIST_SYNTAX, "playlist syntax error"), \ PARA_ERROR(NO_PLAYLIST, "no valid playlist found"), \ PARA_ERROR(PLAYLIST_LOADED, ""), /* not really an error */ \ + PARA_ERROR(PATH_FOUND, ""), /* not really an error */ \ PARA_ERROR(PLAYLIST_EMPTY, "attempted to load empty playlist"), \ @@ -213,8 +140,6 @@ extern const char **para_errlist[]; PARA_ERROR(AUDIOC_SYNTAX, "audioc syntax error"), \ PARA_ERROR(AUDIOC_READ, "audioc read error"), \ PARA_ERROR(AUDIOC_WRITE, "audioc write error"), \ - PARA_ERROR(INIT_SOCK_ADDR, "can not init socket"), \ - PARA_ERROR(AUDIOC_CONNECT, "audioc connect error"), \ PARA_ERROR(AUDIOC_OVERRUN, "audioc buffer overrun"), \ @@ -276,12 +201,8 @@ extern const char **para_errlist[]; PARA_ERROR(HTTP_RECV_EOF, "http_recv: end of file"), \ PARA_ERROR(HTTP_RECV_OVERRUN, "http_recv: outout buffer overrun"), \ - -#define RECV_ERRORS \ - PARA_ERROR(RECV_SYNTAX, "recv syntax error"), \ - - #define RECV_COMMON_ERRORS \ + PARA_ERROR(RECV_SYNTAX, "recv syntax error"), \ #define AUDIOD_ERRORS \ @@ -341,13 +262,15 @@ extern const char **para_errlist[]; #define SIGNAL_ERRORS \ PARA_ERROR(SIGNAL_SIG_ERR, "signal() retured SIG_ERR"), \ PARA_ERROR(SIGNAL_READ, "read error from signal pipe"), \ - PARA_ERROR(WAITPID, "waitpid error"), \ - PARA_ERROR(SIGNAL_PIPE, "failed to setup signal pipe"), \ #define STRING_ERRORS \ PARA_ERROR(MKSTEMP, "mkstemp error: unable to create tmp file"), \ PARA_ERROR(FCHMOD, "fchmod error: can not set mode"), \ + PARA_ERROR(ATOI_OVERFLOW, "value too large"), \ + PARA_ERROR(STRTOLL, "unknown strtoll error"), \ + PARA_ERROR(ATOI_NO_DIGITS, "no digits found in string"), \ + PARA_ERROR(ATOI_JUNK_AT_END, "further characters after number"), \ #define EXEC_ERRORS \ @@ -387,13 +310,11 @@ extern const char **para_errlist[]; #define VSS_ERRORS \ + PARA_ERROR(BAD_AUDIO_FILE_SUFFIX, "unknown suffix"), \ PARA_ERROR(AUDIO_FORMAT, "audio format not recognized"), \ PARA_ERROR(CHUNK, "unable to get chunk"), \ - - -#define AFS_COMMON_ERRORS \ - PARA_ERROR(GETCWD, "can not get current working directory"), \ - PARA_ERROR(LSTAT, "lstat error"), \ + PARA_ERROR(SHORT_AFS_READ, "short read from afs socket"), \ + PARA_ERROR(BAD_AFS_CODE, "received junk from afs"), \ #define CRYPT_ERRORS \ @@ -410,33 +331,6 @@ extern const char **para_errlist[]; PARA_ERROR(SEND_QUEUED_CHUNK, "failed to send queued chunk"), \ -#define RANDOM_SELECTOR_ERRORS \ - PARA_ERROR(NOTHING_FOUND, "no audio files found"), \ - - -#define MYSQL_SELECTOR_ERRORS \ - PARA_ERROR(MYSQL_SYNTAX, "mysql syntax error"), \ - PARA_ERROR(NOTCONN, "not connected to mysql server"), \ - PARA_ERROR(TOOBIG, "mysql: file too large"), \ - PARA_ERROR(NAMETOOLONG, "mysql: name too long"), \ - PARA_ERROR(QFAILED, "mysql query failed"), \ - PARA_ERROR(NOROW, "row is NULL"), \ - PARA_ERROR(NOATTS, "can not get attributes from mysql table"), \ - PARA_ERROR(NORESULT, "error while fetching mysql result"), \ - PARA_ERROR(EMPTY_RESULT, "result is empty"), \ - PARA_ERROR(ESCAPE, "can not escape string"), \ - PARA_ERROR(GET_AUDIO_FILE, "can not get current audio file"), \ - PARA_ERROR(GET_STREAM, "can not get current stream"), \ - PARA_ERROR(NO_STREAM, "no such stream"), \ - PARA_ERROR(AUDIO_FILE, "no such audio file"), \ - PARA_ERROR(GET_QUERY, "can not get query for specified stream"), \ - PARA_ERROR(TMPFILE, "error while writing temporary file"), \ - PARA_ERROR(META, "can not get meta data"), \ - PARA_ERROR(MYSQL_INIT, "can not initialize mysql connection"), \ - PARA_ERROR(NO_MYSQL_PASSWD, "fatal: no mysql passord given"), \ - PARA_ERROR(NO_AF_DIR, "fatal: audio file directory not given"), \ - - #define COMMAND_ERRORS \ PARA_ERROR(COMMAND_SYNTAX, "syntax error in command"), \ PARA_ERROR(AUTH, "did not receive auth request"), \ @@ -450,10 +344,6 @@ extern const char **para_errlist[]; PARA_ERROR(BAD_USER, "you don't exist. Go away."), \ -#define PLAYLIST_SELECTOR_ERRORS \ - PARA_ERROR(LOAD_PLAYLIST, "failed to load playlist"), \ - - #define IPC_ERRORS \ PARA_ERROR(SEM_GET, "failed to create semaphore"), \ PARA_ERROR(SEM_REMOVE, "can not remove semaphore"), \ @@ -481,20 +371,13 @@ extern const char **para_errlist[]; #define FD_ERRORS \ - PARA_ERROR(F_GETFL, "failed to get fd flags"), \ - PARA_ERROR(F_SETFL, "failed to set fd flags"), \ PARA_ERROR(FGETS, "fgets error"), \ - PARA_ERROR(EXIST, "file or directory already exists"), \ - PARA_ERROR(ISDIR, "error: is a directory"), \ - PARA_ERROR(NOENT, "no such file or directory"), \ - PARA_ERROR(OPEN_PERM, "open error (permission denied)"), \ - PARA_ERROR(MKDIR_PERM, "mkdir error (permission denied)"), \ - PARA_ERROR(MKDIR, "failed to create directory"), \ PARA_ERROR(CHDIR, "failed to change directory"), \ - PARA_ERROR(FCHDIR, "fchdir failed"), \ - PARA_ERROR(OPENDIR, "can not open directory"), \ - PARA_ERROR(NOSPC, "no space left on device"), \ PARA_ERROR(OPEN, "failed to open file"), \ + PARA_ERROR(CHDIR_PERM, "insufficient permissions to chdir"), \ + PARA_ERROR(EMPTY, "file empty"), \ + PARA_ERROR(MMAP, "mmap error"), \ + PARA_ERROR(MUNMAP, "munmap failed"), \ #define WRITE_ERRORS \ @@ -546,6 +429,7 @@ extern const char **para_errlist[]; #define CHUNK_QUEUE_ERRORS \ PARA_ERROR(QUEUE, "packet queue overrun"), \ +/** \endcond */ /** * the subsystem shift @@ -586,12 +470,26 @@ extern const char **para_errlist[]; */ #define ERRNUM_TO_INDEX(num) (((1 << SS_SHIFT) - 1) & (num)) +#define SYSTEM_ERROR_BIT 30 + +#define IS_SYSTEM_ERROR(num) (!!((num) & (1 << SYSTEM_ERROR_BIT))) + +#define ERRNO_TO_PARA_ERROR(num) ((num) | (1 << SYSTEM_ERROR_BIT)) + +static inline int is_errno(int val, int _errno) +{ + assert(val > 0 && _errno > 0); + return ERRNO_TO_PARA_ERROR(_errno) == val; +} + /** * paraslash's version of strerror(3) * * expands to the error text of \a num (a string constant). */ -#define PARA_STRERROR(num) para_errlist[ERRNUM_TO_SS(num)] [ERRNUM_TO_INDEX(num)] +#define PARA_STRERROR(num) IS_SYSTEM_ERROR(num)? \ + strerror((num) & ((1 << SYSTEM_ERROR_BIT) - 1)) : \ + para_errlist[ERRNUM_TO_SS(num)] [ERRNUM_TO_INDEX(num)] /** * define the error list for one subsystem @@ -616,79 +514,7 @@ extern const char **para_errlist[]; * 'E_') and gets later redefined to expand to the error text only */ #define PARA_ERROR(err, msg) E_ ## err - -// #define SS_NAME(ss) para_errlist[ss]? para_errlist[ss][0] : "" - -/** \cond popcorn time */ -SS_ENUM(GUI); -SS_ENUM(SCHED); -SS_ENUM(STDIN); -SS_ENUM(STDOUT); -SS_ENUM(WAV); -SS_ENUM(COMPRESS); -SS_ENUM(TIME); -SS_ENUM(CLOSE_ON_FORK); -SS_ENUM(ORTP_RECV); -SS_ENUM(NET); -SS_ENUM(RECV); -SS_ENUM(AUDIOD); -SS_ENUM(AUDIOD_COMMAND); -SS_ENUM(EXEC); -SS_ENUM(SIGNAL); -SS_ENUM(STRING); -SS_ENUM(DAEMON); -SS_ENUM(STAT); -SS_ENUM(GRAB_CLIENT); -SS_ENUM(HTTP_RECV); -SS_ENUM(RECV_COMMON); -SS_ENUM(FILTER_CHAIN); -SS_ENUM(OGGDEC); -SS_ENUM(MP3DEC); -SS_ENUM(AACDEC); -SS_ENUM(FILTER); -SS_ENUM(MP3_AFH); -SS_ENUM(OGG_AFH); -SS_ENUM(AAC_AFH); -SS_ENUM(AAC_COMMON); -SS_ENUM(SERVER); -SS_ENUM(VSS); -SS_ENUM(COMMAND); -SS_ENUM(RANDOM_SELECTOR); -SS_ENUM(PLAYLIST_SELECTOR); -SS_ENUM(CRYPT); -SS_ENUM(HTTP_SEND); -SS_ENUM(ORTP_SEND); -SS_ENUM(AFS_COMMON); -SS_ENUM(MYSQL_SELECTOR); -SS_ENUM(IPC); -SS_ENUM(DCCP); -SS_ENUM(DCCP_RECV); -SS_ENUM(DCCP_SEND); -SS_ENUM(FD); -SS_ENUM(WRITE); -SS_ENUM(WRITE_COMMON); -SS_ENUM(ALSA_WRITE); -SS_ENUM(FILE_WRITE); -SS_ENUM(OSX_WRITE); -SS_ENUM(RINGBUFFER); -SS_ENUM(CLIENT); -SS_ENUM(CLIENT_COMMON); -SS_ENUM(AUDIOC); -SS_ENUM(USER_LIST); -SS_ENUM(CHUNK_QUEUE); - -SS_ENUM(AFS); -SS_ENUM(OSL); -SS_ENUM(AFT); -SS_ENUM(MOOD); -SS_ENUM(SCORE); -SS_ENUM(ATTRIBUTE); -SS_ENUM(BLOB); -SS_ENUM(PLAYLIST); -SS_ENUM(SHA1); -SS_ENUM(RBTREE); -SS_ENUM(FSCK); -/** \endcond */ +#include "error2.h" #undef PARA_ERROR /* rest of the world only sees the error text */ #define PARA_ERROR(err, msg) msg