projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make para_recv use the new scheduler.
[paraslash.git]
/
error.h
diff --git
a/error.h
b/error.h
index b70f7b477094478b6b20267e582a459b386c040f..aa5666b392dc6b2dbca8fe89deaaeeb1e5e36af4 100644
(file)
--- a/
error.h
+++ b/
error.h
@@
-18,25
+18,31
@@
/** \file error.h list of error messages for all subsystems */
/** \file error.h list of error messages for all subsystems */
-/** \cond list of all subsystems that support the shiny
new
error facility */
+/** \cond list of all subsystems that support the shiny error facility */
enum para_subsystem {
enum para_subsystem {
+ SS_SCHED,
+ 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_AUDIOD,
SS_EXEC,
SS_RECV,
SS_NET,
SS_ORTP_RECV,
SS_AUDIOD,
SS_EXEC,
- SS_CLOSE_ON_FORK,
+ SS_STDIN,
+ SS_STDOUT,
SS_SIGNAL,
SS_STRING,
SS_SIGNAL,
SS_STRING,
- SS_DAEMON,
SS_STAT,
SS_STAT,
- SS_TIME,
SS_GRAB_CLIENT,
SS_HTTP_RECV,
SS_RECV_COMMON,
SS_FILTER_CHAIN,
SS_GRAB_CLIENT,
SS_HTTP_RECV,
SS_RECV_COMMON,
SS_FILTER_CHAIN,
- SS_WAV,
- SS_COMPRESS,
SS_OGGDEC,
SS_FILTER,
SS_COMMAND,
SS_OGGDEC,
SS_FILTER,
SS_COMMAND,
@@
-46,8
+52,8
@@
enum para_subsystem {
SS_HTTP_SEND,
SS_ORTP_SEND,
SS_DB,
SS_HTTP_SEND,
SS_ORTP_SEND,
SS_DB,
- SS_OGG,
- SS_MP3,
+ SS_OGG
_AFH
,
+ SS_MP3
_AFH
,
SS_AAC_AFH,
SS_MP3DEC,
SS_AACDEC,
SS_AAC_AFH,
SS_MP3DEC,
SS_AACDEC,
@@
-58,19
+64,40
@@
enum para_subsystem {
SS_IPC,
SS_DCCP,
SS_DCCP_RECV,
SS_IPC,
SS_DCCP,
SS_DCCP_RECV,
- SS_DCCP_SEND,
SS_FD,
SS_FD,
- SS_GUI,
SS_WRITE,
SS_WRITE_COMMON,
SS_ALSA_WRITER,
SS_FILE_WRITER,
SS_WRITE,
SS_WRITE_COMMON,
SS_ALSA_WRITER,
SS_FILE_WRITER,
- SS_RINGBUFFER};
+ NUM_SS
+};
+
+/* these do not need error handling (yet) */
+#define SERVER_ERRORS
+#define WAV_ERRORS
+#define COMPRESS_ERRORS
+#define TIME_ERRORS
+#define CLOSE_ON_FORK_ERRORS
+#define DAEMON_ERRORS
+#define ORTP_SEND_ERRORS
+#define GUI_ERRORS
+#define RINGBUFFER_ERRORS
+#define SCHED_ERRORS
+
-#define NUM_SS (SS_RINGBUFFER + 1)
extern const char **para_errlist[];
/** \endcond */
extern const char **para_errlist[];
/** \endcond */
+#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 \
PARA_ERROR(SEND, "send error"), \
PARA_ERROR(RECV, "receive error"), \
#define NET_ERRORS \
PARA_ERROR(SEND, "send error"), \
PARA_ERROR(RECV, "receive error"), \
@@
-95,12
+122,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(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"), \
#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 \
#define RECV_ERRORS \
@@
-178,7
+207,7
@@
extern const char **para_errlist[];
PARA_ERROR(NULL_OPEN, "can not open /dev/null"), \
PARA_ERROR(NULL_OPEN, "can not open /dev/null"), \
-#define MP3_ERRORS \
+#define MP3_
AFH_
ERRORS \
PARA_ERROR(FREAD, "fread error"), \
PARA_ERROR(FSEEK, "fseek error"), \
PARA_ERROR(FRAME, "invalid mp3 frame"), \
PARA_ERROR(FREAD, "fread error"), \
PARA_ERROR(FSEEK, "fseek error"), \
PARA_ERROR(FRAME, "invalid mp3 frame"), \
@@
-194,15
+223,15
@@
extern const char **para_errlist[];
PARA_ERROR(AAC_REPOS, "aac repositioning error"), \
PARA_ERROR(AAC_READ, "aac read error"), \
PARA_ERROR(STSZ, "did not find stcz atom"), \
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 \
#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"), \
PARA_ERROR(ESDS, "did not find esds atom"), \
PARA_ERROR(STCO, "did not find stco atom"), \
-#define OGG_ERRORS \
+#define OGG_
AFH_
ERRORS \
PARA_ERROR(OGG_READ, "ogg read error"), \
PARA_ERROR(SYNC_PAGEOUT, "ogg sync page-out error (no ogg file?)"), \
PARA_ERROR(STREAM_PAGEIN, "ogg stream page-in error (first page)"), \
PARA_ERROR(OGG_READ, "ogg read error"), \
PARA_ERROR(SYNC_PAGEOUT, "ogg sync page-out error (no ogg file?)"), \
PARA_ERROR(STREAM_PAGEIN, "ogg stream page-in error (first page)"), \
@@
-280,6
+309,7
@@
extern const char **para_errlist[];
PARA_ERROR(LOCK, "lock error"), \
PARA_ERROR(SENDER_CMD, "command not supported by this sender"), \
PARA_ERROR(LOCK, "lock error"), \
PARA_ERROR(SENDER_CMD, "command not supported by this sender"), \
+
#define PLAYLIST_SELECTOR_ERRORS \
PARA_ERROR(LOAD_PLAYLIST, "failed to load playlist"), \
#define PLAYLIST_SELECTOR_ERRORS \
PARA_ERROR(LOAD_PLAYLIST, "failed to load playlist"), \
@@
-297,6
+327,7
@@
extern const char **para_errlist[];
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_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 \
#define DCCP_RECV_ERRORS \
@@
-304,22
+335,25
@@
extern const char **para_errlist[];
PARA_ERROR(DCCP_OVERRUN, "dccp output buffer buffer overrun"), \
PARA_ERROR(DCCP_CONNECT, "dccp connect error"), \
PARA_ERROR(DCCP_OVERRUN, "dccp output buffer buffer overrun"), \
PARA_ERROR(DCCP_CONNECT, "dccp connect error"), \
+
#define DCCP_SEND_ERRORS \
PARA_ERROR(DCCP_BIND, "dccp bind error"), \
PARA_ERROR(DCCP_LISTEN, "dccp listen error"), \
PARA_ERROR(DCCP_WRITE, "dccp write error"), \
#define DCCP_SEND_ERRORS \
PARA_ERROR(DCCP_BIND, "dccp bind error"), \
PARA_ERROR(DCCP_LISTEN, "dccp listen error"), \
PARA_ERROR(DCCP_WRITE, "dccp write error"), \
+
#define FD_ERRORS \
PARA_ERROR(F_GETFL, "failed to get fd flags"), \
PARA_ERROR(F_SETFL, "failed to set fd flags"), \
#define WRITE_ERRORS \
#define FD_ERRORS \
PARA_ERROR(F_GETFL, "failed to get fd flags"), \
PARA_ERROR(F_SETFL, "failed to set fd flags"), \
#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_SYNTAX, "para_write syntax error"), \
- PARA_ERROR(WRITE_OVERRUN, "buffer overrun"), \
PARA_ERROR(PREMATURE_END, "premature end of audio file"), \
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_WRITER_ERRORS \
@@
-340,31
+374,23
@@
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(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 \
PARA_ERROR(FW_WRITE, "file writer write error"), \
PARA_ERROR(FW_OPEN, "file writer: can not open output file"), \
#define FILE_WRITER_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"), \
+
#define WRITE_COMMON_ERRORS \
PARA_ERROR(WRITE_COMMON_SYNTAX, "syntax error in write option"), \
#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"), \
#define AACDEC_ERRORS \
PARA_ERROR(AACDEC_INIT, "failed to init aac decoder"), \
PARA_ERROR(AAC_DECODE, "aac decode error"), \
-/* these do not need error handling (yet) */
-#define SERVER_ERRORS
-#define WAV_ERRORS
-#define COMPRESS_ERRORS
-#define TIME_ERRORS
-#define CLOSE_ON_FORK_ERRORS
-#define DAEMON_ERRORS
-#define ORTP_SEND_ERRORS
-#define GUI_ERRORS
-#define RINGBUFFER_ERRORS
-
/**
* the subsystem shift
/**
* the subsystem shift
@@
-401,9
+427,9
@@
extern const char **para_errlist[];
/**
* determine the index of an error number
*
/**
* determine the index of an error number
*
- * Also easy: It's the lower 8 bits of num
- 1
.
+ * Also easy: It's the lower 8 bits of num.
*/
*/
-#define ERRNUM_TO_INDEX(num) (((1 << SS_SHIFT) - 1) & (
(num) - 1
))
+#define ERRNUM_TO_INDEX(num) (((1 << SS_SHIFT) - 1) & (
num
))
/**
* paraslash's version of strerror(3)
/**
* paraslash's version of strerror(3)
@@
-414,51
+440,58
@@
extern const char **para_errlist[];
/**
* define the error list for one subsystem
/**
* define the error list for one subsystem
- *
+ #
+ * The first entry (index 0) is always the name of the subsystem
* Used by macros in config.h (generated by configure)
*/
* Used by macros in config.h (generated by configure)
*/
-#define DEFINE_ERRLIST(ss) const char * ss ## _ERRLIST[] = {ss ## _ERRORS}
+#define DEFINE_ERRLIST(ss) const char * ss ## _ERRLIST[] = {
#ss,
ss ## _ERRORS}
/**
* activate errors for one subsystem.
*
/**
* activate errors for one subsystem.
*
- * Each executable needs only the error lists of those subssystems it is
actually
- *
linked with. We always reserve zeroed-out space for NUM_SS char ** pointers, but
- *
only init those of the needed subsystems. This macro is used by macros in config.h
- * (generated by configure).
+ * Each executable needs only the error lists of those subssystems it is
+ *
actually linked with. We always reserve space for NUM_SS char ** pointers,
+ *
but only init those of the needed subsystems. This macro is used by macros
+ *
in config.h
(generated by configure).
*/
#define PARA_ERRLIST(ss) [SS_ ## ss] = ss ## _ERRLIST
/**
*/
#define PARA_ERRLIST(ss) [SS_ ## ss] = ss ## _ERRLIST
/**
- * This is temporarily defined to expand to its
second
argument (prefixed by
+ * This is temporarily defined to expand to its
first
argument (prefixed by
* 'E_') and gets later redefined to expand to the error text only
*/
#define PARA_ERROR(err, msg) E_ ## err
* '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 */
/** \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(EXEC);
SS_ENUM(ORTP_RECV);
SS_ENUM(NET);
SS_ENUM(RECV);
SS_ENUM(AUDIOD);
SS_ENUM(EXEC);
-SS_ENUM(CLOSE_ON_FORK);
SS_ENUM(SIGNAL);
SS_ENUM(STRING);
SS_ENUM(DAEMON);
SS_ENUM(STAT);
SS_ENUM(SIGNAL);
SS_ENUM(STRING);
SS_ENUM(DAEMON);
SS_ENUM(STAT);
-SS_ENUM(TIME);
SS_ENUM(GRAB_CLIENT);
SS_ENUM(HTTP_RECV);
SS_ENUM(RECV_COMMON);
SS_ENUM(FILTER_CHAIN);
SS_ENUM(GRAB_CLIENT);
SS_ENUM(HTTP_RECV);
SS_ENUM(RECV_COMMON);
SS_ENUM(FILTER_CHAIN);
-SS_ENUM(WAV);
-SS_ENUM(COMPRESS);
SS_ENUM(OGGDEC);
SS_ENUM(MP3DEC);
SS_ENUM(AACDEC);
SS_ENUM(FILTER);
SS_ENUM(OGGDEC);
SS_ENUM(MP3DEC);
SS_ENUM(AACDEC);
SS_ENUM(FILTER);
-SS_ENUM(MP3);
-SS_ENUM(OGG);
+SS_ENUM(MP3
_AFH
);
+SS_ENUM(OGG
_AFH
);
SS_ENUM(AAC_AFH);
SS_ENUM(AAC_COMMON);
SS_ENUM(SERVER);
SS_ENUM(AAC_AFH);
SS_ENUM(AAC_COMMON);
SS_ENUM(SERVER);
@@
-476,7
+509,6
@@
SS_ENUM(DCCP);
SS_ENUM(DCCP_RECV);
SS_ENUM(DCCP_SEND);
SS_ENUM(FD);
SS_ENUM(DCCP_RECV);
SS_ENUM(DCCP_SEND);
SS_ENUM(FD);
-SS_ENUM(GUI);
SS_ENUM(WRITE);
SS_ENUM(WRITE_COMMON);
SS_ENUM(ALSA_WRITER);
SS_ENUM(WRITE);
SS_ENUM(WRITE_COMMON);
SS_ENUM(ALSA_WRITER);