diff options
author | Wink Saville <wink@google.com> | 2011-07-12 13:56:05 -0700 |
---|---|---|
committer | Wink Saville <wink@google.com> | 2011-07-12 13:56:05 -0700 |
commit | 8ff5a9d84ebb57e2fb520e01e00c8140b28639e3 (patch) | |
tree | d90d39a900e146e63ca6f4309ddaf99cba482066 /core/jni/android_net_TrafficStats.cpp | |
parent | dadae54a88ba5686ebb5dc0cb88a9e4eb9963bc7 (diff) | |
parent | 99cd66711b99272d4b5d8017eb6ed5fc688c2e4d (diff) | |
download | frameworks_base-8ff5a9d84ebb57e2fb520e01e00c8140b28639e3.zip frameworks_base-8ff5a9d84ebb57e2fb520e01e00c8140b28639e3.tar.gz frameworks_base-8ff5a9d84ebb57e2fb520e01e00c8140b28639e3.tar.bz2 |
resolved conflicts for merge of 99cd6671 to master
Change-Id: I81ac18b1b8291a96bdfa3386f2fe3633fd7eeb79
Diffstat (limited to 'core/jni/android_net_TrafficStats.cpp')
-rw-r--r-- | core/jni/android_net_TrafficStats.cpp | 49 |
1 files changed, 33 insertions, 16 deletions
diff --git a/core/jni/android_net_TrafficStats.cpp b/core/jni/android_net_TrafficStats.cpp index 203b5ef..d54981e 100644 --- a/core/jni/android_net_TrafficStats.cpp +++ b/core/jni/android_net_TrafficStats.cpp @@ -67,10 +67,35 @@ static jlong readNumber(char const* filename) { #endif } -// Return the number from the first file which exists and contains data -static jlong tryBoth(char const* a, char const* b) { - jlong num = readNumber(a); - return num >= 0 ? num : readNumber(b); +static const char* mobile_iface_list[] = { + "rmnet0", + "rmnet1", + "rmnet2", + "rmnet3", + "ppp0", + 0 +}; + +static jlong getAll(const char** iface_list, const char* what) { + + char filename[80]; + int idx = 0; + bool supported = false; + jlong total = 0; + while (iface_list[idx] != 0) { + + snprintf(filename, sizeof(filename), "/sys/class/net/%s/statistics/%s", + iface_list[idx], what); + jlong number = readNumber(filename); + if (number >= 0) { + supported = true; + total += number; + } + idx++; + } + if (supported) return total; + + return -1; } // Returns the sum of numbers from the specified path under /sys/class/net/*, @@ -108,27 +133,19 @@ static jlong readTotal(char const* suffix) { // each file every time (rather than caching which ones exist). static jlong getMobileTxPackets(JNIEnv* env, jobject clazz) { - return tryBoth( - "/sys/class/net/rmnet0/statistics/tx_packets", - "/sys/class/net/ppp0/statistics/tx_packets"); + return getAll(mobile_iface_list, "tx_packets"); } static jlong getMobileRxPackets(JNIEnv* env, jobject clazz) { - return tryBoth( - "/sys/class/net/rmnet0/statistics/rx_packets", - "/sys/class/net/ppp0/statistics/rx_packets"); + return getAll(mobile_iface_list, "rx_packets"); } static jlong getMobileTxBytes(JNIEnv* env, jobject clazz) { - return tryBoth( - "/sys/class/net/rmnet0/statistics/tx_bytes", - "/sys/class/net/ppp0/statistics/tx_bytes"); + return getAll(mobile_iface_list, "tx_bytes"); } static jlong getMobileRxBytes(JNIEnv* env, jobject clazz) { - return tryBoth( - "/sys/class/net/rmnet0/statistics/rx_bytes", - "/sys/class/net/ppp0/statistics/rx_bytes"); + return getAll(mobile_iface_list, "rx_bytes"); } static jlong getData(JNIEnv* env, const char* what, jstring javaInterface) { |