You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2013/05/21 19:33:59 UTC
[1/2] git commit: Upgraded libev to 4.15.
Updated Branches:
refs/heads/master 0d80df85d -> c6b980a46
Upgraded libev to 4.15.
Review: https://reviews.apache.org/r/11289
Project: http://git-wip-us.apache.org/repos/asf/incubator-mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mesos/commit/9ba66dc3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mesos/tree/9ba66dc3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mesos/diff/9ba66dc3
Branch: refs/heads/master
Commit: 9ba66dc3fc488ef786c21f97698150535b33d0d6
Parents: 0d80df8
Author: Vinod Kone <vi...@twitter.com>
Authored: Mon May 20 18:47:12 2013 -0700
Committer: Vinod Kone <vi...@twitter.com>
Committed: Mon May 20 23:42:27 2013 -0700
----------------------------------------------------------------------
third_party/libprocess/src/encoder.hpp | 8 +++-
third_party/libprocess/third_party/Makefile.am | 2 +-
third_party/libprocess/third_party/libev-3.8.patch | 29 ---------------
.../libprocess/third_party/libev-3.8.tar.gz | Bin 470250 -> 0 bytes
.../libprocess/third_party/libev-4.15.patch | 11 ++++++
.../libprocess/third_party/libev-4.15.tar.gz | Bin 0 -> 513919 bytes
third_party/libprocess/third_party/versions.am | 2 +-
7 files changed, 19 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/9ba66dc3/third_party/libprocess/src/encoder.hpp
----------------------------------------------------------------------
diff --git a/third_party/libprocess/src/encoder.hpp b/third_party/libprocess/src/encoder.hpp
index ec5e271..55aba22 100644
--- a/third_party/libprocess/src/encoder.hpp
+++ b/third_party/libprocess/src/encoder.hpp
@@ -1,8 +1,6 @@
#ifndef __ENCODER_HPP__
#define __ENCODER_HPP__
-#include <ev.h>
-
#include <map>
#include <sstream>
@@ -15,6 +13,12 @@
#include <stout/numify.hpp>
#include <stout/os.hpp>
+// NOTE: We forward declare "ev_loop" and "ev_io" here because,
+// on OSX, including "ev.h" causes conflict with "EV_ERROR" declared
+// in "/usr/include/sys/event.h".
+struct ev_loop;
+struct ev_io;
+
namespace process {
const uint32_t GZIP_MINIMUM_BODY_LENGTH = 1024;
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/9ba66dc3/third_party/libprocess/third_party/Makefile.am
----------------------------------------------------------------------
diff --git a/third_party/libprocess/third_party/Makefile.am b/third_party/libprocess/third_party/Makefile.am
index b846173..812b7c3 100644
--- a/third_party/libprocess/third_party/Makefile.am
+++ b/third_party/libprocess/third_party/Makefile.am
@@ -33,7 +33,7 @@ EXTRA_DIST = \
$(GMOCK).tar.gz \
$(GPERFTOOLS).tar.gz \
$(LIBEV).tar.gz \
- libev-3.8.patch \
+ $(LIBEV).patch \
$(PROTOBUF).tar.gz \
$(RY_HTTP_PARSER).tar.gz
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/9ba66dc3/third_party/libprocess/third_party/libev-3.8.patch
----------------------------------------------------------------------
diff --git a/third_party/libprocess/third_party/libev-3.8.patch b/third_party/libprocess/third_party/libev-3.8.patch
deleted file mode 100644
index 8f7ac91..0000000
--- a/third_party/libprocess/third_party/libev-3.8.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -rupN libev-3.8/ev.c libev-3.8-patched/ev.c
---- libev-3.8/ev.c 2009-07-29 02:36:02.000000000 -0700
-+++ libev-3.8-patched/ev.c 2012-02-21 09:43:18.000000000 -0800
-@@ -1894,10 +1894,10 @@ ev_default_loop (unsigned int flags)
- if (ev_backend (EV_A))
- {
- #ifndef _WIN32
-- ev_signal_init (&childev, childcb, SIGCHLD);
-- ev_set_priority (&childev, EV_MAXPRI);
-- ev_signal_start (EV_A_ &childev);
-- ev_unref (EV_A); /* child watcher should not keep loop alive */
-+/* ev_signal_init (&childev, childcb, SIGCHLD); */
-+/* ev_set_priority (&childev, EV_MAXPRI); */
-+/* ev_signal_start (EV_A_ &childev); */
-+/* ev_unref (EV_A); /\* child watcher should not keep loop alive *\/ */
- #endif
- }
- else
-@@ -1917,8 +1917,8 @@ ev_default_destroy (void)
- ev_default_loop_ptr = 0;
-
- #ifndef _WIN32
-- ev_ref (EV_A); /* child watcher */
-- ev_signal_stop (EV_A_ &childev);
-+/* ev_ref (EV_A); /\* child watcher *\/ */
-+/* ev_signal_stop (EV_A_ &childev); */
- #endif
-
- loop_destroy (EV_A);
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/9ba66dc3/third_party/libprocess/third_party/libev-3.8.tar.gz
----------------------------------------------------------------------
diff --git a/third_party/libprocess/third_party/libev-3.8.tar.gz b/third_party/libprocess/third_party/libev-3.8.tar.gz
deleted file mode 100644
index 6db7e88..0000000
Binary files a/third_party/libprocess/third_party/libev-3.8.tar.gz and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/9ba66dc3/third_party/libprocess/third_party/libev-4.15.patch
----------------------------------------------------------------------
diff --git a/third_party/libprocess/third_party/libev-4.15.patch b/third_party/libprocess/third_party/libev-4.15.patch
new file mode 100644
index 0000000..2b94532
--- /dev/null
+++ b/third_party/libprocess/third_party/libev-4.15.patch
@@ -0,0 +1,11 @@
+diff -rupN libev-4.15/ev.h libev-4.15-patched/ev.h
+--- libev-4.15/ev.h 2013-03-01 03:05:29.000000000 -0800
++++ libev-4.15-patched/ev.h 2013-05-20 16:01:47.000000000 -0700
+@@ -121,7 +121,7 @@ EV_CPP(extern "C" {)
+ # ifdef _WIN32
+ # define EV_CHILD_ENABLE 0
+ # else
+-# define EV_CHILD_ENABLE EV_FEATURE_WATCHERS
++# define EV_CHILD_ENABLE 0
+ #endif
+ #endif
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/9ba66dc3/third_party/libprocess/third_party/libev-4.15.tar.gz
----------------------------------------------------------------------
diff --git a/third_party/libprocess/third_party/libev-4.15.tar.gz b/third_party/libprocess/third_party/libev-4.15.tar.gz
new file mode 100644
index 0000000..4c282b5
Binary files /dev/null and b/third_party/libprocess/third_party/libev-4.15.tar.gz differ
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/9ba66dc3/third_party/libprocess/third_party/versions.am
----------------------------------------------------------------------
diff --git a/third_party/libprocess/third_party/versions.am b/third_party/libprocess/third_party/versions.am
index b3a766a..9b6a829 100644
--- a/third_party/libprocess/third_party/versions.am
+++ b/third_party/libprocess/third_party/versions.am
@@ -6,6 +6,6 @@ BOOST_VERSION = 1.53.0
GLOG_VERSION = 0.3.1
GMOCK_VERSION = 1.6.0
GPERFTOOLS_VERSION = 2.0
-LIBEV_VERSION = 3.8
+LIBEV_VERSION = 4.15
PROTOBUF_VERSION = 2.4.1
RY_HTTP_PARSER_VERSION = 1c3624a
[2/2] git commit: Fixed python setup.py to use libev-4.15.
Posted by vi...@apache.org.
Fixed python setup.py to use libev-4.15.
Review: https://reviews.apache.org/r/11290
Project: http://git-wip-us.apache.org/repos/asf/incubator-mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mesos/commit/c6b980a4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mesos/tree/c6b980a4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mesos/diff/c6b980a4
Branch: refs/heads/master
Commit: c6b980a468508c002aa758567d762348ee8e93c5
Parents: 9ba66dc
Author: Vinod Kone <vi...@twitter.com>
Authored: Mon May 20 18:47:32 2013 -0700
Committer: Vinod Kone <vi...@twitter.com>
Committed: Mon May 20 23:42:29 2013 -0700
----------------------------------------------------------------------
src/python/setup.py.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/c6b980a4/src/python/setup.py.in
----------------------------------------------------------------------
diff --git a/src/python/setup.py.in b/src/python/setup.py.in
index 5232d4c..0083f23 100644
--- a/src/python/setup.py.in
+++ b/src/python/setup.py.in
@@ -30,7 +30,7 @@ libprocess = os.path.join('third_party', 'libprocess')
# include them here (or more precisely, down where we actually include
# libev.a and libprofiler.a).
glog = os.path.join(libprocess, 'third_party', 'glog-0.3.1')
-libev = os.path.join(libprocess, 'third_party', 'libev-3.8')
+libev = os.path.join(libprocess, 'third_party', 'libev-4.15')
gperftools = os.path.join(libprocess, 'third_party', 'gperftools-2.0')
protobuf = os.path.join(libprocess, 'third_party', 'protobuf-2.4.1')