Cleaned up default servant example

Grzegorz Jabłoński
1 parent f68550b1
Showing 3 changed files with 0 additions and 156 deletions
cpp11/Ice/default_servant/EvictorBase.cpp
cpp11/Ice/default_servant/EvictorBase.h
cpp11/Ice/default_servant/Server.cpp
-#include <EvictorBase.h>
-
-using namespace std;
-
-EvictorBase::EvictorBase(int size) :
-    _size(size)
-{
-    if (_size < 0)
-    {
-        _size = 1000;
-    }
-}
-
-shared_ptr<Ice::Object>
-EvictorBase::locate(const Ice::Current& c, shared_ptr<void>& cookie)
-{
-    lock_guard<mutex> lk(_mutex);
-
-    //
-    // Check if we have a servant in the map already.
-    //
-    shared_ptr<EvictorEntry> entry;
-    auto i = _map.find(c.id);
-    if(i != _map.end())
-    {
-        //
-        // Got an entry already, dequeue the entry from its current position.
-        //
-        entry = i->second;
-        _queue.erase(entry->queuePos);
-    }
-    else
-    {
-        //
-        // We do not have an entry. Ask the derived class to
-        // instantiate a servant and add a new entry to the map.
-        //
-        entry = make_shared<EvictorEntry>();
-        entry->servant = add(c, entry->userCookie); // Down-call
-        if(!entry->servant)
-        {
-            return 0;
-        }
-        entry->useCount = 0;
-        i = _map.insert(make_pair(c.id, entry)).first;
-    }
-
-    //
-    // Increment the use count of the servant and enqueue
-    // the entry at the front, so we get LRU order.
-    //
-    ++(entry->useCount);
-    entry->queuePos = _queue.insert(_queue.begin(), i);
-
-    cookie = entry;
-
-    return entry->servant;
-}
-
-void
-EvictorBase::finished(const Ice::Current&, const shared_ptr<Ice::Object>&, const shared_ptr<void>& cookie)
-{
-    lock_guard<mutex> lk(_mutex);
-
-    auto entry = static_pointer_cast<EvictorEntry>(cookie);
-
-    //
-    // Decrement use count and check if there is something to evict.
-    //
-    --(entry->useCount);
-    evictServants();
-}
-
-void
-EvictorBase::deactivate(const string&)
-{
-    lock_guard<mutex> lk(_mutex);
-
-    _size = 0;
-    evictServants();
-}
-
-void
-EvictorBase::evictServants()
-{
-    //
-    // If the evictor queue has grown larger than the limit,
-    // look at the excess elements to see whether any of them
-    // can be evicted.
-    //
-    auto p = _queue.rbegin();
-    auto excessEntries = static_cast<int>(_map.size() - _size);
-
-    for(int i = 0; i < excessEntries; ++i)
-    {
-        auto mapPos = *p;
-        if(mapPos->second->useCount == 0)
-        {
-            evict(mapPos->second->servant, mapPos->second->userCookie); // Down-call
-            p = EvictorQueue::reverse_iterator(_queue.erase(mapPos->second->queuePos));
-            _map.erase(mapPos);
-        }
-        else
-        {
-            ++p;
-        }
-    }
-}
-#ifndef EVICTORBASE_H
-#define EVICTORBASE_H
-
-#include <Ice/Ice.h>
-#include <map>
-#include <list>
-#include <mutex>
-
-class EvictorBase : public Ice::ServantLocator
-{
-public:
-
-    EvictorBase(int size = 1000);
-
-    virtual std::shared_ptr<Ice::Object> locate(const Ice::Current&, std::shared_ptr<void>&) override;
-    virtual void finished(const Ice::Current&, const std::shared_ptr<Ice::Object>&, const std::shared_ptr<void>&) override;
-    virtual void deactivate(const std::string&) override;
-
-protected:
-
-    virtual std::shared_ptr<Ice::Object> add(const Ice::Current&, std::shared_ptr<void>&) = 0;
-    virtual void evict(const std::shared_ptr<Ice::Object>&, const std::shared_ptr<void>&) = 0;
-
-private:
-
-    struct EvictorEntry;
-
-    using EvictorMap = std::map<Ice::Identity, std::shared_ptr<EvictorEntry>>;
-    using EvictorQueue = std::list<EvictorMap::iterator>;
-
-    struct EvictorEntry
-    {
-        std::shared_ptr<Ice::Object> servant;
-        std::shared_ptr<void> userCookie;
-        EvictorQueue::iterator queuePos;
-        int useCount;
-    };
-
-    EvictorMap _map;
-    EvictorQueue _queue;
-    int _size;
-
-    std::mutex _mutex;
-
-    void evictServants();
-};
-#endif
@@ -4,7 +4,6 @@
 #include <Ice/Ice.h>
 #include <Printer.h>
-#include "EvictorBase.h"
 using namespace std;
 using namespace Demo;