Replaced std::this_thread::sleep_for for gpr_sleep_until.

std::this_thread::sleep_for isn't available in gcc <= 4.6 (4.7?) nor
VS2010.
pull/1693/head
David Garcia Quintas 10 years ago
parent 2c523e5f7d
commit feb67f67dc
  1. 12
      test/cpp/end2end/end2end_test.cc
  2. 10
      test/cpp/end2end/thread_stress_test.cc
  3. 3
      test/cpp/qps/worker.cc

@ -96,14 +96,16 @@ class TestServiceImpl : public ::grpc::cpp::test::util::TestService::Service {
signal_client_ = true; signal_client_ = true;
} }
while (!context->IsCancelled()) { while (!context->IsCancelled()) {
std::this_thread::sleep_for(std::chrono::microseconds( gpr_sleep_until(gpr_time_add(
request->param().client_cancel_after_us())); gpr_now(),
gpr_time_from_micros(request->param().client_cancel_after_us())));
} }
return Status::Cancelled; return Status::Cancelled;
} else if (request->has_param() && } else if (request->has_param() &&
request->param().server_cancel_after_us()) { request->param().server_cancel_after_us()) {
std::this_thread::sleep_for( gpr_sleep_until(gpr_time_add(
std::chrono::microseconds(request->param().server_cancel_after_us())); gpr_now(),
gpr_time_from_micros(request->param().server_cancel_after_us())));
return Status::Cancelled; return Status::Cancelled;
} else { } else {
EXPECT_FALSE(context->IsCancelled()); EXPECT_FALSE(context->IsCancelled());
@ -469,7 +471,7 @@ TEST_F(End2endTest, BadCredentials) {
} }
void CancelRpc(ClientContext* context, int delay_us, TestServiceImpl* service) { void CancelRpc(ClientContext* context, int delay_us, TestServiceImpl* service) {
std::this_thread::sleep_for(std::chrono::microseconds(delay_us)); gpr_sleep_until(gpr_time_add(gpr_now(), gpr_time_from_micros(delay_us)));
while (!service->signal_client()) { while (!service->signal_client()) {
} }
context->TryCancel(); context->TryCancel();

@ -94,14 +94,16 @@ class TestServiceImpl : public ::grpc::cpp::test::util::TestService::Service {
signal_client_ = true; signal_client_ = true;
} }
while (!context->IsCancelled()) { while (!context->IsCancelled()) {
std::this_thread::sleep_for(std::chrono::microseconds( gpr_sleep_until(gpr_time_add(
request->param().client_cancel_after_us())); gpr_now(),
gpr_time_from_micros(request->param().client_cancel_after_us())));
} }
return Status::Cancelled; return Status::Cancelled;
} else if (request->has_param() && } else if (request->has_param() &&
request->param().server_cancel_after_us()) { request->param().server_cancel_after_us()) {
std::this_thread::sleep_for( gpr_sleep_until(gpr_time_add(
std::chrono::microseconds(request->param().server_cancel_after_us())); gpr_now(),
gpr_time_from_micros(request->param().server_cancel_after_us())));
return Status::Cancelled; return Status::Cancelled;
} else { } else {
EXPECT_FALSE(context->IsCancelled()); EXPECT_FALSE(context->IsCancelled());

@ -37,6 +37,7 @@
#include <thread> #include <thread>
#include <grpc/grpc.h> #include <grpc/grpc.h>
#include <grpc/support/time.h>
#include <gflags/gflags.h> #include <gflags/gflags.h>
#include "qps_worker.h" #include "qps_worker.h"
@ -56,7 +57,7 @@ static void RunServer() {
QpsWorker worker(FLAGS_driver_port, FLAGS_server_port); QpsWorker worker(FLAGS_driver_port, FLAGS_server_port);
while (!got_sigint) { while (!got_sigint) {
std::this_thread::sleep_for(std::chrono::seconds(5)); gpr_sleep_until(gpr_time_add(gpr_now(), gpr_time_from_seconds(5)));
} }
} }

Loading…
Cancel
Save