diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-12 09:18:04 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-12 09:18:04 +0200 |
commit | 21b7f7e603639fa8f354c954b0e467abb72b6c12 (patch) | |
tree | d248c1ac41b07a37f8423a01efe613d66c5ef23f /action.h | |
parent | 1e4f374d7d087fac8fbe807545ea1ed3f44c80e1 (diff) | |
parent | d1985c4a65feb5caaea855517431ed564a13ed4c (diff) | |
download | rsyslog-21b7f7e603639fa8f354c954b0e467abb72b6c12.tar.gz rsyslog-21b7f7e603639fa8f354c954b0e467abb72b6c12.tar.xz rsyslog-21b7f7e603639fa8f354c954b0e467abb72b6c12.zip |
Merge branch 'master' into multi-dequeue
Conflicts:
runtime/rsyslog.h
Diffstat (limited to 'action.h')
-rw-r--r-- | action.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -83,6 +83,7 @@ struct action_s { */ qqueue_t *pQueue; /* action queue */ SYNC_OBJ_TOOL; /* required for mutex support */ + uchar *pszName; /* action name (for documentation) */ pthread_mutex_t mutActExec; /* mutex to guard actual execution of doAction for single-threaded modules */ }; typedef struct action_s action_t; |