Partially fixed a bug in the test suite that led to test runs randomly failing.

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

diff --git a/lock_client.h b/lock_client.h
index df22711..5db2cbf 100644 (file)
--- a/lock_client.h
+++ b/lock_client.h
@@ -5,24 +5,69 @@
 
 #ifdef __cplusplus
 
 
 #ifdef __cplusplus
 

-#include <string>
+#include "types.h"

 #include "lock_protocol.h"
 #include "lock_protocol.h"

-#include "rpc.h"
-#include <vector>
+#include "rpc/fifo.h"
+#include "rsm_client.h"

 
 

-// Client interface to the lock server
+class lock_release_user {
+    public:
+        virtual void dorelease(lock_protocol::lockid_t) = 0;
+        virtual ~lock_release_user() {}
+};
+
+class lock_state {
+public:
+    enum {
+        none = 0,
+        retrying,
+        free,
+        locked,
+        acquiring,
+        releasing
+    } state = none;
+    thread::id held_by;
+    list<thread::id> wanted_by;
+    mutex m;
+    map<thread::id, cond> c;
+    lock_protocol::xid_t xid;
+    void wait(lock & mutex_lock);
+    void signal();
+    void signal(thread::id who);
+};
+
+typedef map<lock_protocol::lockid_t, lock_state> lock_map;
+
+// Clients that caches locks.  The server can revoke locks using
+// lock_revoke_server.

 class lock_client {
 class lock_client {

- protected:
-  rpcc *cl;
- public:
-  lock_client(std::string d);
-  virtual ~lock_client() {};
-  virtual lock_protocol::status acquire(lock_protocol::lockid_t);
-  virtual lock_protocol::status release(lock_protocol::lockid_t);
-  virtual lock_protocol::status stat(lock_protocol::lockid_t);
+    private:
+        rpcc *cl;
+        thread releaser_thread;
+        rsm_client *rsmc;
+        lock_release_user *lu;
+        in_port_t rlock_port;
+        string hostname;
+        string id;
+        mutex xid_mutex;
+        lock_protocol::xid_t next_xid;
+        fifo<lock_protocol::lockid_t> release_fifo;
+        mutex lock_table_lock;
+        lock_map lock_table;
+        lock_state &get_lock_state(lock_protocol::lockid_t lid);
+    public:
+        static in_port_t last_port;
+        lock_client(string xdst, lock_release_user *l = 0);
+        ~lock_client() {}
+        lock_protocol::status acquire(lock_protocol::lockid_t);
+        lock_protocol::status release(lock_protocol::lockid_t);
+        int stat(lock_protocol::lockid_t);
+        void releaser();
+        rlock_protocol::status revoke_handler(int &, lock_protocol::lockid_t, lock_protocol::xid_t);
+        rlock_protocol::status retry_handler(int &, lock_protocol::lockid_t, lock_protocol::xid_t);

 };
 
 };
 

-#endif
+#endif // C++

 
 extern "C" {
 
 
 extern "C" {
 

@@ -39,7 +84,7 @@ typedef enum {
 
 typedef int t4_status;
 
 
 typedef int t4_status;
 

-typedef unsigned long long t4_lockid_t;
+typedef const char * t4_lockid_t;

 
 t4_lock_client *t4_lock_client_new(const char *dst);
 void t4_lock_client_delete(t4_lock_client *);
 
 t4_lock_client *t4_lock_client_new(const char *dst);
 void t4_lock_client_delete(t4_lock_client *);