fix review comments

Author: Kirillog

clangpass/refactor_matcher.cpp

@@ -3,9 +3,7 @@
 #include "clang/AST/ExprCXX.h"
 #include "clang/ASTMatchers/ASTMatchers.h"
 #include "clang/Frontend/CompilerInstance.h"
-#include "clang/Lex/Lexer.h"
 #include "clang/Rewrite/Core/Rewriter.h"
-#include "clang/Rewrite/Frontend/FixItRewriter.h"
 #include "clangpass.h"
 #include "llvm/Support/raw_ostream.h"
 

runtime/futex.cpp

@@ -6,15 +6,15 @@
 namespace ltest {
 
 struct mutex {
-  ___atomic void lock() {
+  as_atomic void lock() {
     while (locked) {
       this_coro->SetBlocked(state);
       CoroYield();
     }
     locked = 1;
   }
 
-  ___atomic bool try_lock() {
+  as_atomic bool try_lock() {
     if (locked) {
       CoroYield();
       return false;
@@ -23,7 +23,7 @@ struct mutex {
     return true;
   }
 
-  ___atomic void unlock() {
+  as_atomic void unlock() {
     locked = 0;
     futex_queues.PopAll(
         state.addr);  // Two have the ability schedule any coroutine
@@ -35,25 +35,25 @@ struct mutex {
 };
 
 struct shared_mutex {
-  ___atomic void lock() {
+  as_atomic void lock() {
     while (locked != 0) {
       this_coro->SetBlocked(state);
       CoroYield();
     }
     locked = -1;
   }
-  ___atomic void unlock() {
+  as_atomic void unlock() {
     locked = 0;
     futex_queues.PopAll(state.addr);
   }
-  ___atomic void lock_shared() {
+  as_atomic void lock_shared() {
     while (locked == -1) {
       this_coro->SetBlocked(state);
       CoroYield();
     }
     ++locked;
   }
-  ___atomic void unlock_shared() {
+  as_atomic void unlock_shared() {
     --locked;
     futex_queues.PopAll(state.addr);
   }

runtime/include/blocking_primitives.h

@@ -1,6 +1,6 @@
 #pragma once
 
-extern bool __trap_syscall;
+extern bool ltest_trap_syscall;
 
 namespace ltest {
 

runtime/include/syscall_trap.h

@@ -18,7 +18,7 @@ extern std::vector<TaskBuilder> task_builders;
 // Tell that the function need to be converted to the coroutine.
 #define non_atomic attr(ltest_nonatomic)
 // Tell that the function must not contain interleavings.
-#define ___atomic attr(ltest_atomic)
+#define as_atomic attr(ltest_atomic)
 
 namespace ltest {
 

runtime/include/verifying_macro.h

@@ -1,6 +1,6 @@
 #pragma once
 
-extern bool __yield;
+extern bool ltest_yield;
 
 namespace ltest {
 

runtime/include/yield_guard.h

@@ -59,7 +59,7 @@ std::string_view CoroBase::GetName() const { return name; }
 bool CoroBase::IsReturned() const { return is_returned; }
 
 extern "C" void CoroYield() {
-  if (!__yield) [[unlikely]] {
+  if (!ltest_yield) [[unlikely]] {
     return;
   }
   assert(this_coro && sched_ctx);

runtime/lib.cpp

@@ -2,8 +2,8 @@
 
 /// Required for incapsulating syscall traps only in special places where it's
 /// really needed
-bool __trap_syscall = 0;
+bool ltest_trap_syscall = 0;
 
-ltest::SyscallTrapGuard::SyscallTrapGuard() { __trap_syscall = true; }
+ltest::SyscallTrapGuard::SyscallTrapGuard() { ltest_trap_syscall = true; }
 
-ltest::SyscallTrapGuard::~SyscallTrapGuard() { __trap_syscall = false; }
+ltest::SyscallTrapGuard::~SyscallTrapGuard() { ltest_trap_syscall = false; }

runtime/syscall_trap.cpp

@@ -2,8 +2,8 @@
 
 /// Required for incapsulating CoroYield calls only in coroutines code, allowing
 /// to call methods annotated with non_atomic in scheduler fiber
-bool __yield = 0;
+bool ltest_yield = 0;
 
-ltest::AllowYieldArea::AllowYieldArea() { __yield = true; }
+ltest::AllowYieldArea::AllowYieldArea() { ltest_yield = true; }
 
-ltest::AllowYieldArea::~AllowYieldArea() { __yield = false; }
+ltest::AllowYieldArea::~AllowYieldArea() { ltest_yield = false; }

runtime/yield_guard.cpp

@@ -12,7 +12,7 @@
 
 static int hook(long syscall_number, long arg0, long arg1, long arg2, long arg3,
                 long arg4, long arg5, long *result) {
-  if (!__trap_syscall) {
+  if (!ltest_trap_syscall) {
     return 1;
   }
   if (syscall_number == SYS_sched_yield) {
@@ -29,7 +29,6 @@ static int hook(long syscall_number, long arg0, long arg1, long arg2, long arg3,
         this_coro->SetBlocked(fstate);
         futex_queues.Push(fstate, this_coro.get());
         CoroYield();
-        debug(stderr, "Returned\n");
         *result = 0;
       } else {
         errno = EAGAIN;