testcode.git

@@ -9,10 +9,13 @@ $(SUBDIRS):

 	$(MAKE) -C $@

 all: $(LIBDIR) subdirs

+	for dir in $(SUBDIRS); do \

+		$(MAKE) -C $$dir \

+	done

 debug:

 	for dir in $(SUBDIRS); do \

-		$(MAKE) -C $$dir debug; \

+		$(MAKE) -C $$dir $(MAKECMDGOALS); \

 	done

 product: my_lib

@@ -22,5 +25,5 @@ $(LIBDIR):

 clean:

 	for dir in $(SUBDIRS); do \

-		$(MAKE) -C $$dir clean; \

+		$(MAKE) -C $$dir $(MAKECMDGOALS); \

 	done

@@ -12,7 +12,7 @@ LIB=$(LIBDIR)/libmy_lib.a

 all: $(LIB)

-debug: CPPFLAGS += -g

+debug: CPPFLAGS += -DDEBUG -ggdb

 debug: $(LIB)

 $(OBJDIR):

@@ -6,14 +6,14 @@ LDFLAGS=-pthread -L $(LIBDIR) -lmy_lib

 OBJDIR=obj

 SOURCES=main.cpp main_helper.cpp ui/widget.cpp scoped_set_adder.cpp \

-	thread_with_lambda.cpp thread_manager.cpp

+	thread_with_lambda.cpp thread_manager.cpp deadlock/deadlock.cpp

 # //OBJECTS=$(OBJDIR)$(SOURCES:.cpp=.o)

 OBJECTS=$(foreach bname, $(basename $(SOURCES)), $(OBJDIR)/$(bname).o)

-EXECUTABLE=main

+EXECUTABLE=testcode

 all: $(EXECUTABLE)

-debug: CPPFLAGS += -g

+debug: CPPFLAGS += -DDEBUG -ggdb

 debug: $(EXECUTABLE)

 $(OBJDIR):

@@ -22,10 +22,13 @@ $(OBJDIR):

 $(OBJDIR)/ui:

 	mkdir $@

+$(OBJDIR)/deadlock:

+	mkdir $@

+

 $(EXECUTABLE): $(OBJECTS) $(LIBDIR)/libmy_lib.a

 	$(CXX) $(OBJECTS) $(LDFLAGS) -o $@

-$(OBJDIR)/%.o: %.cpp ../include/my_lib.hpp | $(OBJDIR) $(OBJDIR)/ui

+$(OBJDIR)/%.o: %.cpp ../include/my_lib.hpp | $(OBJDIR) $(OBJDIR)/ui $(OBJDIR)/deadlock

 	$(CXX) $(CPPFLAGS) $< -o $@

 clean:

@@ -0,0 +1,85 @@

+#include <iostream>

+#include <string>

+#include <vector>

+#include <thread>

+#include <mutex>

+#include <unistd.h>

+#include <random>

+#include <chrono>

+#include "deadlock.hpp"

+

+using namespace std;

+

+namespace {

+

+std::mutex left_chopstick;

+std::mutex right_chopstick;

+

+std::vector<std::thread> workers;

+

+void do_work_on_right(bool, int32_t);

+

+int get_rnd()

+{

+    static std::random_device rd;

+    static std::mt19937 gen(rd());

+    static std::uniform_int_distribution<> dis(100, 200);

+    return dis(gen);

+}

+

+void do_work_on_left(bool have_right, int32_t tick)

+{

+    std::lock_guard<std::mutex> lm (left_chopstick);

+    std::this_thread::sleep_for(std::chrono::milliseconds(get_rnd()));

+    if (have_right) {

+        std::cout << "deadlock::thread " << std::hex << this_thread::get_id() << " " << tick << endl;

+    } else {

+        do_work_on_right(true, tick);

+    }

+}

+

+void do_work_on_right(bool have_left, int32_t tick)

+{

+    std::lock_guard<std::mutex> rm (right_chopstick);

+    std::this_thread::sleep_for(std::chrono::milliseconds(get_rnd()));

+    if (have_left) {

+        std::cout << "deadlock::thread " << std::hex << this_thread::get_id() << " " << tick << endl;

+    } else {

+        do_work_on_left(true, tick);

+    }

+}

+

+void work(int32_t ticks)

+{

+    for(int32_t tick = ticks; tick >= 0; tick--) {

+        do_work_on_right(false, tick);

+    }

+}

+

+};

+

+int deadlock()

+{

+    uint32_t ticks = 10;

+    cout << "The function " << __PRETTY_FUNCTION__ << " was called." << endl;

+    cerr << "WARNING: Expect a deadlock. See http://wiki.dlma.com/gdb" << endl;

+

+    // Construct the thread right into the push_back() call.

+    workers.push_back(std::thread([=]{

+        for(uint32_t tick = 0; tick <= ticks; tick++) {

+            do_work_on_left(false, tick);

+            // usleep(get_rnd() * 1000);  // u for microseconds

+        }

+    }));

+

+    // Or, move the thread into the array.

+    std::thread t2(work, ticks);

+    workers.push_back(move(t2));

+

+    // Don't return before the other threads have finished.

+    for (auto &w : workers) {

+        if (w.joinable()) w.join();

+    }

+    return 0;

+}

+

@@ -0,0 +1,4 @@

+#pragma once

+

+int deadlock();

+

@@ -11,6 +11,7 @@

 #include "../include/my_lib.hpp"

 #include "thread_with_lambda.hpp"

 #include "thread_manager.hpp"

+#include "deadlock/deadlock.hpp"

 using namespace std;

@@ -116,6 +117,8 @@ int main() {

         my_class->f();

     }

+    deadlock();

+

     // This_function_is_not_defined();

     cout << "Done." << endl;

@@ -1,5 +1,4 @@

-#ifndef __main_helper_hpp

-#define __main_helper_hpp

+#pragma once

 #include <memory>

 int main_helper_fn();

@@ -22,6 +21,3 @@ public:

     class Impl;  // defined in cpp

     Pimpl<Impl> pimpl;

 };

-

-

-#endif

@@ -1,5 +1,4 @@

-#ifndef scoped_set_adder_h_

-#define scoped_set_adder_h_

+#pragma once

 #include <string>

@@ -15,5 +14,3 @@ public:

 private:

     std::string name_;

 };

- 

-#endif

@@ -1,5 +1,4 @@

-#ifndef thread_manager_hpp_

-#define thread_manager_hpp_

+#pragma once

 #include <mutex>

 #include <condition_variable>

@@ -21,5 +20,3 @@ struct Manager {

     std::thread report_thread_;

 	int data_to_protect_;

 };

-

-#endif

@@ -15,11 +15,11 @@ void thread_with_lambda()

 {

     uint32_t ticks = 10;

     std::lock_guard<std::mutex> lock(my_mutex);

-    if (worker.joinable()) worker.join();

     worker = std::thread([=]{

         for(uint32_t tick = 0; tick <= ticks; tick++) {

-            std::cout << "count " << tick << std::endl;

+            std::cout << __PRETTY_FUNCTION__ << " count " << tick << std::endl;

         }

     });

+    if (worker.joinable()) worker.join();

 }

@@ -1,6 +1,3 @@

-#ifndef thread_with_lambda_hpp_

-#define thread_with_lambda_hpp_

+#pragma once

 void thread_with_lambda();

-

-#endif