torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Raise libevent dependency to 2.0.10-stable or newer

Browse Source 
Only some very ancient distributions don't ship with Libevent 2 anymore,
even the oldest supported Ubuntu LTS version has it. This allows us to
get rid of a lot of compat code.
This commit is contained in:
Sebastian Hahn
2016-07-03 19:42:36 +02:00
parent ec6ea66240
commit 265e40b481
26 changed files with 31 additions and 4383 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test-timers.c
-4
View File
@@ -7,11 +7,7 @@
#include <stdio.h>
#include <string.h>
#ifdef HAVE_EVENT2_EVENT_H
#include <event2/event.h>
#else
#include <event.h>
#endif
#include "compat.h"
#include "compat_libevent.h"
src/test/test_compat_libevent.c
+1 -101
View File
@@ -9,15 +9,11 @@
#include "compat_libevent.h"
#ifdef HAVE_EVENT2_EVENT_H
#include <event2/event.h>
#include <event2/thread.h>
#ifdef USE_BUFFEREVENTS
#include <event2/bufferevent.h>
#endif
#else
#include <event.h>
#endif
#include "log_test_helpers.h"
@@ -106,98 +102,6 @@ test_compat_libevent_logging_callback(void *ignored)
teardown_capture_of_logs(previous_log);
}
static void
test_compat_libevent_le_versions_compatibility(void *ignored)
{
(void)ignored;
int res;
res = le_versions_compatibility(LE_OTHER);
tt_int_op(res, OP_EQ, 0);
res = le_versions_compatibility(V_OLD(0,9,'c'));
tt_int_op(res, OP_EQ, 1);
res = le_versions_compatibility(V(1,3,98));
tt_int_op(res, OP_EQ, 2);
res = le_versions_compatibility(V(1,4,98));
tt_int_op(res, OP_EQ, 3);
res = le_versions_compatibility(V(1,5,0));
tt_int_op(res, OP_EQ, 4);
res = le_versions_compatibility(V(2,0,0));
tt_int_op(res, OP_EQ, 4);
res = le_versions_compatibility(V(2,0,2));
tt_int_op(res, OP_EQ, 5);
done:
(void)0;
}
static void
test_compat_libevent_tor_decode_libevent_version(void *ignored)
{
(void)ignored;
le_version_t res;
res = tor_decode_libevent_version("SOMETHING WRONG");
tt_int_op(res, OP_EQ, LE_OTHER);
res = tor_decode_libevent_version("1.4.11");
tt_int_op(res, OP_EQ, V(1,4,11));
res = tor_decode_libevent_version("1.4.12b-stable");
tt_int_op(res, OP_EQ, V(1,4,12));
res = tor_decode_libevent_version("1.4.17b_stable");
tt_int_op(res, OP_EQ, V(1,4,17));
res = tor_decode_libevent_version("1.4.12!stable");
tt_int_op(res, OP_EQ, LE_OTHER);
res = tor_decode_libevent_version("1.4.12b!stable");
tt_int_op(res, OP_EQ, LE_OTHER);
res = tor_decode_libevent_version("1.4.13-");
tt_int_op(res, OP_EQ, V(1,4,13));
res = tor_decode_libevent_version("1.4.14_");
tt_int_op(res, OP_EQ, V(1,4,14));
res = tor_decode_libevent_version("1.4.15c-");
tt_int_op(res, OP_EQ, V(1,4,15));
res = tor_decode_libevent_version("1.4.16c_");
tt_int_op(res, OP_EQ, V(1,4,16));
res = tor_decode_libevent_version("1.4.17-s");
tt_int_op(res, OP_EQ, V(1,4,17));
res = tor_decode_libevent_version("1.5");
tt_int_op(res, OP_EQ, V(1,5,0));
res = tor_decode_libevent_version("1.2");
tt_int_op(res, OP_EQ, V(1,2,0));
res = tor_decode_libevent_version("1.2-");
tt_int_op(res, OP_EQ, LE_OTHER);
res = tor_decode_libevent_version("1.6e");
tt_int_op(res, OP_EQ, V_OLD(1,6,'e'));
done:
(void)0;
}
#if defined(LIBEVENT_VERSION)
#define HEADER_VERSION LIBEVENT_VERSION
#elif defined(_EVENT_VERSION)
#define HEADER_VERSION _EVENT_VERSION
#endif
static void
test_compat_libevent_header_version(void *ignored)
{
@@ -205,7 +109,7 @@ test_compat_libevent_header_version(void *ignored)
const char *res;
res = tor_libevent_get_header_version_str();
tt_str_op(res, OP_EQ, HEADER_VERSION);
tt_str_op(res, OP_EQ, LIBEVENT_VERSION);
done:
(void)0;
@@ -214,10 +118,6 @@ test_compat_libevent_header_version(void *ignored)
struct testcase_t compat_libevent_tests[] = {
{ "logging_callback", test_compat_libevent_logging_callback,
TT_FORK, NULL, NULL },
{ "le_versions_compatibility",
test_compat_libevent_le_versions_compatibility, 0, NULL, NULL },
{ "tor_decode_libevent_version",
test_compat_libevent_tor_decode_libevent_version, 0, NULL, NULL },
{ "header_version", test_compat_libevent_header_version, 0, NULL, NULL },
END_OF_TESTCASES
};
src/test/test_scheduler.c
-11
View File
@@ -5,12 +5,7 @@
#include "orconfig.h"
/* Libevent stuff */
#ifdef HAVE_EVENT2_EVENT_H
#include <event2/event.h>
#else
#include <event.h>
#endif
#define TOR_CHANNEL_INTERNAL_
#define CHANNEL_PRIVATE_
@@ -90,9 +85,7 @@ mock_event_free_all(void)
static void
mock_event_init(void)
{
#ifdef HAVE_EVENT2_EVENT_H
struct event_config *cfg = NULL;
#endif
tt_ptr_op(mock_event_base, ==, NULL);
@@ -102,7 +95,6 @@ mock_event_init(void)
*/
if (!mock_event_base) {
#ifdef HAVE_EVENT2_EVENT_H
cfg = event_config_new();
#if LIBEVENT_VERSION_NUMBER >= V(2,0,9)
/* We can enable changelist support with epoll, since we don't give
@@ -111,9 +103,6 @@ mock_event_init(void)
#endif
mock_event_base = event_base_new_with_config(cfg);
event_config_free(cfg);
#else
mock_event_base = event_init();
#endif
}
tt_assert(mock_event_base != NULL);
src/test/test_workqueue.c
-4
View File
@@ -12,11 +12,7 @@
#include "compat_libevent.h"
#include <stdio.h>
#ifdef HAVE_EVENT2_EVENT_H
#include <event2/event.h>
#else
#include <event.h>
#endif
#define MAX_INFLIGHT (1<<16)