Changed some variable names in terminal.cc.

src/terminal.cc

@@ -13,9 +13,9 @@ using namespace std; //TODO: remove
 #define WRITE 1
 
 int execute_status=-1;
-std::mutex execute_status_mutex;
+std::mutex async_and_sync_execute_mutex;
-std::unordered_map<pid_t, std::pair<int, int> > async_execute_pid_descriptors;
+std::unordered_map<pid_t, std::pair<int, int> > async_execute_descriptors;
-std::unordered_map<pid_t, int> async_execute_pid_status;
+std::unordered_map<pid_t, int> async_execute_status;
 
 //TODO: Windows...
 //Coppied partially from http://www.linuxprogrammingblog.com/code-examples/sigaction
@@ -23,16 +23,16 @@ void signal_execl_exit(int sig, siginfo_t *siginfo, void *context) {
   int status;
   while (waitpid(siginfo->si_pid, &status, WNOHANG) > 0) {}
   
-  execute_status_mutex.lock();
+  async_and_sync_execute_mutex.lock();
-  if(async_execute_pid_descriptors.find(siginfo->si_pid)!=async_execute_pid_descriptors.end()) {
+  if(async_execute_descriptors.find(siginfo->si_pid)!=async_execute_descriptors.end()) {
-    async_execute_pid_status[siginfo->si_pid]=status;
+    async_execute_status[siginfo->si_pid]=status;
-    close(async_execute_pid_descriptors.at(siginfo->si_pid).first);
+    close(async_execute_descriptors.at(siginfo->si_pid).first);
-    close(async_execute_pid_descriptors.at(siginfo->si_pid).second);
+    close(async_execute_descriptors.at(siginfo->si_pid).second);
-    async_execute_pid_descriptors.erase(siginfo->si_pid);
+    async_execute_descriptors.erase(siginfo->si_pid);
   }
   else
     execute_status=status;
-  execute_status_mutex.unlock();
+  async_and_sync_execute_mutex.unlock();
 }
 
 //TODO: Windows...
@@ -165,11 +165,11 @@ int Terminal::execute(const std::string &command, const std::string &path) {
       while(gtk_events_pending())
         gtk_main_iteration();
     }
-    execute_status_mutex.lock();
+    async_and_sync_execute_mutex.lock();
     int exit_code=pclose(p);
     if(exit_code==-1)
       exit_code=execute_status;
-    execute_status_mutex.unlock();
+    async_and_sync_execute_mutex.unlock();
     return execute_status;
   }
 }
@@ -188,10 +188,10 @@ void Terminal::async_execute(const std::string &command, const std::string &path
       cd_path_and_command=command;
       
     int input_descriptor, output_descriptor;
-    execute_status_mutex.lock();
+    async_and_sync_execute_mutex.lock();
     auto pid=popen2(cd_path_and_command.c_str(), &input_descriptor, &output_descriptor);
-    async_execute_pid_descriptors[pid]={input_descriptor, output_descriptor};
+    async_execute_descriptors[pid]={input_descriptor, output_descriptor};
-    execute_status_mutex.unlock();
+    async_and_sync_execute_mutex.unlock();
     if (pid<=0)
       async_print("Error: Failed to run command" + command + "\n");
     else {
@@ -203,10 +203,10 @@ void Terminal::async_execute(const std::string &command, const std::string &path
           message+=buffer[c];
         async_print(message);
       }
-      execute_status_mutex.lock();
+      async_and_sync_execute_mutex.lock();
-      int exit_code=async_execute_pid_status.at(pid);
+      int exit_code=async_execute_status.at(pid);
-      async_execute_pid_status.erase(pid);
+      async_execute_status.erase(pid);
-      execute_status_mutex.unlock();
+      async_and_sync_execute_mutex.unlock();
       if(callback)
         callback(exit_code);
     }
@@ -215,10 +215,10 @@ void Terminal::async_execute(const std::string &command, const std::string &path
 }
 
 void Terminal::kill_executing() {
-  execute_status_mutex.lock();
+  async_and_sync_execute_mutex.lock();
-  for(auto &pid: async_execute_pid_descriptors)
+  for(auto &pid: async_execute_descriptors)
     kill(pid.first, SIGTERM);
-  execute_status_mutex.unlock();
+  async_and_sync_execute_mutex.unlock();
 }
 
 int Terminal::print(const std::string &message){