Index: ipc/ipc_message_macros.h |
diff --git a/ipc/ipc_message_macros.h b/ipc/ipc_message_macros.h |
index 3152871f28a1fd20a071d9b5eccb3aa1d4432ccb..903d5669306ae84a01f4a522e3314dc6adb76aef 100644 |
--- a/ipc/ipc_message_macros.h |
+++ b/ipc/ipc_message_macros.h |
@@ -845,23 +845,20 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
#define IPC_SYNC_MESSAGE_CONTROL0_0(msg_class) \ |
class msg_class : public IPC::MessageWithReply<Tuple0, Tuple0 > { \ |
- public: \ |
- enum { ID = msg_class##__ID }; \ |
- msg_class() \ |
- : IPC::MessageWithReply<Tuple0, Tuple0 >( \ |
- MSG_ROUTING_CONTROL, ID, \ |
- MakeTuple(), MakeTuple()) {} \ |
+ public: \ |
+ enum { ID = msg_class##__ID }; \ |
+ msg_class(); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
-#define IPC_SYNC_MESSAGE_CONTROL0_1(msg_class, type1_out) \ |
+#define IPC_SYNC_MESSAGE_CONTROL0_1(msg_class, type1_out) \ |
class msg_class : public IPC::MessageWithReply<Tuple0, Tuple1<type1_out&> > { \ |
- public: \ |
- enum { ID = msg_class##__ID }; \ |
- msg_class(type1_out* arg1) \ |
- : IPC::MessageWithReply<Tuple0, Tuple1<type1_out&> >( \ |
- MSG_ROUTING_CONTROL, \ |
- ID, \ |
- MakeTuple(), MakeRefTuple(*arg1)) {} \ |
+ public: \ |
+ enum { ID = msg_class##__ID }; \ |
+ msg_class(type1_out* arg1); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#define IPC_SYNC_MESSAGE_CONTROL0_2(msg_class, type1_out, type2_out) \ |
@@ -869,11 +866,9 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
public IPC::MessageWithReply<Tuple0, Tuple2<type1_out&, type2_out&> > { \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(type1_out* arg1, type2_out* arg2) \ |
- : IPC::MessageWithReply<Tuple0, Tuple2<type1_out&, type2_out&> >( \ |
- MSG_ROUTING_CONTROL, \ |
- ID, \ |
- MakeTuple(), MakeRefTuple(*arg1, *arg2)) {} \ |
+ msg_class(type1_out* arg1, type2_out* arg2); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#define IPC_SYNC_MESSAGE_CONTROL0_3(msg_class, type1_out, type2_out, type3_out) \ |
@@ -882,33 +877,29 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
Tuple3<type1_out&, type2_out&, type3_out&> >{ \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(type1_out* arg1, type2_out* arg2, type3_out* arg3) \ |
- : IPC::MessageWithReply<Tuple0, \ |
- Tuple3<type1_out&, type2_out&, type3_out&> >(MSG_ROUTING_CONTROL, \ |
- ID, \ |
- MakeTuple(), MakeRefTuple(*arg1, *arg2, *arg3)) {} \ |
+ msg_class(type1_out* arg1, type2_out* arg2, type3_out* arg3); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
-#define IPC_SYNC_MESSAGE_CONTROL1_0(msg_class, type1_in) \ |
- class msg_class : \ |
- public IPC::MessageWithReply<Tuple1<type1_in>, Tuple0 > { \ |
- public: \ |
- enum { ID = msg_class##__ID }; \ |
- msg_class(const type1_in& arg1) \ |
- : IPC::MessageWithReply<Tuple1<type1_in>, Tuple0 >( \ |
- MSG_ROUTING_CONTROL, ID, \ |
- MakeRefTuple(arg1), MakeTuple()) {} \ |
+#define IPC_SYNC_MESSAGE_CONTROL1_0(msg_class, type1_in) \ |
+ class msg_class : \ |
+ public IPC::MessageWithReply<Tuple1<type1_in>, Tuple0 > { \ |
+ public: \ |
+ enum { ID = msg_class##__ID }; \ |
+ msg_class(const type1_in& arg1); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
-#define IPC_SYNC_MESSAGE_CONTROL1_1(msg_class, type1_in, type1_out) \ |
- class msg_class : \ |
+#define IPC_SYNC_MESSAGE_CONTROL1_1(msg_class, type1_in, type1_out) \ |
+ class msg_class : \ |
public IPC::MessageWithReply<Tuple1<type1_in>, Tuple1<type1_out&> > { \ |
- public: \ |
- enum { ID = msg_class##__ID }; \ |
- msg_class(const type1_in& arg1, type1_out* arg2) \ |
- : IPC::MessageWithReply<Tuple1<type1_in>, Tuple1<type1_out&> >( \ |
- MSG_ROUTING_CONTROL, ID, \ |
- MakeRefTuple(arg1), MakeRefTuple(*arg2)) {} \ |
+ public: \ |
+ enum { ID = msg_class##__ID }; \ |
+ msg_class(const type1_in& arg1, type1_out* arg2); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#define IPC_SYNC_MESSAGE_CONTROL1_2(msg_class, type1_in, type1_out, type2_out) \ |
@@ -916,10 +907,9 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
public IPC::MessageWithReply<Tuple1<type1_in>, Tuple2<type1_out&, type2_out&> > { \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(const type1_in& arg1, type1_out* arg2, type2_out* arg3) \ |
- : IPC::MessageWithReply<Tuple1<type1_in>, Tuple2<type1_out&, type2_out&> >( \ |
- MSG_ROUTING_CONTROL, ID, \ |
- MakeRefTuple(arg1), MakeRefTuple(*arg2, *arg3)) {} \ |
+ msg_class(const type1_in& arg1, type1_out* arg2, type2_out* arg3); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#define IPC_SYNC_MESSAGE_CONTROL1_3(msg_class, type1_in, type1_out, type2_out, type3_out) \ |
@@ -928,33 +918,29 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
Tuple3<type1_out&, type2_out&, type3_out&> >{ \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(const type1_in& arg1, type1_out* arg2, type2_out* arg3, type3_out* arg4) \ |
- : IPC::MessageWithReply<Tuple1<type1_in>, \ |
- Tuple3<type1_out&, type2_out&, type3_out&> >(MSG_ROUTING_CONTROL, \ |
- ID, \ |
- MakeRefTuple(arg1), MakeRefTuple(*arg2, *arg3, *arg4)) {} \ |
+ msg_class(const type1_in& arg1, type1_out* arg2, type2_out* arg3, type3_out* arg4); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
-#define IPC_SYNC_MESSAGE_CONTROL2_0(msg_class, type1_in, type2_in) \ |
- class msg_class : \ |
+#define IPC_SYNC_MESSAGE_CONTROL2_0(msg_class, type1_in, type2_in) \ |
+ class msg_class : \ |
public IPC::MessageWithReply<Tuple2<type1_in, type2_in>, Tuple0 > { \ |
- public: \ |
- enum { ID = msg_class##__ID }; \ |
- msg_class(const type1_in& arg1, const type2_in& arg2) \ |
- : IPC::MessageWithReply<Tuple2<type1_in, type2_in>, Tuple0 >( \ |
- MSG_ROUTING_CONTROL, ID, \ |
- MakeRefTuple(arg1, arg2), MakeTuple()) {} \ |
+ public: \ |
+ enum { ID = msg_class##__ID }; \ |
+ msg_class(const type1_in& arg1, const type2_in& arg2); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#define IPC_SYNC_MESSAGE_CONTROL2_1(msg_class, type1_in, type2_in, type1_out) \ |
- class msg_class : \ |
+ class msg_class : \ |
public IPC::MessageWithReply<Tuple2<type1_in, type2_in>, Tuple1<type1_out&> > { \ |
- public: \ |
- enum { ID = msg_class##__ID }; \ |
- msg_class(const type1_in& arg1, const type2_in& arg2, type1_out* arg3) \ |
- : IPC::MessageWithReply<Tuple2<type1_in, type2_in>, Tuple1<type1_out&> >( \ |
- MSG_ROUTING_CONTROL, ID, \ |
- MakeRefTuple(arg1, arg2), MakeRefTuple(*arg3)) {} \ |
+ public: \ |
+ enum { ID = msg_class##__ID }; \ |
+ msg_class(const type1_in& arg1, const type2_in& arg2, type1_out* arg3); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#define IPC_SYNC_MESSAGE_CONTROL2_2(msg_class, type1_in, type2_in, type1_out, type2_out) \ |
@@ -963,10 +949,9 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
Tuple2<type1_out&, type2_out&> > { \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(const type1_in& arg1, const type2_in& arg2, type1_out* arg3, type2_out* arg4) \ |
- : IPC::MessageWithReply<Tuple2<type1_in, type2_in>, \ |
- Tuple2<type1_out&, type2_out&> >(MSG_ROUTING_CONTROL, ID, \ |
- MakeRefTuple(arg1, arg2), MakeRefTuple(*arg3, *arg4)) {} \ |
+ msg_class(const type1_in& arg1, const type2_in& arg2, type1_out* arg3, type2_out* arg4); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#define IPC_SYNC_MESSAGE_CONTROL2_3(msg_class, type1_in, type2_in, type1_out, type2_out, type3_out) \ |
@@ -975,11 +960,9 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
Tuple3<type1_out&, type2_out&, type3_out&> > { \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(const type1_in& arg1, const type2_in& arg2, type1_out* arg3, type2_out* arg4, type3_out* arg5) \ |
- : IPC::MessageWithReply<Tuple2<type1_in, type2_in>, \ |
- Tuple3<type1_out&, type2_out&, type3_out&> >(MSG_ROUTING_CONTROL, \ |
- ID, \ |
- MakeRefTuple(arg1, arg2), MakeRefTuple(*arg3, *arg4, *arg5)) {} \ |
+ msg_class(const type1_in& arg1, const type2_in& arg2, type1_out* arg3, type2_out* arg4, type3_out* arg5); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#define IPC_SYNC_MESSAGE_CONTROL3_1(msg_class, type1_in, type2_in, type3_in, type1_out) \ |
@@ -988,10 +971,9 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
Tuple1<type1_out&> > { \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(const type1_in& arg1, const type2_in& arg2, const type3_in& arg3, type1_out* arg4) \ |
- : IPC::MessageWithReply<Tuple3<type1_in, type2_in, type3_in>, \ |
- Tuple1<type1_out&> >(MSG_ROUTING_CONTROL, ID, \ |
- MakeRefTuple(arg1, arg2, arg3), MakeRefTuple(*arg4)) {} \ |
+ msg_class(const type1_in& arg1, const type2_in& arg2, const type3_in& arg3, type1_out* arg4); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#define IPC_SYNC_MESSAGE_CONTROL3_2(msg_class, type1_in, type2_in, type3_in, type1_out, type2_out) \ |
@@ -1000,10 +982,9 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
Tuple2<type1_out&, type2_out&> > { \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(const type1_in& arg1, const type2_in& arg2, const type3_in& arg3, type1_out* arg4, type2_out* arg5) \ |
- : IPC::MessageWithReply<Tuple3<type1_in, type2_in, type3_in>, \ |
- Tuple2<type1_out&, type2_out&> >(MSG_ROUTING_CONTROL, ID, \ |
- MakeRefTuple(arg1, arg2, arg3), MakeRefTuple(*arg4, *arg5)) {} \ |
+ msg_class(const type1_in& arg1, const type2_in& arg2, const type3_in& arg3, type1_out* arg4, type2_out* arg5); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#define IPC_SYNC_MESSAGE_CONTROL3_3(msg_class, type1_in, type2_in, type3_in, type1_out, type2_out, type3_out) \ |
@@ -1012,11 +993,9 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
Tuple3<type1_out&, type2_out&, type3_out&> > { \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(const type1_in& arg1, const type2_in& arg2, const type3_in& arg3, type1_out* arg4, type2_out* arg5, type3_out* arg6) \ |
- : IPC::MessageWithReply<Tuple3<type1_in, type2_in, type3_in>, \ |
- Tuple3<type1_out&, type2_out&, type3_out&> >(MSG_ROUTING_CONTROL, \ |
- ID, \ |
- MakeRefTuple(arg1, arg2, arg3), MakeRefTuple(*arg4, *arg5, *arg6)) {} \ |
+ msg_class(const type1_in& arg1, const type2_in& arg2, const type3_in& arg3, type1_out* arg4, type2_out* arg5, type3_out* arg6); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#define IPC_SYNC_MESSAGE_CONTROL4_1(msg_class, type1_in, type2_in, type3_in, type4_in, type1_out) \ |
@@ -1025,10 +1004,9 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
Tuple1<type1_out&> > { \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(const type1_in& arg1, const type2_in& arg2, const type3_in& arg3, const type4_in& arg4, type1_out* arg6) \ |
- : IPC::MessageWithReply<Tuple4<type1_in, type2_in, type3_in, type4_in>, \ |
- Tuple1<type1_out&> >(MSG_ROUTING_CONTROL, ID, \ |
- MakeRefTuple(arg1, arg2, arg3, arg4), MakeRefTuple(*arg6)) {} \ |
+ msg_class(const type1_in& arg1, const type2_in& arg2, const type3_in& arg3, const type4_in& arg4, type1_out* arg6); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#define IPC_SYNC_MESSAGE_CONTROL4_2(msg_class, type1_in, type2_in, type3_in, type4_in, type1_out, type2_out) \ |
@@ -1037,30 +1015,27 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
Tuple2<type1_out&, type2_out&> > { \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(const type1_in& arg1, const type2_in& arg2, const type3_in& arg3, const type4_in& arg4, type1_out* arg5, type2_out* arg6) \ |
- : IPC::MessageWithReply<Tuple4<type1_in, type2_in, type3_in, type4_in>, \ |
- Tuple2<type1_out&, type2_out&> >(MSG_ROUTING_CONTROL, ID, \ |
- MakeRefTuple(arg1, arg2, arg3, arg4), MakeRefTuple(*arg5, *arg6)) {} \ |
+ msg_class(const type1_in& arg1, const type2_in& arg2, const type3_in& arg3, const type4_in& arg4, type1_out* arg5, type2_out* arg6); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
-#define IPC_SYNC_MESSAGE_ROUTED0_1(msg_class, type1_out) \ |
- class msg_class : public IPC::MessageWithReply<Tuple0, Tuple1<type1_out&> > { \ |
+#define IPC_SYNC_MESSAGE_ROUTED0_0(msg_class) \ |
+ class msg_class : public IPC::MessageWithReply<Tuple0, Tuple0 > { \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(int routing_id, type1_out* arg1) \ |
- : IPC::MessageWithReply<Tuple0, Tuple1<type1_out&> >( \ |
- routing_id, ID, \ |
- MakeTuple(), MakeRefTuple(*arg1)) {} \ |
+ msg_class(int routing_id); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
-#define IPC_SYNC_MESSAGE_ROUTED0_0(msg_class) \ |
- class msg_class : public IPC::MessageWithReply<Tuple0, Tuple0 > { \ |
+#define IPC_SYNC_MESSAGE_ROUTED0_1(msg_class, type1_out) \ |
+ class msg_class : public IPC::MessageWithReply<Tuple0, Tuple1<type1_out&> > { \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(int routing_id) \ |
- : IPC::MessageWithReply<Tuple0, Tuple0 >( \ |
- routing_id, ID, \ |
- MakeTuple(), MakeTuple()) {} \ |
+ msg_class(int routing_id, type1_out* arg1); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#define IPC_SYNC_MESSAGE_ROUTED0_2(msg_class, type1_out, type2_out) \ |
@@ -1068,10 +1043,9 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
public IPC::MessageWithReply<Tuple0, Tuple2<type1_out&, type2_out&> > { \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(int routing_id, type1_out* arg1, type2_out* arg2) \ |
- : IPC::MessageWithReply<Tuple0, Tuple2<type1_out&, type2_out&> >( \ |
- routing_id, ID, \ |
- MakeTuple(), MakeRefTuple(*arg1, *arg2)) {} \ |
+ msg_class(int routing_id, type1_out* arg1, type2_out* arg2); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#define IPC_SYNC_MESSAGE_ROUTED0_3(msg_class, type1_out, type2_out, type3_out) \ |
@@ -1080,10 +1054,9 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
Tuple3<type1_out&, type2_out&, type3_out&> >{ \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(int routing_id, type1_out* arg1, type2_out* arg2, type3_out* arg3) \ |
- : IPC::MessageWithReply<Tuple0, \ |
- Tuple3<type1_out&, type2_out&, type3_out&> >(routing_id, ID, \ |
- MakeTuple(), MakeRefTuple(*arg1, *arg2, *arg3)) {} \ |
+ msg_class(int routing_id, type1_out* arg1, type2_out* arg2, type3_out* arg3); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#define IPC_SYNC_MESSAGE_ROUTED1_0(msg_class, type1_in) \ |
@@ -1091,10 +1064,9 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
public IPC::MessageWithReply<Tuple1<type1_in>, Tuple0 > { \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(int routing_id, const type1_in& arg1) \ |
- : IPC::MessageWithReply<Tuple1<type1_in>, Tuple0 >( \ |
- routing_id, ID, \ |
- MakeRefTuple(arg1), MakeTuple()) {} \ |
+ msg_class(int routing_id, const type1_in& arg1); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#define IPC_SYNC_MESSAGE_ROUTED1_1(msg_class, type1_in, type1_out) \ |
@@ -1102,10 +1074,9 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
public IPC::MessageWithReply<Tuple1<type1_in>, Tuple1<type1_out&> > { \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(int routing_id, const type1_in& arg1, type1_out* arg2) \ |
- : IPC::MessageWithReply<Tuple1<type1_in>, Tuple1<type1_out&> >( \ |
- routing_id, ID, \ |
- MakeRefTuple(arg1), MakeRefTuple(*arg2)) {} \ |
+ msg_class(int routing_id, const type1_in& arg1, type1_out* arg2); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#define IPC_SYNC_MESSAGE_ROUTED1_2(msg_class, type1_in, type1_out, type2_out) \ |
@@ -1113,10 +1084,9 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
public IPC::MessageWithReply<Tuple1<type1_in>, Tuple2<type1_out&, type2_out&> > { \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(int routing_id, const type1_in& arg1, type1_out* arg2, type2_out* arg3) \ |
- : IPC::MessageWithReply<Tuple1<type1_in>, Tuple2<type1_out&, type2_out&> >( \ |
- routing_id, ID, \ |
- MakeRefTuple(arg1), MakeRefTuple(*arg2, *arg3)) {} \ |
+ msg_class(int routing_id, const type1_in& arg1, type1_out* arg2, type2_out* arg3); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#define IPC_SYNC_MESSAGE_ROUTED1_3(msg_class, type1_in, type1_out, type2_out, type3_out) \ |
@@ -1125,10 +1095,9 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
Tuple3<type1_out&, type2_out&, type3_out&> >{ \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(int routing_id, const type1_in& arg1, type1_out* arg2, type2_out* arg3, type3_out* arg4) \ |
- : IPC::MessageWithReply<Tuple1<type1_in>, \ |
- Tuple3<type1_out&, type2_out&, type3_out&> >(routing_id, ID, \ |
- MakeRefTuple(arg1), MakeRefTuple(*arg2, *arg3, *arg4)) {} \ |
+ msg_class(int routing_id, const type1_in& arg1, type1_out* arg2, type2_out* arg3, type3_out* arg4); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#define IPC_SYNC_MESSAGE_ROUTED1_4(msg_class, type1_in, type1_out, type2_out, type3_out, type4_out) \ |
@@ -1137,10 +1106,9 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
Tuple4<type1_out&, type2_out&, type3_out&, type4_out&> >{ \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(int routing_id, const type1_in& arg1, type1_out* arg2, type2_out* arg3, type3_out* arg4, type4_out* arg5) \ |
- : IPC::MessageWithReply<Tuple1<type1_in>, \ |
- Tuple4<type1_out&, type2_out&, type3_out&, type4_out&> >(routing_id, ID, \ |
- MakeRefTuple(arg1), MakeRefTuple(*arg2, *arg3, *arg4, *arg5)) {} \ |
+ msg_class(int routing_id, const type1_in& arg1, type1_out* arg2, type2_out* arg3, type3_out* arg4, type4_out* arg5); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#define IPC_SYNC_MESSAGE_ROUTED2_0(msg_class, type1_in, type2_in) \ |
@@ -1148,10 +1116,9 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
public IPC::MessageWithReply<Tuple2<type1_in, type2_in>, Tuple0 > { \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(int routing_id, const type1_in& arg1, const type2_in& arg2) \ |
- : IPC::MessageWithReply<Tuple2<type1_in, type2_in>, Tuple0 >( \ |
- routing_id, ID, \ |
- MakeRefTuple(arg1, arg2), MakeTuple()) {} \ |
+ msg_class(int routing_id, const type1_in& arg1, const type2_in& arg2); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#define IPC_SYNC_MESSAGE_ROUTED2_1(msg_class, type1_in, type2_in, type1_out) \ |
@@ -1159,10 +1126,9 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
public IPC::MessageWithReply<Tuple2<type1_in, type2_in>, Tuple1<type1_out&> > { \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(int routing_id, const type1_in& arg1, const type2_in& arg2, type1_out* arg3) \ |
- : IPC::MessageWithReply<Tuple2<type1_in, type2_in>, Tuple1<type1_out&> >( \ |
- routing_id, ID, \ |
- MakeRefTuple(arg1, arg2), MakeRefTuple(*arg3)) {} \ |
+ msg_class(int routing_id, const type1_in& arg1, const type2_in& arg2, type1_out* arg3); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#define IPC_SYNC_MESSAGE_ROUTED2_2(msg_class, type1_in, type2_in, type1_out, type2_out) \ |
@@ -1171,10 +1137,9 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
Tuple2<type1_out&, type2_out&> > { \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(int routing_id, const type1_in& arg1, const type2_in& arg2, type1_out* arg3, type2_out* arg4) \ |
- : IPC::MessageWithReply<Tuple2<type1_in, type2_in>, \ |
- Tuple2<type1_out&, type2_out&> >(routing_id, ID, \ |
- MakeRefTuple(arg1, arg2), MakeRefTuple(*arg3, *arg4)) {} \ |
+ msg_class(int routing_id, const type1_in& arg1, const type2_in& arg2, type1_out* arg3, type2_out* arg4); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#define IPC_SYNC_MESSAGE_ROUTED2_3(msg_class, type1_in, type2_in, type1_out, type2_out, type3_out) \ |
@@ -1183,10 +1148,9 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
Tuple3<type1_out&, type2_out&, type3_out&> > { \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(int routing_id, const type1_in& arg1, const type2_in& arg2, type1_out* arg3, type2_out* arg4, type3_out* arg5) \ |
- : IPC::MessageWithReply<Tuple2<type1_in, type2_in>, \ |
- Tuple3<type1_out&, type2_out&, type3_out&> >(routing_id, ID, \ |
- MakeRefTuple(arg1, arg2), MakeRefTuple(*arg3, *arg4, *arg5)) {} \ |
+ msg_class(int routing_id, const type1_in& arg1, const type2_in& arg2, type1_out* arg3, type2_out* arg4, type3_out* arg5); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#define IPC_SYNC_MESSAGE_ROUTED3_0(msg_class, type1_in, type2_in, type3_in) \ |
@@ -1194,11 +1158,10 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
public IPC::MessageWithReply<Tuple3<type1_in, type2_in, type3_in>, Tuple0 > { \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(int routing_id, const type1_in& arg1, const type2_in& arg2, const type3_in& arg3) \ |
- : IPC::MessageWithReply<Tuple3<type1_in, type2_in, type3_in>, Tuple0>( \ |
- routing_id, ID, \ |
- MakeRefTuple(arg1, arg2, arg3), MakeTuple()) {} \ |
- }; |
+ msg_class(int routing_id, const type1_in& arg1, const type2_in& arg2, const type3_in& arg3); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
+ }; |
#define IPC_SYNC_MESSAGE_ROUTED3_1(msg_class, type1_in, type2_in, type3_in, type1_out) \ |
class msg_class : \ |
@@ -1206,10 +1169,9 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
Tuple1<type1_out&> > { \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(int routing_id, const type1_in& arg1, const type2_in& arg2, const type3_in& arg3, type1_out* arg4) \ |
- : IPC::MessageWithReply<Tuple3<type1_in, type2_in, type3_in>, \ |
- Tuple1<type1_out&> >(routing_id, ID, \ |
- MakeRefTuple(arg1, arg2, arg3), MakeRefTuple(*arg4)) {} \ |
+ msg_class(int routing_id, const type1_in& arg1, const type2_in& arg2, const type3_in& arg3, type1_out* arg4); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#define IPC_SYNC_MESSAGE_ROUTED3_2(msg_class, type1_in, type2_in, type3_in, type1_out, type2_out) \ |
@@ -1218,10 +1180,9 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
Tuple2<type1_out&, type2_out&> > { \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(int routing_id, const type1_in& arg1, const type2_in& arg2, const type3_in& arg3, type1_out* arg4, type2_out* arg5) \ |
- : IPC::MessageWithReply<Tuple3<type1_in, type2_in, type3_in>, \ |
- Tuple2<type1_out&, type2_out&> >(routing_id, ID, \ |
- MakeRefTuple(arg1, arg2, arg3), MakeRefTuple(*arg4, *arg5)) {} \ |
+ msg_class(int routing_id, const type1_in& arg1, const type2_in& arg2, const type3_in& arg3, type1_out* arg4, type2_out* arg5); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#define IPC_SYNC_MESSAGE_ROUTED3_3(msg_class, type1_in, type2_in, type3_in, type1_out, type2_out, type3_out) \ |
@@ -1230,10 +1191,9 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
Tuple3<type1_out&, type2_out&, type3_out&> > { \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(int routing_id, const type1_in& arg1, const type2_in& arg2, const type3_in& arg3, type1_out* arg4, type2_out* arg5, type3_out* arg6) \ |
- : IPC::MessageWithReply<Tuple3<type1_in, type2_in, type3_in>, \ |
- Tuple3<type1_out&, type2_out&, type3_out&> >(routing_id, ID, \ |
- MakeRefTuple(arg1, arg2, arg3), MakeRefTuple(*arg4, *arg5, *arg6)) {} \ |
+ msg_class(int routing_id, const type1_in& arg1, const type2_in& arg2, const type3_in& arg3, type1_out* arg4, type2_out* arg5, type3_out* arg6); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#define IPC_SYNC_MESSAGE_ROUTED4_0(msg_class, type1_in, type2_in, type3_in, type4_in) \ |
@@ -1242,10 +1202,9 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
Tuple0 > { \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(int routing_id, const type1_in& arg1, const type2_in& arg2, const type3_in& arg3, const type4_in& arg4) \ |
- : IPC::MessageWithReply<Tuple4<type1_in, type2_in, type3_in, type4_in>, \ |
- Tuple0 >(routing_id, ID, \ |
- MakeRefTuple(arg1, arg2, arg3, arg4), MakeTuple()) {} \ |
+ msg_class(int routing_id, const type1_in& arg1, const type2_in& arg2, const type3_in& arg3, const type4_in& arg4); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#define IPC_SYNC_MESSAGE_ROUTED4_1(msg_class, type1_in, type2_in, type3_in, type4_in, type1_out) \ |
@@ -1254,10 +1213,9 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
Tuple1<type1_out&> > { \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(int routing_id, const type1_in& arg1, const type2_in& arg2, const type3_in& arg3, const type4_in& arg4, type1_out* arg6) \ |
- : IPC::MessageWithReply<Tuple4<type1_in, type2_in, type3_in, type4_in>, \ |
- Tuple1<type1_out&> >(routing_id, ID, \ |
- MakeRefTuple(arg1, arg2, arg3, arg4), MakeRefTuple(*arg6)) {} \ |
+ msg_class(int routing_id, const type1_in& arg1, const type2_in& arg2, const type3_in& arg3, const type4_in& arg4, type1_out* arg6); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#define IPC_SYNC_MESSAGE_ROUTED4_2(msg_class, type1_in, type2_in, type3_in, type4_in, type1_out, type2_out) \ |
@@ -1266,10 +1224,9 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
Tuple2<type1_out&, type2_out&> > { \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(int routing_id, const type1_in& arg1, const type2_in& arg2, const type3_in& arg3, const type4_in& arg4, type1_out* arg5, type2_out* arg6) \ |
- : IPC::MessageWithReply<Tuple4<type1_in, type2_in, type3_in, type4_in>, \ |
- Tuple2<type1_out&, type2_out&> >(routing_id, ID, \ |
- MakeRefTuple(arg1, arg2, arg3, arg4), MakeRefTuple(*arg5, *arg6)) {} \ |
+ msg_class(int routing_id, const type1_in& arg1, const type2_in& arg2, const type3_in& arg3, const type4_in& arg4, type1_out* arg5, type2_out* arg6); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#define IPC_SYNC_MESSAGE_ROUTED4_3(msg_class, type1_in, type2_in, type3_in, type4_in, type1_out, type2_out, type3_out) \ |
@@ -1278,10 +1235,9 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
Tuple3<type1_out&, type2_out&, type3_out&> > { \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(int routing_id, const type1_in& arg1, const type2_in& arg2, const type3_in& arg3, const type4_in& arg4, type1_out* arg5, type2_out* arg6, type3_out* arg7) \ |
- : IPC::MessageWithReply<Tuple4<type1_in, type2_in, type3_in, type4_in>, \ |
- Tuple3<type1_out&, type2_out&, type3_out&> >(routing_id, ID, \ |
- MakeRefTuple(arg1, arg2, arg3, arg4), MakeRefTuple(*arg5, *arg6, *arg7)) {} \ |
+ msg_class(int routing_id, const type1_in& arg1, const type2_in& arg2, const type3_in& arg3, const type4_in& arg4, type1_out* arg5, type2_out* arg6, type3_out* arg7); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#define IPC_SYNC_MESSAGE_ROUTED5_0(msg_class, type1_in, type2_in, type3_in, type4_in, type5_in) \ |
@@ -1290,10 +1246,9 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
Tuple0 > { \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(int routing_id, const type1_in& arg1, const type2_in& arg2, const type3_in& arg3, const type4_in& arg4, const type5_in& arg5) \ |
- : IPC::MessageWithReply<Tuple5<type1_in, type2_in, type3_in, type4_in, type5_in>, \ |
- Tuple0 >(routing_id, ID, \ |
- MakeRefTuple(arg1, arg2, arg3, arg4, arg5), MakeTuple()) {} \ |
+ msg_class(int routing_id, const type1_in& arg1, const type2_in& arg2, const type3_in& arg3, const type4_in& arg4, const type5_in& arg5); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#define IPC_SYNC_MESSAGE_ROUTED5_1(msg_class, type1_in, type2_in, type3_in, type4_in, type5_in, type1_out) \ |
@@ -1302,10 +1257,9 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
Tuple1<type1_out&> > { \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(int routing_id, const type1_in& arg1, const type2_in& arg2, const type3_in& arg3, const type4_in& arg4, const type5_in& arg5, type1_out* arg6) \ |
- : IPC::MessageWithReply<Tuple5<type1_in, type2_in, type3_in, type4_in, type5_in>, \ |
- Tuple1<type1_out&> >(routing_id, ID, \ |
- MakeRefTuple(arg1, arg2, arg3, arg4, arg5), MakeRefTuple(*arg6)) {} \ |
+ msg_class(int routing_id, const type1_in& arg1, const type2_in& arg2, const type3_in& arg3, const type4_in& arg4, const type5_in& arg5, type1_out* arg6); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#define IPC_SYNC_MESSAGE_ROUTED5_2(msg_class, type1_in, type2_in, type3_in, type4_in, type5_in, type1_out, type2_out) \ |
@@ -1314,10 +1268,9 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
Tuple2<type1_out&, type2_out&> > { \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(int routing_id, const type1_in& arg1, const type2_in& arg2, const type3_in& arg3, const type4_in& arg4, const type4_in& arg5, type1_out* arg6, type2_out* arg7) \ |
- : IPC::MessageWithReply<Tuple5<type1_in, type2_in, type3_in, type4_in, type5_in>, \ |
- Tuple2<type1_out&, type2_out&> >(routing_id, ID, \ |
- MakeRefTuple(arg1, arg2, arg3, arg4, arg5), MakeRefTuple(*arg6, *arg7)) {} \ |
+ msg_class(int routing_id, const type1_in& arg1, const type2_in& arg2, const type3_in& arg3, const type4_in& arg4, const type4_in& arg5, type1_out* arg6, type2_out* arg7); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#define IPC_SYNC_MESSAGE_ROUTED5_3(msg_class, type1_in, type2_in, type3_in, type4_in, type5_in, type1_out, type2_out, type3_out) \ |
@@ -1326,10 +1279,9 @@ LogFunction g_log_function_mapping[LastMsgIndex]; |
Tuple3<type1_out&, type2_out&, type3_out&> > { \ |
public: \ |
enum { ID = msg_class##__ID }; \ |
- msg_class(int routing_id, const type1_in& arg1, const type2_in& arg2, const type3_in& arg3, const type4_in& arg4, const type4_in& arg5, type1_out* arg6, type2_out* arg7, type3_out* arg8) \ |
- : IPC::MessageWithReply<Tuple5<type1_in, type2_in, type3_in, type4_in, type5_in>, \ |
- Tuple3<type1_out&, type2_out&, type3_out&> >(routing_id, ID, \ |
- MakeRefTuple(arg1, arg2, arg3, arg4, arg5), MakeRefTuple(*arg6, *arg7, *arg8)) {} \ |
+ msg_class(int routing_id, const type1_in& arg1, const type2_in& arg2, const type3_in& arg3, const type4_in& arg4, const type4_in& arg5, type1_out* arg6, type2_out* arg7, type3_out* arg8); \ |
+ ~msg_class(); \ |
+ static void Log(const Message* msg, std::wstring* l); \ |
}; |
#endif // #if defined() |