safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 05:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Giving threadsafety in client registry with semaphore

Browse Source
This commit is contained in:
Michael Jumper
2010-09-22 00:09:24 -07:00
parent 0fdcfab825
commit df066bcfb8
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
guacamole/libguac/configure.in
View File

@@ -13,7 +13,7 @@ AC_CHECK_LIB([png], [png_write_png])
AC_CHECK_LIB([uuid], [uuid_generate]) AC_CHECK_LIB([uuid], [uuid_generate])
# Checks for header files. # Checks for header files.
AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/socket.h sys/time.h syslog.h unistd.h]) AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/socket.h sys/time.h syslog.h unistd.h semaphore.h])
# Checks for typedefs, structures, and compiler characteristics. # Checks for typedefs, structures, and compiler characteristics.
AC_TYPE_SIZE_T AC_TYPE_SIZE_T

8
guacamole/libguac/include/client.h
View File

@@ -22,8 +22,9 @@
#include <png.h> #include <png.h>
#include <uuid/uuid.h> #include <uuid/uuid.h>
#include "uuidtree.h" #include <semaphore.h>
#include "uuidtree.h"
#include "guacio.h" #include "guacio.h"
/** /**
@@ -237,6 +238,11 @@ struct guac_client_registry {
*/ */
guac_uuid_tree_node* root; guac_uuid_tree_node* root;
/**
* Semaphore controlling access to UUID tree.
*/
sem_t tree_lock;
}; };
guac_client_registry* guac_create_client_registry(); guac_client_registry* guac_create_client_registry();

8
guacamole/libguac/src/clientreg.c
View File

@@ -22,6 +22,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <uuid/uuid.h> #include <uuid/uuid.h>
#include <semaphore.h>
#include "uuidtree.h" #include "uuidtree.h"
#include "client.h" #include "client.h"
@@ -31,13 +32,16 @@ guac_client_registry* guac_create_client_registry() {
guac_client_registry* registry = malloc(sizeof(guac_client_registry)); guac_client_registry* registry = malloc(sizeof(guac_client_registry));
registry->root = guac_create_uuid_tree(); registry->root = guac_create_uuid_tree();
sem_init(&(registry->tree_lock), 0, 1);
return registry; return registry;
} }
void guac_register_client(guac_client_registry* registry, guac_client* client) { void guac_register_client(guac_client_registry* registry, guac_client* client) {
sem_wait(&(registry->tree_lock));
guac_uuid_tree_put(registry->root, client->uuid, client); guac_uuid_tree_put(registry->root, client->uuid, client);
sem_post(&(registry->tree_lock));
} }
guac_client* guac_find_client(guac_client_registry* registry, uuid_t uuid) { guac_client* guac_find_client(guac_client_registry* registry, uuid_t uuid) {
@@ -45,11 +49,15 @@ guac_client* guac_find_client(guac_client_registry* registry, uuid_t uuid) {
} }
void guac_remove_client(guac_client_registry* registry, uuid_t uuid) { void guac_remove_client(guac_client_registry* registry, uuid_t uuid) {
sem_wait(&(registry->tree_lock));
guac_uuid_tree_remove(registry->root, uuid); guac_uuid_tree_remove(registry->root, uuid);
sem_post(&(registry->tree_lock));
} }
void guac_cleanup_registry(guac_client_registry* registry) { void guac_cleanup_registry(guac_client_registry* registry) {
sem_wait(&(registry->tree_lock));
guac_cleanup_uuid_tree(registry->root); guac_cleanup_uuid_tree(registry->root);
sem_destroy(&(registry->tree_lock));
} }
#endif #endif