[Lldb-commits] [lldb] r218773 - thread state coordinator: replaced shortened type name Func suffix with Function.
Todd Fiala
todd.fiala at gmail.com
Wed Oct 1 09:08:21 PDT 2014
Author: tfiala
Date: Wed Oct 1 11:08:20 2014
New Revision: 218773
URL: http://llvm.org/viewvc/llvm-project?rev=218773&view=rev
Log:
thread state coordinator: replaced shortened type name Func suffix with Function.
ThreadIDFunc => ThreadIDFunction
LogFunc => LogIDFunction
We try to avoid abbreviations/shortened names. Adjusted function parameter names
as well to replace _func with _function.
Modified:
lldb/trunk/source/Plugins/Process/Linux/ThreadStateCoordinator.cpp
lldb/trunk/source/Plugins/Process/Linux/ThreadStateCoordinator.h
Modified: lldb/trunk/source/Plugins/Process/Linux/ThreadStateCoordinator.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Linux/ThreadStateCoordinator.cpp?rev=218773&r1=218772&r2=218773&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/Linux/ThreadStateCoordinator.cpp (original)
+++ lldb/trunk/source/Plugins/Process/Linux/ThreadStateCoordinator.cpp Wed Oct 1 11:08:20 2014
@@ -63,14 +63,14 @@ class ThreadStateCoordinator::EventCallA
public:
EventCallAfterThreadsStop (lldb::tid_t triggering_tid,
const ThreadIDSet &wait_for_stop_tids,
- const ThreadIDFunc &request_thread_stop_func,
- const ThreadIDFunc &call_after_func):
+ const ThreadIDFunction &request_thread_stop_function,
+ const ThreadIDFunction &call_after_function):
EventBase (),
m_triggering_tid (triggering_tid),
m_wait_for_stop_tids (wait_for_stop_tids),
m_original_wait_for_stop_tids (wait_for_stop_tids),
- m_request_thread_stop_func (request_thread_stop_func),
- m_call_after_func (call_after_func)
+ m_request_thread_stop_function (request_thread_stop_function),
+ m_call_after_function (call_after_function)
{
}
@@ -113,7 +113,7 @@ public:
auto find_it = coordinator.m_tid_stop_map.find (tid);
if ((find_it == coordinator.m_tid_stop_map.end ()) || !find_it->second)
{
- m_request_thread_stop_func (tid);
+ m_request_thread_stop_function (tid);
sent_tids.insert (tid);
}
}
@@ -168,7 +168,7 @@ public:
// If it was really added, send the stop request to it.
if (insert_result.second)
- m_request_thread_stop_func (tid);
+ m_request_thread_stop_function (tid);
}
private:
@@ -176,14 +176,14 @@ private:
void
NotifyNow ()
{
- m_call_after_func (m_triggering_tid);
+ m_call_after_function (m_triggering_tid);
}
const lldb::tid_t m_triggering_tid;
ThreadIDSet m_wait_for_stop_tids;
const ThreadIDSet m_original_wait_for_stop_tids;
- ThreadIDFunc m_request_thread_stop_func;
- ThreadIDFunc m_call_after_func;
+ ThreadIDFunction m_request_thread_stop_function;
+ ThreadIDFunction m_call_after_function;
};
//===----------------------------------------------------------------------===//
@@ -278,10 +278,10 @@ private:
class ThreadStateCoordinator::EventRequestResume : public ThreadStateCoordinator::EventBase
{
public:
- EventRequestResume (lldb::tid_t tid, const ThreadIDFunc &request_thread_resume_func):
+ EventRequestResume (lldb::tid_t tid, const ThreadIDFunction &request_thread_resume_function):
EventBase (),
m_tid (tid),
- m_request_thread_resume_func (request_thread_resume_func)
+ m_request_thread_resume_function (request_thread_resume_function)
{
}
@@ -331,7 +331,7 @@ public:
// Request a resume. We expect this to be synchronous and the system
// to reflect it is running after this completes.
- m_request_thread_resume_func (m_tid);
+ m_request_thread_resume_function (m_tid);
return true;
}
@@ -339,13 +339,13 @@ public:
private:
const lldb::tid_t m_tid;
- ThreadIDFunc m_request_thread_resume_func;
+ ThreadIDFunction m_request_thread_resume_function;
};
//===----------------------------------------------------------------------===//
-ThreadStateCoordinator::ThreadStateCoordinator (const LogFunc &log_func) :
- m_log_func (log_func),
+ThreadStateCoordinator::ThreadStateCoordinator (const LogFunction &log_function) :
+ m_log_function (log_function),
m_event_queue (),
m_queue_condition (),
m_queue_mutex (),
@@ -402,13 +402,13 @@ ThreadStateCoordinator::SetPendingNotifi
void
ThreadStateCoordinator::CallAfterThreadsStop (const lldb::tid_t triggering_tid,
const ThreadIDSet &wait_for_stop_tids,
- const ThreadIDFunc &request_thread_stop_func,
- const ThreadIDFunc &call_after_func)
+ const ThreadIDFunction &request_thread_stop_function,
+ const ThreadIDFunction &call_after_function)
{
EnqueueEvent (EventBaseSP (new EventCallAfterThreadsStop (triggering_tid,
wait_for_stop_tids,
- request_thread_stop_func,
- call_after_func)));
+ request_thread_stop_function,
+ call_after_function)));
}
void
@@ -486,7 +486,7 @@ ThreadStateCoordinator::Log (const char
va_list args;
va_start (args, format);
- m_log_func (format, args);
+ m_log_function (format, args);
va_end (args);
}
@@ -498,9 +498,9 @@ ThreadStateCoordinator::NotifyThreadStop
}
void
-ThreadStateCoordinator::RequestThreadResume (lldb::tid_t tid, const ThreadIDFunc &request_thread_resume_func)
+ThreadStateCoordinator::RequestThreadResume (lldb::tid_t tid, const ThreadIDFunction &request_thread_resume_function)
{
- EnqueueEvent (EventBaseSP (new EventRequestResume (tid, request_thread_resume_func)));
+ EnqueueEvent (EventBaseSP (new EventRequestResume (tid, request_thread_resume_function)));
}
void
Modified: lldb/trunk/source/Plugins/Process/Linux/ThreadStateCoordinator.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Linux/ThreadStateCoordinator.h?rev=218773&r1=218772&r2=218773&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/Linux/ThreadStateCoordinator.h (original)
+++ lldb/trunk/source/Plugins/Process/Linux/ThreadStateCoordinator.h Wed Oct 1 11:08:20 2014
@@ -31,27 +31,27 @@ namespace lldb_private
// Protocols.
- // Callback definitions.
- typedef std::function<void (lldb::tid_t tid)> ThreadIDFunc;
- typedef std::function<void (const char *format, va_list args)> LogFunc;
+ // Callback/block definitions.
+ typedef std::function<void (lldb::tid_t tid)> ThreadIDFunction;
+ typedef std::function<void (const char *format, va_list args)> LogFunction;
// constructors
- ThreadStateCoordinator (const LogFunc &log_func);
+ ThreadStateCoordinator (const LogFunction &log_function);
// The main purpose of the class: triggering an action after
// a given set of threads stop.
void
CallAfterThreadsStop (lldb::tid_t triggering_tid,
const ThreadIDSet &wait_for_stop_tids,
- const ThreadIDFunc &request_thread_stop_func,
- const ThreadIDFunc &call_after_func);
+ const ThreadIDFunction &request_thread_stop_function,
+ const ThreadIDFunction &call_after_function);
// Notifications called when various state changes occur.
void
NotifyThreadStop (lldb::tid_t tid);
void
- RequestThreadResume (lldb::tid_t tid, const ThreadIDFunc &request_thread_resume_func);
+ RequestThreadResume (lldb::tid_t tid, const ThreadIDFunction &request_thread_resume_func);
void
NotifyThreadCreate (lldb::tid_t tid);
@@ -129,7 +129,7 @@ namespace lldb_private
GetPendingThreadStopNotification ();
// Member variables.
- LogFunc m_log_func;
+ LogFunction m_log_function;
QueueType m_event_queue;
// For now we do simple read/write lock strategy with efficient wait-for-data.
More information about the lldb-commits
mailing list