aboutsummaryrefslogtreecommitdiff
path: root/src/client/linux
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/linux')
-rw-r--r--src/client/linux/Makefile66
-rw-r--r--src/client/linux/handler/exception_handler.cc2
-rw-r--r--src/client/linux/sender/google_crash_report_sender.cc102
3 files changed, 161 insertions, 9 deletions
diff --git a/src/client/linux/Makefile b/src/client/linux/Makefile
index a34187f2..6f1c24f5 100644
--- a/src/client/linux/Makefile
+++ b/src/client/linux/Makefile
@@ -1,45 +1,80 @@
CXX=g++
CC=gcc
-CXXFLAGS=-gstabs+ -I../../ -I../../testing/gtest/include -I../../testing/include -I../../testing/gtest -D_REENTRANT -m32
+CXXFLAGS=-gstabs+ -I../../ -I../../testing/gtest/include -I../../testing -I../../third_party/linux/include -I../../testing/include -I../../testing/gtest -D_REENTRANT -m32 -Wall
CFLAGS=$(CXXFLAGS)
LDFLAGS=-lpthread
OBJ_DIR=.
BIN_DIR=.
+
+# Source vars for components
+
+# Google Test (meant to be included in each test source list)
+GOOGLETEST_CC_SRC=../../testing/gtest/src/gtest_main.cc \
+ ../../testing/gtest/src/gtest-all.cc \
+ ../../testing/src/gmock-all.cc
+
+# Google Logging
+GOOGLELOG_LIB=../../third_party/linux/lib/glog/libglog.a
+
+# Google Flags lib
+GOOGLEFLAGS_LIB=../../third_party/linux/lib/gflags/libgflags.a
+
+# Client exception handling & minidump writing library
LIB_CC_SRC=handler/exception_handler.cc \
minidump_writer/linux_dumper.cc \
minidump_writer/minidump_writer.cc \
../minidump_file_writer.cc \
../../common/string_conversion.cc \
../../common/linux/guid_creator.cc
-
LIB_C_SRC = ../../common/convert_UTF.c
-
LIB_CC_OBJ=$(patsubst %.cc, $(OBJ_DIR)/%.o,$(LIB_CC_SRC))
LIB_C_OBJ=$(patsubst %.c, $(OBJ_DIR)/%.o, $(LIB_C_SRC))
+# Unit tests for client library
TEST_CC_SRC=handler/exception_handler_unittest.cc \
minidump_writer/directory_reader_unittest.cc \
minidump_writer/line_reader_unittest.cc \
minidump_writer/linux_dumper_unittest.cc \
minidump_writer/minidump_writer_unittest.cc \
- ../../testing/gtest/src/gtest_main.cc \
- ../../testing/gtest/src/gtest-all.cc
+ $(GOOGLETEST_CC_SRC)
TEST_CC_OBJ=$(patsubst %.cc, $(OBJ_DIR)/%.o,$(TEST_CC_SRC))
-UNITTEST_BIN=$(BIN_DIR)/linux_client_test
+# Library for crash dump uploader
+SENDER_LIBRARY_SRC=../../common/linux/google_crashdump_uploader.cc ../../common/linux/libcurl_wrapper.cc
+SENDER_LIBRARY_OBJ=$(patsubst %.cc, $(OBJ_DIR)/%.o,$(SENDER_LIBRARY_SRC))
+SENDER_LDFLAGS=-ldl
+# Unit test for crash dump uploader
+SENDER_TEST_SRC=../../common/linux/google_crashdump_uploader_test.cc \
+ $(GOOGLETEST_CC_SRC)
+
+SENDER_TEST_OBJ=$(patsubst %.cc, $(OBJ_DIR)/%.o,$(SENDER_TEST_SRC))
+
+# CLI tool for crash dump uploaer
+SENDER_TOOL_SRC=sender/google_crash_report_sender.cc
+SENDER_TOOL_OBJ=$(patsubst %.cc, $(OBJ_DIR)/%.o,$(SENDER_TOOL_SRC))
+
+# Vars for binary targets
BREAKPAD_LIBRARY=$(BIN_DIR)/libbreakpad.a
+SENDER_LIBRARY=$(BIN_DIR)/libcrash_sender.a
+# Client unit test binary
+UNITTEST_BIN=$(BIN_DIR)/linux_client_test
+# Uploader unit test binary
+SENDER_UNITTEST_BIN=$(BIN_DIR)/google_crashdump_uploader_test
+# Sender CLI tool binary
+SENDER_CLI_TOOL_BIN=$(BIN_DIR)/google_crashdump_uploader
.PHONY:all clean
-all:$(BREAKPAD_LIBRARY) $(UNITTEST_BIN)
+all:$(BREAKPAD_LIBRARY) $(UNITTEST_BIN) $(SENDER_LIBRARY) $(SENDER_UNITTEST_BIN) $(SENDER_CLI_TOOL_BIN)
-check:$(UNITTEST_BIN)
+check:$(UNITTEST_BIN) $(SENDER_UNITTEST_BIN)
$(UNITTEST_BIN)
+ $(SENDER_UNITTEST_BIN)
$(BIN_DIR)/libbreakpad.a:$(LIB_CC_OBJ) $(LIB_C_OBJ)
$(AR) rcs $@ $^
@@ -47,5 +82,18 @@ $(BIN_DIR)/libbreakpad.a:$(LIB_CC_OBJ) $(LIB_C_OBJ)
$(BIN_DIR)/linux_client_test:$(TEST_CC_OBJ) $(BREAKPAD_LIBRARY)
$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -o $@
+$(BIN_DIR)/libcrash_sender.a:$(SENDER_LIBRARY_OBJ)
+ $(AR) rcs $@ $^
+
+$(BIN_DIR)/google_crashdump_uploader_test:$(SENDER_TEST_OBJ) $(SENDER_LIBRARY) \
+ $(GOOGLELOG_LIB)
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(SENDER_LDFLAGS) $^ -o $@
+
+$(BIN_DIR)/google_crashdump_uploader:$(SENDER_TOOL_OBJ) $(SENDER_LIBRARY) \
+ $(GOOGLELOG_LIB) $(GOOGLEFLAGS_LIB)
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(SENDER_LDFLAGS) $^ -o $@
+
clean:
- rm -f $(UNITTEST_BIN) $(BREAKPAD_LIBRARY) $(LIB_CC_OBJ) $(LIB_C_OBJ) $(TEST_CC_OBJ) core
+ rm -f $(UNITTEST_BIN) $(BREAKPAD_LIBRARY) $(LIB_CC_OBJ) $(LIB_C_OBJ) \
+ $(TEST_CC_OBJ) $(SENDER_LIBRARY_OBJ) $(SENDER_LIBRARY) \
+ $(SENDER_TOOL_OBJ) $(SENDER_CLI_TOOL_BIN) $(SENDER_UNITTEST_BIN) core
diff --git a/src/client/linux/handler/exception_handler.cc b/src/client/linux/handler/exception_handler.cc
index 8738b27d..1fe7e83d 100644
--- a/src/client/linux/handler/exception_handler.cc
+++ b/src/client/linux/handler/exception_handler.cc
@@ -88,6 +88,7 @@
// A wrapper for the tgkill syscall: send a signal to a specific thread.
static int tgkill(pid_t tgid, pid_t tid, int sig) {
syscall(__NR_tgkill, tgid, tid, sig);
+ return 0;
}
namespace google_breakpad {
@@ -171,6 +172,7 @@ bool ExceptionHandler::InstallHandlers() {
return false;
old_handlers_.push_back(std::make_pair(kExceptionSignals[i], old));
}
+ return true;
}
// Runs before crashing: normal context.
diff --git a/src/client/linux/sender/google_crash_report_sender.cc b/src/client/linux/sender/google_crash_report_sender.cc
new file mode 100644
index 00000000..da9661da
--- /dev/null
+++ b/src/client/linux/sender/google_crash_report_sender.cc
@@ -0,0 +1,102 @@
+// Copyright (c) 2009, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+// * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "common/linux/google_crashdump_uploader.h"
+#include "third_party/linux/include/glog/logging.h"
+#include "third_party/linux/include/gflags/gflags.h"
+#include <string>
+
+DEFINE_string(crash_server, "http://clients2.google.com/cr",
+ "The crash server to upload minidumps to.");
+DEFINE_string(product_name, "",
+ "The product name that the minidump corresponds to.");
+DEFINE_string(product_version, "",
+ "The version of the product that produced the minidump.");
+DEFINE_string(client_id, "",
+ "The client GUID");
+DEFINE_string(minidump_path, "",
+ "The path of the minidump file.");
+DEFINE_string(ptime, "",
+ "The process uptime in milliseconds.");
+DEFINE_string(ctime, "",
+ "The cumulative process uptime in milliseconds.");
+DEFINE_string(email, "",
+ "The user's email address.");
+DEFINE_string(comments, "",
+ "Extra user comments");
+DEFINE_string(proxy_host, "",
+ "Proxy host");
+DEFINE_string(proxy_userpasswd, "",
+ "Proxy username/password in user:pass format.");
+
+
+bool CheckForRequiredFlagsOrDie() {
+ std::string error_text = "";
+ if (FLAGS_product_name.empty()) {
+ error_text.append("\nProduct name must be specified.");
+ }
+
+ if (FLAGS_product_version.empty()) {
+ error_text.append("\nProduct version must be specified.");
+ }
+
+ if (FLAGS_client_id.empty()) {
+ error_text.append("\nClient ID must be specified.");
+ }
+
+ if (FLAGS_minidump_path.empty()) {
+ error_text.append("\nMinidump pathname must be specified.");
+ }
+
+ if (!error_text.empty()) {
+ LOG(ERROR) << error_text;
+ return false;
+ }
+ return true;
+}
+
+int main(int argc, char *argv[]) {
+ google::InitGoogleLogging(argv[0]);
+ google::ParseCommandLineFlags(&argc, &argv, true);
+ if (!CheckForRequiredFlagsOrDie()) {
+ return 1;
+ }
+ google_breakpad::GoogleCrashdumpUploader g(FLAGS_product_name,
+ FLAGS_product_version,
+ FLAGS_client_id,
+ FLAGS_ptime,
+ FLAGS_ctime,
+ FLAGS_email,
+ FLAGS_comments,
+ FLAGS_minidump_path,
+ FLAGS_crash_server,
+ FLAGS_proxy_host,
+ FLAGS_proxy_userpasswd);
+ g.Upload();
+}
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-24 18:46:28 +0000