nexus: Cleanup the scanner and plug it all in so it works (e67651c8) · Commits · e / os / android_system_core

nexus/Supplicant.cpp

+0 −2

Original line number	Diff line number	Diff line
		@@ -314,8 +314,6 @@ int Supplicant::onEapFailureEvent(SupplicantEvent *evt) {
		}

		int Supplicant::onScanResultsEvent(SupplicantEvent *evt) {
		LOGD("onScanResultsEvent(%s)", evt->getEvent());

		if (!strcmp(evt->getEvent(), "Ready")) {
		char *reply;

nexus/Supplicant.h

+8 −5

Original line number	Diff line number	Diff line
		@@ -38,17 +38,20 @@ public:
		Supplicant();
		virtual ~Supplicant() {}

		virtual int start();
		virtual int stop();
		virtual bool isStarted();
		int start();
		int stop();
		bool isStarted();
		int triggerScan(bool active);

		ScanResultCollection *createLatestScanResults();
		WifiNetworkCollection *createWifiNetworkList();

		virtual int triggerScan(bool active);

		int getState() { return mState; }

		ScanResultCollection *createLatestScanResults();

		// XXX: Extract these into an interface
		// handlers for SupplicantListener
		public:
		virtual int onConnectedEvent(SupplicantEvent *evt);
		virtual int onDisconnectedEvent(SupplicantEvent *evt);

nexus/WifiController.cpp

+4 −3

Original line number	Diff line number	Diff line
		@@ -141,12 +141,13 @@ int WifiController::setScanMode(uint32_t mode) {

		if (!(mode & SCAN_ENABLE_MASK)) {
		if (mCurrentScanMode & SCAN_REPEAT_MASK)
		mScanner->stopPeriodicScan();
		mScanner->stop();
		} else if (mode & SCAN_REPEAT_MASK)
		rc = mScanner->startPeriodicScan(mode & SCAN_ACTIVE_MASK);
		rc = mScanner->start(mode & SCAN_ACTIVE_MASK);
		else
		rc = mSupplicant->triggerScan(mode & SCAN_ACTIVE_MASK);

		mCurrentScanMode = mode;
		return rc;
		}

nexus/WifiScanner.cpp

+39 −49

Original line number	Diff line number	Diff line
		#include <stdlib.h>
		#include <sys/socket.h>
		#include <sys/select.h>
		#include <sys/time.h>
		#include <sys/types.h>
		#include <errno.h>
		#include <pthread.h>

		@@ -13,28 +18,16 @@ WifiScanner::WifiScanner(Supplicant *suppl, int period) {
		mSuppl = suppl;
		mPeriod = period;
		mActive = false;
		mWorkerRunning = false;
		mAbortRequest = false;
		pthread_mutex_init(&mAbortRequestLock, NULL);
		pthread_mutex_init(&mWorkerLock, NULL);
		}

		int WifiScanner::startPeriodicScan(bool active) {
		int WifiScanner::start(bool active) {
		mActive = active;

		pthread_mutex_lock(&mWorkerLock);
		if (mWorkerRunning) {
		errno = EBUSY;
		if(pipe(mCtrlPipe))
		return -1;
		}

		pthread_attr_t attr;
		pthread_attr_init(&attr);
		pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);

		if (pthread_create(&mWorker, &attr, WifiScanner::threadStart, this))
		if (pthread_create(&mThread, NULL, WifiScanner::threadStart, this))
		return -1;

		return 0;
		}

		@@ -45,52 +38,49 @@ void WifiScanner::threadStart(void obj) {
		return NULL;
		}

		void WifiScanner::threadCleanup(void *obj) {
		WifiScanner me = reinterpret_cast<WifiScanner >(obj);

		me->mWorkerRunning = false;
		pthread_mutex_unlock(&me->mWorkerLock);
		int WifiScanner::stop() {
		char c = 0;

		if (me->mAbortRequest) {
		me->mAbortRequest = false;
		pthread_mutex_unlock(&me->mAbortRequestLock);
		}
		if (write(mCtrlPipe[1], &c, 1) != 1) {
		LOGE("Error writing to control pipe (%s)", strerror(errno));
		return -1;
		}

		int WifiScanner::stopPeriodicScan() {
		pthread_mutex_lock(&mAbortRequestLock);
		pthread_mutex_lock(&mWorkerLock);
		if (mWorkerRunning)
		mAbortRequest = true;
		pthread_mutex_unlock(&mWorkerLock);
		pthread_mutex_unlock(&mAbortRequestLock);
		void *ret;
		if (pthread_join(mThread, &ret)) {
		LOGE("Error joining to scanner thread (%s)", strerror(errno));
		return -1;
		}

		close(mCtrlPipe[0]);
		close(mCtrlPipe[1]);
		return 0;
		}

		void WifiScanner::run() {
		LOGD("Thread started");

		mWorkerRunning = true;
		pthread_cleanup_push(WifiScanner::threadCleanup, this);
		pthread_mutex_unlock(&mWorkerLock);
		LOGD("Starting wifi scanner (active = %d)", mActive);

		while(1) {
		LOGD("Triggering periodic scan");
		fd_set read_fds;
		struct timeval to;
		int rc = 0;

		to.tv_sec = 0;
		to.tv_sec = mPeriod;

		FD_ZERO(&read_fds);
		FD_SET(mCtrlPipe[0], &read_fds);

		if (mSuppl->triggerScan(mActive)) {
		LOGW("Error triggering scan (%s)", strerror(errno));
		}

		if ((rc = select(mCtrlPipe[0] + 1, &read_fds, NULL, NULL, &to)) < 0) {
		LOGE("select failed (%s) - sleeping for one scanner period", strerror(errno));
		sleep(mPeriod);
		pthread_mutex_lock(&mAbortRequestLock);
		if (mAbortRequest) {
		LOGD("Abort request!");
		goto out;
		}
		pthread_mutex_unlock(&mAbortRequestLock);
		}

		out:
		pthread_cleanup_pop(1);
		pthread_mutex_unlock(&mWorkerLock);
		continue;
		} else if (!rc) {
		} else if (FD_ISSET(mCtrlPipe[0], &read_fds))
		break;
		} // while
		}

nexus/WifiScanner.h

+4 −9

Original line number	Diff line number	Diff line
		@@ -6,12 +6,8 @@
		class Supplicant;

		class WifiScanner {
		pthread_t mWorker;
		pthread_mutex_t mWorkerLock;
		bool mWorkerRunning;
		bool mAbortRequest;
		pthread_mutex_t mAbortRequestLock;

		pthread_t mThread;
		int mCtrlPipe[2];
		Supplicant *mSuppl;
		int mPeriod;
		bool mActive;
		@@ -23,12 +19,11 @@ public:

		int getPeriod() { return mPeriod; }

		int startPeriodicScan(bool active);
		int stopPeriodicScan();
		int start(bool active);
		int stop();

		private:
		static void threadStart(void obj);
		static void threadCleanup(void *obj);

		void run();
		};