11347194459

Committed 15 Oct 2024 01:33PM UTC coverage: 66.34% (-0.06%) from 66.403%

Build # 11347194459

Build Type

Pull #14773

github

Committed by

web-flow

Commit Message

Merge 28bb1f709 into 6a370569b

Pull Request Pull Request #14773: rec: Backport 14628 to rec 5.1.x: rec: avoid duplicated waiter ids for chained requests

Run Details

16594 of 34996 branches covered (47.42%)

Branch coverage included in aggregate %.

5 of 5 new or added lines in 2 files covered. (100.0%)

73 existing lines in 7 files now uncovered.

56857 of 75723 relevant lines covered (75.09%)

4109981.3 hits per line

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

34.15

/pdns/recursordist/taskqueue.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.
 */

#include "taskqueue.hh"

#include "logging.hh"
#include "syncres.hh"

namespace pdns
{

bool TaskQueue::push(ResolveTask&& task)
{
  // Insertion fails if it's already there, no problem since we're already scheduled
  auto result = d_queue.insert(std::move(task)).second;
  if (result) {
    d_pushes++;
  }
  return result;
}

ResolveTask TaskQueue::pop()
{
  ResolveTask ret = d_queue.get<SequencedTag>().front();
  d_queue.get<SequencedTag>().pop_front();
  return ret;
}

bool ResolveTask::run(bool logErrors) const
{
  if (d_func == nullptr) {
    auto log = g_slog->withName("taskq")->withValues("name", Logging::Loggable(d_qname), "qtype", Logging::Loggable(QType(d_qtype).toString()));
    log->error(Logr::Debug, "null task");
    return false;
  }
  struct timeval now
  {
  };
  Utility::gettimeofday(&now);
  if (d_deadline >= now.tv_sec) {
    d_func(now, logErrors, *this);
  }
  else {
    // Deadline passed
    auto log = g_slog->withName("taskq")->withValues("name", Logging::Loggable(d_qname), "qtype", Logging::Loggable(QType(d_qtype).toString()));
    log->info(Logr::Debug, "deadline passed");
    return true;
  }
  return false;
}

} /* namespace pdns */

namespace boost
{
size_t hash_value(const ComboAddress& address)
{
  return ComboAddress::addressOnlyHash()(address);
}
}

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
23	#include "taskqueue.hh"
24
25	#include "logging.hh"
26	#include "syncres.hh"
27
28	namespace pdns
29	{
30
31	bool TaskQueue::push(ResolveTask&& task)
32	{	464✔
33	// Insertion fails if it's already there, no problem since we're already scheduled
34	auto result = d_queue.insert(std::move(task)).second;	464✔
35	if (result) {	464✔
36	d_pushes++;	450✔
37	}	450✔
38	return result;	464✔
39	}	464✔
40
41	ResolveTask TaskQueue::pop()
42	{	28✔
43	ResolveTask ret = d_queue.get<SequencedTag>().front();	28✔
44	d_queue.get<SequencedTag>().pop_front();	28✔
45	return ret;	28✔
46	}	28✔
47
48	bool ResolveTask::run(bool logErrors) const
UNCOV 49	{	×
UNCOV 50	if (d_func == nullptr) {	×
51	auto log = g_slog->withName("taskq")->withValues("name", Logging::Loggable(d_qname), "qtype", Logging::Loggable(QType(d_qtype).toString()));	×
52	log->error(Logr::Debug, "null task");	×
53	return false;	×
54	}	×
UNCOV 55	struct timeval now	×
UNCOV 56	{	×
UNCOV 57	};	×
UNCOV 58	Utility::gettimeofday(&now);	×
UNCOV 59	if (d_deadline >= now.tv_sec) {	×
UNCOV 60	d_func(now, logErrors, *this);	×
UNCOV 61	}	×
62	else {	×
63	// Deadline passed
64	auto log = g_slog->withName("taskq")->withValues("name", Logging::Loggable(d_qname), "qtype", Logging::Loggable(QType(d_qtype).toString()));	×
65	log->info(Logr::Debug, "deadline passed");	×
66	return true;	×
67	}	×
UNCOV 68	return false;	×
UNCOV 69	}	×
70
71	} /* namespace pdns */
72
73	namespace boost
74	{
75	size_t hash_value(const ComboAddress& address)
76	{	×
77	return ComboAddress::addressOnlyHash()(address);	×
78	}	×
79	}

PowerDNS / pdns / 11347194459

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