Merge branch 'lab4' of https://github.com/BitHigher/cselab into lab4

mlnotes · Nov 26, 2012 · c04c8ac · c04c8ac
2 parents 8f8b679 + e033dd5
commit c04c8ac
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/lock_client_cache.h b/lock_client_cache.h
@@ -19,7 +19,6 @@ class lock_client_info{
   typedef int status;
 
   status state;
-  pthread_t tid;
   pthread_cond_t cond;
 
   lock_client_info(){

diff --git a/lock_server_cache.h b/lock_server_cache.h
@@ -10,15 +10,8 @@
 
 class lock_info{
  public:
-  lock_info(){
-    pthread_cond_init(&cond, NULL);
-  }
-  ~lock_info(){
-    pthread_cond_destroy(&cond);  
-  }
   std::string owner;
   std::string waiting;
-  pthread_cond_t cond;
 };
 
 class lock_server_cache {