diff options
| author | Alon Levy <alevy@redhat.com> | 2013-08-12 14:44:21 +0300 |
|---|---|---|
| committer | Alon Levy <alevy@redhat.com> | 2013-08-14 12:08:04 +0300 |
| commit | fe38ddf724a7cd47fe8225ba6b10e9abaaf53c89 (patch) | |
| tree | ee86ab3be4fc1582831cbb3538728723382c3a7d /server | |
| parent | 376264b00925ce417be2a8a5097c26d7cc58d608 (diff) | |
| download | spice-fe38ddf724a7cd47fe8225ba6b10e9abaaf53c89.tar.gz spice-fe38ddf724a7cd47fe8225ba6b10e9abaaf53c89.tar.xz spice-fe38ddf724a7cd47fe8225ba6b10e9abaaf53c89.zip | |
server: move bit set/clear utilities out of red_worker.h
Diffstat (limited to 'server')
| -rw-r--r-- | server/Makefile.am | 1 | ||||
| -rw-r--r-- | server/red_dispatcher.c | 4 | ||||
| -rw-r--r-- | server/red_worker.c | 1 | ||||
| -rw-r--r-- | server/red_worker.h | 18 | ||||
| -rw-r--r-- | server/spice_server_utils.h | 23 |
5 files changed, 28 insertions, 19 deletions
diff --git a/server/Makefile.am b/server/Makefile.am index e5392ba8..feee2f15 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -99,6 +99,7 @@ libspice_server_la_SOURCES = \ zlib_encoder.h \ spice_bitmap_utils.h \ spice_bitmap_utils.c \ + spice_server_utils.h \ $(NULL) if SUPPORT_TUNNEL diff --git a/server/red_dispatcher.c b/server/red_dispatcher.c index ef47c283..03a4c4ae 100644 --- a/server/red_dispatcher.c +++ b/server/red_dispatcher.c @@ -39,8 +39,10 @@ #endif // USE_OPENGL #include "reds.h" #include "dispatcher.h" -#include "red_dispatcher.h" #include "red_parse_qxl.h" +#include "spice_server_utils.h" + +#include "red_dispatcher.h" static int num_active_workers = 0; diff --git a/server/red_worker.c b/server/red_worker.c index 07042798..3b9c5b08 100644 --- a/server/red_worker.c +++ b/server/red_worker.c @@ -82,6 +82,7 @@ #include "migration_protocol.h" #include "spice_timer_queue.h" #include "main_dispatcher.h" +#include "spice_server_utils.h" //#define COMPRESS_STAT //#define DUMP_BITMAP diff --git a/server/red_worker.h b/server/red_worker.h index 796b0902..272661f4 100644 --- a/server/red_worker.h +++ b/server/red_worker.h @@ -22,24 +22,6 @@ #include <errno.h> #include "red_common.h" - -static inline void set_bit(int index, uint32_t *addr) -{ - uint32_t mask = 1 << index; - __sync_or_and_fetch(addr, mask); -} - -static inline void clear_bit(int index, uint32_t *addr) -{ - uint32_t mask = ~(1 << index); - __sync_and_and_fetch(addr, mask); -} - -static inline int test_bit(int index, uint32_t val) -{ - return val & (1u << index); -} - enum { RED_WORKER_PENDING_WAKEUP, RED_WORKER_PENDING_OOM, diff --git a/server/spice_server_utils.h b/server/spice_server_utils.h new file mode 100644 index 00000000..b3ddc27e --- /dev/null +++ b/server/spice_server_utils.h @@ -0,0 +1,23 @@ +#ifndef H_SPICE_SERVER_UTIL +#define H_SPICE_SERVER_UTIL + +#include <unistd.h> + +static inline void set_bit(int index, uint32_t *addr) +{ + uint32_t mask = 1 << index; + __sync_or_and_fetch(addr, mask); +} + +static inline void clear_bit(int index, uint32_t *addr) +{ + uint32_t mask = ~(1 << index); + __sync_and_and_fetch(addr, mask); +} + +static inline int test_bit(int index, uint32_t val) +{ + return val & (1u << index); +} + +#endif |