2017

[folly.git] / folly / io / async / EventUtil.h

diff --git a/folly/io/async/EventUtil.h b/folly/io/async/EventUtil.h
index 116cf4c5cf8918776b08d101341b66b7cf00bfc8..86de9fa9f76fdb44495b7d85fdb3c4acd27a2908 100644 (file)
--- a/folly/io/async/EventUtil.h
+++ b/folly/io/async/EventUtil.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Facebook, Inc.
+ * Copyright 2017 Facebook, Inc.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements. See the NOTICE file
@@ -20,10 +20,30 @@
  */
 #pragma once
 
+#include <functional>
 #include <event.h>  // libevent
 
 namespace folly {
 
+# if LIBEVENT_VERSION_NUMBER <= 0x02010101
+#   define FOLLY_LIBEVENT_COMPAT_PLUCK(name) ev_##name
+# else
+#   define FOLLY_LIBEVENT_COMPAT_PLUCK(name) ev_evcallback.evcb_##name
+# endif
+# define FOLLY_LIBEVENT_DEF_ACCESSORS(name) \
+    inline auto event_ref_##name(struct event* ev) -> \
+      decltype(std::ref(ev->FOLLY_LIBEVENT_COMPAT_PLUCK(name))) \
+      { return std::ref(ev->FOLLY_LIBEVENT_COMPAT_PLUCK(name)); } \
+    inline auto event_ref_##name(struct event const* ev) -> \
+      decltype(std::cref(ev->FOLLY_LIBEVENT_COMPAT_PLUCK(name))) \
+      { return std::cref(ev->FOLLY_LIBEVENT_COMPAT_PLUCK(name)); } \
+    //
+
+FOLLY_LIBEVENT_DEF_ACCESSORS(flags)
+
+# undef FOLLY_LIBEVENT_COMPAT_PLUCK
+# undef FOLLY_LIBEVENT_DEF_ACCESSORS
+
 /**
  * low-level libevent utility functions
  */
@@ -35,7 +55,7 @@ class EventUtil {
       EVLIST_REGISTERED = (EVLIST_INSERTED | EVLIST_ACTIVE |
                            EVLIST_TIMEOUT | EVLIST_SIGNAL)
     };
-    return (ev->ev_flags & EVLIST_REGISTERED);
+    return (event_ref_flags(ev) & EVLIST_REGISTERED);
   }
 };