Attachment #400372 for bug #545306

View | Details | Raw Unified | Return to bug 545306
Collapse All | Expand All

Lines 732-738 Link Here

(-)third-party/folly/src/folly/io/async.orig/EventBase.cpp (-1 / +1 lines)
732	event_base_set(getLibeventBase(), ev);	732	event_base_set(getLibeventBase(), ev);
733	if (internal == AsyncTimeout::InternalEnum::INTERNAL) {	733	if (internal == AsyncTimeout::InternalEnum::INTERNAL) {
734	// Set the EVLIST_INTERNAL flag	734	// Set the EVLIST_INTERNAL flag
735	ev->ev_flags \|= EVLIST_INTERNAL;	735	ev->ev_evcallback.evcb_flags \|= EVLIST_INTERNAL;
736	}	736	}
737	}	737	}
738		738




    // If the new events are the same are the same as the already registered
    // flags, we don't have to do anything.  Just return.
    if (events == event_.ev_events &&
        static_cast<bool>(event_.ev_evcallback.evcb_flags & EVLIST_INTERNAL) == internal) {
      return true;
    }



  // Set EVLIST_INTERNAL if this is an internal event
  if (internal) {
    event_.ev_evcallback.evcb_flags |= EVLIST_INTERNAL;
  }

  // Add the event.

}

bool EventHandler::isPending() const {
  if (event_.ev_evcallback.evcb_flags & EVLIST_ACTIVE) {
    if (event_.ev_res & EV_READ) {
      return true;
    }

Lines 35-41 Link Here

(-)third-party/folly/src/folly/io/async.orig/EventUtil.h (-1 / +1 lines)
35	EVLIST_REGISTERED = (EVLIST_INSERTED \| EVLIST_ACTIVE \|	35	EVLIST_REGISTERED = (EVLIST_INSERTED \| EVLIST_ACTIVE \|
36	EVLIST_TIMEOUT \| EVLIST_SIGNAL)	36	EVLIST_TIMEOUT \| EVLIST_SIGNAL)
37	};	37	};
38	return (ev->ev_flags & EVLIST_REGISTERED);	38	return (ev->ev_evcallback.evcb_flags & EVLIST_REGISTERED);
39	}	39	}
40	};	40	};

Return to bug 545306

Lines 50-56 Link Here

(-)third-party/folly/src/folly/io/async.orig/EventHandler.cpp (-3 / +3 lines)
50	// If the new events are the same are the same as the already registered	50	// If the new events are the same are the same as the already registered
51	// flags, we don't have to do anything. Just return.	51	// flags, we don't have to do anything. Just return.
52	if (events == event_.ev_events &&	52	if (events == event_.ev_events &&
53	static_cast<bool>(event_.ev_flags & EVLIST_INTERNAL) == internal) {	53	static_cast<bool>(event_.ev_evcallback.evcb_flags & EVLIST_INTERNAL) == internal) {
54	return true;	54	return true;
55	}	55	}
56		56
Lines 67-73 Link Here
67		67
68	// Set EVLIST_INTERNAL if this is an internal event	68	// Set EVLIST_INTERNAL if this is an internal event
69	if (internal) {	69	if (internal) {
70	event_.ev_flags \|= EVLIST_INTERNAL;	70	event_.ev_evcallback.evcb_flags \|= EVLIST_INTERNAL;
71	}	71	}
72		72
73	// Add the event.	73	// Add the event.
Lines 159-165 Link Here
159	}	159	}
160		160
161	bool EventHandler::isPending() const {	161	bool EventHandler::isPending() const {
162	if (event_.ev_flags & EVLIST_ACTIVE) {	162	if (event_.ev_evcallback.evcb_flags & EVLIST_ACTIVE) {
163	if (event_.ev_res & EV_READ) {	163	if (event_.ev_res & EV_READ) {
164	return true;	164	return true;
165	}	165	}