summaryrefslogtreecommitdiffhomepage
path: root/test/syscalls/linux/wait.cc
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-01-21 16:32:49 -0800
committergVisor bot <gvisor-bot@google.com>2020-01-21 16:32:49 -0800
commit45a8edbd5ae6c836317923dc7d2b5baac9feea98 (patch)
treec8e011c89c1808fe2e520ee41c9bcb2af7911cd0 /test/syscalls/linux/wait.cc
parentb3405a719cbb33dac2deced192209a5584e5e3d6 (diff)
parent200cf245c4ed43d8e2a37484cdbc36f5fbfa1ac9 (diff)
Merge pull request #1492 from majek:err_typo_in_netstack_tests
PiperOrigin-RevId: 290840370
Diffstat (limited to 'test/syscalls/linux/wait.cc')
-rw-r--r--test/syscalls/linux/wait.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/test/syscalls/linux/wait.cc b/test/syscalls/linux/wait.cc
index 944149d5e..709b87a21 100644
--- a/test/syscalls/linux/wait.cc
+++ b/test/syscalls/linux/wait.cc
@@ -64,7 +64,7 @@ static const size_t kStackSize = 2 * kPageSize;
// The child thread created in CloneAndExit runs this function.
// This child does not have the TLS setup, so it must not use glibc functions.
int CloneChild(void* priv) {
- int64_t sleep = reinterpret_cast<int64_t>(priv);
+ int64 sleep = reinterpret_cast<int64>(priv);
SleepSafe(absl::Seconds(sleep));
// glibc's _exit(2) function wrapper will helpfully call exit_group(2),
@@ -75,7 +75,7 @@ int CloneChild(void* priv) {
// ForkAndExit forks a child process which exits with exit_code, after
// sleeping for the specified duration (seconds).
-pid_t ForkAndExit(int exit_code, int64_t sleep) {
+pid_t ForkAndExit(int exit_code, int64 sleep) {
pid_t child = fork();
if (child == 0) {
SleepSafe(absl::Seconds(sleep));
@@ -84,16 +84,16 @@ pid_t ForkAndExit(int exit_code, int64_t sleep) {
return child;
}
-int64_t clock_gettime_nsecs(clockid_t id) {
+int64 clock_gettime_nsecs(clockid_t id) {
struct timespec ts;
TEST_PCHECK(clock_gettime(id, &ts) == 0);
return (ts.tv_sec * 1000000000 + ts.tv_nsec);
}
-void spin(int64_t sec) {
- int64_t ns = sec * 1000000000;
- int64_t start = clock_gettime_nsecs(CLOCK_THREAD_CPUTIME_ID);
- int64_t end = start + ns;
+void spin(int64 sec) {
+ int64 ns = sec * 1000000000;
+ int64 start = clock_gettime_nsecs(CLOCK_THREAD_CPUTIME_ID);
+ int64 end = start + ns;
do {
constexpr int kLoopCount = 1000000; // large and arbitrary
@@ -105,7 +105,7 @@ void spin(int64_t sec) {
// ForkSpinAndExit forks a child process which exits with exit_code, after
// spinning for the specified duration (seconds).
-pid_t ForkSpinAndExit(int exit_code, int64_t spintime) {
+pid_t ForkSpinAndExit(int exit_code, int64 spintime) {
pid_t child = fork();
if (child == 0) {
spin(spintime);
@@ -141,7 +141,7 @@ int FreeStack(uintptr_t addr) {
// CloneAndExit clones a child thread, which exits with 0 after sleeping for
// the specified duration (must be in seconds). extra_flags are ORed against
// the standard clone(2) flags.
-int CloneAndExit(int64_t sleep, uintptr_t stack, int extra_flags) {
+int CloneAndExit(int64 sleep, uintptr_t stack, int extra_flags) {
return clone(CloneChild, reinterpret_cast<void*>(stack),
CLONE_FILES | CLONE_FS | CLONE_SIGHAND | CLONE_VM | extra_flags,
reinterpret_cast<void*>(sleep));