Merge pull request #11 from ganlvtech/master

Fix #10: Fix pthread_spin_unlock. Add new test case

Author: noodle1983

pthread_spin_lock.h

@@ -34,8 +34,7 @@ static inline int pthread_spin_trylock(pthread_spinlock_t *lock) {
 }
 
 static inline int pthread_spin_unlock(pthread_spinlock_t *lock) {
-	__asm__ __volatile__ ("" ::: "memory");
-	*lock = 0;
+	__sync_sub_and_fetch(lock, 1);
 	return 0;
 }
 

unittest/test_mutex.cpp

@@ -7,49 +7,51 @@
 
 struct GlobalData
 {	
-	std::map<int, int> g_fd_to_file;	
-	PthreadRwMutex g_file_to_shadowzip_mutex;
+    std::map<int, int> g_fd_to_file;
+    PthreadRwMutex g_file_to_shadowzip_mutex;
 };
 #define g_global_data (LeakSingleton<GlobalData, 0>::instance())
 
-int count;
+int a = 0;
+int b = 0;
+int c = 0;
+int d = 0;
 const size_t THREAD_NUM = 6; 
 
 void increment_count()
 {
-	{
-		PthreadWriteGuard guard(g_global_data->g_file_to_shadowzip_mutex);
-		count = count + 1;
-		std::cout << "write count:" << count << std::endl;
-	}
+    PthreadWriteGuard guard(g_global_data->g_file_to_shadowzip_mutex);
+    a++;
+    b++;
+    c++;
+    d++;
 }
 
-long long get_count()
+void verify_count()
 {
-    long long c;   
-	{
-		PthreadReadGuard guard(g_global_data->g_file_to_shadowzip_mutex);
-		c = count;		
-		std::cout << "read count:" << count << std::endl;
-	}
-    return (c);
+    PthreadReadGuard guard(g_global_data->g_file_to_shadowzip_mutex);
+    if (a != b || a != c || a != d) {
+        std::cout << "pthread unit test failed: " << a << " " << b << " " << c << " " << d << std::endl;
+    }
 }
 
 //-----------------------------------------------------------------------
 void *thread_proc(void *arg)
 {
+    int thread_id = (int) (intptr_t) arg;
+    std::cout << "thread " << thread_id << " started" << std::endl;
     for(int i = 0; i < 1000000; i++){
-		increment_count();
-		get_count();
-	}
-
+        increment_count();
+        verify_count();
+    }
+    std::cout << "thread " << thread_id << " end" << std::endl;
     pthread_exit(0);
     return 0;
 }
 
 int main(int argc, char *argv[])
 {
-	LeakSingleton<GlobalData, 0>::init();
+    LeakSingleton<GlobalData, 0>::init();
     pthread_t threadids[THREAD_NUM];
     for(size_t i = 0; i < THREAD_NUM; i++)
     {