9855724712

Committed 09 Jul 2024 10:53AM UTC coverage: 55.745% (+0.03%) from 55.717%

Build # 9855724712

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #14450 from rgacogne/ddist19-backport-14392

dnsdist-1.9.x: Backport of 14392 - Handle Quiche >= 0.22.0

Run Details

13797 of 45278 branches covered (30.47%)

Branch coverage included in aggregate %.

2 of 2 new or added lines in 1 file covered. (100.0%)

1 existing line in 1 file now uncovered.

47915 of 65426 relevant lines covered (73.24%)

3563207.8 hits per line

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

82.39

/pdns/pollmplexer.cc

#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "mplexer.hh"
#include "sstuff.hh"
#include <iostream>
#include <poll.h>
#include <unordered_map>
#include "misc.hh"
#include "namespaces.hh"

FDMultiplexer* FDMultiplexer::getMultiplexerSilent(unsigned int maxEventsHint)
{
  FDMultiplexer* ret = nullptr;
  for (const auto& i : FDMultiplexer::getMultiplexerMap()) {
    try {
      ret = i.second(std::min(maxEventsHint, FDMultiplexer::s_maxevents));
      return ret;
    }
    catch (const FDMultiplexerException& fe) {
    }
    catch (...) {
    }
  }
  return ret;
}

class PollFDMultiplexer : public FDMultiplexer
{
public:
  PollFDMultiplexer(unsigned int /* maxEventsHint */)
  {}

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

  void addFD(int fd, FDMultiplexer::EventKind) override;
  void removeFD(int fd, FDMultiplexer::EventKind) override;

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

private:
  std::unordered_map<int, struct pollfd> d_pollfds;
  vector<struct pollfd> preparePollFD() const;
};

static FDMultiplexer* make(unsigned int maxEventsHint)
{
  return new PollFDMultiplexer(maxEventsHint);
}

static struct RegisterOurselves
{
  RegisterOurselves()
  {
    FDMultiplexer::getMultiplexerMap().emplace(2, &make);
  }
} doIt;

static int convertEventKind(FDMultiplexer::EventKind kind)
{
  switch (kind) {
  case FDMultiplexer::EventKind::Read:
    return POLLIN;
  case FDMultiplexer::EventKind::Write:
    return POLLOUT;
  case FDMultiplexer::EventKind::Both:
    return POLLIN | POLLOUT;
  }
  throw std::runtime_error("Unhandled event kind in the ports multiplexer");
}

void PollFDMultiplexer::addFD(int fd, FDMultiplexer::EventKind kind)
{
  if (d_pollfds.count(fd) == 0) {
    auto& pollfd = d_pollfds[fd];
    pollfd.fd = fd;
    pollfd.events = 0;
  }
  auto& pollfd = d_pollfds.at(fd);
  pollfd.events |= convertEventKind(kind);
}

void PollFDMultiplexer::removeFD(int fd, FDMultiplexer::EventKind)
{
  d_pollfds.erase(fd);
}

vector<struct pollfd> PollFDMultiplexer::preparePollFD() const
{
  std::vector<struct pollfd> result;
  result.reserve(d_pollfds.size());
  for (const auto& entry : d_pollfds) {
    result.push_back(entry.second);
  }

  return result;
}

void PollFDMultiplexer::getAvailableFDs(std::vector<int>& fds, int timeout)
{
  auto pollfds = preparePollFD();
  if (pollfds.empty()) {
    return;
  }

  int ret = poll(&pollfds[0], pollfds.size(), timeout);

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

  for (const auto& pollfd : pollfds) {
    if (pollfd.revents & POLLIN || pollfd.revents & POLLOUT || pollfd.revents & POLLERR || pollfd.revents & POLLHUP) {
      fds.push_back(pollfd.fd);
    }
  }
}

int PollFDMultiplexer::run(struct timeval* now, int timeout)
{
  if (d_inrun) {
    throw FDMultiplexerException("FDMultiplexer::run() is not reentrant!\n");
  }

  auto pollfds = preparePollFD();
  if (pollfds.empty()) {
    gettimeofday(now, nullptr); // MANDATORY!
    return 0;
  }

  int ret = poll(&pollfds[0], pollfds.size(), timeout);
  gettimeofday(now, nullptr); // MANDATORY!

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

  d_inrun = true;
  int count = 0;
  for (const auto& pollfd : pollfds) {
    if (pollfd.revents & POLLIN || pollfd.revents & POLLERR || pollfd.revents & POLLHUP) {
      const auto& iter = d_readCallbacks.find(pollfd.fd);
      if (iter != d_readCallbacks.end()) {
        iter->d_callback(iter->d_fd, iter->d_parameter);
        count++;
      }
    }

    if (pollfd.revents & POLLOUT || pollfd.revents & POLLERR) {
      const auto& iter = d_writeCallbacks.find(pollfd.fd);
      if (iter != d_writeCallbacks.end()) {
        iter->d_callback(iter->d_fd, iter->d_parameter);
        count++;
      }
    }
  }

  d_inrun = false;
  return count;
}

#if 0

void acceptData(int fd, boost::any& parameter)
{
  cout<<"Have data on fd "<<fd<<endl;
  Socket* sock=boost::any_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);

  PollFDMultiplexer 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	#ifdef HAVE_CONFIG_H
2	#include "config.h"
3	#endif
4	#include "mplexer.hh"
5	#include "sstuff.hh"
6	#include <iostream>
7	#include <poll.h>
8	#include <unordered_map>
9	#include "misc.hh"
10	#include "namespaces.hh"
11
12	FDMultiplexer* FDMultiplexer::getMultiplexerSilent(unsigned int maxEventsHint)
13	{	4,773✔
14	FDMultiplexer* ret = nullptr;	4,773✔
15	for (const auto& i : FDMultiplexer::getMultiplexerMap()) {	4,778!
16	try {	4,778✔
17	ret = i.second(std::min(maxEventsHint, FDMultiplexer::s_maxevents));	4,778✔
18	return ret;	4,778✔
19	}	4,778✔
20	catch (const FDMultiplexerException& fe) {	4,778✔
21	}	5✔
22	catch (...) {	4,778✔
23	}	×
24	}	4,778✔
UNCOV 25	return ret;	×
26	}	4,773✔
27
28	class PollFDMultiplexer : public FDMultiplexer
29	{
30	public:
31	PollFDMultiplexer(unsigned int /* maxEventsHint */)
32	{}	9✔
33
34	int run(struct timeval* tv, int timeout = 500) override;
35	void getAvailableFDs(std::vector<int>& fds, int timeout) override;
36
37	void addFD(int fd, FDMultiplexer::EventKind) override;
38	void removeFD(int fd, FDMultiplexer::EventKind) override;
39
40	string getName() const override
41	{	×
42	return "poll";	×
43	}	×
44
45	private:
46	std::unordered_map<int, struct pollfd> d_pollfds;
47	vector<struct pollfd> preparePollFD() const;
48	};
49
50	static FDMultiplexer* make(unsigned int maxEventsHint)
51	{	9✔
52	return new PollFDMultiplexer(maxEventsHint);	9✔
53	}	9✔
54
55	static struct RegisterOurselves
56	{
57	RegisterOurselves()
58	{	631✔
59	FDMultiplexer::getMultiplexerMap().emplace(2, &make);	631✔
60	}	631✔
61	} doIt;
62
63	static int convertEventKind(FDMultiplexer::EventKind kind)
64	{	14✔
65	switch (kind) {	14!
66	case FDMultiplexer::EventKind::Read:	4✔
67	return POLLIN;	4✔
68	case FDMultiplexer::EventKind::Write:	8✔
69	return POLLOUT;	8✔
70	case FDMultiplexer::EventKind::Both:	2✔
71	return POLLIN \| POLLOUT;	2✔
72	}	14✔
73	throw std::runtime_error("Unhandled event kind in the ports multiplexer");	×
74	}	14✔
75
76	void PollFDMultiplexer::addFD(int fd, FDMultiplexer::EventKind kind)
77	{	14✔
78	if (d_pollfds.count(fd) == 0) {	14✔
79	auto& pollfd = d_pollfds[fd];	12✔
80	pollfd.fd = fd;	12✔
81	pollfd.events = 0;	12✔
82	}	12✔
83	auto& pollfd = d_pollfds.at(fd);	14✔
84	pollfd.events \|= convertEventKind(kind);	14✔
85	}	14✔
86
87	void PollFDMultiplexer::removeFD(int fd, FDMultiplexer::EventKind)
88	{	12✔
89	d_pollfds.erase(fd);	12✔
90	}	12✔
91
92	vector<struct pollfd> PollFDMultiplexer::preparePollFD() const
93	{	34✔
94	std::vector<struct pollfd> result;	34✔
95	result.reserve(d_pollfds.size());	34✔
96	for (const auto& entry : d_pollfds) {	34✔
97	result.push_back(entry.second);	30✔
98	}	30✔
99
100	return result;	34✔
101	}	34✔
102
103	void PollFDMultiplexer::getAvailableFDs(std::vector<int>& fds, int timeout)
104	{	18✔
105	auto pollfds = preparePollFD();	18✔
106	if (pollfds.empty()) {	18✔
107	return;	4✔
108	}	4✔
109
110	int ret = poll(&pollfds[0], pollfds.size(), timeout);	14✔
111
112	if (ret < 0 && errno != EINTR) {	14!
113	throw FDMultiplexerException("poll returned error: " + stringerror());	×
114	}	×
115
116	for (const auto& pollfd : pollfds) {	16✔
117	if (pollfd.revents & POLLIN \|\| pollfd.revents & POLLOUT \|\| pollfd.revents & POLLERR \|\| pollfd.revents & POLLHUP) {	16!
118	fds.push_back(pollfd.fd);	14✔
119	}	14✔
120	}	16✔
121	}	14✔
122
123	int PollFDMultiplexer::run(struct timeval* now, int timeout)
124	{	16✔
125	if (d_inrun) {	16!
126	throw FDMultiplexerException("FDMultiplexer::run() is not reentrant!\n");	×
127	}	×
128
129	auto pollfds = preparePollFD();	16✔
130	if (pollfds.empty()) {	16✔
131	gettimeofday(now, nullptr); // MANDATORY!	4✔
132	return 0;	4✔
133	}	4✔
134
135	int ret = poll(&pollfds[0], pollfds.size(), timeout);	12✔
136	gettimeofday(now, nullptr); // MANDATORY!	12✔
137
138	if (ret < 0 && errno != EINTR) {	12!
139	throw FDMultiplexerException("poll returned error: " + stringerror());	×
140	}	×
141
142	d_inrun = true;	12✔
143	int count = 0;	12✔
144	for (const auto& pollfd : pollfds) {	14✔
145	if (pollfd.revents & POLLIN \|\| pollfd.revents & POLLERR \|\| pollfd.revents & POLLHUP) {	14!
146	const auto& iter = d_readCallbacks.find(pollfd.fd);	6✔
147	if (iter != d_readCallbacks.end()) {	6!
148	iter->d_callback(iter->d_fd, iter->d_parameter);	6✔
149	count++;	6✔
150	}	6✔
151	}	6✔
152
153	if (pollfd.revents & POLLOUT \|\| pollfd.revents & POLLERR) {	14!
154	const auto& iter = d_writeCallbacks.find(pollfd.fd);	8✔
155	if (iter != d_writeCallbacks.end()) {	8!
156	iter->d_callback(iter->d_fd, iter->d_parameter);	8✔
157	count++;	8✔
158	}	8✔
159	}	8✔
160	}	14✔
161
162	d_inrun = false;	12✔
163	return count;	12✔
164	}	12✔
165
166	#if 0
167
168	void acceptData(int fd, boost::any& parameter)
169	{
170	cout<<"Have data on fd "<<fd<<endl;
171	Socket* sock=boost::any_cast<Socket*>(parameter);
172	string packet;
173	IPEndpoint rem;
174	sock->recvFrom(packet, rem);
175	cout<<"Received "<<packet.size()<<" bytes!\n";
176	}
177
178
179	int main()
180	{
181	Socket s(AF_INET, SOCK_DGRAM);
182
183	IPEndpoint loc("0.0.0.0", 2000);
184	s.bind(loc);
185
186	PollFDMultiplexer sfm;
187
188	sfm.addReadFD(s.getHandle(), &acceptData, &s);
189
190	for(int n=0; n < 100 ; ++n) {
191	sfm.run();
192	}
193	sfm.removeReadFD(s.getHandle());
194	sfm.removeReadFD(s.getHandle());
195	}
196	#endif

PowerDNS / pdns / 9855724712

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