Remove old eventfd on thread concept

We use epoll now to change readiness.

Remove old eventfd on thread concept
We use epoll now to change readiness.
Wiebe Cazemier
1 parent 321015d4
Showing 3 changed files with 0 additions and 51 deletions
mainapp.cpp
threaddata.cpp
threaddata.h
@@ -16,21 +16,8 @@ void do_thread_work(ThreadData *threadData)
     std::vector<MqttPacket> packetQueueIn;
-    uint64_t eventfd_value = 0;
-
     while (threadData->running)
     {
-        if (eventfd_value > 0)
-        {
-            for (Client_p client : threadData->getReadyForDequeueing())
-            {
-                //client->queuedMessagesToBuffer();
-                client->writeBufIntoFd();
-            }
-            threadData->clearReadyForDequeueing();
-            eventfd_value = 0;
-        }
-
         int fdcount = epoll_wait(epoll_fd, events, MAX_EVENTS, 100);
         if (fdcount < 0)
@@ -46,13 +33,6 @@ void do_thread_work(ThreadData *threadData)
                 struct epoll_event cur_ev = events[i];
                 int fd = cur_ev.data.fd;
-                // If this thread was actively woken up.
-                if (fd == threadData->event_fd)
-                {
-                    read(fd, &eventfd_value, sizeof(uint64_t));
-                    continue;
-                }
-
                 Client_p client = threadData->getClient(fd);
                 if (client)
@@ -7,13 +7,6 @@ ThreadData::ThreadData(int threadnr, std::shared_ptr&lt;SubscriptionStore&gt; &amp;subscri
     threadnr(threadnr)
 {
     epollfd = check<std::runtime_error>(epoll_create(999));
-    event_fd = eventfd(0, EFD_NONBLOCK);
-
-    struct epoll_event ev;
-    memset(&ev, 0, sizeof (struct epoll_event));
-    ev.data.fd = event_fd;
-    ev.events = EPOLLIN;
-    check<std::runtime_error>(epoll_ctl(epollfd, EPOLL_CTL_ADD, event_fd, &ev));
 }
 void ThreadData::moveThreadHere(std::thread &&thread)
@@ -79,22 +72,5 @@ std::shared_ptr&lt;SubscriptionStore&gt; &amp;ThreadData::getSubscriptionStore()
     return subscriptionStore;
 }
-void ThreadData::wakeUpThread()
-{
-    uint64_t one = 1;
-    write(event_fd, &one, sizeof(uint64_t));
-}
-
-void ThreadData::addToReadyForDequeuing(Client_p &client)
-{
-    std::lock_guard<std::mutex> lock(readForDequeuingMutex);
-    this->readyForDequeueing.insert(client);
-}
-
-void ThreadData::clearReadyForDequeueing()
-{
-    std::lock_guard<std::mutex> lock(readForDequeuingMutex);
-    this->readyForDequeueing.clear();
-}
@@ -24,15 +24,12 @@ class ThreadData
     std::unordered_map<int, Client_p> clients_by_fd;
     std::mutex clients_by_fd_mutex;
     std::shared_ptr<SubscriptionStore> subscriptionStore;
-    std::unordered_set<Client_p> readyForDequeueing;
-    std::mutex readForDequeuingMutex;
 public:
     bool running = true;
     std::thread thread;
     int threadnr = 0;
     int epollfd = 0;
-    int event_fd = 0;
     ThreadData(int threadnr, std::shared_ptr<SubscriptionStore> &subscriptionStore);
@@ -43,10 +40,6 @@ public:
     void removeClient(Client_p client);
     void removeClient(int fd);
     std::shared_ptr<SubscriptionStore> &getSubscriptionStore();
-    void wakeUpThread();
-    void addToReadyForDequeuing(Client_p &client);
-    std::unordered_set<Client_p> &getReadyForDequeueing() { return readyForDequeueing; }
-    void clearReadyForDequeueing();
 };
 #endif // THREADDATA_H