Chiebot-Mirror
/
c-ares
mirror of https://github.com/c-ares/c-ares.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

tests: use std::chrono instead of pulling in ares__tvnow and ares__timeval_remaining (#809)

Browse Source 
This will allow more tests to run even when internal symbols aren't
accessible.

Fix By: Brad House (@bradh352)
v1.27
Brad House 8 months ago
parent 15b4f2e71b
commit 3cbd1b7629
5 changed files with 41 additions and 93 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      test/ares-test-mock-ai.cc
  2. 2
      test/ares-test-mock-et.cc
  3. 2
      test/ares-test-mock.cc
  4. 107
      test/ares-test.cc
  5. 21
      test/ares-test.h

2
test/ares-test-mock-ai.cc vendored
Unescape View File

@ -450,7 +450,6 @@ TEST_P(MockChannelTestAI, FamilyV6) {
EXPECT_THAT(result.ai_, IncludesV6Address("2121:0000:0000:0000:0000:0000:0000:0303"));
}
#ifndef CARES_SYMBOL_HIDING
// Test case for Issue #662
TEST_P(MockChannelTestAI, PartialQueryCancel) {
std::vector<byte> nothing;
@ -478,7 +477,6 @@ TEST_P(MockChannelTestAI, PartialQueryCancel) {
EXPECT_TRUE(result.done_);
EXPECT_EQ(ARES_ECANCELLED, result.status_);
}
#endif
TEST_P(MockChannelTestAI, FamilyV4) {
DNSPacket rsp4;

2
test/ares-test-mock-et.cc vendored
Unescape View File

@ -841,7 +841,6 @@ TEST_P(MockEventThreadTest, DestroyQuick) {
EXPECT_TRUE(result.done_);
}
#ifndef CARES_SYMBOL_HIDING
// Test case for Issue #662
TEST_P(MockEventThreadTest, PartialQueryCancel) {
std::vector<byte> nothing;
@ -864,7 +863,6 @@ TEST_P(MockEventThreadTest, PartialQueryCancel) {
EXPECT_TRUE(result.done_);
EXPECT_EQ(ARES_ECANCELLED, result.status_);
}
#endif
TEST_P(MockEventThreadTest, UnspecifiedFamilyV6) {
DNSPacket rsp6;

2
test/ares-test-mock.cc vendored
Unescape View File

@ -826,7 +826,6 @@ TEST_P(MockChannelTest, V4WorksV6Timeout) {
EXPECT_EQ("{'www.google.com' aliases=[] addrs=[1.2.3.4]}", ss.str());
}
#ifndef CARES_SYMBOL_HIDING
// Test case for Issue #662
TEST_P(MockChannelTest, PartialQueryCancel) {
std::vector<byte> nothing;
@ -849,7 +848,6 @@ TEST_P(MockChannelTest, PartialQueryCancel) {
EXPECT_TRUE(result.done_);
EXPECT_EQ(ARES_ECANCELLED, result.status_);
}
#endif
TEST_P(MockChannelTest, UnspecifiedFamilyV6) {
DNSPacket rsp6;

107
test/ares-test.cc vendored
Unescape View File

@ -58,6 +58,8 @@ extern "C" {
#include <functional>
#include <sstream>
#include <algorithm>
#include <chrono>
#ifdef WIN32
#define BYTE_CAST (char *)
@ -256,27 +258,15 @@ void ProcessWork(ares_channel_t *channel,
int nfds, count;
fd_set readers, writers;
#ifndef CARES_SYMBOL_HIDING
struct timeval tv_begin = ares__tvnow();
struct timeval tv_cancel = tv_begin;
auto tv_begin = std::chrono::high_resolution_clock::now();
auto tv_cancel = tv_begin;
if (cancel_ms) {
if (verbose) std::cerr << "ares_cancel will be called after " << cancel_ms << "ms" << std::endl;
tv_cancel.tv_sec += (cancel_ms / 1000);
tv_cancel.tv_usec += ((cancel_ms % 1000) * 1000);
tv_cancel += std::chrono::milliseconds(cancel_ms);
}
#else
if (cancel_ms) {
std::cerr << "library built with symbol hiding, can't test with cancel support" << std::endl;
return;
}
#endif
while (true) {
#ifndef CARES_SYMBOL_HIDING
struct timeval tv_now = ares__tvnow();
struct timeval tv_remaining;
#endif
struct timeval tv;
struct timeval *tv_select;
@ -302,23 +292,24 @@ void ProcessWork(ares_channel_t *channel,
if (tv_select == NULL)
return;
#ifndef CARES_SYMBOL_HIDING
if (cancel_ms) {
unsigned int remaining_ms;
ares__timeval_remaining(&tv_remaining,
&tv_now,
&tv_cancel);
remaining_ms = (unsigned int)((tv_remaining.tv_sec * 1000) + (tv_remaining.tv_usec / 1000));
if (remaining_ms == 0) {
auto tv_now = std::chrono::high_resolution_clock::now();
auto remaining_ms = std::chrono::duration_cast<std::chrono::milliseconds>(tv_cancel - tv_now).count();
if (remaining_ms <= 0) {
if (verbose) std::cerr << "Issuing ares_cancel()" << std::endl;
ares_cancel(channel);
cancel_ms = 0; /* Disable issuing cancel again */
} else {
struct timeval tv_remaining;
tv_remaining.tv_sec = remaining_ms / 1000;
tv_remaining.tv_usec = (int)(remaining_ms % 1000);
/* Recalculate proper timeout since we also have a cancel to wait on */
tv_select = ares_timeout(channel, &tv_remaining, &tv);
}
}
#endif
count = select(nfds, &readers, &writers, nullptr, tv_select);
if (count < 0) {
@ -831,38 +822,25 @@ void MockChannelOptsTest::Process(unsigned int cancel_ms) {
cancel_ms);
}
void MockEventThreadOptsTest::ProcessThread() {
void MockEventThreadOptsTest::Process(unsigned int cancel_ms) {
std::set<ares_socket_t> fds;
#ifndef CARES_SYMBOL_HIDING
bool has_cancel_ms = false;
struct timeval tv_begin;
struct timeval tv_cancel;
#endif
auto tv_begin = std::chrono::high_resolution_clock::now();
auto tv_cancel = tv_begin;
mutex.lock();
if (cancel_ms) {
if (verbose) std::cerr << "ares_cancel will be called after " << cancel_ms << "ms" << std::endl;
tv_cancel += std::chrono::milliseconds(cancel_ms);
}
while (isup) {
while (1) {
int nfds = 0;
fd_set readers;
#ifndef CARES_SYMBOL_HIDING
struct timeval tv_now = ares__tvnow();
struct timeval tv_remaining;
if (cancel_ms_ && !has_cancel_ms) {
tv_begin = ares__tvnow();
tv_cancel = tv_begin;
if (verbose) std::cerr << "ares_cancel will be called after " << cancel_ms_ << "ms" << std::endl;
tv_cancel.tv_sec += (cancel_ms_ / 1000);
tv_cancel.tv_usec += ((cancel_ms_ % 1000) * 1000);
has_cancel_ms = true;
}
#else
if (cancel_ms_) {
std::cerr << "library built with symbol hiding, can't test with cancel support" << std::endl;
return;
struct timeval tv;
if (ares_timeout(channel_, NULL, &tv) == NULL) {
break;
}
#endif
struct timeval tv;
/* c-ares is using its own event thread, so we only need to monitor the
* extrafds passed in */
@ -875,27 +853,25 @@ void MockEventThreadOptsTest::ProcessThread() {
}
}
#ifndef CARES_SYMBOL_HIDING
if (has_cancel_ms) {
unsigned int remaining_ms;
ares__timeval_remaining(&tv_remaining,
&tv_now,
&tv_cancel);
remaining_ms = (unsigned int)((tv_remaining.tv_sec * 1000) + (tv_remaining.tv_usec / 1000));
if (remaining_ms == 0) {
/* We just always wait 20ms then recheck if we're done. Not doing any
* complex signaling. */
tv.tv_sec = 0;
tv.tv_usec = 20000;
if (cancel_ms) {
auto tv_now = std::chrono::high_resolution_clock::now();
auto remaining_ms = std::chrono::duration_cast<std::chrono::milliseconds>(tv_cancel - tv_now).count();
if (remaining_ms <= 0) {
if (verbose) std::cerr << "Issuing ares_cancel()" << std::endl;
ares_cancel(channel_);
cancel_ms_ = 0; /* Disable issuing cancel again */
has_cancel_ms = false;
cancel_ms = 0; /* Disable issuing cancel again */
} else {
tv.tv_sec = remaining_ms / 1000;
tv.tv_usec = (int)(remaining_ms % 1000);
}
}
#endif
/* We just always wait 20ms then recheck. Not doing any complex signaling. */
tv.tv_sec = 0;
tv.tv_usec = 20000;
mutex.unlock();
if (select(nfds, &readers, nullptr, nullptr, &tv) < 0) {
fprintf(stderr, "select() failed, errno %d\n", errno);
return;
@ -907,10 +883,7 @@ void MockEventThreadOptsTest::ProcessThread() {
ProcessFD(fd);
}
}
mutex.lock();
}
mutex.unlock();
}
std::ostream& operator<<(std::ostream& os, const HostResult& result) {

21
test/ares-test.h vendored
Unescape View File

@ -356,17 +356,10 @@ public:
FillOptionsET(&evopts_, givenopts, evsys),
optmask | ARES_OPT_EVENT_THREAD)
{
cancel_ms_ = 0;
isup = true;
thread = std::thread(&MockEventThreadOptsTest::ProcessThread, this);
}
~MockEventThreadOptsTest()
{
mutex.lock();
isup = false;
mutex.unlock();
thread.join();
}
static struct ares_options *FillOptionsET(struct ares_options *opts,
@ -382,21 +375,9 @@ public:
return opts;
}
void Process(unsigned int cancel_ms = 0)
{
mutex.lock();
cancel_ms_ = cancel_ms;
mutex.unlock();
ares_queue_wait_empty(channel_, -1);
}
void Process(unsigned int cancel_ms = 0);
private:
void ProcessThread();
struct ares_options evopts_;
unsigned int cancel_ms_;
bool isup;
std::mutex mutex;
std::thread thread;
};
class MockEventThreadTest

Write Preview
Loading…
Cancel
Save