More renaming

[invirt/third/libt4.git] / lock_server.h

diff --git a/lock_server_cache_rsm.h b/lock_server.h
similarity index 88%
rename from lock_server_cache_rsm.h
rename to lock_server.h
index c33b51e..2aa8445 100644 (file)
--- a/lock_server_cache_rsm.h
+++ b/lock_server.h
@@ -1,5 +1,5 @@
-#ifndef lock_server_cache_rsm_h
-#define lock_server_cache_rsm_h
+#ifndef lock_server_h
+#define lock_server_h

 
 #include <string>
 
 
 #include <string>
 

@@ -34,7 +34,7 @@ public:
 
 typedef map<lock_protocol::lockid_t, lock_state> lock_map;
 
 
 typedef map<lock_protocol::lockid_t, lock_state> lock_map;
 

-class lock_server_cache_rsm : public rsm_state_transfer {
+class lock_server : public rsm_state_transfer {

     private:
         int nacquire;
         mutex lock_table_lock;
     private:
         int nacquire;
         mutex lock_table_lock;

@@ -44,7 +44,7 @@ class lock_server_cache_rsm : public rsm_state_transfer {
         fifo<lock_protocol::lockid_t> revoke_fifo;
         class rsm *rsm;
     public:
         fifo<lock_protocol::lockid_t> revoke_fifo;
         class rsm *rsm;
     public:

-        lock_server_cache_rsm(class rsm *rsm = 0);
+        lock_server(class rsm *rsm = 0);

         lock_protocol::status stat(int &, lock_protocol::lockid_t);
         void revoker();
         void retryer();
         lock_protocol::status stat(int &, lock_protocol::lockid_t);
         void revoker();
         void retryer();