Revert "Implement eloop for Fuchsia."
This reverts commit 27398e96aa3b38817cb2a693d746ada42bb4e4a2.
Change-Id: I8dedebe6442aa96a26fac31ddf1825b81d8ee20a
diff --git a/src/utils/eloop_fuchsia.cc b/src/utils/eloop_fuchsia.cc
index bcd1170..a938f26 100644
--- a/src/utils/eloop_fuchsia.cc
+++ b/src/utils/eloop_fuchsia.cc
@@ -7,64 +7,9 @@
#include "includes.h"
#include "eloop.h"
-} // extern "C"
+} // extern "C"
-#include <assert.h>
-#include <stdint.h>
-
-#include <algorithm>
-#include <list>
-#include <memory>
-
-#include "lib/ftl/time/time_delta.h"
-#include "lib/ftl/time/time_point.h"
-#include "lib/mtl/tasks/message_loop.h"
-
-extern "C" {
-#include "os.h"
-} // extern "C"
-
-constexpr int64_t kUsecPerSec = 1000000L;
-
-struct EloopTimeout {
- int id;
- eloop_timeout_handler handler;
- void *eloop_data;
- void *user_data;
- ftl::TimeDelta delay;
- ftl::TimePoint approx_end_time;
-};
-
-static mtl::MessageLoop *loop;
-static std::list<EloopTimeout> *timeouts;
-static int current_registration_id = 0;
-
-static std::list<EloopTimeout>::iterator find_timeout(
- eloop_timeout_handler handler, void *eloop_data, void *user_data) {
- return std::find_if(timeouts->begin(), timeouts->end(),
- [handler, eloop_data, user_data](EloopTimeout timeout) {
- return timeout.handler == handler &&
- timeout.eloop_data == eloop_data &&
- timeout.user_data == user_data;
- });
-}
-
-static ftl::TimeDelta time_delta(unsigned int secs, unsigned int usecs) {
- return ftl::TimeDelta::FromSeconds(secs) +
- ftl::TimeDelta::FromMicroseconds(usecs);
-}
-
-static ftl::TimeDelta remaining_time_delta(ftl::TimePoint end_time) {
- ftl::TimePoint now = ftl::TimePoint::Now();
- return end_time > now ? ftl::TimeDelta::Zero() : end_time - now;
-}
-
-extern "C" int eloop_init() {
- assert(loop == nullptr);
- loop = new mtl::MessageLoop();
- timeouts = new std::list<EloopTimeout>();
- return 0;
-}
+extern "C" int eloop_init() { return 0; }
extern "C" int eloop_register_read_sock(int sock, eloop_sock_handler handler,
void *eloop_data, void *user_data) {
@@ -101,103 +46,43 @@
extern "C" int eloop_register_timeout(unsigned int secs, unsigned int usecs,
eloop_timeout_handler handler,
void *eloop_data, void *user_data) {
- ftl::TimeDelta delay = time_delta(secs, usecs);
- int registration_id = ++current_registration_id;
- EloopTimeout timeout = {registration_id, handler,
- eloop_data, user_data,
- delay, ftl::TimePoint::Now() + delay};
- timeouts->push_back(timeout);
- loop->task_runner()->PostDelayedTask(
- [registration_id] {
- for (auto timeout = timeouts->begin(); timeout != timeouts->end();
- ++timeout) {
- if (registration_id == timeout->id) {
- timeout->handler(timeout->eloop_data, timeout->user_data);
- timeouts->erase(timeout);
- break;
- }
- }
- },
- delay);
- return 0;
+ // TODO(alangardner): Implement
+ return -1;
}
extern "C" int eloop_cancel_timeout(eloop_timeout_handler handler,
void *eloop_data, void *user_data) {
- int old_size = std::distance(timeouts->begin(), timeouts->end());
- timeouts->erase(
- std::remove_if(timeouts->begin(), timeouts->end(),
- [handler, eloop_data, user_data](EloopTimeout timeout) {
- return timeout.handler == handler &&
- (timeout.eloop_data == eloop_data ||
- eloop_data == ELOOP_ALL_CTX) &&
- (timeout.user_data == user_data ||
- user_data == ELOOP_ALL_CTX);
- }),
- timeouts->end());
- int new_size = std::distance(timeouts->begin(), timeouts->end());
- return old_size - new_size;
+ // TODO(alangardner): Implement
+ return -1;
}
extern "C" int eloop_cancel_timeout_one(eloop_timeout_handler handler,
void *eloop_data, void *user_data,
struct os_reltime *remaining) {
- std::list<EloopTimeout>::iterator timeout =
- find_timeout(handler, eloop_data, user_data);
- if (timeout == timeouts->end()) {
- return 0;
- } else {
- ftl::TimeDelta remaining_delta =
- remaining_time_delta(timeout->approx_end_time);
- remaining->sec = remaining_delta.ToSeconds();
- remaining->usec = remaining_delta.ToMicroseconds() % kUsecPerSec;
- timeouts->erase(timeout);
- return 1;
- }
+ // TODO(alangardner): Implement
+ return -1;
}
extern "C" int eloop_is_timeout_registered(eloop_timeout_handler handler,
void *eloop_data, void *user_data) {
- return find_timeout(handler, eloop_data, user_data) == timeouts->end() ? 0
- : 1;
+ // TODO(alangardner): Implement
+ return -1;
}
extern "C" int eloop_deplete_timeout(unsigned int req_secs,
unsigned int req_usecs,
eloop_timeout_handler handler,
void *eloop_data, void *user_data) {
- std::list<EloopTimeout>::iterator timeout =
- find_timeout(handler, eloop_data, user_data);
- if (timeout == timeouts->end()) {
- return -1;
- } else if (remaining_time_delta(timeout->approx_end_time) >
- time_delta(req_secs, req_usecs)) {
- timeouts->erase(timeout);
- // Note: Current implementation of register cannot fail.
- eloop_register_timeout(req_secs, req_usecs, handler, eloop_data, user_data);
- return 1;
- } else {
- return 0;
- }
+ // TODO(alangardner): Implement
+ return -1;
}
extern "C" int eloop_replenish_timeout(unsigned int req_secs,
unsigned int req_usecs,
eloop_timeout_handler handler,
void *eloop_data, void *user_data) {
- std::list<EloopTimeout>::iterator timeout =
- find_timeout(handler, eloop_data, user_data);
- if (timeout == timeouts->end()) {
- return -1;
- } else if (remaining_time_delta(timeout->approx_end_time) <
- time_delta(req_secs, req_usecs)) {
- timeouts->erase(timeout);
- // Note: Current implementation of register cannot fail.
- eloop_register_timeout(req_secs, req_usecs, handler, eloop_data, user_data);
- return 1;
- } else {
- return 0;
- }
+ // TODO(alangardner): Implement
+ return -1;
}
extern "C" int eloop_register_signal(int sig, eloop_signal_handler handler,
@@ -219,24 +104,21 @@
}
extern "C" void eloop_run() {
- assert(loop);
- loop->Run();
+ // TODO(alangardner): Implement
}
extern "C" void eloop_terminate() {
- assert(loop);
- loop->QuitNow();
+ // TODO(alangardner): Implement
}
extern "C" void eloop_destroy() {
- assert(loop);
- loop->QuitNow();
- delete loop;
- loop = nullptr;
- delete timeouts;
+ // TODO(alangardner): Implement
}
-extern "C" int eloop_terminated() { return loop ? 0 : 1; }
+extern "C" int eloop_terminated() {
+ // TODO(alangardner): Implement
+ return 1;
+}
extern "C" void eloop_wait_for_read_sock(int sock) {
// Not implemented.
diff --git a/wpa_supplicant/BUILD.gn b/wpa_supplicant/BUILD.gn
index 1eb68e3..b28e87f 100644
--- a/wpa_supplicant/BUILD.gn
+++ b/wpa_supplicant/BUILD.gn
@@ -94,10 +94,4 @@
]
configs += [ ":wpa_supplicant_private" ]
-
- deps = [
- "//lib/ftl",
- "//lib/mtl",
- "//mojo/system",
- ]
}
