diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 10:46:48 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 10:46:48 +0000 |
| commit | 9d43cd1f7d78bcb696401bd1ab7359a8d76fde81 (patch) | |
| tree | 0e7912dd1372987a584f687fe263b248c03122aa /ipc | |
| parent | ab39dc873522a528d61532fe3ab98d0d012caaff (diff) | |
| download | chromium_src-9d43cd1f7d78bcb696401bd1ab7359a8d76fde81.zip chromium_src-9d43cd1f7d78bcb696401bd1ab7359a8d76fde81.tar.gz chromium_src-9d43cd1f7d78bcb696401bd1ab7359a8d76fde81.tar.bz2 | |
Revert 108752 - Support tracking of IPC messages as tasks in profiler
Also started to do more cleanup, including creating
a base/profiler directory, and moving parts of the
over-sized tracked_objects.* into that directory.
r=rtenneti
Review URL: http://codereview.chromium.org/8480014
TBR=jar@chromium.org
Review URL: http://codereview.chromium.org/8496008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109004 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/ipc_message_macros.h | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/ipc/ipc_message_macros.h b/ipc/ipc_message_macros.h index 3c7f50f..9b3f732 100644 --- a/ipc/ipc_message_macros.h +++ b/ipc/ipc_message_macros.h @@ -20,7 +20,7 @@ // // The XXXMsgStart value is an enumeration that ensures uniqueness for // each different message file. Later, you will use this inside your -// XXX_messages.h file before invoking message declaration macros: +// XXX_messages.h file before invoking message declatation macros: // #define IPC_MESSAGE_START XXXMsgStart // ( ... your macro invocations go here ... ) // @@ -176,7 +176,6 @@ #ifndef IPC_IPC_MESSAGE_MACROS_H_ #define IPC_IPC_MESSAGE_MACROS_H_ -#include "base/profiler/scoped_profile.h" #include "ipc/ipc_message_utils.h" #include "ipc/param_traits_macros.h" @@ -941,24 +940,20 @@ LogFunctionMap g_log_function_mapping; bool msg_is_ok__ = true; \ switch (ipc_message__.type()) { \ -#define IPC_MESSAGE_FORWARD(msg_class, obj, member_func) \ - case msg_class::ID: { \ - TRACK_RUN_IN_IPC_HANDLER(member_func); \ - msg_is_ok__ = msg_class::Dispatch(&ipc_message__, obj, this, \ - &member_func); \ - } \ - break; +#define IPC_MESSAGE_FORWARD(msg_class, obj, member_func) \ + case msg_class::ID: \ + msg_is_ok__ = msg_class::Dispatch(&ipc_message__, obj, this, \ + &member_func); \ + break; #define IPC_MESSAGE_HANDLER(msg_class, member_func) \ IPC_MESSAGE_FORWARD(msg_class, this, _IpcMessageHandlerClass::member_func) -#define IPC_MESSAGE_FORWARD_DELAY_REPLY(msg_class, obj, member_func) \ - case msg_class::ID: { \ - TRACK_RUN_IN_IPC_HANDLER(member_func); \ - msg_is_ok__ = msg_class::DispatchDelayReply(&ipc_message__, obj, \ - &member_func); \ - } \ - break; +#define IPC_MESSAGE_FORWARD_DELAY_REPLY(msg_class, obj, member_func) \ + case msg_class::ID: \ + msg_is_ok__ = msg_class::DispatchDelayReply(&ipc_message__, obj, \ + &member_func); \ + break; #define IPC_MESSAGE_HANDLER_DELAY_REPLY(msg_class, member_func) \ IPC_MESSAGE_FORWARD_DELAY_REPLY(msg_class, this, \ @@ -969,11 +964,9 @@ LogFunctionMap g_log_function_mapping; code; \ break; -#define IPC_REPLY_HANDLER(func) \ - case IPC_REPLY_ID: { \ - TRACK_RUN_IN_IPC_HANDLER(func); \ - func(ipc_message__); \ - } \ +#define IPC_REPLY_HANDLER(func) \ + case IPC_REPLY_ID: \ + func(ipc_message__); \ break; |