diff options
Diffstat (limited to 'bcmdhd/wifi_hal/wifi_hal.cpp')
| -rw-r--r-- | bcmdhd/wifi_hal/wifi_hal.cpp | 70 |
1 files changed, 50 insertions, 20 deletions
diff --git a/bcmdhd/wifi_hal/wifi_hal.cpp b/bcmdhd/wifi_hal/wifi_hal.cpp index b27bac2..28f5565 100644 --- a/bcmdhd/wifi_hal/wifi_hal.cpp +++ b/bcmdhd/wifi_hal/wifi_hal.cpp @@ -179,12 +179,14 @@ wifi_error wifi_initialize(wifi_handle *handle) ALOGI("Creating socket"); if (socketpair(AF_UNIX, SOCK_STREAM, 0, info->cleanup_socks) == -1) { ALOGE("Could not create cleanup sockets"); + free(info); return WIFI_ERROR_UNKNOWN; } struct nl_sock *cmd_sock = wifi_create_nl_socket(WIFI_HAL_CMD_SOCK_PORT); if (cmd_sock == NULL) { ALOGE("Could not create handle"); + free(info); return WIFI_ERROR_UNKNOWN; } @@ -192,12 +194,16 @@ wifi_error wifi_initialize(wifi_handle *handle) if (event_sock == NULL) { ALOGE("Could not create handle"); nl_socket_free(cmd_sock); + free(info); return WIFI_ERROR_UNKNOWN; } struct nl_cb *cb = nl_socket_get_cb(event_sock); if (cb == NULL) { ALOGE("Could not create handle"); + nl_socket_free(cmd_sock); + nl_socket_free(event_sock); + free(info); return WIFI_ERROR_UNKNOWN; } @@ -288,9 +294,28 @@ static void internal_cleaned_up_handler(wifi_handle handle) void wifi_cleanup(wifi_handle handle, wifi_cleaned_up_handler handler) { hal_info *info = getHalInfo(handle); + char buf[64]; + info->cleaned_up_handler = handler; + if (write(info->cleanup_socks[0], "Exit", 4) < 1) { + // As a fallback set the cleanup flag to TRUE + ALOGE("could not write to the cleanup socket"); + } else { + // Listen to the response + // Hopefully we dont get errors or get hung up + // Not much can be done in that case, but assume that + // it has rx'ed the Exit message to exit the thread. + // As a fallback set the cleanup flag to TRUE + memset(buf, 0, sizeof(buf)); + int result = read(info->cleanup_socks[0], buf, sizeof(buf)); + ALOGE("%s: Read after POLL returned %d, error no = %d", __FUNCTION__, result, errno); + if (strncmp(buf, "Done", 4) == 0) { + ALOGE("Event processing terminated"); + } else { + ALOGD("Rx'ed %s", buf); + } + } info->clean_up = true; - pthread_mutex_lock(&info->cb_lock); int bad_commands = 0; @@ -298,7 +323,7 @@ void wifi_cleanup(wifi_handle handle, wifi_cleaned_up_handler handler) for (int i = 0; i < info->num_event_cb; i++) { cb_info *cbi = &(info->event_cb[i]); WifiCommand *cmd = (WifiCommand *)cbi->cb_arg; - ALOGE("Command left in event_cb %p:%s", cmd, cmd->getType()); + ALOGI("Command left in event_cb %p:%s", cmd, (cmd ? cmd->getType(): "")); } while (info->num_cmd > bad_commands) { @@ -306,14 +331,14 @@ void wifi_cleanup(wifi_handle handle, wifi_cleaned_up_handler handler) cmd_info *cmdi = &(info->cmd[bad_commands]); WifiCommand *cmd = cmdi->cmd; if (cmd != NULL) { - ALOGD("Cancelling command %p:%s", cmd, cmd->getType()); + ALOGI("Cancelling command %p:%s", cmd, cmd->getType()); pthread_mutex_unlock(&info->cb_lock); cmd->cancel(); pthread_mutex_lock(&info->cb_lock); /* release reference added when command is saved */ cmd->releaseRef(); if (num_cmd == info->num_cmd) { - ALOGE("Cancelling command %p:%s did not work", cmd, cmd->getType()); + ALOGI("Cancelling command %p:%s did not work", cmd, (cmd ? cmd->getType(): "")); bad_commands++; } } @@ -324,14 +349,8 @@ void wifi_cleanup(wifi_handle handle, wifi_cleaned_up_handler handler) WifiCommand *cmd = (WifiCommand *)cbi->cb_arg; ALOGE("Leaked command %p", cmd); } - pthread_mutex_unlock(&info->cb_lock); - - if (write(info->cleanup_socks[0], "T", 1) < 1) { - ALOGE("could not write to cleanup socket"); - } else { - ALOGI("Wifi cleanup completed"); - } + internal_cleaned_up_handler(handle); } static int internal_pollin_handler(wifi_handle handle) @@ -384,16 +403,23 @@ void wifi_event_loop(wifi_handle handle) // ALOGI("Found some events!!!"); internal_pollin_handler(handle); } else if (pfd[1].revents & POLLIN) { - ALOGI("Got a signal to exit!!!"); + memset(buf, 0, sizeof(buf)); int result2 = read(pfd[1].fd, buf, sizeof(buf)); - ALOGE("Read after POLL returned %d, error no = %d", result2, errno); + ALOGE("%s: Read after POLL returned %d, error no = %d", __FUNCTION__, result2, errno); + if (strncmp(buf, "Exit", 4) == 0) { + ALOGD("Got a signal to exit!!!"); + if (write(pfd[1].fd, "Done", 4) < 1) { + ALOGE("could not write to the cleanup socket"); + } + break; + } else { + ALOGD("Rx'ed %s on the cleanup socket\n", buf); + } } else { ALOGE("Unknown event - %0x, %0x", pfd[0].revents, pfd[1].revents); } } while (!info->clean_up); - - ALOGI("Cleaning up"); - internal_cleaned_up_handler(handle); + ALOGI("Exit %s", __FUNCTION__); } /////////////////////////////////////////////////////////////////////////////////////// @@ -454,10 +480,9 @@ static int internal_valid_message_handler(nl_msg *msg, void *arg) if (cmd != NULL) { cmd->addRef(); } - pthread_mutex_unlock(&info->cb_lock); - - (*cb_func)(msg, cb_arg); + if (cb_func) + (*cb_func)(msg, cb_arg); if (cmd != NULL) { cmd->releaseRef(); } @@ -1009,7 +1034,12 @@ static wifi_error wifi_start_rssi_monitoring(wifi_request_id id, wifi_interface_ wifi_handle handle = getWifiHandle(iface); SetRSSIMonitorCommand *cmd = new SetRSSIMonitorCommand(id, iface, max_rssi, min_rssi, eh); wifi_register_cmd(handle, id, cmd); - return (wifi_error)cmd->start(); + + wifi_error result = (wifi_error)cmd->start(); + if (result != WIFI_SUCCESS) { + wifi_unregister_cmd(handle, id); + } + return result; } |