X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=732a5470c5c6f928131ec4721c6dbf90a5ddf3e2;hp=84f427986006265a39fba96e34dce00c49ac738f;hb=6976e1e3084857a4548ee11eeacb5060ee7f9653;hpb=2290d9be0703d3f83f38c2f100b1b41ec0790bb3 diff --git a/error.h b/error.h index 84f42798..732a5470 100644 --- a/error.h +++ b/error.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Andre Noll + * Copyright (C) 2006-2007 Andre Noll * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,6 +20,7 @@ /** \cond list of all subsystems that support the shiny error facility */ enum para_subsystem { + SS_CLIENT, SS_GUI, SS_TIME, SS_WAV, @@ -31,10 +32,14 @@ enum para_subsystem { SS_RECV, SS_NET, SS_ORTP_RECV, + SS_CLIENT_COMMON, + SS_AUDIOC, + SS_SCHED, SS_AUDIOD, + SS_AUDIOD_COMMAND, SS_EXEC, - SS_SCHED, SS_STDIN, + SS_STDOUT, SS_SIGNAL, SS_STRING, SS_STAT, @@ -50,7 +55,7 @@ enum para_subsystem { SS_CRYPT, SS_HTTP_SEND, SS_ORTP_SEND, - SS_DB, + SS_AFS, SS_OGG_AFH, SS_MP3_AFH, SS_AAC_AFH, @@ -58,7 +63,7 @@ enum para_subsystem { SS_AACDEC, SS_AAC_COMMON, SS_SERVER, - SS_AFS, + SS_VSS, SS_MYSQL_SELECTOR, SS_IPC, SS_DCCP, @@ -66,13 +71,16 @@ enum para_subsystem { SS_FD, SS_WRITE, SS_WRITE_COMMON, - SS_ALSA_WRITER, - SS_FILE_WRITER, + SS_ALSA_WRITE, + SS_FILE_WRITE, + SS_OSX_WRITE, + SS_USER_LIST, NUM_SS }; /* these do not need error handling (yet) */ #define SERVER_ERRORS +#define CLIENT_ERRORS #define WAV_ERRORS #define COMPRESS_ERRORS #define TIME_ERRORS @@ -83,18 +91,59 @@ enum para_subsystem { #define RINGBUFFER_ERRORS + extern const char **para_errlist[]; /** \endcond */ -#define STDIN_ERRORS \ - PARA_ERROR(STDIN_READ, "failed to read from stdin"), \ +#define USER_LIST_ERRORS \ + PARA_ERROR(USERLIST, "failed to open user list file"), \ + + +#define OSX_WRITE_ERRORS \ + PARA_ERROR(STREAM_FORMAT, "could not set stream format"), \ + PARA_ERROR(ADD_CALLBACK, "can not add callback"), \ + PARA_ERROR(READ_STDIN, "failed to read from stdin"), \ + PARA_ERROR(OPEN_COMP, "OpenAComponent() error"), \ + PARA_ERROR(UNIT_INIT, "AudioUnitInitialize() error"), \ + PARA_ERROR(UNIT_START, "AudioUnitStart() error"), \ + PARA_ERROR(DEFAULT_COMP, "can not find default audio output component"), \ + + +#define AUDIOC_ERRORS \ + 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"), \ + + + + +#define CLIENT_COMMON_ERRORS \ + PARA_ERROR(CLIENT_SYNTAX, "syntax error"), \ + PARA_ERROR(INVALID_CHALLENGE, "did not receive valid challenge"), \ + PARA_ERROR(NO_CONFIG, "config file not found"), \ + PARA_ERROR(CLIENT_AUTH, "authentication failed"), \ + PARA_ERROR(SERVER_EOF, "connection closed by para_server"), \ + PARA_ERROR(INPUT_EOF, "end of input"), \ + PARA_ERROR(HANDSHAKE_COMPLETE, ""), /* not really an error */ \ #define SCHED_ERRORS \ - PARA_ERROR(PRE_EOF, "pre_select returned zero"), \ - PARA_ERROR(POST_EOF, "post_select returned zero"), \ + PARA_ERROR(TASK_KILLED, "task killed"), \ + PARA_ERROR(NO_SUCH_TASK, "task not found"), \ + PARA_ERROR(NOT_INITIALIZED, "scheduler not yet initialized"), \ +#define STDIN_ERRORS \ + PARA_ERROR(STDIN_READ, "failed to read from stdin"), \ + PARA_ERROR(STDIN_EOF, "end of file"), \ + + +#define STDOUT_ERRORS \ + PARA_ERROR(STDOUT_WRITE, "failed to write to stdout"), \ + PARA_ERROR(STDOUT_EOF, "end of file"), \ #define NET_ERRORS \ @@ -121,12 +170,14 @@ extern const char **para_errlist[]; PARA_ERROR(TOO_MANY_BAD_CHUNKS, "too many consecutive bad chunks"), \ PARA_ERROR(INVALID_HEADER, "invalid header packet"), \ PARA_ERROR(OVERRUN, "outout buffer overrun"), \ + PARA_ERROR(ORTP_RECV_EOF, "ortp_recv: end of file"), \ #define HTTP_RECV_ERRORS \ PARA_ERROR(SEND_HTTP_REQUEST, "failed to send http request"), \ PARA_ERROR(MISSING_OK, "did not receive OK message from peer"), \ - PARA_ERROR(HTTP_RECV_BUF, "did not receive buffer") + PARA_ERROR(HTTP_RECV_BUF, "did not receive buffer"), \ + PARA_ERROR(HTTP_RECV_EOF, "http_recv: end of file"), \ #define RECV_ERRORS \ @@ -143,14 +194,21 @@ extern const char **para_errlist[]; PARA_ERROR(NO_MORE_SLOTS, "no more empty slots"), \ PARA_ERROR(MISSING_COLON, "syntax error: missing colon"), \ PARA_ERROR(UNSUPPORTED_AUDIO_FORMAT, "given audio format not supported"), \ + PARA_ERROR(STATUS_EOF, "server closed status connection"), \ + + +#define AUDIOD_COMMAND_ERRORS \ PARA_ERROR(CLIENT_WRITE, "client write error"), \ + PARA_ERROR(AUDIOD_SYNTAX, "syntax error"), \ PARA_ERROR(UCRED_PERM, "permission denied"), \ PARA_ERROR(INVALID_AUDIOD_CMD, "invalid command"), \ + PARA_ERROR(BAD_USER, "you don't exist. Go away."), \ #define FILTER_CHAIN_ERRORS \ PARA_ERROR(UNSUPPORTED_FILTER, "given filter not supported"), \ PARA_ERROR(BAD_FILTER_OPTIONS, "invalid filter option given"), \ + PARA_ERROR(FC_EOF, "filter chain: eof"), \ #define STAT_ERRORS \ @@ -192,6 +250,7 @@ extern const char **para_errlist[]; PARA_ERROR(SIGNAL_READ, "read error from signal pipe"), \ PARA_ERROR(WAITPID, "waitpid error"), \ PARA_ERROR(SIGNAL_PIPE, "failed to setup signal pipe"), \ + PARA_ERROR(SIGNAL_CAUGHT, "caught signal"), \ #define STRING_ERRORS \ @@ -205,8 +264,6 @@ extern const char **para_errlist[]; #define MP3_AFH_ERRORS \ - PARA_ERROR(FREAD, "fread error"), \ - PARA_ERROR(FSEEK, "fseek error"), \ PARA_ERROR(FRAME, "invalid mp3 frame"), \ PARA_ERROR(FRAME_LENGTH, "invalid frame length"), \ PARA_ERROR(MP3_NO_FILE, "invalid mp3 file pointer"), \ @@ -217,14 +274,11 @@ extern const char **para_errlist[]; #define AAC_AFH_ERRORS \ - PARA_ERROR(AAC_REPOS, "aac repositioning error"), \ - PARA_ERROR(AAC_READ, "aac read error"), \ PARA_ERROR(STSZ, "did not find stcz atom"), \ PARA_ERROR(MP4ASC, "audio spec config error"), \ #define AAC_COMMON_ERRORS \ - PARA_ERROR(AAC_BUF, "invalid buffer"), \ PARA_ERROR(ESDS, "did not find esds atom"), \ PARA_ERROR(STCO, "did not find stco atom"), \ @@ -241,12 +295,13 @@ extern const char **para_errlist[]; PARA_ERROR(OGG_REPOS, "ogg repositioning error"), \ -#define AFS_ERRORS \ +#define VSS_ERRORS \ PARA_ERROR(AUDIO_FORMAT, "audio format not recognized"), \ PARA_ERROR(FSTAT, "failed to fstat() audio file"), \ + PARA_ERROR(EMPTY_CHUNK, "empty chunk"), \ -#define DB_ERRORS \ +#define AFS_ERRORS \ PARA_ERROR(GETCWD, "can not get current working directory"), \ PARA_ERROR(CHDIR, "can not change directory"), \ PARA_ERROR(OPENDIR, "can not open directory"), \ @@ -268,7 +323,6 @@ extern const char **para_errlist[]; #define RANDOM_SELECTOR_ERRORS \ - PARA_ERROR(FILE_COUNT, "audio file count exceeded"), \ PARA_ERROR(NOTHING_FOUND, "no audio files found"), \ @@ -302,10 +356,9 @@ extern const char **para_errlist[]; PARA_ERROR(NO_AUDIO_FILE, "no audio file"), \ PARA_ERROR(BAD_CMD, "invalid command"), \ PARA_ERROR(PERM, "permission denied"), \ - PARA_ERROR(USERLIST, "failed to open user list file"), \ - PARA_ERROR(BAD_USER, "you don't exist. Go away."), \ PARA_ERROR(LOCK, "lock error"), \ PARA_ERROR(SENDER_CMD, "command not supported by this sender"), \ + PARA_ERROR(SERVER_CRASH, "para_server crashed -- can not live without it"), \ #define PLAYLIST_SELECTOR_ERRORS \ @@ -323,8 +376,7 @@ extern const char **para_errlist[]; #define DCCP_ERRORS \ PARA_ERROR(DCCP_SOCKET, "can not create dccp socket"), \ - PARA_ERROR(DCCP_PACKET_SIZE, "failed to set dccp packet size"), \ - PARA_ERROR(DCCP_SERVICE, "could not get service code"), \ + PARA_ERROR(DCCP_RECV_EOF, "dccp_recv: end of file"), \ #define DCCP_RECV_ERRORS \ @@ -342,19 +394,21 @@ 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(FSEEK, "fseek error"), \ + PARA_ERROR(FREAD, "fread error"), \ #define WRITE_ERRORS \ - PARA_ERROR(READ_HDR, "failed to read audio file header"), \ - PARA_ERROR(READ_STDIN, "failed to read from stdin"), \ PARA_ERROR(WRITE_SYNTAX, "para_write syntax error"), \ - PARA_ERROR(WRITE_OVERRUN, "buffer overrun"), \ PARA_ERROR(PREMATURE_END, "premature end of audio file"), \ PARA_ERROR(NO_WAV_HEADER, "wave header not found"), \ + PARA_ERROR(WAV_HEADER_SUCCESS, "successfully read wave header"), \ PARA_ERROR(NO_DELAY, "no initial delay"), \ + PARA_ERROR(DELAY_TIMEOUT, "initial delay timeout"), \ -#define ALSA_WRITER_ERRORS \ +#define ALSA_WRITE_ERRORS \ PARA_ERROR(BROKEN_CONF, "Broken alsa configuration"), \ PARA_ERROR(ACCESS_TYPE, "alsa access type not available"), \ PARA_ERROR(SAMPLE_FORMAT, "sample format not available"), \ @@ -372,10 +426,9 @@ extern const char **para_errlist[]; PARA_ERROR(SET_RATE, "snd_pcm_hw_params_set_rate_near failed"), \ PARA_ERROR(START_THRESHOLD, "snd_pcm_sw_params_set_start_threshold() failed"), \ PARA_ERROR(STOP_THRESHOLD, "snd_pcm_sw_params_set_stop_threshold() failed"), \ - PARA_ERROR(ALSA_LOG, "snd_output_stdio_attach() failed"), \ -#define FILE_WRITER_ERRORS \ +#define FILE_WRITE_ERRORS \ PARA_ERROR(FW_WRITE, "file writer write error"), \ PARA_ERROR(FW_OPEN, "file writer: can not open output file"), \ PARA_ERROR(FW_NO_FILE, "task started without open file"), \ @@ -383,11 +436,13 @@ extern const char **para_errlist[]; #define WRITE_COMMON_ERRORS \ PARA_ERROR(WRITE_COMMON_SYNTAX, "syntax error in write option"), \ + PARA_ERROR(WNG_EOF, "wng: end of file"), \ #define AACDEC_ERRORS \ PARA_ERROR(AACDEC_INIT, "failed to init aac decoder"), \ PARA_ERROR(AAC_DECODE, "aac decode error"), \ + PARA_ERROR(AAC_OVERRUN, "aac output buffer overrun"), \ /** @@ -460,12 +515,13 @@ extern const char **para_errlist[]; */ #define PARA_ERROR(err, msg) E_ ## err -#define SS_NAME(ss) para_errlist[ss]? para_errlist[ss][0] : "" +// #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); @@ -474,6 +530,7 @@ 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); @@ -492,14 +549,14 @@ SS_ENUM(OGG_AFH); SS_ENUM(AAC_AFH); SS_ENUM(AAC_COMMON); SS_ENUM(SERVER); -SS_ENUM(AFS); +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(DB); +SS_ENUM(AFS); SS_ENUM(MYSQL_SELECTOR); SS_ENUM(IPC); SS_ENUM(DCCP); @@ -508,9 +565,14 @@ SS_ENUM(DCCP_SEND); SS_ENUM(FD); SS_ENUM(WRITE); SS_ENUM(WRITE_COMMON); -SS_ENUM(ALSA_WRITER); -SS_ENUM(FILE_WRITER); +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); /** \endcond */ #undef PARA_ERROR /* rest of the world only sees the error text */