diff options
Diffstat (limited to 'ipc/ipc_message_impl_macros.h')
| -rw-r--r-- | ipc/ipc_message_impl_macros.h | 224 |
1 files changed, 67 insertions, 157 deletions
diff --git a/ipc/ipc_message_impl_macros.h b/ipc/ipc_message_impl_macros.h index 3fa8978..b6b6278 100644 --- a/ipc/ipc_message_impl_macros.h +++ b/ipc/ipc_message_impl_macros.h @@ -6,7 +6,7 @@ // messages. This file works similarly, except that it defines the // implementations of the constructors and the logging methods. (These only // have to be generated once). It is meant to be included in a XXX_messages.cc -// file. +// file right before including XXX_messages_internal.h. #ifndef IPC_IPC_MESSAGE_IMPL_MACROS_H_ #define IPC_IPC_MESSAGE_IMPL_MACROS_H_ @@ -14,97 +14,16 @@ #include "ipc/ipc_message_utils.h" #include "ipc/ipc_message_utils_impl.h" -#ifndef MESSAGES_INTERNAL_IMPL_FILE -#error This file should only be included by X_messages.cc, which needs to define MESSAGES_INTERNAL_IMPL_FILE first. -#endif - -// Trick xcode into seeing the possible real dependencies since they -// don't understand #include MESSAGES_INTERNAL_FILE. See http://crbug.com/7828 -#if 0 -#include "ipc/ipc_sync_message_unittest.h" -#include "chrome/common/automation_messages_internal.h" -#include "chrome/common/devtools_messages_internal.h" -#include "chrome/common/gpu_messages_internal.h" -#include "chrome/common/nacl_messages_internal.h" -#include "chrome/common/plugin_messages_internal.h" -#include "chrome/common/render_messages_internal.h" -#include "chrome/common/service_messages_internal.h" -#include "chrome/common/utility_messages_internal.h" -#include "chrome/common/worker_messages_internal.h" -#include "ppapi/proxy/ppapi_messages_internal.h" -#endif - -// These are probalby still defined because of ipc_message_macros.h should be -// included before us for the class/method declarations. -#undef IPC_BEGIN_MESSAGES -#undef IPC_END_MESSAGES -#undef IPC_MESSAGE_CONTROL0 -#undef IPC_MESSAGE_CONTROL1 -#undef IPC_MESSAGE_CONTROL2 -#undef IPC_MESSAGE_CONTROL3 -#undef IPC_MESSAGE_CONTROL4 -#undef IPC_MESSAGE_CONTROL5 -#undef IPC_MESSAGE_ROUTED0 -#undef IPC_MESSAGE_ROUTED1 -#undef IPC_MESSAGE_ROUTED2 -#undef IPC_MESSAGE_ROUTED3 -#undef IPC_MESSAGE_ROUTED4 -#undef IPC_MESSAGE_ROUTED5 -#undef IPC_SYNC_MESSAGE_CONTROL0_0 -#undef IPC_SYNC_MESSAGE_CONTROL0_1 -#undef IPC_SYNC_MESSAGE_CONTROL0_2 -#undef IPC_SYNC_MESSAGE_CONTROL0_3 -#undef IPC_SYNC_MESSAGE_CONTROL1_0 -#undef IPC_SYNC_MESSAGE_CONTROL1_1 -#undef IPC_SYNC_MESSAGE_CONTROL1_2 -#undef IPC_SYNC_MESSAGE_CONTROL1_3 -#undef IPC_SYNC_MESSAGE_CONTROL2_0 -#undef IPC_SYNC_MESSAGE_CONTROL2_1 -#undef IPC_SYNC_MESSAGE_CONTROL2_2 -#undef IPC_SYNC_MESSAGE_CONTROL2_3 -#undef IPC_SYNC_MESSAGE_CONTROL3_1 -#undef IPC_SYNC_MESSAGE_CONTROL3_2 -#undef IPC_SYNC_MESSAGE_CONTROL3_3 -#undef IPC_SYNC_MESSAGE_CONTROL3_4 -#undef IPC_SYNC_MESSAGE_CONTROL4_1 -#undef IPC_SYNC_MESSAGE_CONTROL4_2 -#undef IPC_SYNC_MESSAGE_ROUTED0_0 -#undef IPC_SYNC_MESSAGE_ROUTED0_1 -#undef IPC_SYNC_MESSAGE_ROUTED0_2 -#undef IPC_SYNC_MESSAGE_ROUTED0_3 -#undef IPC_SYNC_MESSAGE_ROUTED1_0 -#undef IPC_SYNC_MESSAGE_ROUTED1_1 -#undef IPC_SYNC_MESSAGE_ROUTED1_2 -#undef IPC_SYNC_MESSAGE_ROUTED1_3 -#undef IPC_SYNC_MESSAGE_ROUTED1_4 -#undef IPC_SYNC_MESSAGE_ROUTED2_0 -#undef IPC_SYNC_MESSAGE_ROUTED2_1 -#undef IPC_SYNC_MESSAGE_ROUTED2_2 -#undef IPC_SYNC_MESSAGE_ROUTED2_3 -#undef IPC_SYNC_MESSAGE_ROUTED3_0 -#undef IPC_SYNC_MESSAGE_ROUTED3_1 -#undef IPC_SYNC_MESSAGE_ROUTED3_2 -#undef IPC_SYNC_MESSAGE_ROUTED3_3 -#undef IPC_SYNC_MESSAGE_ROUTED3_4 -#undef IPC_SYNC_MESSAGE_ROUTED4_0 -#undef IPC_SYNC_MESSAGE_ROUTED4_1 -#undef IPC_SYNC_MESSAGE_ROUTED4_2 -#undef IPC_SYNC_MESSAGE_ROUTED4_3 -#undef IPC_SYNC_MESSAGE_ROUTED5_0 -#undef IPC_SYNC_MESSAGE_ROUTED5_1 -#undef IPC_SYNC_MESSAGE_ROUTED5_2 -#undef IPC_SYNC_MESSAGE_ROUTED5_3 - -// These don't do anything during this pass. -#define IPC_BEGIN_MESSAGES(label) -#define IPC_END_MESSAGES(label) - // Every class must include a destructor and a log method that is keyed to the // specific types. #define IPC_ASYNC_MESSAGE_DTOR_AND_LOG(msg_class) \ msg_class::~msg_class() {} \ \ - void msg_class::Log(const Message* msg, std::string* l) { \ + void msg_class::Log(std::string* name, const Message* msg, std::string* l) { \ + if (name) \ + *name = #msg_class; \ + if (!msg || !l) \ + return; \ Param p; \ if (Read(msg, &p)) \ IPC::LogParam(p, l); \ @@ -112,23 +31,23 @@ // This derives from IPC::Message and thus doesn't need us to keep the // implementations in this impl file. -#define IPC_MESSAGE_CONTROL0(msg_class) +#define IPC_MESSAGE_CONTROL0_EXTRA(msg_class) -#define IPC_MESSAGE_CONTROL1(msg_class, type1) \ +#define IPC_MESSAGE_CONTROL1_EXTRA(msg_class, type1) \ msg_class::msg_class(const type1& arg1) \ : IPC::MessageWithTuple< Tuple1<type1> >( \ MSG_ROUTING_CONTROL, ID, MakeRefTuple(arg1)) {} \ \ IPC_ASYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_MESSAGE_CONTROL2(msg_class, type1, type2) \ +#define IPC_MESSAGE_CONTROL2_EXTRA(msg_class, type1, type2) \ msg_class::msg_class(const type1& arg1, const type2& arg2) \ : IPC::MessageWithTuple< Tuple2<type1, type2> >( \ MSG_ROUTING_CONTROL, ID, MakeRefTuple(arg1, arg2)) {} \ \ IPC_ASYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_MESSAGE_CONTROL3(msg_class, type1, type2, type3) \ +#define IPC_MESSAGE_CONTROL3_EXTRA(msg_class, type1, type2, type3) \ msg_class::msg_class(const type1& arg1, const type2& arg2, \ const type3& arg3) \ : IPC::MessageWithTuple< Tuple3<type1, type2, type3> >( \ @@ -136,7 +55,7 @@ \ IPC_ASYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_MESSAGE_CONTROL4(msg_class, type1, type2, type3, type4) \ +#define IPC_MESSAGE_CONTROL4_EXTRA(msg_class, type1, type2, type3, type4) \ msg_class::msg_class(const type1& arg1, const type2& arg2, \ const type3& arg3, const type4& arg4) \ : IPC::MessageWithTuple< Tuple4<type1, type2, type3, type4> >( \ @@ -144,7 +63,7 @@ \ IPC_ASYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_MESSAGE_CONTROL5(msg_class, type1, type2, type3, type4, type5) \ +#define IPC_MESSAGE_CONTROL5_EXTRA(msg_class, type1, type2, type3, type4, type5) \ msg_class::msg_class(const type1& arg1, const type2& arg2, \ const type3& arg3, const type4& arg4, \ const type5& arg5) \ @@ -156,16 +75,16 @@ // This derives from IPC::Message and thus doesn't need us to keep the // implementations in this impl file. -#define IPC_MESSAGE_ROUTED0(msg_class) +#define IPC_MESSAGE_ROUTED0_EXTRA(msg_class) -#define IPC_MESSAGE_ROUTED1(msg_class, type1) \ +#define IPC_MESSAGE_ROUTED1_EXTRA(msg_class, type1) \ msg_class::msg_class(int32 routing_id, const type1& arg1) \ : IPC::MessageWithTuple< Tuple1<type1> >( \ routing_id, ID, MakeRefTuple(arg1)) {} \ \ IPC_ASYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_MESSAGE_ROUTED2(msg_class, type1, type2) \ +#define IPC_MESSAGE_ROUTED2_EXTRA(msg_class, type1, type2) \ msg_class::msg_class(int32 routing_id, const type1& arg1, const type2& arg2) \ : IPC::MessageWithTuple< Tuple2<type1, type2> >( \ routing_id, ID, MakeRefTuple(arg1, arg2)) {} \ @@ -173,7 +92,7 @@ IPC_ASYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_MESSAGE_ROUTED3(msg_class, type1, type2, type3) \ +#define IPC_MESSAGE_ROUTED3_EXTRA(msg_class, type1, type2, type3) \ msg_class::msg_class(int32 routing_id, const type1& arg1, \ const type2& arg2, const type3& arg3) \ : IPC::MessageWithTuple< Tuple3<type1, type2, type3> >( \ @@ -181,7 +100,7 @@ \ IPC_ASYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_MESSAGE_ROUTED4(msg_class, type1, type2, type3, type4) \ +#define IPC_MESSAGE_ROUTED4_EXTRA(msg_class, type1, type2, type3, type4) \ msg_class::msg_class(int32 routing_id, const type1& arg1, const type2& arg2, \ const type3& arg3, const type4& arg4) \ : IPC::MessageWithTuple< Tuple4<type1, type2, type3, type4> >( \ @@ -189,7 +108,7 @@ \ IPC_ASYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_MESSAGE_ROUTED5(msg_class, type1, type2, type3, type4, type5) \ +#define IPC_MESSAGE_ROUTED5_EXTRA(msg_class, type1, type2, type3, type4, type5) \ msg_class::msg_class(int32 routing_id, const type1& arg1, \ const type2& arg2, const type3& arg3, \ const type4& arg4, const type5& arg5) \ @@ -205,12 +124,15 @@ #define IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) \ msg_class::~msg_class() {} \ \ - void msg_class::Log(const Message* msg, std::string* l) { \ + void msg_class::Log(std::string* name, const Message* msg, std::string* l) { \ + if (name) \ + *name = #msg_class; \ + if (!msg || !l) \ + return; \ if (msg->is_sync()) { \ TupleTypes<SendParam>::ValueTuple p; \ if (ReadSendParam(msg, &p)) \ IPC::LogParam(p, l); \ - \ AddOutputParamsToLog(msg, l); \ } else { \ TupleTypes<ReplyParam>::ValueTuple p; \ @@ -219,7 +141,7 @@ } \ } -#define IPC_SYNC_MESSAGE_CONTROL0_0(msg_class) \ +#define IPC_SYNC_MESSAGE_CONTROL0_0_EXTRA(msg_class) \ msg_class::msg_class() \ : IPC::MessageWithReply<Tuple0, Tuple0 >( \ MSG_ROUTING_CONTROL, ID, \ @@ -227,7 +149,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_CONTROL0_1(msg_class, type1_out) \ +#define IPC_SYNC_MESSAGE_CONTROL0_1_EXTRA(msg_class, type1_out) \ msg_class::msg_class(type1_out* arg1) \ : IPC::MessageWithReply<Tuple0, Tuple1<type1_out&> >( \ MSG_ROUTING_CONTROL, ID, \ @@ -235,7 +157,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_CONTROL0_2(msg_class, type1_out, type2_out) \ +#define IPC_SYNC_MESSAGE_CONTROL0_2_EXTRA(msg_class, type1_out, type2_out) \ msg_class::msg_class(type1_out* arg1, type2_out* arg2) \ : IPC::MessageWithReply<Tuple0, Tuple2<type1_out&, type2_out&> >( \ MSG_ROUTING_CONTROL, ID, \ @@ -243,7 +165,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_CONTROL0_3(msg_class, type1_out, type2_out, \ +#define IPC_SYNC_MESSAGE_CONTROL0_3_EXTRA(msg_class, type1_out, type2_out, \ type3_out) \ msg_class::msg_class(type1_out* arg1, type2_out* arg2, type3_out* arg3) \ : IPC::MessageWithReply<Tuple0, Tuple3<type1_out&, type2_out&, \ @@ -254,7 +176,7 @@ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_CONTROL1_0(msg_class, type1_in) \ +#define IPC_SYNC_MESSAGE_CONTROL1_0_EXTRA(msg_class, type1_in) \ msg_class::msg_class(const type1_in& arg1) \ : IPC::MessageWithReply<Tuple1<type1_in>, Tuple0 >( \ MSG_ROUTING_CONTROL, ID, \ @@ -262,7 +184,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_CONTROL1_1(msg_class, type1_in, type1_out) \ +#define IPC_SYNC_MESSAGE_CONTROL1_1_EXTRA(msg_class, type1_in, type1_out) \ msg_class::msg_class(const type1_in& arg1, type1_out* arg2) \ : IPC::MessageWithReply<Tuple1<type1_in>, Tuple1<type1_out&> >( \ MSG_ROUTING_CONTROL, ID, \ @@ -270,7 +192,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_CONTROL1_2(msg_class, type1_in, type1_out, type2_out) \ +#define IPC_SYNC_MESSAGE_CONTROL1_2_EXTRA(msg_class, type1_in, type1_out, type2_out) \ msg_class::msg_class(const type1_in& arg1, type1_out* arg2, type2_out* arg3) \ : IPC::MessageWithReply<Tuple1<type1_in>, \ Tuple2<type1_out&, type2_out&> >( \ @@ -279,7 +201,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_CONTROL1_3(msg_class, type1_in, type1_out, \ +#define IPC_SYNC_MESSAGE_CONTROL1_3_EXTRA(msg_class, type1_in, type1_out, \ type2_out, type3_out) \ msg_class::msg_class(const type1_in& arg1, type1_out* arg2, \ type2_out* arg3, type3_out* arg4) \ @@ -290,7 +212,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_CONTROL2_0(msg_class, type1_in, type2_in) \ +#define IPC_SYNC_MESSAGE_CONTROL2_0_EXTRA(msg_class, type1_in, type2_in) \ msg_class::msg_class(const type1_in& arg1, const type2_in& arg2) \ : IPC::MessageWithReply<Tuple2<type1_in, type2_in>, Tuple0 >( \ MSG_ROUTING_CONTROL, ID, \ @@ -298,7 +220,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_CONTROL2_1(msg_class, type1_in, type2_in, type1_out) \ +#define IPC_SYNC_MESSAGE_CONTROL2_1_EXTRA(msg_class, type1_in, type2_in, type1_out) \ msg_class::msg_class(const type1_in& arg1, const type2_in& arg2, \ type1_out* arg3) \ : IPC::MessageWithReply<Tuple2<type1_in, type2_in>, \ @@ -309,7 +231,7 @@ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_CONTROL2_2(msg_class, type1_in, type2_in, \ +#define IPC_SYNC_MESSAGE_CONTROL2_2_EXTRA(msg_class, type1_in, type2_in, \ type1_out, type2_out) \ msg_class::msg_class(const type1_in& arg1, const type2_in& arg2, \ type1_out* arg3, type2_out* arg4) \ @@ -320,7 +242,7 @@ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_CONTROL2_3(msg_class, type1_in, type2_in, \ +#define IPC_SYNC_MESSAGE_CONTROL2_3_EXTRA(msg_class, type1_in, type2_in, \ type1_out, type2_out, type3_out) \ msg_class::msg_class(const type1_in& arg1, const type2_in& arg2, \ type1_out* arg3, type2_out* arg4, type3_out* arg5) \ @@ -332,7 +254,7 @@ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_CONTROL3_1(msg_class, type1_in, type2_in, \ +#define IPC_SYNC_MESSAGE_CONTROL3_1_EXTRA(msg_class, type1_in, type2_in, \ type3_in, type1_out) \ msg_class::msg_class(const type1_in& arg1, const type2_in& arg2, \ const type3_in& arg3, type1_out* arg4) \ @@ -342,7 +264,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_CONTROL3_2(msg_class, type1_in, type2_in, \ +#define IPC_SYNC_MESSAGE_CONTROL3_2_EXTRA(msg_class, type1_in, type2_in, \ type3_in, type1_out, type2_out) \ msg_class::msg_class(const type1_in& arg1, const type2_in& arg2, \ const type3_in& arg3, type1_out* arg4, type2_out* arg5) \ @@ -353,7 +275,7 @@ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_CONTROL3_3(msg_class, type1_in, type2_in, \ +#define IPC_SYNC_MESSAGE_CONTROL3_3_EXTRA(msg_class, type1_in, type2_in, \ type3_in, type1_out, type2_out, \ type3_out) \ msg_class::msg_class(const type1_in& arg1, const type2_in& arg2, \ @@ -367,7 +289,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_CONTROL3_4(msg_class, type1_in, type2_in, \ +#define IPC_SYNC_MESSAGE_CONTROL3_4_EXTRA(msg_class, type1_in, type2_in, \ type3_in, type1_out, type2_out, \ type3_out, type4_out) \ msg_class::msg_class(const type1_in& arg1, const type2_in& arg2, \ @@ -382,7 +304,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_CONTROL4_1(msg_class, type1_in, type2_in, \ +#define IPC_SYNC_MESSAGE_CONTROL4_1_EXTRA(msg_class, type1_in, type2_in, \ type3_in, type4_in, type1_out) \ msg_class::msg_class(const type1_in& arg1, const type2_in& arg2, \ const type3_in& arg3, const type4_in& arg4, \ @@ -394,7 +316,7 @@ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_CONTROL4_2(msg_class, type1_in, type2_in, \ +#define IPC_SYNC_MESSAGE_CONTROL4_2_EXTRA(msg_class, type1_in, type2_in, \ type3_in, type4_in, type1_out, \ type2_out) \ msg_class::msg_class(const type1_in& arg1, const type2_in& arg2, \ @@ -408,7 +330,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_ROUTED0_0(msg_class) \ +#define IPC_SYNC_MESSAGE_ROUTED0_0_EXTRA(msg_class) \ msg_class::msg_class(int routing_id) \ : IPC::MessageWithReply<Tuple0, Tuple0>( \ routing_id, ID, \ @@ -416,7 +338,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_ROUTED0_1(msg_class, type1_out) \ +#define IPC_SYNC_MESSAGE_ROUTED0_1_EXTRA(msg_class, type1_out) \ msg_class::msg_class(int routing_id, type1_out* arg1) \ : IPC::MessageWithReply<Tuple0, Tuple1<type1_out&> >( \ routing_id, ID, \ @@ -424,7 +346,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_ROUTED0_2(msg_class, type1_out, type2_out) \ +#define IPC_SYNC_MESSAGE_ROUTED0_2_EXTRA(msg_class, type1_out, type2_out) \ msg_class::msg_class(int routing_id, type1_out* arg1, type2_out* arg2) \ : IPC::MessageWithReply<Tuple0, Tuple2<type1_out&, type2_out&> >( \ routing_id, ID, \ @@ -432,7 +354,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_ROUTED0_3(msg_class, type1_out, type2_out, \ +#define IPC_SYNC_MESSAGE_ROUTED0_3_EXTRA(msg_class, type1_out, type2_out, \ type3_out) \ msg_class::msg_class(int routing_id, type1_out* arg1, type2_out* arg2, \ type3_out* arg3) \ @@ -442,7 +364,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_ROUTED1_0(msg_class, type1_in) \ +#define IPC_SYNC_MESSAGE_ROUTED1_0_EXTRA(msg_class, type1_in) \ msg_class::msg_class(int routing_id, const type1_in& arg1) \ : IPC::MessageWithReply<Tuple1<type1_in>, Tuple0 >( \ routing_id, ID, \ @@ -450,7 +372,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_ROUTED1_1(msg_class, type1_in, type1_out) \ +#define IPC_SYNC_MESSAGE_ROUTED1_1_EXTRA(msg_class, type1_in, type1_out) \ msg_class::msg_class(int routing_id, const type1_in& arg1, \ type1_out* arg2) \ : IPC::MessageWithReply<Tuple1<type1_in>, Tuple1<type1_out&> >( \ @@ -459,7 +381,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_ROUTED1_2(msg_class, type1_in, type1_out, \ +#define IPC_SYNC_MESSAGE_ROUTED1_2_EXTRA(msg_class, type1_in, type1_out, \ type2_out) \ msg_class::msg_class(int routing_id, const type1_in& arg1, \ type1_out* arg2, type2_out* arg3) \ @@ -470,7 +392,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_ROUTED1_3(msg_class, type1_in, type1_out, \ +#define IPC_SYNC_MESSAGE_ROUTED1_3_EXTRA(msg_class, type1_in, type1_out, \ type2_out, type3_out) \ msg_class::msg_class(int routing_id, const type1_in& arg1, \ type1_out* arg2, type2_out* arg3, type3_out* arg4) \ @@ -480,7 +402,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_ROUTED1_4(msg_class, type1_in, type1_out, \ +#define IPC_SYNC_MESSAGE_ROUTED1_4_EXTRA(msg_class, type1_in, type1_out, \ type2_out, type3_out, type4_out) \ msg_class::msg_class(int routing_id, const type1_in& arg1, \ type1_out* arg2, type2_out* arg3, \ @@ -492,7 +414,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_ROUTED2_0(msg_class, type1_in, type2_in) \ +#define IPC_SYNC_MESSAGE_ROUTED2_0_EXTRA(msg_class, type1_in, type2_in) \ msg_class::msg_class(int routing_id, const type1_in& arg1, \ const type2_in& arg2) \ : IPC::MessageWithReply<Tuple2<type1_in, type2_in>, Tuple0 >( \ @@ -500,7 +422,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_ROUTED2_1(msg_class, type1_in, type2_in, \ +#define IPC_SYNC_MESSAGE_ROUTED2_1_EXTRA(msg_class, type1_in, type2_in, \ type1_out) \ msg_class::msg_class(int routing_id, const type1_in& arg1, \ const type2_in& arg2, type1_out* arg3) \ @@ -510,7 +432,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_ROUTED2_2(msg_class, type1_in, type2_in, \ +#define IPC_SYNC_MESSAGE_ROUTED2_2_EXTRA(msg_class, type1_in, type2_in, \ type1_out, type2_out) \ msg_class::msg_class(int routing_id, const type1_in& arg1, \ const type2_in& arg2, type1_out* arg3, \ @@ -521,7 +443,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_ROUTED2_3(msg_class, type1_in, type2_in, \ +#define IPC_SYNC_MESSAGE_ROUTED2_3_EXTRA(msg_class, type1_in, type2_in, \ type1_out, type2_out, type3_out) \ msg_class::msg_class(int routing_id, const type1_in& arg1, \ const type2_in& arg2, type1_out* arg3, \ @@ -532,7 +454,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_ROUTED3_0(msg_class, type1_in, type2_in, \ +#define IPC_SYNC_MESSAGE_ROUTED3_0_EXTRA(msg_class, type1_in, type2_in, \ type3_in) \ msg_class::msg_class(int routing_id, const type1_in& arg1, \ const type2_in& arg2, const type3_in& arg3) \ @@ -542,7 +464,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_ROUTED3_1(msg_class, type1_in, type2_in, \ +#define IPC_SYNC_MESSAGE_ROUTED3_1_EXTRA(msg_class, type1_in, type2_in, \ type3_in, type1_out) \ msg_class::msg_class(int routing_id, const type1_in& arg1, \ const type2_in& arg2, const type3_in& arg3, \ @@ -553,7 +475,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_ROUTED3_2(msg_class, type1_in, type2_in, \ +#define IPC_SYNC_MESSAGE_ROUTED3_2_EXTRA(msg_class, type1_in, type2_in, \ type3_in, type1_out, type2_out) \ msg_class::msg_class(int routing_id, const type1_in& arg1, \ const type2_in& arg2, const type3_in& arg3, \ @@ -564,7 +486,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_ROUTED3_3(msg_class, type1_in, type2_in, \ +#define IPC_SYNC_MESSAGE_ROUTED3_3_EXTRA(msg_class, type1_in, type2_in, \ type3_in, type1_out, type2_out, \ type3_out) \ msg_class::msg_class(int routing_id, const type1_in& arg1, \ @@ -577,7 +499,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_ROUTED3_4(msg_class, type1_in, type2_in, \ +#define IPC_SYNC_MESSAGE_ROUTED3_4_EXTRA(msg_class, type1_in, type2_in, \ type3_in, type1_out, type2_out, \ type3_out, type4_out) \ msg_class::msg_class(int routing_id, const type1_in& arg1, \ @@ -591,7 +513,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_ROUTED4_0(msg_class, type1_in, type2_in, \ +#define IPC_SYNC_MESSAGE_ROUTED4_0_EXTRA(msg_class, type1_in, type2_in, \ type3_in, type4_in) \ msg_class::msg_class(int routing_id, const type1_in& arg1, \ const type2_in& arg2, const type3_in& arg3, \ @@ -602,7 +524,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_ROUTED4_1(msg_class, type1_in, type2_in, \ +#define IPC_SYNC_MESSAGE_ROUTED4_1_EXTRA(msg_class, type1_in, type2_in, \ type3_in, type4_in, type1_out) \ msg_class::msg_class(int routing_id, const type1_in& arg1, \ const type2_in& arg2, const type3_in& arg3, \ @@ -614,7 +536,7 @@ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_ROUTED4_2(msg_class, type1_in, type2_in, \ +#define IPC_SYNC_MESSAGE_ROUTED4_2_EXTRA(msg_class, type1_in, type2_in, \ type3_in, type4_in, type1_out, \ type2_out) \ msg_class::msg_class(int routing_id, const type1_in& arg1, \ @@ -627,7 +549,7 @@ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_ROUTED4_3(msg_class, type1_in, type2_in, \ +#define IPC_SYNC_MESSAGE_ROUTED4_3_EXTRA(msg_class, type1_in, type2_in, \ type3_in, type4_in, type1_out, \ type2_out, type3_out) \ msg_class::msg_class(int routing_id, const type1_in& arg1, \ @@ -641,7 +563,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_ROUTED5_0(msg_class, type1_in, type2_in, \ +#define IPC_SYNC_MESSAGE_ROUTED5_0_EXTRA(msg_class, type1_in, type2_in, \ type3_in, type4_in, type5_in) \ msg_class::msg_class(int routing_id, const type1_in& arg1, \ const type2_in& arg2, const type3_in& arg3, \ @@ -652,7 +574,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_ROUTED5_1(msg_class, type1_in, type2_in, \ +#define IPC_SYNC_MESSAGE_ROUTED5_1_EXTRA(msg_class, type1_in, type2_in, \ type3_in, type4_in, type5_in, type1_out) \ msg_class::msg_class(int routing_id, const type1_in& arg1, \ const type2_in& arg2, const type3_in& arg3, \ @@ -665,7 +587,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_ROUTED5_2(msg_class, type1_in, type2_in, \ +#define IPC_SYNC_MESSAGE_ROUTED5_2_EXTRA(msg_class, type1_in, type2_in, \ type3_in, type4_in, type5_in, \ type1_out, type2_out) \ msg_class::msg_class(int routing_id, const type1_in& arg1, \ @@ -679,7 +601,7 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -#define IPC_SYNC_MESSAGE_ROUTED5_3(msg_class, type1_in, type2_in, \ +#define IPC_SYNC_MESSAGE_ROUTED5_3_EXTRA(msg_class, type1_in, type2_in, \ type3_in, type4_in, type5_in, \ type1_out, type2_out, type3_out) \ msg_class::msg_class(int routing_id, const type1_in& arg1, \ @@ -695,16 +617,4 @@ \ IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class) -// Trigger the header guard define in ipc_message_macros.h so we don't get -// duplicate including when we include MESSAGES_INTERNAL_FILE again at the end -// of this file. -#define IPC_MESSAGE_MACROS_INCLUDE_BLOCK - -// Redefine MESSAGES_INTERNAL_FILE just for the header check in -// ipc_messages_macros.h that happens before it breaks on the header guard. -#define MESSAGES_INTERNAL_FILE MESSAGES_INTERNAL_IMPL_FILE - -// Include our INTERNAL file first to get the normal expansion. -#include MESSAGES_INTERNAL_IMPL_FILE - #endif // IPC_IPC_MESSAGE_IMPL_MACROS_H_ |