SwitchEmu/breakpad
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/breakpad.git synced 2026-03-05 12:12:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert revision 658 ('Add glog style logging to symupload').

Browse Source 
R=nealsid at http://breakpad.appspot.com/190001


git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@685 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
erikwright@chromium.org
2010-09-15 17:38:03 +00:00
parent 90a41b68ad
commit 7fde9a879d
4 changed files with 8 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/tools/windows/symupload/symupload.cc
View File

@@ -51,14 +51,10 @@
#include <string>
#include <vector>
#include "common/windows/string_utils-inl.h"
#include "common/windows/http_upload.h"
#include "common/windows/pdb_source_line_writer.h"
#include "common/windows/string_utils-inl.h"
#include "common/windows/wchar_logging.h"
// See http://code.google.com/p/google-glog/issues/detail?id=33 for why
// this #undef is added.
#undef ERROR
#include "third_party/glog/glog/src/windows/glog/logging.h"
using std::string;
using std::wstring;
@@ -116,15 +112,12 @@ static bool DumpSymbolsToTempFile(const wchar_t *file,
wstring *temp_file_path,
PDBModuleInfo *pdb_info) {
google_breakpad::PDBSourceLineWriter writer;
VLOG(1) << "DumpSymbolsToTempFile opening file";
// Use EXE_FILE to get information out of the exe/dll in addition to the
// pdb. The name and version number of the exe/dll are of value, and
// there's no way to locate an exe/dll given a pdb.
if (!writer.Open(file, PDBSourceLineWriter::EXE_FILE)) {
VLOG(1) << "Error opening input module";
return false;
}
VLOG(1) << "DumpSymbolsToTempFile file opened";
wchar_t temp_path[_MAX_PATH];
if (GetTempPath(_MAX_PATH, temp_path) == 0) {
@@ -135,7 +128,6 @@ static bool DumpSymbolsToTempFile(const wchar_t *file,
if (GetTempFileName(temp_path, L"sym", 0, temp_filename) == 0) {
return false;
}
VLOG(1) << "Temporary symbol filename is: " << temp_filename;
FILE *temp_file = NULL;
#if _MSC_VER >= 1400 // MSVC 2005/8
@@ -153,8 +145,7 @@ static bool DumpSymbolsToTempFile(const wchar_t *file,
fclose(temp_file);
if (!success) {
_wunlink(temp_filename);
LOG(ERROR) << "Error writing to temp file";
return false;
return false;
}
*temp_file_path = temp_filename;
@@ -169,24 +160,11 @@ void printUsageAndExit() {
exit(0);
}
int wmain(int argc, wchar_t *argv[]) {
char progname[MAX_PATH];
size_t convertedChars;
wcstombs_s(&convertedChars, progname, MAX_PATH, argv[0], _TRUNCATE);
google::InitGoogleLogging(progname);
if ((argc != 3) &&
(argc != 5)) {
printUsageAndExit();
}
if (argc == 5) {
VLOG(1) << "Module: " << argv[3];
VLOG(1) << "Server: " << argv[4];
} else {
VLOG(1) << "Module: " << argv[1];
VLOG(1) << "Server: " << argv[2];
}
const wchar_t *module, *url;
int timeout = -1;
if (argc == 3) {
@@ -203,15 +181,12 @@ int wmain(int argc, wchar_t *argv[]) {
}
}
VLOG(1) << "Beginning symbol dump";
wstring symbol_file;
PDBModuleInfo pdb_info;
if (!DumpSymbolsToTempFile(module, &symbol_file, &pdb_info)) {
fwprintf(stderr, L"Could not get symbol data from %s\n", module);
LOG(ERROR) << "Could not get symbol data from " << module;
return 1;
}
VLOG(1) << "Symbol dump completed to " << symbol_file;
wstring code_file = WindowsStringUtils::GetBaseName(wstring(module));

84
src/tools/windows/symupload/symupload.vcproj
View File

@@ -39,7 +39,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\third_party\glog\glog\src\windows;..\..\..;&quot;$(VSInstallDir)\DIA SDK\include&quot;"
AdditionalIncludeDirectories="&quot;$(VSInstallDir)\DIA SDK\include&quot;;..\..\.."
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -115,7 +115,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\third_party\glog\glog\src\windows;..\..\..\;&quot;$(VSInstallDir)\DIA SDK\include&quot;"
AdditionalIncludeDirectories="&quot;$(VSInstallDir)\DIA SDK\include&quot;;..\..\.."
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -192,10 +192,6 @@
RelativePath="..\..\..\common\windows\string_utils-inl.h"
>
</File>
<File
RelativePath="..\..\..\common\windows\wchar_logging.h"
>
</File>
</Filter>
<Filter
Name="Resource Files"
@@ -215,94 +211,18 @@
<File
RelativePath="..\..\..\common\windows\http_upload.cc"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="GOOGLE_GLOG_DLL_DECL="
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="GOOGLE_GLOG_DLL_DECL="
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\third_party\glog\glog\src\logging.cc"
>
</File>
<File
RelativePath="..\..\..\common\windows\pdb_source_line_writer.cc"
>
</File>
<File
RelativePath="..\..\..\third_party\glog\glog\src\windows\port.cc"
>
</File>
<File
RelativePath="..\..\..\third_party\glog\glog\src\raw_logging.cc"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="GOOGLE_GLOG_DLL_DECL="
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\common\windows\string_utils.cc"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="GOOGLE_GLOG_DLL_DECL="
/>
</FileConfiguration>
</File>
<File
RelativePath=".\symupload.cc"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="GOOGLE_GLOG_DLL_DECL="
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="GOOGLE_GLOG_DLL_DECL="
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\third_party\glog\glog\src\utilities.cc"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="GOOGLE_GLOG_DLL_DECL="
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\third_party\glog\glog\src\vlog_is_on.cc"
>
</File>
</Filter>
</Files>