socket: add disable_timeout flag to socket structure to prevent checking for…

socket: add disable_timeout flag to socket structure to prevent checking for environment variable all the time

socket: add disable_timeout flag to socket structure to prevent checking for…
socket: add disable_timeout flag to socket structure to prevent checking for environment variable all the time
24331ad8 · Michael Reese · 726fd2f7 · 24331ad8 · 24331ad8 · 24331ad8
Commit 24331ad8 authored Sep 15, 2020 by Michael Reese
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

sdb.c api/glue/sdb.c +1 -2

socket.c api/glue/socket.c +5 -1

socket.h api/glue/socket.h +1 -0

No files found.
--- a/api/glue/sdb.c
+++ b/api/glue/sdb.c
@@ -843,8 +843,7 @@ static eb_status_t eb_sdb_find_by_identity_real(
  
  *devices = record.fill_output;
  // intercept all timeouts if this environment variable is set
-  const char *eb_disable_all_timeouts = getenv("EB_DISABLE_ALL_TIMEOUTS");
-  if (eb_disable_all_timeouts != NULL && record.status == EB_TIMEOUT) {
+  if (getenv("EB_DISABLE_ALL_TIMEOUTS") != NULL && record.status == EB_TIMEOUT) {
      return EB_OK;
  }  
  return record.status;

--- a/api/glue/socket.c
+++ b/api/glue/socket.c
@@ -138,6 +138,10 @@ eb_status_t eb_socket_open(uint16_t abi_code, const char* port, eb_width_t suppo
  socket->last_response = EB_NULL;
  socket->widths = supported_widths;
  socket->aux = auxp;
+  socket->disable_all_timeouts = 0;
+  if (getenv("EB_DISABLE_ALL_TIMEOUTS") != NULL) {
+    socket->disable_all_timeouts = 1;
+  }
  
  aux = EB_SOCKET_AUX(auxp);
  aux->time_cache = 0;
@@ -386,7 +390,7 @@ int eb_socket_check(eb_socket_t socketp, uint32_t now, eb_user_data_t user, eb_d
  completed = 0;
  
  /* Step 1. Kill any expired timeouts */
-  if (getenv("EB_DISABLE_ALL_TIMEOUTS") == NULL) {
+  if (!socket->disable_all_timeouts) {
    while (socket->first_response != EB_NULL &&
           eb_socket_timeout(socketp) <= now) {
      /* Kill first */

--- a/api/glue/socket.h
+++ b/api/glue/socket.h
@@ -72,6 +72,7 @@ struct eb_socket {
  
  eb_socket_aux_t aux;
  uint8_t widths;
+  uint8_t disable_all_timeouts;
 };

 /* Invert last_response, suitable for attaching to the end of first_response */