Removed unused statefulhelper::IsAvailable and OnEmptyQueue and related typedefs...

diff --git a/src/helper.cc b/src/helper.cc
index 7adc03a1b54b8f546a941bbf1ee4a9507149cf8a..ee6ffdbb8f4e1844acede7d33356353789d31776 100644 (file)
--- a/src/helper.cc
+++ b/src/helper.cc
@@ -510,8 +510,6 @@ helperStatefulReleaseServer(helper_stateful_server * srv)
     ++ srv->stats.releases;
 
     srv->flags.reserved = false;
-    if (srv->parent->OnEmptyQueue != NULL && srv->data)
-        srv->parent->OnEmptyQueue(srv->data);
 
     helperStatefulServerDone(srv);
 }
@@ -1262,9 +1260,6 @@ StatefulGetFirstAvailable(statefulhelper * hlp)
         if (srv->flags.shutdown)
             continue;
 
-        if ((hlp->IsAvailable != NULL) && (srv->data != NULL) && !(hlp->IsAvailable(srv->data)))
-            continue;
-
         debugs(84, 5, "StatefulGetFirstAvailable: returning srv-" << srv->index);
         return srv;
     }

diff --git a/src/helper.h b/src/helper.h
index c6c11c566b148b7ff46114694e6354b3ee786e07..884194e8eaf8b2fc9a6f057928f2eacc22dbb68b 100644 (file)
--- a/src/helper.h
+++ b/src/helper.h
@@ -27,11 +27,6 @@
 class Packable;
 class wordlist;
 
-/// callback type for helper empty-queue event
-typedef void HLPSONEQ(void *);
-/// callback type for helper-available event
-typedef int HLPSAVAIL(void *);
-
 /**
  * Managers a set of individual helper processes with a common queue of requests.
  *
@@ -116,13 +111,11 @@ class statefulhelper : public helper
     CBDATA_CLASS(statefulhelper);
 
 public:
-    inline statefulhelper(const char *name) : helper(name), datapool(NULL), IsAvailable(NULL), OnEmptyQueue(NULL) {}
+    inline statefulhelper(const char *name) : helper(name), datapool(NULL) {}
     inline ~statefulhelper() {}
 
 public:
     MemAllocator *datapool;
-    HLPSAVAIL *IsAvailable;
-    HLPSONEQ *OnEmptyQueue;
 
 private:
     friend void helperStatefulSubmit(statefulhelper * hlp, const char *buf, HLPCB * callback, void *data, helper_stateful_server * lastserver);