Skip to content

Commit

Permalink
Revert 55259 - FBTF: New IPC definitions, only applied to async ROUTE…
Browse files Browse the repository at this point in the history 
…D and CONTROL messages.

The slowest cc files in chrome include render_messages.h and other IPC message
definitions. Including one of these files will bring in half of chrome because
in the IPC system previously required full class definitions due to
implementation details.

The new system allows forward declarations and places the implementations of
functions that need the full class definitions (ctor/dtor()/Log() and
superclass ctor/Read() methods) into a separate xxx_messages.cc file using a
parallel set of macros to ipc_message_macros.h. This has the added benefit
of moving most of the template instantiation junk into a small number of
files.

Pros:
- Will speed up compiling by a lot once everything is forward declared.
- Already, intermediary .o/.a files are smaller.

Cons:
- Adds a 4th pass to the messages system, this time in a different header.

BUG=51411
TEST=none

Review URL: http://codereview.chromium.org/2873090

TBR=erg@google.com
Review URL: http://codereview.chromium.org/3080040

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55406 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
pinkerton@google.com committed Aug 9, 2010
1 parent c9f28a7 commit 071b4b9
Show file tree
Hide file tree
Showing 27 changed files with 234 additions and 867 deletions.
264 changes: 108 additions & 156 deletions base/tuple.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,6 @@ struct TupleTraits<P&> {
typedef P& ParamType;
};

template <class P>
struct TupleTypes { };

// Tuple -----------------------------------------------------------------------
//
// This set of classes is useful for bundling 0 or more heterogeneous data types
Expand All @@ -79,6 +76,9 @@ template <class A>
struct Tuple1 {
public:
typedef A TypeA;
typedef Tuple1<typename TupleTraits<A>::ValueType> ValueTuple;
typedef Tuple1<typename TupleTraits<A>::RefType> RefTuple;
typedef Tuple1<typename TupleTraits<A>::ParamType> ParamTuple;

Tuple1() {}
explicit Tuple1(typename TupleTraits<A>::ParamType a) : a(a) {}
Expand All @@ -91,6 +91,12 @@ struct Tuple2 {
public:
typedef A TypeA;
typedef B TypeB;
typedef Tuple2<typename TupleTraits<A>::ValueType,
typename TupleTraits<B>::ValueType> ValueTuple;
typedef Tuple2<typename TupleTraits<A>::RefType,
typename TupleTraits<B>::RefType> RefTuple;
typedef Tuple2<typename TupleTraits<A>::ParamType,
typename TupleTraits<B>::ParamType> ParamTuple;

Tuple2() {}
Tuple2(typename TupleTraits<A>::ParamType a,
Expand All @@ -108,6 +114,15 @@ struct Tuple3 {
typedef A TypeA;
typedef B TypeB;
typedef C TypeC;
typedef Tuple3<typename TupleTraits<A>::ValueType,
typename TupleTraits<B>::ValueType,
typename TupleTraits<C>::ValueType> ValueTuple;
typedef Tuple3<typename TupleTraits<A>::RefType,
typename TupleTraits<B>::RefType,
typename TupleTraits<C>::RefType> RefTuple;
typedef Tuple3<typename TupleTraits<A>::ParamType,
typename TupleTraits<B>::ParamType,
typename TupleTraits<C>::ParamType> ParamTuple;

Tuple3() {}
Tuple3(typename TupleTraits<A>::ParamType a,
Expand All @@ -128,6 +143,18 @@ struct Tuple4 {
typedef B TypeB;
typedef C TypeC;
typedef D TypeD;
typedef Tuple4<typename TupleTraits<A>::ValueType,
typename TupleTraits<B>::ValueType,
typename TupleTraits<C>::ValueType,
typename TupleTraits<D>::ValueType> ValueTuple;
typedef Tuple4<typename TupleTraits<A>::RefType,
typename TupleTraits<B>::RefType,
typename TupleTraits<C>::RefType,
typename TupleTraits<D>::RefType> RefTuple;
typedef Tuple4<typename TupleTraits<A>::ParamType,
typename TupleTraits<B>::ParamType,
typename TupleTraits<C>::ParamType,
typename TupleTraits<D>::ParamType> ParamTuple;

Tuple4() {}
Tuple4(typename TupleTraits<A>::ParamType a,
Expand All @@ -151,6 +178,21 @@ struct Tuple5 {
typedef C TypeC;
typedef D TypeD;
typedef E TypeE;
typedef Tuple5<typename TupleTraits<A>::ValueType,
typename TupleTraits<B>::ValueType,
typename TupleTraits<C>::ValueType,
typename TupleTraits<D>::ValueType,
typename TupleTraits<E>::ValueType> ValueTuple;
typedef Tuple5<typename TupleTraits<A>::RefType,
typename TupleTraits<B>::RefType,
typename TupleTraits<C>::RefType,
typename TupleTraits<D>::RefType,
typename TupleTraits<E>::RefType> RefTuple;
typedef Tuple5<typename TupleTraits<A>::ParamType,
typename TupleTraits<B>::ParamType,
typename TupleTraits<C>::ParamType,
typename TupleTraits<D>::ParamType,
typename TupleTraits<E>::ParamType> ParamTuple;

Tuple5() {}
Tuple5(typename TupleTraits<A>::ParamType a,
Expand All @@ -177,6 +219,24 @@ struct Tuple6 {
typedef D TypeD;
typedef E TypeE;
typedef F TypeF;
typedef Tuple6<typename TupleTraits<A>::ValueType,
typename TupleTraits<B>::ValueType,
typename TupleTraits<C>::ValueType,
typename TupleTraits<D>::ValueType,
typename TupleTraits<E>::ValueType,
typename TupleTraits<F>::ValueType> ValueTuple;
typedef Tuple6<typename TupleTraits<A>::RefType,
typename TupleTraits<B>::RefType,
typename TupleTraits<C>::RefType,
typename TupleTraits<D>::RefType,
typename TupleTraits<E>::RefType,
typename TupleTraits<F>::RefType> RefTuple;
typedef Tuple6<typename TupleTraits<A>::ParamType,
typename TupleTraits<B>::ParamType,
typename TupleTraits<C>::ParamType,
typename TupleTraits<D>::ParamType,
typename TupleTraits<E>::ParamType,
typename TupleTraits<F>::ParamType> ParamTuple;

Tuple6() {}
Tuple6(typename TupleTraits<A>::ParamType a,
Expand Down Expand Up @@ -206,6 +266,27 @@ struct Tuple7 {
typedef E TypeE;
typedef F TypeF;
typedef G TypeG;
typedef Tuple7<typename TupleTraits<A>::ValueType,
typename TupleTraits<B>::ValueType,
typename TupleTraits<C>::ValueType,
typename TupleTraits<D>::ValueType,
typename TupleTraits<E>::ValueType,
typename TupleTraits<F>::ValueType,
typename TupleTraits<G>::ValueType> ValueTuple;
typedef Tuple7<typename TupleTraits<A>::RefType,
typename TupleTraits<B>::RefType,
typename TupleTraits<C>::RefType,
typename TupleTraits<D>::RefType,
typename TupleTraits<E>::RefType,
typename TupleTraits<F>::RefType,
typename TupleTraits<G>::RefType> RefTuple;
typedef Tuple7<typename TupleTraits<A>::ParamType,
typename TupleTraits<B>::ParamType,
typename TupleTraits<C>::ParamType,
typename TupleTraits<D>::ParamType,
typename TupleTraits<E>::ParamType,
typename TupleTraits<F>::ParamType,
typename TupleTraits<G>::ParamType> ParamTuple;

Tuple7() {}
Tuple7(typename TupleTraits<A>::ParamType a,
Expand Down Expand Up @@ -239,6 +320,30 @@ struct Tuple8 {
typedef F TypeF;
typedef G TypeG;
typedef H TypeH;
typedef Tuple8<typename TupleTraits<A>::ValueType,
typename TupleTraits<B>::ValueType,
typename TupleTraits<C>::ValueType,
typename TupleTraits<D>::ValueType,
typename TupleTraits<E>::ValueType,
typename TupleTraits<F>::ValueType,
typename TupleTraits<G>::ValueType,
typename TupleTraits<H>::ValueType> ValueTuple;
typedef Tuple8<typename TupleTraits<A>::RefType,
typename TupleTraits<B>::RefType,
typename TupleTraits<C>::RefType,
typename TupleTraits<D>::RefType,
typename TupleTraits<E>::RefType,
typename TupleTraits<F>::RefType,
typename TupleTraits<G>::RefType,
typename TupleTraits<H>::RefType> RefTuple;
typedef Tuple8<typename TupleTraits<A>::ParamType,
typename TupleTraits<B>::ParamType,
typename TupleTraits<C>::ParamType,
typename TupleTraits<D>::ParamType,
typename TupleTraits<E>::ParamType,
typename TupleTraits<F>::ParamType,
typename TupleTraits<G>::ParamType,
typename TupleTraits<H>::ParamType> ParamTuple;

Tuple8() {}
Tuple8(typename TupleTraits<A>::ParamType a,
Expand All @@ -262,159 +367,6 @@ struct Tuple8 {
H h;
};

// Tuple types ----------------------------------------------------------------
//
// Allows for selection of ValueTuple/RefTuple/ParamTuple without needing the
// definitions of class types the tuple takes as parameters.

template <>
struct TupleTypes< Tuple0 > {
typedef Tuple0 ValueTuple;
typedef Tuple0 RefTuple;
typedef Tuple0 ParamTuple;
};

template <class A>
struct TupleTypes< Tuple1<A> > {
typedef Tuple1<typename TupleTraits<A>::ValueType> ValueTuple;
typedef Tuple1<typename TupleTraits<A>::RefType> RefTuple;
typedef Tuple1<typename TupleTraits<A>::ParamType> ParamTuple;
};

template <class A, class B>
struct TupleTypes< Tuple2<A, B> > {
typedef Tuple2<typename TupleTraits<A>::ValueType,
typename TupleTraits<B>::ValueType> ValueTuple;
typedef Tuple2<typename TupleTraits<A>::RefType,
typename TupleTraits<B>::RefType> RefTuple;
typedef Tuple2<typename TupleTraits<A>::ParamType,
typename TupleTraits<B>::ParamType> ParamTuple;
};

template <class A, class B, class C>
struct TupleTypes< Tuple3<A, B, C> > {
typedef Tuple3<typename TupleTraits<A>::ValueType,
typename TupleTraits<B>::ValueType,
typename TupleTraits<C>::ValueType> ValueTuple;
typedef Tuple3<typename TupleTraits<A>::RefType,
typename TupleTraits<B>::RefType,
typename TupleTraits<C>::RefType> RefTuple;
typedef Tuple3<typename TupleTraits<A>::ParamType,
typename TupleTraits<B>::ParamType,
typename TupleTraits<C>::ParamType> ParamTuple;
};

template <class A, class B, class C, class D>
struct TupleTypes< Tuple4<A, B, C, D> > {
typedef Tuple4<typename TupleTraits<A>::ValueType,
typename TupleTraits<B>::ValueType,
typename TupleTraits<C>::ValueType,
typename TupleTraits<D>::ValueType> ValueTuple;
typedef Tuple4<typename TupleTraits<A>::RefType,
typename TupleTraits<B>::RefType,
typename TupleTraits<C>::RefType,
typename TupleTraits<D>::RefType> RefTuple;
typedef Tuple4<typename TupleTraits<A>::ParamType,
typename TupleTraits<B>::ParamType,
typename TupleTraits<C>::ParamType,
typename TupleTraits<D>::ParamType> ParamTuple;
};

template <class A, class B, class C, class D, class E>
struct TupleTypes< Tuple5<A, B, C, D, E> > {
typedef Tuple5<typename TupleTraits<A>::ValueType,
typename TupleTraits<B>::ValueType,
typename TupleTraits<C>::ValueType,
typename TupleTraits<D>::ValueType,
typename TupleTraits<E>::ValueType> ValueTuple;
typedef Tuple5<typename TupleTraits<A>::RefType,
typename TupleTraits<B>::RefType,
typename TupleTraits<C>::RefType,
typename TupleTraits<D>::RefType,
typename TupleTraits<E>::RefType> RefTuple;
typedef Tuple5<typename TupleTraits<A>::ParamType,
typename TupleTraits<B>::ParamType,
typename TupleTraits<C>::ParamType,
typename TupleTraits<D>::ParamType,
typename TupleTraits<E>::ParamType> ParamTuple;
};

template <class A, class B, class C, class D, class E, class F>
struct TupleTypes< Tuple6<A, B, C, D, E, F> > {
typedef Tuple6<typename TupleTraits<A>::ValueType,
typename TupleTraits<B>::ValueType,
typename TupleTraits<C>::ValueType,
typename TupleTraits<D>::ValueType,
typename TupleTraits<E>::ValueType,
typename TupleTraits<F>::ValueType> ValueTuple;
typedef Tuple6<typename TupleTraits<A>::RefType,
typename TupleTraits<B>::RefType,
typename TupleTraits<C>::RefType,
typename TupleTraits<D>::RefType,
typename TupleTraits<E>::RefType,
typename TupleTraits<F>::RefType> RefTuple;
typedef Tuple6<typename TupleTraits<A>::ParamType,
typename TupleTraits<B>::ParamType,
typename TupleTraits<C>::ParamType,
typename TupleTraits<D>::ParamType,
typename TupleTraits<E>::ParamType,
typename TupleTraits<F>::ParamType> ParamTuple;
};

template <class A, class B, class C, class D, class E, class F, class G>
struct TupleTypes< Tuple7<A, B, C, D, E, F, G> > {
typedef Tuple7<typename TupleTraits<A>::ValueType,
typename TupleTraits<B>::ValueType,
typename TupleTraits<C>::ValueType,
typename TupleTraits<D>::ValueType,
typename TupleTraits<E>::ValueType,
typename TupleTraits<F>::ValueType,
typename TupleTraits<G>::ValueType> ValueTuple;
typedef Tuple7<typename TupleTraits<A>::RefType,
typename TupleTraits<B>::RefType,
typename TupleTraits<C>::RefType,
typename TupleTraits<D>::RefType,
typename TupleTraits<E>::RefType,
typename TupleTraits<F>::RefType,
typename TupleTraits<G>::RefType> RefTuple;
typedef Tuple7<typename TupleTraits<A>::ParamType,
typename TupleTraits<B>::ParamType,
typename TupleTraits<C>::ParamType,
typename TupleTraits<D>::ParamType,
typename TupleTraits<E>::ParamType,
typename TupleTraits<F>::ParamType,
typename TupleTraits<G>::ParamType> ParamTuple;
};

template <class A, class B, class C, class D, class E, class F, class G,
class H>
struct TupleTypes< Tuple8<A, B, C, D, E, F, G, H> > {
typedef Tuple8<typename TupleTraits<A>::ValueType,
typename TupleTraits<B>::ValueType,
typename TupleTraits<C>::ValueType,
typename TupleTraits<D>::ValueType,
typename TupleTraits<E>::ValueType,
typename TupleTraits<F>::ValueType,
typename TupleTraits<G>::ValueType,
typename TupleTraits<H>::ValueType> ValueTuple;
typedef Tuple8<typename TupleTraits<A>::RefType,
typename TupleTraits<B>::RefType,
typename TupleTraits<C>::RefType,
typename TupleTraits<D>::RefType,
typename TupleTraits<E>::RefType,
typename TupleTraits<F>::RefType,
typename TupleTraits<G>::RefType,
typename TupleTraits<H>::RefType> RefTuple;
typedef Tuple8<typename TupleTraits<A>::ParamType,
typename TupleTraits<B>::ParamType,
typename TupleTraits<C>::ParamType,
typename TupleTraits<D>::ParamType,
typename TupleTraits<E>::ParamType,
typename TupleTraits<F>::ParamType,
typename TupleTraits<G>::ParamType,
typename TupleTraits<H>::ParamType> ParamTuple;
};

// Tuple creators -------------------------------------------------------------
//
// Helper functions for constructing tuples while inferring the template
Expand Down
7 changes: 1 addition & 6 deletions chrome/browser/importer/firefox_importer_unittest_utils_mac.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,11 @@
#include "ipc/ipc_switches.h"
#include "testing/multiprocess_func_list.h"

// Declaration of IPC Messages used for this test.
// Definition of IPC Messages used for this test.
#define MESSAGES_INTERNAL_FILE \
"chrome/browser/importer/firefox_importer_unittest_messages_internal.h"
#include "ipc/ipc_message_macros.h"

// Definition of IPC Messages used for this test.
#define MESSAGES_INTERNAL_IMPL_FILE \
"chrome/browser/importer/firefox_importer_unittest_messages_internal.h"
#include "ipc/ipc_message_impl_macros.h"

namespace {

// Name of IPC Channel to use for Server<-> Child Communications.
Expand Down
11 changes: 0 additions & 11 deletions chrome/browser/importer/importer_messages.cc
View file

This file was deleted.

1 change: 0 additions & 1 deletion chrome/chrome.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1710,7 +1710,6 @@
'test/automation/automation_constants.h',
'test/automation/automation_handle_tracker.cc',
'test/automation/automation_handle_tracker.h',
'test/automation/automation_messages.cc',
'test/automation/automation_messages.h',
'test/automation/automation_messages_internal.h',
'test/automation/automation_proxy.cc',
Expand Down
7 changes: 0 additions & 7 deletions chrome/chrome_browser.gypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1825,7 +1825,6 @@
'browser/importer/importer_data_types.h',
'browser/importer/importer_list.cc',
'browser/importer/importer_list.h',
'browser/importer/importer_messages.cc',
'browser/importer/importer_messages.h',
'browser/importer/importer_messages_internal.h',
'browser/importer/mork_reader.cc',
Expand Down Expand Up @@ -2913,12 +2912,6 @@
'browser/zygote_host_linux.cc',
'browser/zygote_main_linux.cc',

# TODO(erg): http://crbug.com/51409 These files are also specified as
# part of the automation project, but we need these definitions here,
# too, due to usage in our automation provider.
'test/automation/automation_messages.cc',
'test/automation/automation_messages.h',

# These files are generated by GRIT.
'<(grit_out_dir)/grit/bookmark_manager_resources_map.cc',
'<(grit_out_dir)/grit/shared_resources_map.cc',
Expand Down
Loading

0 comments on commit 071b4b9

Please sign in to comment.