Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(824)

Side by Side Diff: chromecast/crash/linux/crash_util.cc

Issue 1227963002: Replace system IO calls in chromecast/crash with Chrome utilities. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: nit. Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chromecast/crash/linux/crash_util.h" 5 #include "chromecast/crash/linux/crash_util.h"
6 6
7 #include <stdlib.h>
8
9 #include "base/bind.h" 7 #include "base/bind.h"
10 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/files/file_util.h"
10 #include "base/threading/thread_restrictions.h"
11 #include "base/time/time.h" 11 #include "base/time/time.h"
12 #include "chromecast/base/path_utils.h" 12 #include "chromecast/base/path_utils.h"
13 #include "chromecast/base/version.h" 13 #include "chromecast/base/version.h"
14 #include "chromecast/crash/app_state_tracker.h" 14 #include "chromecast/crash/app_state_tracker.h"
15 #include "chromecast/crash/linux/dummy_minidump_generator.h" 15 #include "chromecast/crash/linux/dummy_minidump_generator.h"
16 #include "chromecast/crash/linux/minidump_writer.h" 16 #include "chromecast/crash/linux/minidump_writer.h"
17 17
18 namespace chromecast { 18 namespace chromecast {
19 19
20 namespace { 20 namespace {
21 21
22 // This can be set to a callback for testing. This allows us to inject a fake 22 // This can be set to a callback for testing. This allows us to inject a fake
23 // dumpstate routine to avoid calling an executable during an automated test. 23 // dumpstate routine to avoid calling an executable during an automated test.
24 // This value should not be mutated through any other function except 24 // This value should not be mutated through any other function except
25 // CrashUtil::SetDumpStateCbForTest(). 25 // CrashUtil::SetDumpStateCbForTest().
26 static base::Callback<int(const std::string&)>* g_dumpstate_cb = nullptr; 26 static base::Callback<int(const std::string&)>* g_dumpstate_cb = nullptr;
27 27
28 } // namespace 28 } // namespace
29 29
30 // static 30 // static
31 uint64_t CrashUtil::GetCurrentTimeMs() { 31 uint64_t CrashUtil::GetCurrentTimeMs() {
32 return (base::TimeTicks::Now() - base::TimeTicks()).InMilliseconds(); 32 return (base::TimeTicks::Now() - base::TimeTicks()).InMilliseconds();
33 } 33 }
34 34
35 // static 35 // static
36 bool CrashUtil::RequestUploadCrashDump( 36 bool CrashUtil::RequestUploadCrashDump(
37 const std::string& existing_minidump_path, 37 const std::string& existing_minidump_path,
38 const std::string& crashed_process_name, 38 const std::string& crashed_process_name,
39 uint64_t crashed_process_start_time_ms) { 39 uint64_t crashed_process_start_time_ms) {
40 // Remove IO restrictions from this thread. Chromium IO functions must be used
41 // to access the file system and upload information to the crash server.
42 const bool io_allowed = base::ThreadRestrictions::SetIOAllowed(true);
43
40 LOG(INFO) << "Request to upload crash dump " << existing_minidump_path 44 LOG(INFO) << "Request to upload crash dump " << existing_minidump_path
41 << " for process " << crashed_process_name; 45 << " for process " << crashed_process_name;
42 46
43 // Note: Do not use Chromium IO methods in this function. When cast_shell
44 // crashes, this function can be called by any thread, which may not allow IO.
45 // Use stdlib system calls for IO instead.
46 uint64_t uptime_ms = GetCurrentTimeMs() - crashed_process_start_time_ms; 47 uint64_t uptime_ms = GetCurrentTimeMs() - crashed_process_start_time_ms;
47 MinidumpParams params(crashed_process_name, 48 MinidumpParams params(crashed_process_name,
48 uptime_ms, 49 uptime_ms,
49 "", // suffix 50 "", // suffix
50 AppStateTracker::GetPreviousApp(), 51 AppStateTracker::GetPreviousApp(),
51 AppStateTracker::GetCurrentApp(), 52 AppStateTracker::GetCurrentApp(),
52 AppStateTracker::GetLastLaunchedApp(), 53 AppStateTracker::GetLastLaunchedApp(),
53 CAST_BUILD_RELEASE, 54 CAST_BUILD_RELEASE,
54 CAST_BUILD_INCREMENTAL); 55 CAST_BUILD_INCREMENTAL);
55 DummyMinidumpGenerator minidump_generator(existing_minidump_path); 56 DummyMinidumpGenerator minidump_generator(existing_minidump_path);
56 57
57 base::FilePath filename = base::FilePath(existing_minidump_path).BaseName(); 58 base::FilePath filename = base::FilePath(existing_minidump_path).BaseName();
58 59
59 scoped_ptr<MinidumpWriter> writer; 60 scoped_ptr<MinidumpWriter> writer;
60 if (g_dumpstate_cb) { 61 if (g_dumpstate_cb) {
61 writer.reset(new MinidumpWriter( 62 writer.reset(new MinidumpWriter(
62 &minidump_generator, filename.value(), params, *g_dumpstate_cb)); 63 &minidump_generator, filename.value(), params, *g_dumpstate_cb));
63 } else { 64 } else {
64 writer.reset( 65 writer.reset(
65 new MinidumpWriter(&minidump_generator, filename.value(), params)); 66 new MinidumpWriter(&minidump_generator, filename.value(), params));
66 } 67 }
67 bool success = false; 68 bool success = false;
68 writer->set_non_blocking(false); 69 writer->set_non_blocking(false);
69 success = (0 == writer->Write()); // error already logged. 70 success = (0 == writer->Write()); // error already logged.
70 71
71 // In case the file is still in $TEMP, remove it. 72 // In case the file is still in $TEMP, remove it. Note that DeleteFile() will
72 if (remove(existing_minidump_path.c_str()) < 0 && errno != ENOENT) { 73 // return true if |existing_minidump_path| has already been moved.
74 if (!base::DeleteFile(base::FilePath(existing_minidump_path), false)) {
73 LOG(ERROR) << "Unable to delete temp minidump file " 75 LOG(ERROR) << "Unable to delete temp minidump file "
74 << existing_minidump_path << ": " << strerror(errno); 76 << existing_minidump_path;
75 success = false; 77 success = false;
76 } 78 }
77 79
78 // Use std::endl to flush the log stream in case this process exits. 80 // Use std::endl to flush the log stream in case this process exits.
79 LOG(INFO) << "Request to upload crash dump finished. " 81 LOG(INFO) << "Request to upload crash dump finished. "
80 << "Exit now if it is main process that crashed." << std::endl; 82 << "Exit now if it is main process that crashed." << std::endl;
81 83
84 // Restore the original IO restrictions on the thread, if there were any.
85 base::ThreadRestrictions::SetIOAllowed(io_allowed);
86
82 return success; 87 return success;
83 } 88 }
84 89
85 void CrashUtil::SetDumpStateCbForTest( 90 void CrashUtil::SetDumpStateCbForTest(
86 const base::Callback<int(const std::string&)>& cb) { 91 const base::Callback<int(const std::string&)>& cb) {
87 DCHECK(!g_dumpstate_cb); 92 DCHECK(!g_dumpstate_cb);
88 g_dumpstate_cb = new base::Callback<int(const std::string&)>(cb); 93 g_dumpstate_cb = new base::Callback<int(const std::string&)>(cb);
89 } 94 }
90 95
91 } // namespace chromecast 96 } // namespace chromecast
OLDNEW
« no previous file with comments | « chromecast/app/linux/cast_crash_reporter_client_unittest.cc ('k') | chromecast/crash/linux/dummy_minidump_generator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698