gecko/netwerk/wifi/nsWifiMonitor.h
Eric Rahm 9100016c49 Bug 1165515 - Part 13-2: Replace usage of PRLogModuleLevel and PR_LOG_*. rs=froydnj
This is straightforward mapping of PR_LOG levels to their LogLevel
counterparts:
  PR_LOG_ERROR   -> LogLevel::Error
  PR_LOG_WARNING -> LogLevel::Warning
  PR_LOG_WARN    -> LogLevel::Warning
  PR_LOG_INFO    -> LogLevel::Info
  PR_LOG_DEBUG   -> LogLevel::Debug
  PR_LOG_NOTICE  -> LogLevel::Debug
  PR_LOG_VERBOSE -> LogLevel::Verbose

Instances of PRLogModuleLevel were mapped to a fully qualified
mozilla::LogLevel, instances of PR_LOG levels in #defines were mapped to a
fully qualified mozilla::LogLevel::* level, and all other instances were
mapped to us a shorter format of LogLevel::*.

Bustage for usage of the non-fully qualified LogLevel were fixed by adding
|using mozilla::LogLevel;| where appropriate.
2015-06-03 15:25:57 -07:00

111 lines
2.4 KiB
C++

/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef __nsWifiMonitor__
#define __nsWifiMonitor__
#include "nsIWifiMonitor.h"
#include "nsCOMPtr.h"
#include "nsAutoPtr.h"
#include "nsProxyRelease.h"
#include "nsIThread.h"
#include "nsIRunnable.h"
#include "nsCOMArray.h"
#include "nsIWifiListener.h"
#include "mozilla/Atomics.h"
#include "mozilla/ReentrantMonitor.h"
#include "mozilla/Logging.h"
#include "nsIObserver.h"
#include "nsTArray.h"
#include "nsITimer.h"
#include "mozilla/Attributes.h"
#include "nsIInterfaceRequestor.h"
#ifdef XP_WIN
#include "win_wifiScanner.h"
#endif
extern PRLogModuleInfo *gWifiMonitorLog;
#define LOG(args) MOZ_LOG(gWifiMonitorLog, mozilla::LogLevel::Debug, args)
class nsWifiAccessPoint;
#define kDefaultWifiScanInterval 5 /* seconds */
class nsWifiListener
{
public:
explicit nsWifiListener(nsMainThreadPtrHolder<nsIWifiListener>* aListener)
{
mListener = aListener;
mHasSentData = false;
}
~nsWifiListener() {}
nsMainThreadPtrHandle<nsIWifiListener> mListener;
bool mHasSentData;
};
#ifndef MOZ_WIDGET_GONK
class nsWifiMonitor final : nsIRunnable, nsIWifiMonitor, nsIObserver
{
public:
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIWIFIMONITOR
NS_DECL_NSIRUNNABLE
NS_DECL_NSIOBSERVER
nsWifiMonitor();
private:
~nsWifiMonitor();
nsresult DoScan();
nsresult CallWifiListeners(const nsCOMArray<nsWifiAccessPoint> &aAccessPoints,
bool aAccessPointsChanged);
mozilla::Atomic<bool> mKeepGoing;
mozilla::Atomic<bool> mThreadComplete;
nsCOMPtr<nsIThread> mThread;
nsTArray<nsWifiListener> mListeners;
mozilla::ReentrantMonitor mReentrantMonitor;
#ifdef XP_WIN
nsAutoPtr<WindowsWifiScannerInterface> mWinWifiScanner;
#endif
};
#else
#include "nsIWifi.h"
class nsWifiMonitor final : nsIWifiMonitor, nsIWifiScanResultsReady, nsIObserver
{
public:
NS_DECL_ISUPPORTS
NS_DECL_NSIWIFIMONITOR
NS_DECL_NSIOBSERVER
NS_DECL_NSIWIFISCANRESULTSREADY
nsWifiMonitor();
private:
~nsWifiMonitor();
void ClearTimer() {
if (mTimer) {
mTimer->Cancel();
mTimer = nullptr;
}
}
void StartScan();
nsCOMArray<nsWifiAccessPoint> mLastAccessPoints;
nsTArray<nsWifiListener> mListeners;
nsCOMPtr<nsITimer> mTimer;
};
#endif
#endif