mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-09 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

mainloop: don't initialize fields we don't have to

Browse source
This commit is contained in:
Lennart Poettering 2009-09-18 04:00:38 +02:00
parent a049909a70
commit b32f5994e9
1 changed files with 4 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/pulse/mainloop.c
View file

@ -172,17 +172,14 @@ static pa_io_event* mainloop_io_new(
m = a->userdata; m = a->userdata;
pa_assert(a == &m->api); pa_assert(a == &m->api);
e = pa_xnew(pa_io_event, 1); e = pa_xnew0(pa_io_event, 1);
e->mainloop = m; e->mainloop = m;
e->dead = FALSE;
e->fd = fd; e->fd = fd;
e->events = events; e->events = events;
e->pollfd = NULL;
e->callback = callback; e->callback = callback;
e->userdata = userdata; e->userdata = userdata;
e->destroy_callback = NULL;
#ifdef OS_IS_WIN32 #ifdef OS_IS_WIN32
{ {
@ -265,16 +262,14 @@ static pa_defer_event* mainloop_defer_new(
m = a->userdata; m = a->userdata;
pa_assert(a == &m->api); pa_assert(a == &m->api);
e = pa_xnew(pa_defer_event, 1); e = pa_xnew0(pa_defer_event, 1);
e->mainloop = m; e->mainloop = m;
e->dead = FALSE;
e->enabled = TRUE; e->enabled = TRUE;
m->n_enabled_defer_events++; m->n_enabled_defer_events++;
e->callback = callback; e->callback = callback;
e->userdata = userdata; e->userdata = userdata;
e->destroy_callback = NULL;
PA_LLIST_PREPEND(pa_defer_event, m->defer_events, e); PA_LLIST_PREPEND(pa_defer_event, m->defer_events, e);
@ -354,9 +349,8 @@ static pa_time_event* mainloop_time_new(
m = a->userdata; m = a->userdata;
pa_assert(a == &m->api); pa_assert(a == &m->api);
e = pa_xnew(pa_time_event, 1); e = pa_xnew0(pa_time_event, 1);
e->mainloop = m; e->mainloop = m;
e->dead = FALSE;
if ((e->enabled = (t != PA_USEC_INVALID))) { if ((e->enabled = (t != PA_USEC_INVALID))) {
e->time = t; e->time = t;
@ -373,7 +367,6 @@ static pa_time_event* mainloop_time_new(
e->callback = callback; e->callback = callback;
e->userdata = userdata; e->userdata = userdata;
e->destroy_callback = NULL;
PA_LLIST_PREPEND(pa_time_event, m->time_events, e); PA_LLIST_PREPEND(pa_time_event, m->time_events, e);
@ -478,9 +471,8 @@ pa_mainloop *pa_mainloop_new(void) {
pa_init_i18n(); pa_init_i18n();
m = pa_xnew(pa_mainloop, 1); m = pa_xnew0(pa_mainloop, 1);
m->wakeup_pipe_type = 0;
if (pipe(m->wakeup_pipe) < 0) { if (pipe(m->wakeup_pipe) < 0) {
pa_log_error("ERROR: cannot create wakeup pipe"); pa_log_error("ERROR: cannot create wakeup pipe");
pa_xfree(m); pa_xfree(m);
@ -491,32 +483,14 @@ pa_mainloop *pa_mainloop_new(void) {
pa_make_fd_nonblock(m->wakeup_pipe[1]); pa_make_fd_nonblock(m->wakeup_pipe[1]);
pa_make_fd_cloexec(m->wakeup_pipe[0]); pa_make_fd_cloexec(m->wakeup_pipe[0]);
pa_make_fd_cloexec(m->wakeup_pipe[1]); pa_make_fd_cloexec(m->wakeup_pipe[1]);
m->wakeup_requested = FALSE;
PA_LLIST_HEAD_INIT(pa_io_event, m->io_events);
PA_LLIST_HEAD_INIT(pa_time_event, m->time_events);
PA_LLIST_HEAD_INIT(pa_defer_event, m->defer_events);
m->n_enabled_defer_events = m->n_enabled_time_events = m->n_io_events = 0;
m->io_events_please_scan = m->time_events_please_scan = m->defer_events_please_scan = 0;
m->cached_next_time_event = NULL;
m->prepared_timeout = 0;
m->pollfds = NULL;
m->max_pollfds = m->n_pollfds = 0;
m->rebuild_pollfds = TRUE; m->rebuild_pollfds = TRUE;
m->quit = FALSE;
m->retval = 0;
m->api = vtable; m->api = vtable;
m->api.userdata = m; m->api.userdata = m;
m->state = STATE_PASSIVE; m->state = STATE_PASSIVE;
m->poll_func = NULL;
m->poll_func_userdata = NULL;
m->poll_func_ret = -1; m->poll_func_ret = -1;
return m; return m;