diff options
author | Eric Wong <normalperson@yhbt.net> | 2008-10-04 21:00:47 -0700 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2008-10-04 21:00:52 -0700 |
commit | 3e0c1bcf6237f42506cd0d74046e74a70fff0cb7 (patch) | |
tree | 29340c40beff08df42d8a05a296172959dacec7d /src/main_notify.c | |
parent | 662b6bc9d75d879e52456f680fb1c4fdd0053996 (diff) | |
parent | 18ba438d902c801c5f1a6a37d43c87a779e06a84 (diff) | |
download | mpd-3e0c1bcf6237f42506cd0d74046e74a70fff0cb7.tar.gz mpd-3e0c1bcf6237f42506cd0d74046e74a70fff0cb7.tar.xz mpd-3e0c1bcf6237f42506cd0d74046e74a70fff0cb7.zip |
Merge commit 'box/directory' into ew/song-locks
* commit 'box/directory':
command: get rid of specialized list handlers
directory: simplify list update handling logic
main_notify: define main_task so we can use it for assertions
directory: streamline deletes
Conflicts:
src/command.c
Diffstat (limited to 'src/main_notify.c')
-rw-r--r-- | src/main_notify.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main_notify.c b/src/main_notify.c index 2c546633d..04ceac62d 100644 --- a/src/main_notify.c +++ b/src/main_notify.c @@ -24,6 +24,8 @@ #include "gcc.h" #include "log.h" +pthread_t main_task; + static struct ioOps main_notify_IO; static int main_pipe[2]; @@ -55,6 +57,7 @@ static int ioops_consume(int fd_count, fd_set * rfds, void init_main_notify(void) { + main_task = pthread_self(); init_async_pipe(main_pipe); main_notify_IO.fdset = ioops_fdset; main_notify_IO.consume = ioops_consume; |