aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Bollo <jose.bollo@iot.bzh>2017-04-14 15:35:43 +0200
committerJosé Bollo <jose.bollo@iot.bzh>2017-04-14 15:35:43 +0200
commit01534912a8e32468b62d848ec1fe23004df1dd19 (patch)
treef50bad5b7e445a278f331f52655d42f010b98049
parent32518ea65c0eb94f516a929bb63387ca53d138c5 (diff)
use heuristic message ids
Change-Id: I9492288de61b79074db38818c459f7447b12b4e6 Signed-off-by: José Bollo <jose.bollo@iot.bzh>
-rw-r--r--src/afb-api-ws.c19
1 files changed, 16 insertions, 3 deletions
diff --git a/src/afb-api-ws.c b/src/afb-api-ws.c
index b03ef668..56682ddc 100644
--- a/src/afb-api-ws.c
+++ b/src/afb-api-ws.c
@@ -77,7 +77,6 @@ struct api_ws
pthread_mutex_t mutex; /**< resource control */
union {
struct {
- uint32_t id;
struct afb_ws *ws;
struct api_ws_event *events;
struct api_ws_memo *memos;
@@ -93,6 +92,18 @@ struct api_ws
#define RETERR 2
#define RETRAW 3
+/******************* common usefull tools **********************************/
+
+/**
+ * translate a pointer to some integer
+ * @param ptr the pointer to translate
+ * @return an integer
+ */
+static inline uint32_t ptr2id(void *ptr)
+{
+ return (uint32_t)(((intptr_t)ptr) >> 6);
+}
+
/******************* websocket interface for client part **********************************/
static void api_ws_client_on_binary(void *closure, char *data, size_t size);
@@ -545,7 +556,9 @@ static struct api_ws_memo *api_ws_client_memo_make(struct api_ws *api, struct af
if (memo != NULL) {
afb_xreq_addref(xreq);
memo->xreq = xreq;
- do { memo->msgid = ++api->client.id; } while(api_ws_client_memo_search(api, memo->msgid) != NULL);
+ memo->msgid = ptr2id(memo);
+ while(api_ws_client_memo_search(api, memo->msgid) != NULL)
+ memo->msgid++;
memo->api = api;
memo->next = api->client.memos;
api->client.memos = memo;
@@ -1304,7 +1317,7 @@ static void api_ws_server_req_subcall_cb(struct afb_xreq *xreq, const char *api,
sc->closure = cb_closure;
pthread_mutex_unlock(&client->mutex);
- sc->subcallid = (uint32_t)(((intptr_t)sc) >> 6);
+ sc->subcallid = ptr2id(sc);
do {
sc->subcallid++;
osc = client->subcalls;