12321902803

Committed 13 Dec 2024 07:34PM UTC coverage: 66.359% (+1.6%) from 64.78%

Build # 12321902803

Build Type

Pull #14970

github

Committed by

web-flow

Commit Message

Merge e3a7df61c into 3dfd8e317

Pull Request Pull Request #14970: boost > std optional

Run Details

26084 of 54744 branches covered (47.65%)

Branch coverage included in aggregate %.

14 of 15 new or added lines in 2 files covered. (93.33%)

1863 existing lines in 52 files now uncovered.

85857 of 113946 relevant lines covered (75.35%)

4412729.59 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

83.13

/pdns/epollmplexer.cc

/*
 * This file is part of PowerDNS or dnsdist.
 * Copyright -- PowerDNS.COM B.V. and its contributors
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of version 2 of the GNU General Public License as
 * published by the Free Software Foundation.
 *
 * In addition, for the avoidance of any doubt, permission is granted to
 * link this program with OpenSSL and to (re)distribute the binaries
 * produced as the result of such linking.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "mplexer.hh"
#include "sstuff.hh"
#include <iostream>
#include <unistd.h>
#include "misc.hh"
#ifdef __linux__
#include <sys/epoll.h>
#endif

#include "namespaces.hh"

class EpollFDMultiplexer : public FDMultiplexer
{
public:
  EpollFDMultiplexer(unsigned int maxEventsHint);
  ~EpollFDMultiplexer() override
  {
    if (d_epollfd >= 0) {
      close(d_epollfd);
    }
  }

  int run(struct timeval* tv, int timeout = 500) override;
  void getAvailableFDs(std::vector<int>& fds, int timeout) override;

  void addFD(int fd, FDMultiplexer::EventKind kind) override;
  void removeFD(int fd, FDMultiplexer::EventKind kind) override;
  void alterFD(int fd, FDMultiplexer::EventKind from, FDMultiplexer::EventKind to) override;

  string getName() const override
  {
    return "epoll";
  }

private:
  int d_epollfd;
  std::vector<epoll_event> d_eevents;
};

static FDMultiplexer* makeEpoll(unsigned int maxEventsHint)
{
  return new EpollFDMultiplexer(maxEventsHint);
}

static struct EpollRegisterOurselves
{
  EpollRegisterOurselves()
  {
    FDMultiplexer::getMultiplexerMap().emplace(0, &makeEpoll); // priority 0!
  }
} doItEpoll;

EpollFDMultiplexer::EpollFDMultiplexer(unsigned int maxEventsHint) :
  d_eevents(maxEventsHint)
{
  d_epollfd = epoll_create(static_cast<int>(maxEventsHint)); // not hard max, just a hint that is actually ignored since Linux 2.6.8
  if (d_epollfd < 0) {
    throw FDMultiplexerException("Setting up epoll: " + stringerror());
  }
  int fd = socket(AF_INET, SOCK_DGRAM, 0); // for self-test

  if (fd < 0) {
    return;
  }

  try {
    addReadFD(fd, 0);
    removeReadFD(fd);
    close(fd);
    return;
  }
  catch (const FDMultiplexerException& fe) {
    close(fd);
    close(d_epollfd);
    throw FDMultiplexerException("epoll multiplexer failed self-test: " + string(fe.what()));
  }
}

static uint32_t convertEventKind(FDMultiplexer::EventKind kind)
{
  switch (kind) {
  case FDMultiplexer::EventKind::Read:
    return EPOLLIN;
  case FDMultiplexer::EventKind::Write:
    return EPOLLOUT;
  case FDMultiplexer::EventKind::Both:
    return EPOLLIN | EPOLLOUT;
  }

  throw std::runtime_error("Unhandled event kind in the epoll multiplexer");
}

void EpollFDMultiplexer::addFD(int fd, FDMultiplexer::EventKind kind)
{
  struct epoll_event eevent;

  eevent.events = convertEventKind(kind);

  eevent.data.u64 = 0; // placate valgrind (I love it so much)
  eevent.data.fd = fd;

  if (epoll_ctl(d_epollfd, EPOLL_CTL_ADD, fd, &eevent) < 0) {
    throw FDMultiplexerException("Adding fd to epoll set: " + stringerror());
  }
}

void EpollFDMultiplexer::removeFD(int fd, FDMultiplexer::EventKind)
{
  struct epoll_event dummy;
  dummy.events = 0;
  dummy.data.u64 = 0;

  if (epoll_ctl(d_epollfd, EPOLL_CTL_DEL, fd, &dummy) < 0) {
    throw FDMultiplexerException("Removing fd from epoll set: " + stringerror());
  }
}

void EpollFDMultiplexer::alterFD(int fd, FDMultiplexer::EventKind, FDMultiplexer::EventKind to)
{
  struct epoll_event eevent;
  eevent.events = convertEventKind(to);
  eevent.data.u64 = 0; // placate valgrind (I love it so much)
  eevent.data.fd = fd;

  if (epoll_ctl(d_epollfd, EPOLL_CTL_MOD, fd, &eevent) < 0) {
    throw FDMultiplexerException("Altering fd in epoll set: " + stringerror());
  }
}

void EpollFDMultiplexer::getAvailableFDs(std::vector<int>& fds, int timeout)
{
  int ret = epoll_wait(d_epollfd, d_eevents.data(), d_eevents.size(), timeout);

  if (ret < 0 && errno != EINTR) {
    throw FDMultiplexerException("epoll returned error: " + stringerror());
  }

  for (int n = 0; n < ret; ++n) {
    fds.push_back(d_eevents[n].data.fd);
  }
}

int EpollFDMultiplexer::run(struct timeval* now, int timeout)
{
  InRun guard(d_inrun);

  int ret = epoll_wait(d_epollfd, d_eevents.data(), d_eevents.size(), timeout);
  gettimeofday(now, nullptr); // MANDATORY

  if (ret < 0 && errno != EINTR) {
    throw FDMultiplexerException("epoll returned error: " + stringerror());
  }

  if (ret < 1) { // thanks AB!
    return 0;
  }

  int count = 0;

  for (int n = 0; n < ret; ++n) {
    if ((d_eevents[n].events & EPOLLIN) || (d_eevents[n].events & EPOLLERR) || (d_eevents[n].events & EPOLLHUP)) {
      const auto& iter = d_readCallbacks.find(d_eevents[n].data.fd);
      if (iter != d_readCallbacks.end()) {
        iter->d_callback(iter->d_fd, iter->d_parameter);
        count++;
      }
    }

    if ((d_eevents[n].events & EPOLLOUT) || (d_eevents[n].events & EPOLLERR) || (d_eevents[n].events & EPOLLHUP)) {
      const auto& iter = d_writeCallbacks.find(d_eevents[n].data.fd);
      if (iter != d_writeCallbacks.end()) {
        iter->d_callback(iter->d_fd, iter->d_parameter);
        count++;
      }
    }
  }

  return count;
}

#if 0
void acceptData(int fd, funcparam_t& parameter)
{
  cout<<"Have data on fd "<<fd<<endl;
  Socket* sock=funcparam_t_cast<Socket*>(parameter);
  string packet;
  IPEndpoint rem;
  sock->recvFrom(packet, rem);
  cout<<"Received "<<packet.size()<<" bytes!\n";
}


int main()
{
  Socket s(AF_INET, SOCK_DGRAM);

  IPEndpoint loc("0.0.0.0", 2000);
  s.bind(loc);

  EpollFDMultiplexer sfm;

  sfm.addReadFD(s.getHandle(), &acceptData, &s);

  for(int n=0; n < 100 ; ++n) {
    sfm.run();
  }
  sfm.removeReadFD(s.getHandle());
  sfm.removeReadFD(s.getHandle());
}
#endif

1	/*
2	* This file is part of PowerDNS or dnsdist.
3	* Copyright -- PowerDNS.COM B.V. and its contributors
4	*
5	* This program is free software; you can redistribute it and/or modify
6	* it under the terms of version 2 of the GNU General Public License as
7	* published by the Free Software Foundation.
8	*
9	* In addition, for the avoidance of any doubt, permission is granted to
10	* link this program with OpenSSL and to (re)distribute the binaries
11	* produced as the result of such linking.
12	*
13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.
17	*
18	* You should have received a copy of the GNU General Public License
19	* along with this program; if not, write to the Free Software
20	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
21	*/
22	#ifdef HAVE_CONFIG_H
23	#include "config.h"
24	#endif
25	#include "mplexer.hh"
26	#include "sstuff.hh"
27	#include <iostream>
28	#include <unistd.h>
29	#include "misc.hh"
30	#ifdef __linux__
31	#include <sys/epoll.h>
32	#endif
33
34	#include "namespaces.hh"
35
36	class EpollFDMultiplexer : public FDMultiplexer
37	{
38	public:
39	EpollFDMultiplexer(unsigned int maxEventsHint);
40	~EpollFDMultiplexer() override
41	{	16✔
42	if (d_epollfd >= 0) {	16!
43	close(d_epollfd);	16✔
44	}	16✔
45	}	16✔
46
47	int run(struct timeval* tv, int timeout = 500) override;
48	void getAvailableFDs(std::vector<int>& fds, int timeout) override;
49
50	void addFD(int fd, FDMultiplexer::EventKind kind) override;
51	void removeFD(int fd, FDMultiplexer::EventKind kind) override;
52	void alterFD(int fd, FDMultiplexer::EventKind from, FDMultiplexer::EventKind to) override;
53
54	string getName() const override
55	{	152✔
56	return "epoll";	152✔
57	}	152✔
58
59	private:
60	int d_epollfd;
61	std::vector<epoll_event> d_eevents;
62	};
63
64	static FDMultiplexer* makeEpoll(unsigned int maxEventsHint)
65	{	813✔
66	return new EpollFDMultiplexer(maxEventsHint);	813✔
67	}	813✔
68
69	static struct EpollRegisterOurselves
70	{
71	EpollRegisterOurselves()
72	{	161✔
73	FDMultiplexer::getMultiplexerMap().emplace(0, &makeEpoll); // priority 0!	161✔
74	}	161✔
75	} doItEpoll;
76
77	EpollFDMultiplexer::EpollFDMultiplexer(unsigned int maxEventsHint) :
78	d_eevents(maxEventsHint)
79	{	813✔
80	d_epollfd = epoll_create(static_cast<int>(maxEventsHint)); // not hard max, just a hint that is actually ignored since Linux 2.6.8	813✔
81	if (d_epollfd < 0) {	813!
UNCOV 82	throw FDMultiplexerException("Setting up epoll: " + stringerror());	×
UNCOV 83	}	×
84	int fd = socket(AF_INET, SOCK_DGRAM, 0); // for self-test	813✔
85
86	if (fd < 0) {	813!
87	return;	×
88	}	×
89
90	try {	813✔
91	addReadFD(fd, 0);	813✔
92	removeReadFD(fd);	813✔
93	close(fd);	813✔
94	return;	813✔
95	}	813✔
96	catch (const FDMultiplexerException& fe) {	813✔
97	close(fd);	×
98	close(d_epollfd);	×
99	throw FDMultiplexerException("epoll multiplexer failed self-test: " + string(fe.what()));	×
100	}	×
101	}	813✔
102
103	static uint32_t convertEventKind(FDMultiplexer::EventKind kind)
104	{	16,142✔
105	switch (kind) {	16,142✔
106	case FDMultiplexer::EventKind::Read:	16,121✔
107	return EPOLLIN;	16,121✔
108	case FDMultiplexer::EventKind::Write:	18✔
109	return EPOLLOUT;	18✔
110	case FDMultiplexer::EventKind::Both:	3✔
111	return EPOLLIN \| EPOLLOUT;	3✔
112	}	16,142✔
113
114	throw std::runtime_error("Unhandled event kind in the epoll multiplexer");	×
115	}	16,142✔
116
117	void EpollFDMultiplexer::addFD(int fd, FDMultiplexer::EventKind kind)
118	{	16,138✔
119	struct epoll_event eevent;	16,138✔
120
121	eevent.events = convertEventKind(kind);	16,138✔
122
123	eevent.data.u64 = 0; // placate valgrind (I love it so much)	16,138✔
124	eevent.data.fd = fd;	16,138✔
125
126	if (epoll_ctl(d_epollfd, EPOLL_CTL_ADD, fd, &eevent) < 0) {	16,138✔
127	throw FDMultiplexerException("Adding fd to epoll set: " + stringerror());	3✔
128	}	3✔
129	}	16,138✔
130
131	void EpollFDMultiplexer::removeFD(int fd, FDMultiplexer::EventKind)
132	{	14,071✔
133	struct epoll_event dummy;	14,071✔
134	dummy.events = 0;	14,071✔
135	dummy.data.u64 = 0;	14,071✔
136
137	if (epoll_ctl(d_epollfd, EPOLL_CTL_DEL, fd, &dummy) < 0) {	14,071!
138	throw FDMultiplexerException("Removing fd from epoll set: " + stringerror());	×
139	}	×
140	}	14,071✔
141
142	void EpollFDMultiplexer::alterFD(int fd, FDMultiplexer::EventKind, FDMultiplexer::EventKind to)
143	{	10✔
144	struct epoll_event eevent;	10✔
145	eevent.events = convertEventKind(to);	10✔
146	eevent.data.u64 = 0; // placate valgrind (I love it so much)	10✔
147	eevent.data.fd = fd;	10✔
148
149	if (epoll_ctl(d_epollfd, EPOLL_CTL_MOD, fd, &eevent) < 0) {	10!
150	throw FDMultiplexerException("Altering fd in epoll set: " + stringerror());	×
151	}	×
152	}	10✔
153
154	void EpollFDMultiplexer::getAvailableFDs(std::vector<int>& fds, int timeout)
155	{	27✔
156	int ret = epoll_wait(d_epollfd, d_eevents.data(), d_eevents.size(), timeout);	27✔
157
158	if (ret < 0 && errno != EINTR) {	27!
159	throw FDMultiplexerException("epoll returned error: " + stringerror());	×
160	}	×
161
162	for (int n = 0; n < ret; ++n) {	48✔
163	fds.push_back(d_eevents[n].data.fd);	21✔
164	}	21✔
165	}	27✔
166
167	int EpollFDMultiplexer::run(struct timeval* now, int timeout)
168	{	28,330✔
169	InRun guard(d_inrun);	28,330✔
170
171	int ret = epoll_wait(d_epollfd, d_eevents.data(), d_eevents.size(), timeout);	28,330✔
172	gettimeofday(now, nullptr); // MANDATORY	28,330✔
173
174	if (ret < 0 && errno != EINTR) {	28,330!
175	throw FDMultiplexerException("epoll returned error: " + stringerror());	×
176	}	×
177
178	if (ret < 1) { // thanks AB!	28,330✔
179	return 0;	10,310✔
180	}	10,310✔
181
182	int count = 0;	18,020✔
183
184	for (int n = 0; n < ret; ++n) {	38,266✔
185	if ((d_eevents[n].events & EPOLLIN) \|\| (d_eevents[n].events & EPOLLERR) \|\| (d_eevents[n].events & EPOLLHUP)) {	20,280!
186	const auto& iter = d_readCallbacks.find(d_eevents[n].data.fd);	20,266✔
187	if (iter != d_readCallbacks.end()) {	20,269✔
188	iter->d_callback(iter->d_fd, iter->d_parameter);	20,245✔
189	count++;	20,245✔
190	}	20,245✔
191	}	20,266✔
192
193	if ((d_eevents[n].events & EPOLLOUT) \|\| (d_eevents[n].events & EPOLLERR) \|\| (d_eevents[n].events & EPOLLHUP)) {	20,287✔
194	const auto& iter = d_writeCallbacks.find(d_eevents[n].data.fd);	61✔
195	if (iter != d_writeCallbacks.end()) {	61✔
196	iter->d_callback(iter->d_fd, iter->d_parameter);	18✔
197	count++;	18✔
198	}	18✔
199	}	61✔
200	}	20,246✔
201
202	return count;	18,020✔
203	}	28,330✔
204
205	#if 0
206	void acceptData(int fd, funcparam_t& parameter)
207	{
208	cout<<"Have data on fd "<<fd<<endl;
209	Socket* sock=funcparam_t_cast<Socket*>(parameter);
210	string packet;
211	IPEndpoint rem;
212	sock->recvFrom(packet, rem);
213	cout<<"Received "<<packet.size()<<" bytes!\n";
214	}
215
216
217	int main()
218	{
219	Socket s(AF_INET, SOCK_DGRAM);
220
221	IPEndpoint loc("0.0.0.0", 2000);
222	s.bind(loc);
223
224	EpollFDMultiplexer sfm;
225
226	sfm.addReadFD(s.getHandle(), &acceptData, &s);
227
228	for(int n=0; n < 100 ; ++n) {
229	sfm.run();
230	}
231	sfm.removeReadFD(s.getHandle());
232	sfm.removeReadFD(s.getHandle());
233	}
234	#endif

PowerDNS / pdns / 12321902803

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous