gator: Merge gator version 5.23.1

[profile/mobile/platform/kernel/linux-3.10-sc7730.git] / tools / gator / daemon / NetDriver.cpp

diff --git a/tools/gator/daemon/NetDriver.cpp b/tools/gator/daemon/NetDriver.cpp
index e75c069..50a187d 100644 (file)
--- a/tools/gator/daemon/NetDriver.cpp
+++ b/tools/gator/daemon/NetDriver.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) ARM Limited 2013-2014. All rights reserved.
+ * Copyright (C) ARM Limited 2013-2015. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -52,7 +52,7 @@ NetDriver::~NetDriver() {
 
 void NetDriver::readEvents(mxml_node_t *const) {
        // Only for use with perf
-       if (!gSessionData->perf.isSetup()) {
+       if (!gSessionData.mPerf.isSetup()) {
                return;
        }
 
@@ -108,7 +108,7 @@ bool NetDriver::doRead() {
 
 void NetDriver::start() {
        if (!doRead()) {
-               logg->logError(__FILE__, __LINE__, "Unable to read network stats");
+               logg.logError("Unable to read network stats");
                handleException();
        }
        // Initialize previous values
@@ -122,7 +122,7 @@ void NetDriver::start() {
 
 void NetDriver::read(Buffer *const buffer) {
        if (!doRead()) {
-               logg->logError(__FILE__, __LINE__, "Unable to read network stats");
+               logg.logError("Unable to read network stats");
                handleException();
        }
        super::read(buffer);