Index: lldb/trunk/test/api/multiple-debuggers/multi-process-driver.cpp =================================================================== --- lldb/trunk/test/api/multiple-debuggers/multi-process-driver.cpp +++ lldb/trunk/test/api/multiple-debuggers/multi-process-driver.cpp @@ -29,6 +29,9 @@ #include #endif +#include +#include + #define NUMBER_OF_SIMULTANEOUS_DEBUG_SESSIONS 50 #define DEBUG 0 @@ -233,10 +236,10 @@ inferior_process_name = argv[1]; } + std::thread threads[NUMBER_OF_SIMULTANEOUS_DEBUG_SESSIONS]; for (uint64_t i = 0; i< NUMBER_OF_SIMULTANEOUS_DEBUG_SESSIONS; i++) { - pthread_t thread; - pthread_create (&thread, NULL, do_one_debugger, (void*) i); + threads[i] = std::move(std::thread(do_one_debugger, (void*)i)); } @@ -244,7 +247,7 @@ int iter = 0; while (1) { - sleep (3); + std::this_thread::sleep_for(std::chrono::seconds(3)); bool all_done = true; int successful_threads = 0; int total_completed_threads = 0; Index: lldb/trunk/test/expression_command/call-restarts/TestCallThatRestarts.py =================================================================== --- lldb/trunk/test/expression_command/call-restarts/TestCallThatRestarts.py +++ lldb/trunk/test/expression_command/call-restarts/TestCallThatRestarts.py @@ -30,6 +30,7 @@ @dwarf_test @skipIfLinux # llvm.org/pr19246: intermittent failure @skipIfDarwin # llvm.org/pr19246: intermittent failure + @skipIfWindows # Test relies on signals, unsupported on Windows def test_with_dwarf(self): """Test calling std::String member function.""" self.buildDwarf() Index: lldb/trunk/test/expression_command/timeout/Makefile =================================================================== --- lldb/trunk/test/expression_command/timeout/Makefile +++ lldb/trunk/test/expression_command/timeout/Makefile @@ -1,5 +1,5 @@ LEVEL = ../../make -C_SOURCES := wait-a-while.c +CXX_SOURCES := wait-a-while.cpp include $(LEVEL)/Makefile.rules Index: lldb/trunk/test/expression_command/timeout/TestCallWithTimeout.py =================================================================== --- lldb/trunk/test/expression_command/timeout/TestCallWithTimeout.py +++ lldb/trunk/test/expression_command/timeout/TestCallWithTimeout.py @@ -15,7 +15,7 @@ # Call super's setUp(). TestBase.setUp(self) - self.main_source = "wait-a-while.c" + self.main_source = "wait-a-while.cpp" self.main_source_spec = lldb.SBFileSpec (self.main_source) Index: lldb/trunk/test/expression_command/timeout/wait-a-while.c =================================================================== --- lldb/trunk/test/expression_command/timeout/wait-a-while.c +++ lldb/trunk/test/expression_command/timeout/wait-a-while.c @@ -1,41 +0,0 @@ -#include -#include -#include -#include - -int -wait_a_while (useconds_t interval) -{ - int num_times = 0; - int return_value = 1; - - struct timeval start_time; - gettimeofday(&start_time, NULL); - uint64_t target = start_time.tv_sec * 1000000 + start_time.tv_usec + interval; - - while (1) - { - num_times++; - return_value = usleep (interval); - if (return_value != 0) - { - struct timeval now; - gettimeofday(&now, NULL); - interval = target - (now.tv_sec * 1000000 + now.tv_usec); - } - else - break; - } - return num_times; -} - -int -main (int argc, char **argv) -{ - printf ("stop here in main.\n"); - int num_times = wait_a_while (argc * 1000); - printf ("Done, took %d times.\n", num_times); - - return 0; - -} Index: lldb/trunk/test/expression_command/timeout/wait-a-while.cpp =================================================================== --- lldb/trunk/test/expression_command/timeout/wait-a-while.cpp +++ lldb/trunk/test/expression_command/timeout/wait-a-while.cpp @@ -0,0 +1,31 @@ +#include +#include + +#include +#include + + +int +wait_a_while (int microseconds) +{ + int num_times = 0; + + while (1) + { + num_times++; + std::this_thread::sleep_for(std::chrono::microseconds(microseconds)); + break; + } + return num_times; +} + +int +main (int argc, char **argv) +{ + printf ("stop here in main.\n"); + int num_times = wait_a_while (argc * 1000); + printf ("Done, took %d times.\n", num_times); + + return 0; + +} Index: lldb/trunk/test/functionalities/attach_resume/Makefile =================================================================== --- lldb/trunk/test/functionalities/attach_resume/Makefile +++ lldb/trunk/test/functionalities/attach_resume/Makefile @@ -1,8 +1,7 @@ LEVEL = ../../make -C_SOURCES := main.c -LD_EXTRAS := -lpthread - +CXX_SOURCES := main.cpp +ENABLE_THREADS := Yes EXE := AttachResume include $(LEVEL)/Makefile.rules Index: lldb/trunk/test/functionalities/attach_resume/TestAttachResume.py =================================================================== --- lldb/trunk/test/functionalities/attach_resume/TestAttachResume.py +++ lldb/trunk/test/functionalities/attach_resume/TestAttachResume.py @@ -70,7 +70,7 @@ 'Process not stopped after interrupt') # check that this breakpoint is auto-cleared on detach (r204752) - self.runCmd("br set -f main.c -l 12") + self.runCmd("br set -f main.cpp -l 12") self.runCmd("c") self.assertTrue(wait_for_state(lldb.eStateRunning), Index: lldb/trunk/test/functionalities/attach_resume/main.c =================================================================== --- lldb/trunk/test/functionalities/attach_resume/main.c +++ lldb/trunk/test/functionalities/attach_resume/main.c @@ -1,32 +0,0 @@ -#include -#include -#include -#include - -void *start(void *data) -{ - int i; - size_t idx = (size_t)data; - for (i=0; i<30; i++) - { - if ( idx == 0 ) - usleep(1); - sleep(1); - } - return 0; -} - -int main(int argc, char const *argv[]) -{ - static const size_t nthreads = 16; - pthread_attr_t attr; - pthread_t threads[nthreads]; - size_t i; - - pthread_attr_init(&attr); - for (i=0; i +#include + +#include +#include + +void *start(void *data) +{ + int i; + size_t idx = (size_t)data; + for (i=0; i<30; i++) + { + if ( idx == 0 ) + std::this_thread::sleep_for(std::chrono::microseconds(1)); + std::this_thread::sleep_for(std::chrono::seconds(1)); + } + return 0; +} + +int main(int argc, char const *argv[]) +{ + static const size_t nthreads = 16; + std::thread threads[nthreads]; + size_t i; + + for (i=0; i 32 + # i386, i686, x86 -> 32 # amd64, x86_64, x64 -> 64 ifeq "$(ARCH)" "amd64" override ARCH := $(subst amd64,64,$(ARCH)) @@ -84,6 +87,9 @@ ifeq "$(ARCH)" "x64" override ARCH := $(subst x64,64,$(ARCH)) endif + ifeq "$(ARCH)" "x86" + override ARCH := $(subst x86,32,$(ARCH)) + endif ifeq "$(ARCH)" "i386" override ARCH := $(subst i386,32,$(ARCH)) endif @@ -97,15 +103,21 @@ endif CFLAGS ?= -g -O0 -CFLAGS += $(ARCHFLAG)$(ARCH) $(FRAMEWORK_INCLUDES) $(CFLAGS_EXTRAS) +CFLAGS += $(ARCHFLAG)$(ARCH) $(FRAMEWORK_INCLUDES) $(CFLAGS_EXTRAS) -I$(LLDB_BASE_DIR)include # Use this one if you want to build one part of the result without debug information: CFLAGS_NO_DEBUG = -O0 $(ARCHFLAG)$(ARCH) $(FRAMEWORK_INCLUDES) $(CFLAGS_EXTRAS) -CXXFLAGS +=$(CFLAGS) +CXXFLAGS += -std=c++11 +CXXFLAGS += $(CFLAGS) LD = $(CC) LDFLAGS ?= $(CFLAGS) LDFLAGS += $(LD_EXTRAS) +ifneq "$(OS)" "Windows_NT" + ifeq "$(ENABLE_THREADS)" "Yes" + LDFLAGS += -lpthread + endif +endif OBJECTS = EXE ?= a.out @@ -126,6 +138,17 @@ cxx_linker = $(if $(findstring /,$(1)),$(join $(dir $(1)), $(call cxx_linker_notdir,$(notdir $(1)))),$(call cxx_linker_notdir,$(1))) #---------------------------------------------------------------------- +# Clang for Windows doesn't yet support exceptions +#---------------------------------------------------------------------- +ifeq "$(OS)" "Windows_NT" + ifneq (,$(findstring clang,$(CC))) + CXXFLAGS += -fno-exceptions + CXXFLAGS += -include $(THIS_FILE_DIR)uncaught_exception.h + CXXFLAGS += -D_HAS_EXCEPTIONS=0 + endif +endif + +#---------------------------------------------------------------------- # C++ standard library options #---------------------------------------------------------------------- ifeq (1,$(USE_LIBSTDCPP)) Index: lldb/trunk/test/make/uncaught_exception.h =================================================================== --- lldb/trunk/test/make/uncaught_exception.h +++ lldb/trunk/test/make/uncaught_exception.h @@ -0,0 +1,5 @@ +// MSVC header files have compilation issues when compiling with exceptions disabled. Notably, +// this function is compiled out when _HAS_EXCEPTIONS=0, but this function is called from another +// place even when _HAS_EXCEPTIONS=0. So we define a dummy implementation as a workaround and +// force include this header file. +static void *__uncaught_exception() { return nullptr; } Index: lldb/trunk/test/python_api/lldbutil/iter/Makefile =================================================================== --- lldb/trunk/test/python_api/lldbutil/iter/Makefile +++ lldb/trunk/test/python_api/lldbutil/iter/Makefile @@ -1,8 +1,8 @@ LEVEL = ../../../make CFLAGS_EXTRAS := -D__STDC_LIMIT_MACROS -LD_EXTRAS := -lpthread +ENABLE_THREADS := YES CXX_SOURCES := main.cpp -MAKE_DSYM :=NO +MAKE_DSYM := NO include $(LEVEL)/Makefile.rules Index: lldb/trunk/test/python_api/lldbutil/iter/main.cpp =================================================================== --- lldb/trunk/test/python_api/lldbutil/iter/main.cpp +++ lldb/trunk/test/python_api/lldbutil/iter/main.cpp @@ -8,15 +8,20 @@ //===----------------------------------------------------------------------===// // C includes -#include #include #include #include -#include -pthread_t g_thread_1 = NULL; -pthread_t g_thread_2 = NULL; -pthread_t g_thread_3 = NULL; +// C++ includes +#include +#include +#include +#include + +std::thread g_thread_1; +std::thread g_thread_2; +std::thread g_thread_3; +std::mutex g_mask_mutex; typedef enum { eGet, @@ -29,9 +34,9 @@ uint32_t mask_access (MaskAction action, uint32_t mask) { - static pthread_mutex_t g_mask_mutex = PTHREAD_MUTEX_INITIALIZER; static uint32_t g_mask = 0; - ::pthread_mutex_lock (&g_mask_mutex); + + std::lock_guard lock(g_mask_mutex); switch (action) { case eGet: @@ -45,9 +50,7 @@ g_mask &= ~mask; break; } - uint32_t new_mask = g_mask; - ::pthread_mutex_unlock (&g_mask_mutex); - return new_mask; + return g_mask; } void * @@ -57,12 +60,17 @@ uint32_t thread_mask = (1u << (thread_index)); printf ("%s (thread index = %u) startng...\n", __FUNCTION__, thread_index); + std::default_random_engine generator; + std::uniform_int_distribution distribution(0, 3000000); + while (mask_access(eGet) & thread_mask) { // random micro second sleep from zero to 3 seconds - int usec = ::rand() % 3000000; + int usec = distribution(generator); printf ("%s (thread = %u) doing a usleep (%d)...\n", __FUNCTION__, thread_index, usec); - ::usleep (usec); + + std::chrono::microseconds duration(usec); + std::this_thread::sleep_for(duration); printf ("%s (thread = %u) after usleep ...\n", __FUNCTION__, thread_index); // Set break point at this line. } printf ("%s (thread index = %u) exiting...\n", __FUNCTION__, thread_index); @@ -72,8 +80,6 @@ int main (int argc, char const *argv[]) { - int err; - void *thread_result = NULL; uint32_t thread_index_1 = 1; uint32_t thread_index_2 = 2; uint32_t thread_index_3 = 3; @@ -85,9 +91,9 @@ mask_access (eAssign, thread_mask_1 | thread_mask_2 | thread_mask_3); // And that line. // Create 3 threads - err = ::pthread_create (&g_thread_1, NULL, thread_func, &thread_index_1); - err = ::pthread_create (&g_thread_2, NULL, thread_func, &thread_index_2); - err = ::pthread_create (&g_thread_3, NULL, thread_func, &thread_index_3); + g_thread_1 = std::thread(thread_func, (void*)&thread_index_1); + g_thread_2 = std::thread(thread_func, (void*)&thread_index_2); + g_thread_3 = std::thread(thread_func, (void*)&thread_index_3); char line[64]; while (mask_access(eGet) != 0) @@ -120,9 +126,9 @@ mask_access (eClearBits, UINT32_MAX); // Join all of our threads - err = ::pthread_join (g_thread_1, &thread_result); - err = ::pthread_join (g_thread_2, &thread_result); - err = ::pthread_join (g_thread_3, &thread_result); + g_thread_1.join(); + g_thread_2.join(); + g_thread_3.join(); return 0; } Index: lldb/trunk/test/python_api/lldbutil/process/Makefile =================================================================== --- lldb/trunk/test/python_api/lldbutil/process/Makefile +++ lldb/trunk/test/python_api/lldbutil/process/Makefile @@ -1,7 +1,7 @@ LEVEL = ../../../make CFLAGS_EXTRAS := -D__STDC_LIMIT_MACROS -LD_EXTRAS := -lpthread +ENABLE_THREADS := YES CXX_SOURCES := main.cpp MAKE_DSYM :=NO Index: lldb/trunk/test/python_api/lldbutil/process/main.cpp =================================================================== --- lldb/trunk/test/python_api/lldbutil/process/main.cpp +++ lldb/trunk/test/python_api/lldbutil/process/main.cpp @@ -8,15 +8,20 @@ //===----------------------------------------------------------------------===// // C includes -#include #include #include #include -#include -pthread_t g_thread_1 = NULL; -pthread_t g_thread_2 = NULL; -pthread_t g_thread_3 = NULL; +// C++ includes +#include +#include +#include +#include + +std::thread g_thread_1; +std::thread g_thread_2; +std::thread g_thread_3; +std::mutex g_mask_mutex; typedef enum { eGet, @@ -29,9 +34,9 @@ uint32_t mask_access (MaskAction action, uint32_t mask) { - static pthread_mutex_t g_mask_mutex = PTHREAD_MUTEX_INITIALIZER; static uint32_t g_mask = 0; - ::pthread_mutex_lock (&g_mask_mutex); + + std::lock_guard lock(g_mask_mutex); switch (action) { case eGet: @@ -45,9 +50,7 @@ g_mask &= ~mask; break; } - uint32_t new_mask = g_mask; - ::pthread_mutex_unlock (&g_mask_mutex); - return new_mask; + return g_mask; } void * @@ -57,12 +60,17 @@ uint32_t thread_mask = (1u << (thread_index)); printf ("%s (thread index = %u) startng...\n", __FUNCTION__, thread_index); + std::default_random_engine generator; + std::uniform_int_distribution distribution(0, 3000000); + while (mask_access(eGet) & thread_mask) { // random micro second sleep from zero to 3 seconds - int usec = ::rand() % 3000000; + int usec = distribution(generator); + printf ("%s (thread = %u) doing a usleep (%d)...\n", __FUNCTION__, thread_index, usec); - ::usleep (usec); + std::chrono::microseconds duration(usec); + std::this_thread::sleep_for(duration); printf ("%s (thread = %u) after usleep ...\n", __FUNCTION__, thread_index); // Set break point at this line. } printf ("%s (thread index = %u) exiting...\n", __FUNCTION__, thread_index); @@ -85,9 +93,9 @@ mask_access (eAssign, thread_mask_1 | thread_mask_2 | thread_mask_3); // And that line. // Create 3 threads - err = ::pthread_create (&g_thread_1, NULL, thread_func, &thread_index_1); - err = ::pthread_create (&g_thread_2, NULL, thread_func, &thread_index_2); - err = ::pthread_create (&g_thread_3, NULL, thread_func, &thread_index_3); + g_thread_1 = std::thread(thread_func, (void*)&thread_index_1); + g_thread_2 = std::thread(thread_func, (void*)&thread_index_2); + g_thread_3 = std::thread(thread_func, (void*)&thread_index_3); char line[64]; while (mask_access(eGet) != 0) @@ -120,9 +128,9 @@ mask_access (eClearBits, UINT32_MAX); // Join all of our threads - err = ::pthread_join (g_thread_1, &thread_result); - err = ::pthread_join (g_thread_2, &thread_result); - err = ::pthread_join (g_thread_3, &thread_result); + g_thread_1.join(); + g_thread_2.join(); + g_thread_3.join(); return 0; } Index: lldb/trunk/test/python_api/module_section/Makefile =================================================================== --- lldb/trunk/test/python_api/module_section/Makefile +++ lldb/trunk/test/python_api/module_section/Makefile @@ -1,7 +1,7 @@ LEVEL = ../../make CFLAGS_EXTRAS := -D__STDC_LIMIT_MACROS -LD_EXTRAS := -lpthread +ENABLE_THREADS := YES CXX_SOURCES := main.cpp b.cpp c.cpp MAKE_DSYM :=NO Index: lldb/trunk/test/python_api/module_section/main.cpp =================================================================== --- lldb/trunk/test/python_api/module_section/main.cpp +++ lldb/trunk/test/python_api/module_section/main.cpp @@ -8,15 +8,20 @@ //===----------------------------------------------------------------------===// // C includes -#include #include #include #include -#include -pthread_t g_thread_1 = NULL; -pthread_t g_thread_2 = NULL; -pthread_t g_thread_3 = NULL; +// C++ includes +#include +#include +#include +#include + +std::thread g_thread_1; +std::thread g_thread_2; +std::thread g_thread_3; +std::mutex g_mask_mutex; typedef enum { eGet, @@ -29,9 +34,9 @@ uint32_t mask_access (MaskAction action, uint32_t mask) { - static pthread_mutex_t g_mask_mutex = PTHREAD_MUTEX_INITIALIZER; static uint32_t g_mask = 0; - ::pthread_mutex_lock (&g_mask_mutex); + + std::lock_guard lock(g_mask_mutex); switch (action) { case eGet: @@ -45,9 +50,7 @@ g_mask &= ~mask; break; } - uint32_t new_mask = g_mask; - ::pthread_mutex_unlock (&g_mask_mutex); - return new_mask; + return g_mask; } void * @@ -57,12 +60,17 @@ uint32_t thread_mask = (1u << (thread_index)); printf ("%s (thread index = %u) startng...\n", __FUNCTION__, thread_index); + std::default_random_engine generator; + std::uniform_int_distribution distribution(0, 3000000); + while (mask_access(eGet) & thread_mask) { // random micro second sleep from zero to 3 seconds - int usec = ::rand() % 3000000; + int usec = distribution(generator); + printf ("%s (thread = %u) doing a usleep (%d)...\n", __FUNCTION__, thread_index, usec); - ::usleep (usec); + std::chrono::microseconds duration(usec); + std::this_thread::sleep_for(duration); printf ("%s (thread = %u) after usleep ...\n", __FUNCTION__, thread_index); // Set break point at this line. } printf ("%s (thread index = %u) exiting...\n", __FUNCTION__, thread_index); @@ -85,9 +93,9 @@ mask_access (eAssign, thread_mask_1 | thread_mask_2 | thread_mask_3); // And that line. // Create 3 threads - err = ::pthread_create (&g_thread_1, NULL, thread_func, &thread_index_1); - err = ::pthread_create (&g_thread_2, NULL, thread_func, &thread_index_2); - err = ::pthread_create (&g_thread_3, NULL, thread_func, &thread_index_3); + g_thread_1 = std::thread(thread_func, (void*)&thread_index_1); + g_thread_2 = std::thread(thread_func, (void*)&thread_index_2); + g_thread_3 = std::thread(thread_func, (void*)&thread_index_3); char line[64]; while (mask_access(eGet) != 0) @@ -120,9 +128,9 @@ mask_access (eClearBits, UINT32_MAX); // Join all of our threads - err = ::pthread_join (g_thread_1, &thread_result); - err = ::pthread_join (g_thread_2, &thread_result); - err = ::pthread_join (g_thread_3, &thread_result); + g_thread_1.join(); + g_thread_2.join(); + g_thread_3.join(); return 0; } Index: lldb/trunk/test/python_api/signals/main.cpp =================================================================== --- lldb/trunk/test/python_api/signals/main.cpp +++ lldb/trunk/test/python_api/signals/main.cpp @@ -8,13 +8,21 @@ //===----------------------------------------------------------------------===// #include #include +#if defined(_WIN32) +#include +#else #include #include +#endif // This simple program is to test the lldb Python API related to process. int main (int argc, char const *argv[]) { +#if defined(_WIN32) + ::ExitProcess(1); +#else kill(getpid(), SIGINT); // Set break point at this line and setup signal ignores. +#endif return 0; } Index: lldb/trunk/test/python_api/watchpoint/watchlocation/Makefile =================================================================== --- lldb/trunk/test/python_api/watchpoint/watchlocation/Makefile +++ lldb/trunk/test/python_api/watchpoint/watchlocation/Makefile @@ -1,6 +1,6 @@ LEVEL = ../../../make -LD_EXTRAS := -lpthread +ENABLE_THREADS := YES CXX_SOURCES := main.cpp include $(LEVEL)/Makefile.rules Index: lldb/trunk/test/tools/lldb-gdbserver/Makefile =================================================================== --- lldb/trunk/test/tools/lldb-gdbserver/Makefile +++ lldb/trunk/test/tools/lldb-gdbserver/Makefile @@ -1,7 +1,7 @@ LEVEL = ../../make -CFLAGS_EXTRAS := -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS -std=c++11 -LD_EXTRAS := -lpthread +CFLAGS_EXTRAS := -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS +ENABLE_THREADS := YES CXX_SOURCES := main.cpp MAKE_DSYM :=NO