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

Unified Diff: runtime/vm/os_thread_linux.cc

Issue 1466523002: Landing patch set 7 from https://codereview.chromium.org/1450113003/ (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/os_thread_android.cc ('k') | runtime/vm/os_thread_macos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/os_thread_linux.cc
diff --git a/runtime/vm/os_thread_linux.cc b/runtime/vm/os_thread_linux.cc
index 470c3e348a265d3aa3ba965d6b6f17c884d1c9e7..2bf570902fd05657895de38beb6355911221b838 100644
--- a/runtime/vm/os_thread_linux.cc
+++ b/runtime/vm/os_thread_linux.cc
@@ -13,27 +13,16 @@
#include <sys/time.h> // NOLINT
#include "platform/assert.h"
+#include "platform/utils.h"
namespace dart {
-static char* strerror_helper(int err, char* buffer, size_t bufsize) {
-#if !defined(__GLIBC__) || \
- ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE)
- // Use the standard version
- return strerror_r(err, buffer, bufsize) == 0 ?
- buffer : const_cast<char*>("strerror_r failed");
-#else
- // Use the gnu specific version
- return strerror_r(err, buffer, bufsize);
-#endif
-}
-
#define VALIDATE_PTHREAD_RESULT(result) \
if (result != 0) { \
const int kBufferSize = 1024; \
char error_buf[kBufferSize]; \
FATAL2("pthread error: %d (%s)", result, \
- strerror_helper(result, error_buf, kBufferSize)); \
+ Utils::StrError(result, error_buf, kBufferSize)); \
}
@@ -52,7 +41,7 @@ static char* strerror_helper(int err, char* buffer, size_t bufsize) {
char error_buf[kBufferSize]; \
fprintf(stderr, "%s:%d: pthread error: %d (%s)\n", \
__FILE__, __LINE__, result, \
- strerror_helper(result, error_buf, kBufferSize)); \
+ Utils::StrError(result, error_buf, kBufferSize)); \
return result; \
}
#else
« no previous file with comments | « runtime/vm/os_thread_android.cc ('k') | runtime/vm/os_thread_macos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698