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

Side by Side Diff: webrtc/modules/utility/source/helpers_android.cc

Issue 2685783014: Replace NULL with nullptr in all C++ files. (Closed)
Patch Set: Fixing android. Created 3 years, 10 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 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/base/checks.h" 11 #include "webrtc/base/checks.h"
12 #include "webrtc/modules/utility/include/helpers_android.h" 12 #include "webrtc/modules/utility/include/helpers_android.h"
13 13
14 #include <android/log.h> 14 #include <android/log.h>
15 #include <assert.h> 15 #include <assert.h>
16 #include <pthread.h> 16 #include <pthread.h>
17 #include <stddef.h> 17 #include <stddef.h>
18 #include <unistd.h> 18 #include <unistd.h>
19 19
20 #define TAG "HelpersAndroid" 20 #define TAG "HelpersAndroid"
21 #define ALOGD(...) __android_log_print(ANDROID_LOG_DEBUG, TAG, __VA_ARGS__) 21 #define ALOGD(...) __android_log_print(ANDROID_LOG_DEBUG, TAG, __VA_ARGS__)
22 22
23 namespace webrtc { 23 namespace webrtc {
24 24
25 JNIEnv* GetEnv(JavaVM* jvm) { 25 JNIEnv* GetEnv(JavaVM* jvm) {
26 void* env = NULL; 26 void* env = nullptr;
27 jint status = jvm->GetEnv(&env, JNI_VERSION_1_6); 27 jint status = jvm->GetEnv(&env, JNI_VERSION_1_6);
28 RTC_CHECK(((env != NULL) && (status == JNI_OK)) || 28 RTC_CHECK(((env != nullptr) && (status == JNI_OK)) ||
29 ((env == NULL) && (status == JNI_EDETACHED))) 29 ((env == nullptr) && (status == JNI_EDETACHED)))
30 << "Unexpected GetEnv return: " << status << ":" << env; 30 << "Unexpected GetEnv return: " << status << ":" << env;
31 return reinterpret_cast<JNIEnv*>(env); 31 return reinterpret_cast<JNIEnv*>(env);
32 } 32 }
33 33
34 // Return a |jlong| that will correctly convert back to |ptr|. This is needed 34 // Return a |jlong| that will correctly convert back to |ptr|. This is needed
35 // because the alternative (of silently passing a 32-bit pointer to a vararg 35 // because the alternative (of silently passing a 32-bit pointer to a vararg
36 // function expecting a 64-bit param) picks up garbage in the high 32 bits. 36 // function expecting a 64-bit param) picks up garbage in the high 32 bits.
37 jlong PointerTojlong(void* ptr) { 37 jlong PointerTojlong(void* ptr) {
38 static_assert(sizeof(intptr_t) <= sizeof(jlong), 38 static_assert(sizeof(intptr_t) <= sizeof(jlong),
39 "Time to rethink the use of jlongs"); 39 "Time to rethink the use of jlongs");
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 RTC_CHECK(ret); 76 RTC_CHECK(ret);
77 return ret; 77 return ret;
78 } 78 }
79 79
80 void DeleteGlobalRef(JNIEnv* jni, jobject o) { 80 void DeleteGlobalRef(JNIEnv* jni, jobject o) {
81 jni->DeleteGlobalRef(o); 81 jni->DeleteGlobalRef(o);
82 CHECK_EXCEPTION(jni) << "Error during DeleteGlobalRef"; 82 CHECK_EXCEPTION(jni) << "Error during DeleteGlobalRef";
83 } 83 }
84 84
85 std::string GetThreadId() { 85 std::string GetThreadId() {
86 char buf[21]; // Big enough to hold a kuint64max plus terminating NULL. 86 char buf[21]; // Big enough to hold a kuint64max plus terminating nullptr.
87 int thread_id = gettid(); 87 int thread_id = gettid();
88 RTC_CHECK_LT(snprintf(buf, sizeof(buf), "%i", thread_id), 88 RTC_CHECK_LT(snprintf(buf, sizeof(buf), "%i", thread_id),
89 static_cast<int>(sizeof(buf))) 89 static_cast<int>(sizeof(buf)))
90 << "Thread id is bigger than uint64??"; 90 << "Thread id is bigger than uint64??";
91 return std::string(buf); 91 return std::string(buf);
92 } 92 }
93 93
94 std::string GetThreadInfo() { 94 std::string GetThreadInfo() {
95 return "@[tid=" + GetThreadId() + "]"; 95 return "@[tid=" + GetThreadId() + "]";
96 } 96 }
97 97
98 AttachThreadScoped::AttachThreadScoped(JavaVM* jvm) 98 AttachThreadScoped::AttachThreadScoped(JavaVM* jvm)
99 : attached_(false), jvm_(jvm), env_(NULL) { 99 : attached_(false), jvm_(jvm), env_(nullptr) {
100 env_ = GetEnv(jvm); 100 env_ = GetEnv(jvm);
101 if (!env_) { 101 if (!env_) {
102 // Adding debug log here so we can track down potential leaks and figure 102 // Adding debug log here so we can track down potential leaks and figure
103 // out why we sometimes see "Native thread exiting without having called 103 // out why we sometimes see "Native thread exiting without having called
104 // DetachCurrentThread" in logcat outputs. 104 // DetachCurrentThread" in logcat outputs.
105 ALOGD("Attaching thread to JVM%s", GetThreadInfo().c_str()); 105 ALOGD("Attaching thread to JVM%s", GetThreadInfo().c_str());
106 jint res = jvm->AttachCurrentThread(&env_, NULL); 106 jint res = jvm->AttachCurrentThread(&env_, nullptr);
107 attached_ = (res == JNI_OK); 107 attached_ = (res == JNI_OK);
108 RTC_CHECK(attached_) << "AttachCurrentThread failed: " << res; 108 RTC_CHECK(attached_) << "AttachCurrentThread failed: " << res;
109 } 109 }
110 } 110 }
111 111
112 AttachThreadScoped::~AttachThreadScoped() { 112 AttachThreadScoped::~AttachThreadScoped() {
113 if (attached_) { 113 if (attached_) {
114 ALOGD("Detaching thread from JVM%s", GetThreadInfo().c_str()); 114 ALOGD("Detaching thread from JVM%s", GetThreadInfo().c_str());
115 jint res = jvm_->DetachCurrentThread(); 115 jint res = jvm_->DetachCurrentThread();
116 RTC_CHECK(res == JNI_OK) << "DetachCurrentThread failed: " << res; 116 RTC_CHECK(res == JNI_OK) << "DetachCurrentThread failed: " << res;
117 RTC_CHECK(!GetEnv(jvm_)); 117 RTC_CHECK(!GetEnv(jvm_));
118 } 118 }
119 } 119 }
120 120
121 JNIEnv* AttachThreadScoped::env() { return env_; } 121 JNIEnv* AttachThreadScoped::env() { return env_; }
122 122
123 } // namespace webrtc 123 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698