diff --git a/CMakeLists.txt b/CMakeLists.txt index e7be197..003f313 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.2) +cmake_minimum_required(VERSION 3.5) # The directory label is used for CDash to treat EVPath as a subproject of # GTKorvo diff --git a/cm.c b/cm.c index 82dde06..e1bb4fd 100644 --- a/cm.c +++ b/cm.c @@ -17,6 +17,7 @@ #include #include #ifdef HAVE_WINDOWS_H +#define FD_SETSIZE 1024 #include #define __ANSI_CPP__ #else diff --git a/cm_evol.c b/cm_evol.c index bd661ea..dc62cdd 100644 --- a/cm_evol.c +++ b/cm_evol.c @@ -11,6 +11,7 @@ #endif #include #ifdef HAVE_WINDOWS_H +#define FD_SETSIZE 1024 #include #define __ANSI_CPP__ #else diff --git a/cm_pbio.c b/cm_pbio.c index 9e41a5d..84aedbc 100644 --- a/cm_pbio.c +++ b/cm_pbio.c @@ -8,6 +8,7 @@ #endif #include #ifdef HAVE_WINDOWS_H +#define FD_SETSIZE 1024 #include #else #include diff --git a/cm_perf.c b/cm_perf.c index a1328f0..30bce15 100644 --- a/cm_perf.c +++ b/cm_perf.c @@ -12,6 +12,7 @@ #endif #include #ifdef HAVE_WINDOWS_H +#define FD_SETSIZE 1024 #include #define __ANSI_CPP__ #else diff --git a/cm_schedule.h b/cm_schedule.h index 32ed8bb..8b2132b 100644 --- a/cm_schedule.h +++ b/cm_schedule.h @@ -8,6 +8,7 @@ extern "C" { #endif #ifdef _MSC_VER +#define FD_SETSIZE 1024 #include #endif typedef struct _avail_period { diff --git a/cmenet.c b/cmenet.c index 3e04e45..eeac56f 100644 --- a/cmenet.c +++ b/cmenet.c @@ -6,6 +6,7 @@ #undef NDEBUG #ifdef HAVE_WINDOWS_H +#define FD_SETSIZE 1024 #include #include #include diff --git a/cmepoll.c b/cmepoll.c index 57951c1..b28fca2 100644 --- a/cmepoll.c +++ b/cmepoll.c @@ -3,6 +3,7 @@ #include #ifdef HAVE_WINDOWS_H +#define FD_SETSIZE 1024 #include #include #include diff --git a/cmib.c b/cmib.c index 0100083..6cfd7c8 100644 --- a/cmib.c +++ b/cmib.c @@ -3,6 +3,7 @@ #include #ifdef HAVE_WINDOWS_H +#define FD_SETSIZE 1024 #include #include #define getpid() _getpid() diff --git a/cmmulticast.c b/cmmulticast.c index 82fdec1..03acd64 100644 --- a/cmmulticast.c +++ b/cmmulticast.c @@ -3,6 +3,7 @@ #include #ifdef HAVE_WINDOWS_H +#define FD_SETSIZE 1024 #include #include #include diff --git a/cmselect.c b/cmselect.c index 36a6a62..baf9409 100644 --- a/cmselect.c +++ b/cmselect.c @@ -3,6 +3,7 @@ #include #ifdef HAVE_WINDOWS_H +#define FD_SETSIZE 1024 #include #include #include @@ -121,8 +122,8 @@ typedef struct select_data { int closed; CManager cm; int select_consistency_number; - int wake_read_fd; - int wake_write_fd; + SOCKET wake_read_fd; + SOCKET wake_write_fd; } *select_data_ptr; static void wake_server_thread(select_data_ptr socket_data); @@ -879,8 +880,7 @@ int err; */ int -pipe(filedes) -SOCKET filedes[2]; +pipe(SOCKET *filedes) { int length; @@ -970,7 +970,7 @@ SOCKET filedes[2]; static void setup_wake_mechanism(CMtrans_services svc, select_data_ptr *sdp) { - int filedes[2]; + SOCKET filedes[2]; select_data_ptr sd = *((select_data_ptr *)sdp); if (sd->cm) { @@ -978,7 +978,7 @@ setup_wake_mechanism(CMtrans_services svc, select_data_ptr *sdp) assert(CM_LOCKED(svc, sd->cm)); } if (sd->wake_read_fd != -1) return; - if (pipe(filedes) != 0) { + if (pipe(&filedes[0]) != 0) { perror("Pipe for wake not created. Wake mechanism inoperative."); return; } @@ -986,7 +986,7 @@ setup_wake_mechanism(CMtrans_services svc, select_data_ptr *sdp) sd->wake_write_fd = filedes[1]; svc->verbose(sd->cm, CMSelectVerbose, "CMSelect Adding read_wake_fd as action on fd %d", sd->wake_read_fd); - libcmselect_LTX_add_select(svc, sdp, sd->wake_read_fd, read_wake_fd, + libcmselect_LTX_add_select(svc, sdp, (int)sd->wake_read_fd, read_wake_fd, (void*)(intptr_t)sd->wake_read_fd, NULL); } diff --git a/cmsockets.c b/cmsockets.c index 26d83b8..a4bfb79 100644 --- a/cmsockets.c +++ b/cmsockets.c @@ -3,6 +3,7 @@ #include #ifdef HAVE_WINDOWS_H +#define FD_SETSIZE 1024 #include #include #include @@ -782,7 +783,7 @@ libcmsockets_LTX_non_blocking_listen(CManager cm, CMtrans_services svc, transpor return NULL; } sd->listen_fds = realloc(sd->listen_fds, - sizeof(int)*(sd->listen_count+1)); + sizeof(SOCKET)*(sd->listen_count+1)); sd->listen_ports = realloc(sd->listen_ports, sizeof(int)*(sd->listen_count+1)); sd->listen_fds[sd->listen_count] = conn_sock; @@ -973,12 +974,10 @@ int iovcnt; { ssize_t wrote = 0; int i; - printf("tmp Writev iovcnt %d\n", iovcnt); for (i = 0; i < iovcnt; i++) { size_t left = iov[i].iov_len; ssize_t iget = 0; - printf("Writing block[%d] of len %zu, startig at %p\n", i, left, iov[i].iov_base); while (left > 0) { errno = 0; size_t this_write = left; @@ -1208,7 +1207,7 @@ libcmsockets_LTX_initialize(CManager cm, CMtrans_services svc, transport_entry t socket_data->svc = svc; socket_data->characteristics = create_attr_list(); socket_data->listen_count = 0; - socket_data->listen_fds = malloc(sizeof(int)); + socket_data->listen_fds = malloc(sizeof(SOCKET)); socket_data->listen_ports = malloc(sizeof(int)); add_int_attr(socket_data->characteristics, CM_TRANSPORT_RELIABLE, 1); svc->add_shutdown_task(cm, free_socket_data, (void *) socket_data, FREE_TASK); diff --git a/cmudp.c b/cmudp.c index bcde47a..d865034 100644 --- a/cmudp.c +++ b/cmudp.c @@ -3,6 +3,7 @@ #include #ifdef HAVE_WINDOWS_H +#define FD_SETSIZE 1024 #include #include #define getpid() _getpid() diff --git a/ip_config.c b/ip_config.c index f52f9e8..e07b4ec 100644 --- a/ip_config.c +++ b/ip_config.c @@ -7,6 +7,7 @@ #include #endif #ifdef HAVE_WINDOWS_H +#define FD_SETSIZE 1024 #include #include #include diff --git a/qual_hostname.c b/qual_hostname.c index c917626..eed0e02 100644 --- a/qual_hostname.c +++ b/qual_hostname.c @@ -7,6 +7,7 @@ #include #endif #ifdef HAVE_WINDOWS_H +#define FD_SETSIZE 1024 #include #define __ANSI_CPP__ #else diff --git a/tests/auto_test.c b/tests/auto_test.c index 492b9dc..aeba229 100644 --- a/tests/auto_test.c +++ b/tests/auto_test.c @@ -273,7 +273,7 @@ do_regression_master_test() int message_count = 0, i; EVstone handle; #ifdef HAVE_WINDOWS_H - SetTimer(NULL, 5, 1000, (TIMERPROC) fail_and_die); + SetTimer(NULL, 5, 300*1000, (TIMERPROC) fail_and_die); #else struct sigaction sigact; sigact.sa_flags = 0; diff --git a/tests/block_test.c b/tests/block_test.c index 9bdf394..4e64d7d 100644 --- a/tests/block_test.c +++ b/tests/block_test.c @@ -371,7 +371,7 @@ do_regression_master_test() int expected_count = msg_limit; int done = 0; #ifdef HAVE_WINDOWS_H - SetTimer(NULL, 5, 1000, (TIMERPROC) fail_and_die); + SetTimer(NULL, 5, 300*1000, (TIMERPROC) fail_and_die); #else struct sigaction sigact; sigact.sa_flags = 0; diff --git a/tests/bulktest.c b/tests/bulktest.c index af28afa..9068ffd 100644 --- a/tests/bulktest.c +++ b/tests/bulktest.c @@ -513,7 +513,7 @@ do_regression_master_test() EVstone handle; int done = 0; #ifdef HAVE_WINDOWS_H - SetTimer(NULL, 5, 1000, (TIMERPROC)fail_and_die); + SetTimer(NULL, 5, 300*1000, (TIMERPROC)fail_and_die); #else struct sigaction sigact; sigact.sa_flags = 0; diff --git a/tests/cmconn.c b/tests/cmconn.c index 3bd777a..1894709 100644 --- a/tests/cmconn.c +++ b/tests/cmconn.c @@ -271,7 +271,7 @@ do_regression_master_test() CMFormat format; int message_count = 0; #ifdef HAVE_WINDOWS_H - SetTimer(NULL, 5, 1000, (TIMERPROC) fail_and_die); + SetTimer(NULL, 5, 300*1000, (TIMERPROC) fail_and_die); #else struct sigaction sigact; sigact.sa_flags = 0; diff --git a/tests/cmping.c b/tests/cmping.c index 56247e4..23c7804 100644 --- a/tests/cmping.c +++ b/tests/cmping.c @@ -301,7 +301,7 @@ do_regression_master_test() char *string_list, *transport; int message_count = 0; #ifdef HAVE_WINDOWS_H - SetTimer(NULL, 5, 1000, (TIMERPROC) fail_and_die); + SetTimer(NULL, 5, 300*1000, (TIMERPROC) fail_and_die); #else struct sigaction sigact; sigact.sa_flags = 0; diff --git a/tests/congest_bulktest.c b/tests/congest_bulktest.c index a082f8b..6d76a23 100644 --- a/tests/congest_bulktest.c +++ b/tests/congest_bulktest.c @@ -337,7 +337,7 @@ do_regression_master_test() int expected_count = msg_limit; int done = 0; #ifdef HAVE_WINDOWS_H - SetTimer(NULL, 5, 1000, (TIMERPROC) fail_and_die); + SetTimer(NULL, 5, 300*1000, (TIMERPROC) fail_and_die); #else struct sigaction sigact; sigact.sa_flags = 0; diff --git a/tests/congestion_test.c b/tests/congestion_test.c index 7fcf469..3316468 100644 --- a/tests/congestion_test.c +++ b/tests/congestion_test.c @@ -355,7 +355,7 @@ do_regression_master_test() int expected_count = msg_limit; int done = 0; #ifdef HAVE_WINDOWS_H - SetTimer(NULL, 5, 1000, (TIMERPROC) fail_and_die); + SetTimer(NULL, 5, 300*1000, (TIMERPROC) fail_and_die); #else struct sigaction sigact; sigact.sa_flags = 0; diff --git a/tests/evtest.c b/tests/evtest.c index 7359753..b13102d 100644 --- a/tests/evtest.c +++ b/tests/evtest.c @@ -287,7 +287,7 @@ do_regression_master_test() EVstone handle; int i; #ifdef HAVE_WINDOWS_H - SetTimer(NULL, 5, 1000, (TIMERPROC) fail_and_die); + SetTimer(NULL, 5, 300*1000, (TIMERPROC) fail_and_die); #else struct sigaction sigact; sigact.sa_flags = 0; diff --git a/tests/extract_test.c b/tests/extract_test.c index 5e036c6..5ef1816 100644 --- a/tests/extract_test.c +++ b/tests/extract_test.c @@ -360,7 +360,7 @@ do_regression_master_test() EVstone term0, term1, term2; struct _client_rec rec0, rec1, rec2; #ifdef HAVE_WINDOWS_H - SetTimer(NULL, 5, 1000, (TIMERPROC) fail_and_die); + SetTimer(NULL, 5, 300*1000, (TIMERPROC) fail_and_die); #else struct sigaction sigact; sigact.sa_flags = 0; diff --git a/tests/filter2_test.c b/tests/filter2_test.c index 6fb5f6d..accbf42 100644 --- a/tests/filter2_test.c +++ b/tests/filter2_test.c @@ -453,7 +453,7 @@ do_regression_master_test() EVstone term, fstone; EVaction faction; #ifdef HAVE_WINDOWS_H - SetTimer(NULL, 5, 1000, (TIMERPROC) fail_and_die); + SetTimer(NULL, 5, 300*1000, (TIMERPROC) fail_and_die); #else struct sigaction sigact; sigact.sa_flags = 0; diff --git a/tests/filter_test.c b/tests/filter_test.c index bc680fc..9f04927 100644 --- a/tests/filter_test.c +++ b/tests/filter_test.c @@ -323,7 +323,7 @@ do_regression_master_test(int do_dll) EVstone term, fstone; EVaction faction; #ifdef HAVE_WINDOWS_H - SetTimer(NULL, 5, 1000, (TIMERPROC) fail_and_die); + SetTimer(NULL, 5, 300*1000, (TIMERPROC) fail_and_die); #else struct sigaction sigact; sigact.sa_flags = 0; diff --git a/tests/http_test.c b/tests/http_test.c index f1ced50..46bb40e 100644 --- a/tests/http_test.c +++ b/tests/http_test.c @@ -272,7 +272,7 @@ do_regression_master_test() EVstone handle; int i; #ifdef HAVE_WINDOWS_H - SetTimer(NULL, 5, 1000, (TIMERPROC) fail_and_die); + SetTimer(NULL, 5, 300*1000, (TIMERPROC) fail_and_die); #else struct sigaction sigact; sigact.sa_flags = 0; diff --git a/tests/multi_thread.c b/tests/multi_thread.c index db740c3..2397a1e 100644 --- a/tests/multi_thread.c +++ b/tests/multi_thread.c @@ -173,7 +173,7 @@ main(int argc, char **argv) srand48(getpid()); #ifdef HAVE_WINDOWS_H - SetTimer(NULL, 5, 1000, (TIMERPROC) fail_and_die); + SetTimer(NULL, 5, 300*1000, (TIMERPROC) fail_and_die); #else struct sigaction sigact; sigact.sa_flags = 0; diff --git a/tests/multiq_test.c b/tests/multiq_test.c index 163db52..2fe2919 100644 --- a/tests/multiq_test.c +++ b/tests/multiq_test.c @@ -370,7 +370,7 @@ do_regression_master_test() EVaction faction; int i; #ifdef HAVE_WINDOWS_H - SetTimer(NULL, 5, 1000, (TIMERPROC) fail_and_die); + SetTimer(NULL, 5, 300*1000, (TIMERPROC) fail_and_die); #else struct sigaction sigact; sigact.sa_flags = 0; diff --git a/tests/no_type_router_test.c b/tests/no_type_router_test.c index 3a49811..6894d30 100644 --- a/tests/no_type_router_test.c +++ b/tests/no_type_router_test.c @@ -319,7 +319,7 @@ do_regression_master_test() int i; struct _client_rec rec0, rec1, rec2; #ifdef HAVE_WINDOWS_H - SetTimer(NULL, 5, 1000, (TIMERPROC) fail_and_die); + SetTimer(NULL, 5, 300*1000, (TIMERPROC) fail_and_die); #else struct sigaction sigact; sigact.sa_flags = 0; diff --git a/tests/rawtest.c b/tests/rawtest.c index 0a40e4f..5869a5b 100644 --- a/tests/rawtest.c +++ b/tests/rawtest.c @@ -265,7 +265,7 @@ do_regression_master_test() simple_rec data; EVsource source_handle; #ifdef HAVE_WINDOWS_H - SetTimer(NULL, 5, 1000, (TIMERPROC) fail_and_die); + SetTimer(NULL, 5, 300*1000, (TIMERPROC) fail_and_die); #else struct sigaction sigact; sigact.sa_flags = 0; diff --git a/tests/rawtest2.c b/tests/rawtest2.c index 242ee50..3cbdd0f 100644 --- a/tests/rawtest2.c +++ b/tests/rawtest2.c @@ -279,7 +279,7 @@ do_regression_master_test() simple_rec data; EVsource source_handle; #ifdef HAVE_WINDOWS_H - SetTimer(NULL, 5, 1000, (TIMERPROC) fail_and_die); + SetTimer(NULL, 5, 300*1000, (TIMERPROC) fail_and_die); #else struct sigaction sigact; sigact.sa_flags = 0; diff --git a/tests/router_test.c b/tests/router_test.c index d99d503..4a3d946 100644 --- a/tests/router_test.c +++ b/tests/router_test.c @@ -339,7 +339,7 @@ do_regression_master_test() EVaction faction; struct _client_rec rec0, rec1, rec2; #ifdef HAVE_WINDOWS_H - SetTimer(NULL, 5, 1000, (TIMERPROC) fail_and_die); + SetTimer(NULL, 5, 300*1000, (TIMERPROC) fail_and_die); #else struct sigaction sigact; sigact.sa_flags = 0; diff --git a/tests/router_test2.c b/tests/router_test2.c index 43a8919..6f7c528 100644 --- a/tests/router_test2.c +++ b/tests/router_test2.c @@ -348,7 +348,7 @@ do_regression_master_test() EVstone term0, term1, term2; struct _client_rec rec0, rec1, rec2; #ifdef HAVE_WINDOWS_H - SetTimer(NULL, 5, 1000, (TIMERPROC) fail_and_die); + SetTimer(NULL, 5, 300*1000, (TIMERPROC) fail_and_die); #else struct sigaction sigact; sigact.sa_flags = 0; diff --git a/tests/split_test.c b/tests/split_test.c index 6aa2d22..a40e2af 100644 --- a/tests/split_test.c +++ b/tests/split_test.c @@ -291,7 +291,7 @@ do_regression_master_test() int message_count = 0; EVstone handle; #ifdef HAVE_WINDOWS_H - SetTimer(NULL, 5, 1000, (TIMERPROC) fail_and_die); + SetTimer(NULL, 5, 300*1000, (TIMERPROC) fail_and_die); #else struct sigaction sigact; sigact.sa_flags = 0; diff --git a/tests/store_limit_test.c b/tests/store_limit_test.c index b60a151..cf9e45a 100644 --- a/tests/store_limit_test.c +++ b/tests/store_limit_test.c @@ -293,7 +293,7 @@ do_regression_master_test() EVstone term, fstone; EVaction faction; #ifdef HAVE_WINDOWS_H - SetTimer(NULL, 5, 1000, (TIMERPROC) fail_and_die); + SetTimer(NULL, 5, 300*1000, (TIMERPROC) fail_and_die); #else struct sigaction sigact; sigact.sa_flags = 0; diff --git a/tests/store_send_test.c b/tests/store_send_test.c index 127684b..c9f8175 100644 --- a/tests/store_send_test.c +++ b/tests/store_send_test.c @@ -297,7 +297,7 @@ do_regression_master_test() EVstone term, fstone; EVaction faction; #ifdef HAVE_WINDOWS_H - SetTimer(NULL, 5, 1000, (TIMERPROC) fail_and_die); + SetTimer(NULL, 5, 300*1000, (TIMERPROC) fail_and_die); #else struct sigaction sigact; sigact.sa_flags = 0; diff --git a/tests/submit_test.c b/tests/submit_test.c index 7d7d933..8d24650 100644 --- a/tests/submit_test.c +++ b/tests/submit_test.c @@ -333,7 +333,7 @@ do_regression_master_test() EVstone term, fstone; EVaction faction; #ifdef HAVE_WINDOWS_H - SetTimer(NULL, 5, 1000, (TIMERPROC) fail_and_die); + SetTimer(NULL, 5, 300*1000, (TIMERPROC) fail_and_die); #else struct sigaction sigact; sigact.sa_flags = 0; diff --git a/tests/take_test.c b/tests/take_test.c index c3add02..ff97f7f 100644 --- a/tests/take_test.c +++ b/tests/take_test.c @@ -396,7 +396,7 @@ do_regression_master_test() attr_list listen_list = NULL; #ifdef HAVE_WINDOWS_H - SetTimer(NULL, 5, 1000, (TIMERPROC) fail_and_die); + SetTimer(NULL, 5, 300*1000, (TIMERPROC) fail_and_die); #else struct sigaction sigact; sigact.sa_flags = 0; diff --git a/tests/thin_test.c b/tests/thin_test.c index f6a3340..3e13c45 100644 --- a/tests/thin_test.c +++ b/tests/thin_test.c @@ -160,7 +160,7 @@ do_regression_master_test() char port_str[10]; char stone_str[10]; #ifdef HAVE_WINDOWS_H - SetTimer(NULL, 5, 1000, (TIMERPROC) fail_and_die); + SetTimer(NULL, 5, 300*1000, (TIMERPROC) fail_and_die); #else struct sigaction sigact; sigact.sa_flags = 0; diff --git a/tests/transform_test.c b/tests/transform_test.c index c36a3f0..48f7197 100644 --- a/tests/transform_test.c +++ b/tests/transform_test.c @@ -364,7 +364,7 @@ do_regression_master_test(int do_dll) EVstone term, fstone; EVaction faction; #ifdef HAVE_WINDOWS_H - SetTimer(NULL, 5, 1000, (TIMERPROC) fail_and_die); + SetTimer(NULL, 5, 300*1000, (TIMERPROC) fail_and_die); #else struct sigaction sigact; sigact.sa_flags = 0; diff --git a/thin_server.c b/thin_server.c index 7384bff..6e2080b 100644 --- a/thin_server.c +++ b/thin_server.c @@ -3,6 +3,7 @@ #include #include #ifdef HAVE_WINSOCK2_H +#define FD_SETSIZE 1024 #include #include #define drand48() (((double)rand())/((double)RAND_MAX))