Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: src/plugin/PluginDebug.cpp

Issue 11013110: Cleanup (Closed)
Left Patch Set: Created July 5, 2013, 3:28 a.m.
Right Patch Set: More beautification and addressing comments Created July 29, 2013, 12:13 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Right: Side by side diff | Download
« no previous file with change/comment | « src/plugin/PluginConfiguration.cpp ('k') | src/plugin/PluginFilter.cpp » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
(no file at all)
1 #include "PluginStdAfx.h" 1 #include "PluginStdAfx.h"
2 2
3 #include "PluginDebug.h" 3 #include "PluginDebug.h"
4 #include "PluginMutex.h" 4 #include "PluginMutex.h"
5 #include "PluginSettings.h" 5 #include "PluginSettings.h"
6 6
7 7
8 class CPluginDebugLock : public CPluginMutex 8 class CPluginDebugLock : public CPluginMutex
9 { 9 {
10 10
(...skipping 26 matching lines...) Expand all
37 #endif 37 #endif
38 38
39 if (CPluginSettings::HasInstance()) 39 if (CPluginSettings::HasInstance())
40 { 40 {
41 #ifdef ENABLE_DEBUG_SPLIT_FILE 41 #ifdef ENABLE_DEBUG_SPLIT_FILE
42 CPluginSettings* settings = CPluginSettings::GetInstance(); 42 CPluginSettings* settings = CPluginSettings::GetInstance();
43 43
44 bool isWorkingThread = settings->IsWorkingThread(dwThreadId); 44 bool isWorkingThread = settings->IsWorkingThread(dwThreadId);
45 45
46 CString processor; 46 CString processor;
47 if (settings->IsMainProcess(dwProcessId) && settings->IsMainThread(dwThreadI d)) 47 wchar_t tmp[10];
48 { 48 _itow_s(::GetCurrentProcessId(), tmp, 10);
49 processor = L"main_thread"; 49 if (isWorkingThread)
50 } 50 processor = L"tab" + CString(tmp) + L"_thread";
51 else if (settings->IsMainProcess(dwProcessId) && settings->IsMainUiThread(dw ThreadId))
52 {
53 processor = L"main_ui";
54 }
55 else if (isWorkingThread)
56 {
57 processor = L"tab" + settings->GetTabNumber() + L"_thread";
58 }
59 else 51 else
60 { 52 processor = L"tab" + CString(tmp) + L"_ui";
61 processor = L"tab" + settings->GetTabNumber() + L"_ui";
62 }
63 #else 53 #else
64 if (dwProcessId == 0) 54 if (dwProcessId == 0)
65 { 55 {
66 dwProcessId = ::GetCurrentProcessId(); 56 dwProcessId = ::GetCurrentProcessId();
67 } 57 }
68 if (dwThreadId == 0) 58 if (dwThreadId == 0)
69 { 59 {
70 dwThreadId = ::GetCurrentThreadId(); 60 dwThreadId = ::GetCurrentThreadId();
71 } 61 }
72 62
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 srcTrunc = src.Left(67) + L"..." + src.Right(30); 237 srcTrunc = src.Left(67) + L"..." + src.Right(30);
248 } 238 }
249 239
250 CString blocking; 240 CString blocking;
251 blocking.Format(L"Ignored %-12s %s %s", type, domain.IsEmpty()? L"-" : doma in, srcTrunc); 241 blocking.Format(L"Ignored %-12s %s %s", type, domain.IsEmpty()? L"-" : doma in, srcTrunc);
252 242
253 DebugResult(blocking); 243 DebugResult(blocking);
254 } 244 }
255 245
256 #endif // ENABLE_DEBUG_RESULT_IGNORED 246 #endif // ENABLE_DEBUG_RESULT_IGNORED
LEFTRIGHT

Powered by Google App Engine
This is Rietveld