From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 8 Sep 2010 18:12:12 +0000 (-0400)
Subject: Merge remote branch 'chrisd/iocp-fixes4'
X-Git-Tag: release-2.0.7-rc~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3658b1696df8784b156cc6643a36f7cfa69e0213;p=libevent

Merge remote branch 'chrisd/iocp-fixes4'

Conflicts:
	test/regress_thread.c
---

3658b1696df8784b156cc6643a36f7cfa69e0213
diff --cc test/regress_thread.c
index 88b0e167,675e350e..7401f362
--- a/test/regress_thread.c
+++ b/test/regress_thread.c
@@@ -51,7 -49,7 +54,8 @@@
  #include "event2/event_struct.h"
  #include "event2/thread.h"
  #include "evthread-internal.h"
 +#include "event-internal.h"
+ #include "defer-internal.h"
  #include "regress.h"
  #include "tinytest_macros.h"
  
@@@ -386,18 -316,102 +390,108 @@@ end
  	;
  }
  
+ #define CB_COUNT 128
+ #define QUEUE_THREAD_COUNT 8
+ 
+ #ifdef WIN32
+ #define SLEEP_MS(ms) Sleep(ms)
+ #else
+ #define SLEEP_MS(ms) usleep((ms) * 1000)
+ #endif
+ 
+ struct deferred_test_data {
+ 	struct deferred_cb cbs[CB_COUNT];
+ 	struct deferred_cb_queue *queue;
+ };
+ 
+ static time_t timer_start = 0;
+ static time_t timer_end = 0;
+ static unsigned callback_count = 0;
+ static THREAD_T load_threads[QUEUE_THREAD_COUNT];
+ static struct deferred_test_data deferred_data[QUEUE_THREAD_COUNT];
+ 
+ static void
+ deferred_callback(struct deferred_cb *cb, void *arg)
+ {
+ 	SLEEP_MS(1);
+ 	callback_count += 1;
+ }
+ 
+ static THREAD_FN
+ load_deferred_queue(void *arg)
+ {
+ 	struct deferred_test_data *data = arg;
+ 	size_t i;
+ 
+ 	for (i = 0; i < CB_COUNT; ++i) {
+ 		event_deferred_cb_init(&data->cbs[i], deferred_callback, NULL);
+ 		event_deferred_cb_schedule(data->queue, &data->cbs[i]);
+ 		SLEEP_MS(1);
+ 	}
+ 
+ 	THREAD_RETURN();
+ }
+ 
+ static void
+ timer_callback(evutil_socket_t fd, short what, void *arg)
+ {
+ 	timer_end = time(NULL);
+ }
+ 
+ static void
+ start_threads_callback(evutil_socket_t fd, short what, void *arg)
+ {
+ 	int i;
+ 
+ 	for (i = 0; i < QUEUE_THREAD_COUNT; ++i) {
+ 		THREAD_START(load_threads[i], load_deferred_queue,
+ 				&deferred_data[i]);
+ 	}
+ }
+ 
+ static void
+ thread_deferred_cb_skew(void *arg)
+ {
+ 	struct basic_test_data *data = arg;
+ 	struct timeval tv_timer = {4, 0};
+ 	struct event event_threads;
+ 	struct deferred_cb_queue *queue;
+ 	int i;
+ 
+ 	queue = event_base_get_deferred_cb_queue(data->base);
+ 	tt_assert(queue);
+ 
+ 	for (i = 0; i < QUEUE_THREAD_COUNT; ++i)
+ 		deferred_data[i].queue = queue;
+ 
+ 	timer_start = time(NULL);
+ 	event_base_once(data->base, -1, EV_TIMEOUT, timer_callback, NULL,
+ 			&tv_timer);
+ 	event_base_once(data->base, -1, EV_TIMEOUT, start_threads_callback,
+ 			NULL, NULL);
+ 	event_base_dispatch(data->base);
+ 
+ 	TT_BLATHER(("callback count, %u", callback_count));
+ 	tt_int_op(timer_end - timer_start, ==, 4);
+ 
+ end:
+ 	for (i = 0; i < QUEUE_THREAD_COUNT; ++i)
+ 		THREAD_JOIN(load_threads[i]);
+ }
+ 
  #define TEST(name)							\
 -	    { #name, thread_##name, TT_FORK|TT_NEED_THREADS|TT_NEED_BASE, \
 -	      &basic_setup, NULL }
 +	{ #name, thread_##name, TT_FORK|TT_NEED_THREADS|TT_NEED_BASE,	\
 +	  &basic_setup, NULL }
 +
  struct testcase_t thread_testcases[] = {
 -	TEST(basic),
 +	{ "basic", thread_basic, TT_FORK|TT_NEED_THREADS|TT_NEED_BASE,
 +	  &basic_setup, NULL },
 +#ifndef WIN32
 +	{ "forking", thread_basic, TT_FORK|TT_NEED_THREADS|TT_NEED_BASE,
 +	  &basic_setup, (char*)"forking" },
 +#endif
  	TEST(conditions_simple),
+ 	TEST(deferred_cb_skew),
  	END_OF_TESTCASES
  };