summaryrefslogtreecommitdiffstats
path: root/chrome/tools
diff options
context:
space:
mode:
authorrbyers@chromium.org <rbyers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-14 16:19:57 +0000
committerrbyers@chromium.org <rbyers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-14 16:19:57 +0000
commit3b250964a2bc37d956755173fe983a3c17f5951a (patch)
tree34a7bdaae48bbe278b44c12de5773110b79aa732 /chrome/tools
parente7ca8dd2ef98a042b7cc7437419067c43cadf1b0 (diff)
downloadchromium_src-3b250964a2bc37d956755173fe983a3c17f5951a.zip
chromium_src-3b250964a2bc37d956755173fe983a3c17f5951a.tar.gz
chromium_src-3b250964a2bc37d956755173fe983a3c17f5951a.tar.bz2
Revert 121889 - Add simple trace logging of received IPC messages
Somehow triggered a crash in the Windows linker Adds an entry to chrome://tracing for processing IPC messages that includes the IPC message type ID (which can be matched to a name with the ipclist tool), and in DEBUG builds (or other builds where IPC_MESSAGE_LOG_ENABLED has been set), the message name. Also adds shell_messages.h to the message generator headers (per the rules in ipc_message_macros.h) to fix broken IPC message logging. BUG=79942 TEST= Review URL: http://codereview.chromium.org/9389020 TBR=rbyers@chromium.org Review URL: https://chromiumcodereview.appspot.com/9365058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121890 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/tools')
-rw-r--r--chrome/tools/ipclist/ipclist.cc15
1 files changed, 4 insertions, 11 deletions
diff --git a/chrome/tools/ipclist/ipclist.cc b/chrome/tools/ipclist/ipclist.cc
index a2d37a8..9a2faab 100644
--- a/chrome/tools/ipclist/ipclist.cc
+++ b/chrome/tools/ipclist/ipclist.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -38,11 +38,10 @@ static bool check_msgtable() {
int highest_class_id = 0;
std::vector<int> exemptions;
- // Exclude test and other non-browser files from consideration. Do not
- // include message files used inside the actual chrome browser in this list.
+ // Exclude test files from consideration. Do not include message
+ // files used inside the actual chrome browser in this list.
exemptions.push_back(TestMsgStart);
exemptions.push_back(FirefoxImporterUnittestMsgStart);
- exemptions.push_back(ShellMsgStart);
for (size_t i = 0; i < MSGTABLE_SIZE; ++i) {
int class_id = IPC_MESSAGE_ID_CLASS(msgtable[i].id);
@@ -65,15 +64,9 @@ static bool check_msgtable() {
highest_class_id = class_id;
}
- while (LastIPCMsgStart > highest_class_id + 1) {
- std::vector<int>::iterator iter;
- iter = find(exemptions.begin(), exemptions.end(), highest_class_id+1);
- if (iter == exemptions.end()) {
+ if (LastIPCMsgStart > highest_class_id + 1) {
std::cout << "Missing message file: gap before LastIPCMsgStart\n";
result = false;
- break;
- }
- ++highest_class_id;
}
if (!result)