← Back to branch summary

~ubuntu-branches/ubuntu/natty/plymouth/natty

« back to all changes in this revision

Viewing changes to debian/patches/upstream-event-loop-number.patch

  • Committer: Colin Watson
  • Date: 2011-03-24 08:49:26 UTC
  • Revision ID: cjwatson@canonical.com-20110324084926-64wbkl0r2wcuvdtk
https://launchpad.net/bugs/553745
* Backport from upstream:
  - [event-loop] Add reference count to event sources (with any luck, this
    will fix LP: #553745).
  - [event-loop] Handle more than 8 events at once.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/upstream-event-loop-number.patch
 
1
Origin: commit:26bc6f87c0507d0b457b23548094c475e00e75c9
 
2
Author: Tero Mononen <tmo@iki.fi>
 
3
Subject: [event-loop] Handle more than 8 events at once
 
4
 
 
5
epoll_wait was getting passed a pointer to 64 events,
 
6
but was only being told to use up to 8 of those events
 
7
at a time because it was using sizeof (pointer) for the
 
8
argument specifying the number of events instead of the
 
9
actual number of events.
 
10
 
 
11
Index: b/src/libply/ply-event-loop.c
 
12
===================================================================
 
13
--- a/src/libply/ply-event-loop.c
 
14
+++ b/src/libply/ply-event-loop.c
 
15
@@ -1274,7 +1274,8 @@
 
16
        }
 
17
 
 
18
      number_of_received_events = epoll_wait (loop->epoll_fd, events,
 
19
-                                             sizeof (events), timeout);
 
20
+                                             PLY_EVENT_LOOP_NUM_EVENT_HANDLERS,
 
21
+                                             timeout);
 
22
 
 
23
      ply_event_loop_handle_timeouts (loop);
 
24