More clean-ups and cool template stuff

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

diff --git a/handle.h b/handle.h
index 6b042fb..a06b156 100644 (file)
--- a/handle.h
+++ b/handle.h
@@ -23,23 +23,18 @@
 #ifndef handle_h
 #define handle_h
 
-#include <string>
-#include <vector>
 #include "rpc/rpc.h"
+#include <string>
 
-struct hinfo {
-  rpcc *cl;
-  int refcnt;
-  bool del;
-  std::string m;
-  std::mutex cl_mutex;
-};
+using std::string;
+
+class hinfo;
 
 class handle {
     private:
-        struct hinfo *h;
+        hinfo *h;
     public:
-        handle(std::string m);
+        handle(const string & m);
         ~handle();
         /* safebind will try to bind with the rpc server on the first call.
          * Since bind may block, the caller probably should not hold a mutex
@@ -62,18 +57,6 @@ class handle {
         rpcc *safebind();
 };
 
-class handle_mgr {
-    private:
-        std::mutex handle_mutex;
-        std::map<std::string, struct hinfo *> hmap;
-    public:
-        handle_mgr();
-        struct hinfo *get_handle(std::string m);
-        void done_handle(struct hinfo *h);
-        void delete_handle(std::string m);
-        void delete_handle_wo(std::string m);
-};
-
-extern class handle_mgr mgr;
+void invalidate_handle(const string & m);
 
 #endif