Skip to content

Commit

Permalink
auth: Properly record coverage data when exiting
Browse files Browse the repository at this point in the history
  • Loading branch information
rgacogne committed Oct 9, 2023
1 parent a985c6a commit 460a6da
Show file tree
Hide file tree
Showing 4 changed files with 91 additions and 0 deletions.
1 change: 1 addition & 0 deletions pdns/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ pdns_server_SOURCES = \
circular_buffer.hh \
comment.hh \
communicator.cc communicator.hh \
coverage.cc coverage.hh \
credentials.cc credentials.hh \
dbdnsseckeeper.cc \
digests.hh \
Expand Down
15 changes: 15 additions & 0 deletions pdns/auth-main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
#endif

#include "auth-main.hh"
#include "coverage.hh"
#include "secpoll-auth.hh"
#include "dynhandler.hh"
#include "dnsseckeeper.hh"
Expand Down Expand Up @@ -1183,6 +1184,14 @@ static void tbhandler(int num)
}
#endif

#ifdef COVERAGE
static void sigTermHandler([[maybe_unused]] int signal)
{
pdns::coverage::dumpCoverageData();
_exit(EXIT_SUCCESS);
}
#endif /* COVERAGE */

//! The main function of pdns, the pdns process
int main(int argc, char** argv)
{
Expand Down Expand Up @@ -1282,6 +1291,12 @@ int main(int argc, char** argv)
cerr << "Um, we did get here!" << endl;
}

#ifdef COVERAGE
if (!::arg().mustDo("guardian") && !::arg().mustDo("daemon")) {
signal(SIGTERM, sigTermHandler);
}
#endif

// we really need to do work - either standalone or as an instance

#if defined(__GLIBC__) && !defined(__UCLIBC__)
Expand Down
48 changes: 48 additions & 0 deletions pdns/coverage.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/*
* 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 "config.h"
#include "coverage.hh"

#ifdef COVERAGE
extern "C"
{
//NOLINTNEXTLINE(bugprone-reserved-identifier): not ours
void __gcov_dump(void);
#ifdef CLANG_COVERAGE
//NOLINTNEXTLINE(bugprone-reserved-identifier): not ours
int __llvm_profile_write_file(void);
#endif /* CLANG_COVERAGE */
}
#endif /* COVERAGE */

namespace pdns::coverage
{
void dumpCoverageData()
{
#ifdef COVERAGE
__gcov_dump();
#ifdef CLANG_COVERAGE
__llvm_profile_write_file();
#endif /* CLANG_COVERAGE */
#endif /* COVERAGE */
}
}
27 changes: 27 additions & 0 deletions pdns/coverage.hh
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/*
* 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.
*/
#pragma once

namespace pdns::coverage
{
void dumpCoverageData();
}

0 comments on commit 460a6da

Please sign in to comment.