Migrated to namespaced RUNNING state.

[guacd.git] / src / client.c

diff --git a/src/client.c b/src/client.c
index 1a92f88..2645980 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -37,13 +37,13 @@
 
 #include <stdlib.h>
 #include <time.h>
+#include <pthread.h>
 
 #include <guacamole/socket.h>
 #include <guacamole/client.h>
 #include <guacamole/error.h>
 
 #include "client.h"
-#include "thread.h"
 #include "log.h"
 
 /**
@@ -51,7 +51,7 @@
  *
  * @param millis The number of milliseconds to sleep.
  */
-void __guacd_sleep(int millis) {
+void __guacdd_sleep(int millis) {
 
     struct timespec sleep_period;
 
@@ -62,11 +62,7 @@ void __guacd_sleep(int millis) {
 
 }
 
-void guac_client_stop(guac_client* client) {
-    client->state = STOPPING;
-}
-
-void* __guac_client_output_thread(void* data) {
+void* __guacd_client_output_thread(void* data) {
 
     guac_client* client = (guac_client*) data;
     guac_socket* socket = client->socket;
@@ -74,11 +70,11 @@ void* __guac_client_output_thread(void* data) {
     guac_timestamp last_ping_timestamp = guac_protocol_get_timestamp();
 
     /* Guacamole client output loop */
-    while (client->state == RUNNING) {
+    while (client->state == GUAC_CLIENT_RUNNING) {
 
         /* Occasionally ping client with repeat of last sync */
         guac_timestamp timestamp = guac_protocol_get_timestamp();
-        if (timestamp - last_ping_timestamp > GUAC_SYNC_FREQUENCY) {
+        if (timestamp - last_ping_timestamp > GUACD_SYNC_FREQUENCY) {
 
             /* Record time of last synnc */
             last_ping_timestamp = timestamp;
@@ -106,7 +102,7 @@ void* __guac_client_output_thread(void* data) {
 
             /* Only handle messages if synced within threshold */
             if (client->last_sent_timestamp - client->last_received_timestamp
-                    < GUAC_SYNC_THRESHOLD) {
+                    < GUACD_SYNC_THRESHOLD) {
 
                 int retval = client->handle_messages(client);
                 if (retval) {
@@ -135,14 +131,15 @@ void* __guac_client_output_thread(void* data) {
 
             }
 
-            /* Sleep before handling more messages */
-            __guacd_sleep(GUAC_SERVER_MESSAGE_HANDLE_FREQUENCY);
+            /* Do not spin while waiting for old sync */
+            else
+                __guacdd_sleep(GUACD_MESSAGE_HANDLE_FREQUENCY);
 
         }
 
         /* If no message handler, just sleep until next sync ping */
         else
-            __guacd_sleep(GUAC_SYNC_FREQUENCY);
+            __guacdd_sleep(GUACD_SYNC_FREQUENCY);
 
     } /* End of output loop */
 
@@ -151,17 +148,17 @@ void* __guac_client_output_thread(void* data) {
 
 }
 
-void* __guac_client_input_thread(void* data) {
+void* __guacd_client_input_thread(void* data) {
 
     guac_client* client = (guac_client*) data;
     guac_socket* socket = client->socket;
 
     /* Guacamole client input loop */
-    while (client->state == RUNNING) {
+    while (client->state == GUAC_CLIENT_RUNNING) {
 
         /* Read instruction */
         guac_instruction* instruction =
-            guac_protocol_read_instruction(socket, GUAC_USEC_TIMEOUT);
+            guac_protocol_read_instruction(socket, GUACD_USEC_TIMEOUT);
 
         /* Stop on error */
         if (instruction == NULL) {
@@ -202,25 +199,25 @@ void* __guac_client_input_thread(void* data) {
 
 }
 
-int guac_start_client(guac_client* client) {
+int guacd_client_start(guac_client* client) {
 
-    guac_thread input_thread, output_thread;
+    pthread_t input_thread, output_thread;
 
-    if (guac_thread_create(&output_thread, __guac_client_output_thread, (void*) client)) {
+    if (pthread_create(&output_thread, NULL, __guacd_client_output_thread, (void*) client)) {
         guac_client_log_error(client, "Unable to start output thread");
         return -1;
     }
 
-    if (guac_thread_create(&input_thread, __guac_client_input_thread, (void*) client)) {
+    if (pthread_create(&input_thread, NULL, __guacd_client_input_thread, (void*) client)) {
         guac_client_log_error(client, "Unable to start input thread");
         guac_client_stop(client);
-        guac_thread_join(output_thread);
+        pthread_join(output_thread, NULL);
         return -1;
     }
 
     /* Wait for I/O threads */
-    guac_thread_join(input_thread);
-    guac_thread_join(output_thread);
+    pthread_join(input_thread, NULL);
+    pthread_join(output_thread, NULL);
 
     /* Done */
     return 0;