Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tools/ipc_fuzzer/fuzzer/fuzzer.cc

Issue 1532053002: use variadic macros/templates in IPC message implementation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: simplify Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« ipc/ipc_message_templates.h ('K') | « ipc/ipc_message_templates_impl.h ('k') | tools/ipc_fuzzer/message_lib/message_names.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/ipc_fuzzer/fuzzer/fuzzer.cc
diff --git a/tools/ipc_fuzzer/fuzzer/fuzzer.cc b/tools/ipc_fuzzer/fuzzer/fuzzer.cc
index d0c336e3a1d462c1ca382252cd826b62661c503b..37e81c5a04c8ef42918036a9f41a8a05cb3d1807 100644
--- a/tools/ipc_fuzzer/fuzzer/fuzzer.cc
+++ b/tools/ipc_fuzzer/fuzzer/fuzzer.cc
@@ -1999,135 +1999,157 @@ struct FuzzTraits<webrtc::MouseCursor> {
#include "tools/ipc_fuzzer/message_lib/all_messages.h"
#include "tools/ipc_fuzzer/message_lib/all_message_null_macros.h"
-// Redefine macros to generate generating funtions
-#undef IPC_MESSAGE_DECL
-#define IPC_MESSAGE_DECL(kind, type, name, in, out, ilist, olist) \
- IPC_##kind##_##type##_FUZZ(name, in, out, ilist, olist)
-
-#define IPC_EMPTY_CONTROL_FUZZ(name, in, out, ilist, olist) \
- IPC::Message* fuzzer_for_##name(IPC::Message* msg, Fuzzer* fuzzer) { \
- if (msg) { \
- return NULL; \
- } \
- return new name(); \
- }
-
-#define IPC_EMPTY_ROUTED_FUZZ(name, in, out, ilist, olist) \
- IPC::Message* fuzzer_for_##name(IPC::Message* msg, Fuzzer* fuzzer) { \
- if (msg) { \
- return NULL; \
- } \
- return new name(RandInRange(MAX_FAKE_ROUTING_ID)); \
- }
-
-#define IPC_ASYNC_CONTROL_FUZZ(name, in, out, ilist, olist) \
- IPC::Message* fuzzer_for_##name(IPC::Message* msg, Fuzzer* fuzzer) { \
- IPC_TUPLE_IN_##in ilist p; \
- if (msg) { \
- name::Read(static_cast<name*>(msg), &p); \
- } \
- if (FuzzParam(&p, fuzzer)) { \
- return new name(IPC_MEMBERS_IN_##in(p)); \
- } \
- std::cerr << "Don't know how to handle " << #name << "\n"; \
- return 0; \
- }
-
-#define IPC_ASYNC_ROUTED_FUZZ(name, in, out, ilist, olist) \
- IPC::Message* fuzzer_for_##name(IPC::Message* msg, Fuzzer* fuzzer) { \
- IPC_TUPLE_IN_##in ilist p; \
- if (msg) { \
- name::Read(static_cast<name*>(msg), &p); \
- } \
- if (FuzzParam(&p, fuzzer)) { \
- return new name(RandInRange(MAX_FAKE_ROUTING_ID) \
- IPC_COMMA_##in \
- IPC_MEMBERS_IN_##in(p)); \
- } \
- std::cerr << "Don't know how to handle " << #name << "\n"; \
- return 0; \
- }
-
-#define IPC_SYNC_CONTROL_FUZZ(name, in, out, ilist, olist) \
- IPC::Message* fuzzer_for_##name(IPC::Message* msg, Fuzzer* fuzzer) { \
- IPC_TUPLE_IN_##in ilist p; \
- name* real_msg = static_cast<name*>(msg); \
- name* new_msg = NULL; \
- if (real_msg) { \
- name::ReadSendParam(real_msg, &p); \
- } \
- if (FuzzParam(&p, fuzzer)) { \
- new_msg = new name(IPC_MEMBERS_IN_##in(p) \
- IPC_COMMA_AND_##out(IPC_COMMA_##in) \
- IPC_MEMBERS_OUT_##out()); \
- } \
- if (real_msg && new_msg) { \
- MessageCracker::CopyMessageID(new_msg, real_msg); \
- } \
- else if (!new_msg) { \
- std::cerr << "Don't know how to handle " << #name << "\n"; \
- } \
- return new_msg; \
- }
-
-#define IPC_SYNC_ROUTED_FUZZ(name, in, out, ilist, olist) \
- IPC::Message* fuzzer_for_##name(IPC::Message* msg, Fuzzer* fuzzer) { \
- IPC_TUPLE_IN_##in ilist p; \
- name* real_msg = static_cast<name*>(msg); \
- name* new_msg = NULL; \
- if (real_msg) { \
- name::ReadSendParam(real_msg, &p); \
- } \
- if (FuzzParam(&p, fuzzer)) { \
- new_msg = new name(RandInRange(MAX_FAKE_ROUTING_ID) \
- IPC_COMMA_OR_##out(IPC_COMMA_##in) \
- IPC_MEMBERS_IN_##in(p) \
- IPC_COMMA_AND_##out(IPC_COMMA_##in) \
- IPC_MEMBERS_OUT_##out()); \
- } \
- if (real_msg && new_msg) { \
- MessageCracker::CopyMessageID(new_msg, real_msg); \
- } \
- else if (!new_msg) { \
- std::cerr << "Don't know how to handle " << #name << "\n"; \
- } \
- return new_msg; \
+#define MAX_FAKE_ROUTING_ID 15
+
+template <typename Message>
+class FuzzerHelper;
+
+template <uint32_t Id, const char* Name, typename... Ins>
+class FuzzerHelper<
+ IPC::AsyncControlMessage<Id, Name, base::Tuple<Ins...>, base::Tuple<>>> {
+ public:
+ using Message =
+ IPC::AsyncControlMessage<Id, Name, base::Tuple<Ins...>, base::Tuple<>>;
+
+ static IPC::Message* Fuzz(IPC::Message* msg, Fuzzer* fuzzer) {
+ return FuzzImpl(msg, fuzzer, base::MakeIndexSequence<sizeof...(Ins)>());
}
-#define MAX_FAKE_ROUTING_ID 15
+ private:
+ template <size_t... Ns>
+ static IPC::Message* FuzzImpl(IPC::Message* msg,
+ Fuzzer* fuzzer,
+ base::IndexSequence<Ns...>) {
+ typename Message::Param p;
+ if (msg) {
+ Message::Read(static_cast<Message*>(msg), &p);
+ }
+ if (FuzzParam(&p, fuzzer)) {
+ return new Message(base::get<Ns>(p)...);
+ }
+ std::cerr << "Don't know how to handle " << Name << "\n";
+ return nullptr;
+ }
+};
-#define IPC_MEMBERS_IN_0(p)
-#define IPC_MEMBERS_IN_1(p) base::get<0>(p)
-#define IPC_MEMBERS_IN_2(p) base::get<0>(p), base::get<1>(p)
-#define IPC_MEMBERS_IN_3(p) base::get<0>(p), base::get<1>(p), base::get<2>(p)
-#define IPC_MEMBERS_IN_4(p) base::get<0>(p), base::get<1>(p), base::get<2>(p), \
- base::get<3>(p)
-#define IPC_MEMBERS_IN_5(p) base::get<0>(p), base::get<1>(p), base::get<2>(p), \
- base::get<3>(p), base::get<4>(p)
-
-#define IPC_MEMBERS_OUT_0()
-#define IPC_MEMBERS_OUT_1() NULL
-#define IPC_MEMBERS_OUT_2() NULL, NULL
-#define IPC_MEMBERS_OUT_3() NULL, NULL, NULL
-#define IPC_MEMBERS_OUT_4() NULL, NULL, NULL, NULL
-#define IPC_MEMBERS_OUT_5() NULL, NULL, NULL, NULL, NULL
+template <uint32_t Id, const char* Name, typename... Ins>
+class FuzzerHelper<
+ IPC::AsyncRoutedMessage<Id, Name, base::Tuple<Ins...>, base::Tuple<>>> {
+ public:
+ using Message =
+ IPC::AsyncRoutedMessage<Id, Name, base::Tuple<Ins...>, base::Tuple<>>;
+
+ static IPC::Message* Fuzz(IPC::Message* msg, Fuzzer* fuzzer) {
+ return FuzzImpl(msg, fuzzer, base::MakeIndexSequence<sizeof...(Ins)>());
+ }
+
+ private:
+ template <size_t... Ns>
+ static IPC::Message* FuzzImpl(IPC::Message* msg,
+ Fuzzer* fuzzer,
+ base::IndexSequence<Ns...>) {
+ typename Message::Param p;
+ if (msg) {
+ Message::Read(static_cast<Message*>(msg), &p);
+ }
+ if (FuzzParam(&p, fuzzer)) {
+ return new Message(RandInRange(MAX_FAKE_ROUTING_ID), base::get<Ns>(p)...);
+ }
+ std::cerr << "Don't know how to handle " << Name << "\n";
+ return nullptr;
+ }
+};
+
+template <uint32_t Id, const char* Name, typename... Ins, typename... Outs>
+class FuzzerHelper<IPC::SyncControlMessage<Id,
+ Name,
+ base::Tuple<Ins...>,
+ base::Tuple<Outs...>>> {
+ public:
+ using Message = IPC::
+ SyncControlMessage<Id, Name, base::Tuple<Ins...>, base::Tuple<Outs...>>;
+
+ static IPC::Message* Fuzz(IPC::Message* msg, Fuzzer* fuzzer) {
+ return FuzzImpl(msg, fuzzer, base::MakeIndexSequence<sizeof...(Ins)>());
+ }
+
+ private:
+ template <size_t... Ns>
+ static IPC::Message* FuzzImpl(IPC::Message* msg,
+ Fuzzer* fuzzer,
+ base::IndexSequence<Ns...>) {
+ typename Message::SendParam p;
+ Message* real_msg = static_cast<Message*>(msg);
+ Message* new_msg = nullptr;
+ if (real_msg) {
+ Message::ReadSendParam(real_msg, &p);
+ }
+ if (FuzzParam(&p, fuzzer)) {
+ new_msg =
+ new Message(base::get<Ns>(p)..., static_cast<Outs*>(nullptr)...);
+ }
+ if (real_msg && new_msg) {
+ MessageCracker::CopyMessageID(new_msg, real_msg);
+ } else if (!new_msg) {
+ std::cerr << "Don't know how to handle " << Name << "\n";
+ }
+ return new_msg;
+ }
+};
+
+template <uint32_t Id, const char* Name, typename... Ins, typename... Outs>
+class FuzzerHelper<IPC::SyncRoutedMessage<Id,
+ Name,
+ base::Tuple<Ins...>,
+ base::Tuple<Outs...>>> {
+ public:
+ using Message = IPC::
+ SyncRoutedMessage<Id, Name, base::Tuple<Ins...>, base::Tuple<Outs...>>;
+
+ static IPC::Message* Fuzz(IPC::Message* msg, Fuzzer* fuzzer) {
+ return FuzzImpl(msg, fuzzer, base::MakeIndexSequence<sizeof...(Ins)>());
+ }
+
+ private:
+ template <size_t... Ns>
+ static IPC::Message* FuzzImpl(IPC::Message* msg,
+ Fuzzer* fuzzer,
+ base::IndexSequence<Ns...>) {
+ typename Message::SendParam p;
+ Message* real_msg = static_cast<Message*>(msg);
+ Message* new_msg = nullptr;
+ if (real_msg) {
+ Message::ReadSendParam(real_msg, &p);
+ }
+ if (FuzzParam(&p, fuzzer)) {
+ new_msg =
+ new Message(RandInRange(MAX_FAKE_ROUTING_ID), base::get<Ns>(p)...,
+ static_cast<Outs*>(nullptr)...);
+ }
+ if (real_msg && new_msg) {
+ MessageCracker::CopyMessageID(new_msg, real_msg);
+ } else if (!new_msg) {
+ std::cerr << "Don't know how to handle " << Name << "\n";
+ }
+ return new_msg;
+ }
+};
-#include "tools/ipc_fuzzer/message_lib/all_messages.h"
#include "tools/ipc_fuzzer/message_lib/all_message_null_macros.h"
void PopulateFuzzerFunctionVector(
FuzzerFunctionVector* function_vector) {
#undef IPC_MESSAGE_DECL
-#define IPC_MESSAGE_DECL(kind, type, name, in, out, ilist, olist) \
- function_vector->push_back(fuzzer_for_##name);
+#define IPC_MESSAGE_DECL(name, ...) \
+ function_vector->push_back(FuzzerHelper<name>::Fuzz);
#include "tools/ipc_fuzzer/message_lib/all_messages.h"
}
// Redefine macros to register fuzzing functions into map.
#include "tools/ipc_fuzzer/message_lib/all_message_null_macros.h"
#undef IPC_MESSAGE_DECL
-#define IPC_MESSAGE_DECL(kind, type, name, in, out, ilist, olist) \
- (*map)[static_cast<uint32>(name::ID)] = fuzzer_for_##name;
+#define IPC_MESSAGE_DECL(name, ...) \
+ (*map)[static_cast<uint32>(name::ID)] = FuzzerHelper<name>::Fuzz;
void PopulateFuzzerFunctionMap(FuzzerFunctionMap* map) {
#include "tools/ipc_fuzzer/message_lib/all_messages.h"
« ipc/ipc_message_templates.h ('K') | « ipc/ipc_message_templates_impl.h ('k') | tools/ipc_fuzzer/message_lib/message_names.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698