File 0003-.PS.-DEV-3755-replaced-js-object-mapping-b... of Package zabbix

Overview Repositories Revisions Requests Users Attributes Meta

File 0003-.PS.-DEV-3755-replaced-js-object-mapping-by-hardcode.patch of Package zabbix (Revision 4c77b783472de5e48bc06219d99f7fbd)

Currently displaying revision 4c77b783472de5e48bc06219d99f7fbd , Show latest

From 8501a50025ea4c7954f27a206b80b1c03161323a Mon Sep 17 00:00:00 2001
From: Andris Zeila <andris.zeila@zabbix.com>
Date: Fri, 31 May 2024 14:18:09 +0300
Subject: [PATCH 3/7] .......PS. [DEV-3755] replaced js object mapping by
 hardcoded property with mapping by object heap pointer

---
 src/libs/zbxembed/embed.c       | 82 +++++++++++++++++++++------------
 src/libs/zbxembed/embed.h       | 16 ++-----
 src/libs/zbxembed/httprequest.c | 42 +++--------------
 3 files changed, 63 insertions(+), 77 deletions(-)

diff --git a/src/libs/zbxembed/embed.c b/src/libs/zbxembed/embed.c
index 8f6f969cfa9..72aca43e698 100644
--- src/libs/zbxembed/embed.c
+++ src/libs/zbxembed/embed.c
@@ -38,13 +38,10 @@
 
 typedef struct
 {
-	void			*ref;	/* memory block reference, kept as pointer property in duktape */
-					/* because it's closest to uint64 value                        */
-
-	void			*ptr;
-	zbx_es_obj_type_t	type;
+	void	*heapptr;	/* js object heap ptr */
+	void	*data;
 }
-zbx_es_ptr_t;
+zbx_es_obj_data_t;
 
 /******************************************************************************
  *                                                                            *
@@ -357,8 +354,7 @@ int	zbx_es_init_env(zbx_es_t *es, char **error)
 
 	es->env->timeout = ZBX_ES_TIMEOUT;
 
-	zbx_hashset_create(&es->env->ptrmap, 0, ZBX_DEFAULT_PTR_HASH_FUNC, ZBX_DEFAULT_PTR_COMPARE_FUNC);
-	es->env->ptrmap_nextid = 1;
+	zbx_hashset_create(&es->env->objmap, 0, ZBX_DEFAULT_PTR_HASH_FUNC, ZBX_DEFAULT_PTR_COMPARE_FUNC);
 
 	ret = SUCCEED;
 out:
@@ -399,7 +395,7 @@ int	zbx_es_destroy_env(zbx_es_t *es, char **error)
 		goto out;
 	}
 
-	zbx_hashset_destroy(&es->env->ptrmap);
+	zbx_hashset_destroy(&es->env->objmap);
 
 	duk_destroy_heap(es->env->ctx);
 	zbx_es_debug_disable(es);
@@ -806,61 +802,89 @@ zbx_es_env_t	*zbx_es_get_env(duk_context *ctx)
 		return NULL;
 
 	env = (zbx_es_env_t *)duk_to_pointer(ctx, -1);
-	duk_pop(ctx);
+	duk_pop_2(ctx);
 
 	return env;
 }
 
 /******************************************************************************
  *                                                                            *
- * Purpose: store pointer in cache                                            *
+ * Purpose: attach data pointer to current object                             *
  *                                                                            *
- * Return value: pointer reference, used to locate pointer in cache           *
+ * Comments: This function must be used only from object constructor          *
  *                                                                            *
  ******************************************************************************/
-void	*es_put_ptr(zbx_es_env_t *env, void *ptr, zbx_es_obj_type_t type)
+void	es_obj_attach_data(zbx_es_env_t *env, void *data)
 {
-	zbx_es_ptr_t	ptr_local = {
-			.ref = (void *)env->ptrmap_nextid++,
-			.type = type,
-			.ptr = ptr
-	};
+	zbx_es_obj_data_t	obj_local;
+
+	duk_push_this(env->ctx);
+	obj_local.heapptr = duk_require_heapptr(env->ctx, -1);
+	duk_pop(env->ctx);
 
-	zbx_hashset_insert(&env->ptrmap, &ptr_local, sizeof(ptr_local));
+	obj_local.data = data;
+	zbx_hashset_insert(&env->objmap, &obj_local, sizeof(obj_local));
 
-	return ptr_local.ref;
+	printf("+ %p\n", data);
 }
 
 /******************************************************************************
  *                                                                            *
- * Purpose: get pointer from cache                                            *
+ * Purpose: get data pointer attached to current object                       *
  *                                                                            *
  * Parameters: env  - [IN]                                                    *
  *             ref  - [IN] pointer reference, returned by es_put_ptr()        *
  *             type - [IN] pointer type                                       *
  *                                                                            *
+ * Comments: This function must be used only from object methods.             *
+ *                                                                            *
  ******************************************************************************/
-void	*es_get_ptr(zbx_es_env_t *env, void *ref, zbx_es_obj_type_t type)
+void	*es_obj_get_data(zbx_es_env_t *env)
 {
-	zbx_es_ptr_t	ptr_local = {.ref = ref}, *ptr;
+	zbx_es_obj_data_t	obj_local, *obj;
 
-	if (NULL != (ptr = zbx_hashset_search(&env->ptrmap, &ptr_local)) && ptr->type == type)
-		return ptr->ptr;
+	duk_push_this(env->ctx);
+	obj_local.heapptr = duk_require_heapptr(env->ctx, -1);
+	duk_pop(env->ctx);
+
+	if (NULL != (obj = zbx_hashset_search(&env->objmap, &obj_local)))
+	{
+		printf(". %p\n", obj->data);
+		return obj->data;
+	}
 
 	return NULL;
 }
 
 /******************************************************************************
  *                                                                            *
- * Purpose: remove pointer from cache                                         *
+ * Purpose: detach data pointer from current object                           *
  *                                                                            *
  * Parameters: env - [IN]                                                     *
  *             ref - [IN] pointer reference, returned by es_put_ptr()         *
  *                                                                            *
+ * Return value: detached data pointer                                        *
+ *                                                                            *
+ * Comments: The finalizing object must be on the top of the stack (-1).      *
+ *           If the pointer contains allocated data it must be freed by the   *
+ *           caller.                                                          *
+ *           This function must be used only from object destructor.          *
+ *                                                                            *
  ******************************************************************************/
-void	es_remove_ptr(zbx_es_env_t *env, void *ref)
+void	*es_obj_detach_data(zbx_es_env_t *env)
 {
-	zbx_es_ptr_t	ptr_local = {.ref = ref};
+	zbx_es_obj_data_t	obj_local, *obj;
+	void			*data;
+
+	obj_local.heapptr = duk_require_heapptr(env->ctx, -1);
+
+	if (NULL == (obj = zbx_hashset_search(&env->objmap, &obj_local)))
+		return NULL;
+
+	data = obj->data;
+	zbx_hashset_remove_direct(&env->objmap, obj);
+
+	printf("- %p\n", data);
 
-	zbx_hashset_remove(&env->ptrmap, &ptr_local);
+	return data;
 }
diff --git a/src/libs/zbxembed/embed.h b/src/libs/zbxembed/embed.h
index 09362498008..714e29ff55c 100644
--- src/libs/zbxembed/embed.h
+++ src/libs/zbxembed/embed.h
@@ -55,23 +55,15 @@ struct zbx_es_env
 	int		http_req_objects;
 	int		logged_msgs;
 
-	zbx_hashset_t	ptrmap;
-	uintptr_t	ptrmap_nextid;
+	zbx_hashset_t	objmap;
 };
 
 zbx_es_env_t	*zbx_es_get_env(duk_context *ctx);
 
 int	es_duktape_string_decode(const char *duk_str, char **out_str);
 
-typedef enum
-{
-	ES_OBJ_HTTPREQUEST = 1,
-
-}
-zbx_es_obj_type_t;
-
-void	*es_put_ptr(zbx_es_env_t *env, void *ptr, zbx_es_obj_type_t type);
-void	*es_get_ptr(zbx_es_env_t *env, void *ref, zbx_es_obj_type_t type);
-void	es_remove_ptr(zbx_es_env_t *env, void *ref);
+void	es_obj_attach_data(zbx_es_env_t *env, void *data);
+void	*es_obj_get_data(zbx_es_env_t *env);
+void	*es_obj_detach_data(zbx_es_env_t *env);
 
 #endif /* ZABBIX_EMBED_H */
diff --git a/src/libs/zbxembed/httprequest.c b/src/libs/zbxembed/httprequest.c
index f1a14c41ad0..449afdf1746 100644
--- src/libs/zbxembed/httprequest.c
+++ src/libs/zbxembed/httprequest.c
@@ -95,7 +95,6 @@ static size_t	curl_header_cb(void *ptr, size_t size, size_t nmemb, void *userdat
  ******************************************************************************/
 static zbx_es_httprequest_t *es_httprequest(duk_context *ctx)
 {
-	void			*ref;
 	zbx_es_env_t		*env;
 	zbx_es_httprequest_t	*request;
 
@@ -106,26 +105,8 @@ static zbx_es_httprequest_t *es_httprequest(duk_context *ctx)
 		return NULL;
 	}
 
-	duk_push_this(ctx);
-	duk_get_global_string(ctx, "HttpRequest");
-	duk_get_global_string(ctx, "CurlHttpRequest");
-
-	if (0 == duk_instanceof(ctx, -3, -2) && 0 == duk_instanceof(ctx, -3, -1))
-	{
-		(void)duk_push_error_object(ctx, DUK_RET_EVAL_ERROR,
-				"object is not an instance of HttpRequest or CurlHttpRequest");
-
-		return NULL;
-	}
-
-	duk_pop_2(ctx);
-
-	duk_get_prop_string(ctx, -1, "\xff""\xff""d");
-	ref = duk_to_pointer(ctx, -1);
-	duk_pop_2(ctx);
-
-	if (NULL == (request = (zbx_es_httprequest_t *)es_get_ptr(env, ref, ES_OBJ_HTTPREQUEST)))
-		(void)duk_push_error_object(ctx, DUK_RET_EVAL_ERROR, "cannot find embedded native data");
+	if (NULL == (request = (zbx_es_httprequest_t *)es_obj_get_data(env)))
+		(void)duk_push_error_object(ctx, DUK_RET_EVAL_ERROR, "cannot find native data attached to object");
 
 	return request;
 }
@@ -138,16 +119,12 @@ static zbx_es_httprequest_t *es_httprequest(duk_context *ctx)
 static duk_ret_t	es_httprequest_dtor(duk_context *ctx)
 {
 	zbx_es_httprequest_t	*request;
-	void			*ref;
 	zbx_es_env_t		*env;
 
 	if (NULL == (env = zbx_es_get_env(ctx)))
 		return duk_error(ctx, DUK_RET_TYPE_ERROR, "cannot access internal environment");
 
-	duk_get_prop_string(ctx, 0, "\xff""\xff""d");
-	ref = duk_to_pointer(ctx, -1);
-
-	if (NULL != (request = (zbx_es_httprequest_t *)es_get_ptr(env, ref, ES_OBJ_HTTPREQUEST)))
+	if (NULL != (request = (zbx_es_httprequest_t *)es_obj_detach_data(env)))
 	{
 		env->http_req_objects--;
 
@@ -158,8 +135,6 @@ static duk_ret_t	es_httprequest_dtor(duk_context *ctx)
 		zbx_free(request->data);
 		zbx_free(request->headers_in);
 		zbx_free(request);
-
-		es_remove_ptr(env, ref);
 	}
 
 	return 0;
@@ -177,7 +152,6 @@ static duk_ret_t	es_httprequest_ctor(duk_context *ctx)
 	CURLcode		err;
 	zbx_es_env_t		*env;
 	int			err_index = -1;
-	void			*ref = NULL;
 
 	if (!duk_is_constructor_call(ctx))
 		return DUK_RET_TYPE_ERROR;
@@ -192,7 +166,8 @@ static duk_ret_t	es_httprequest_ctor(duk_context *ctx)
 
 	request = (zbx_es_httprequest_t *)zbx_malloc(NULL, sizeof(zbx_es_httprequest_t));
 	memset(request, 0, sizeof(zbx_es_httprequest_t));
-	ref = es_put_ptr(env, request, ES_OBJ_HTTPREQUEST);
+
+	es_obj_attach_data(env, request);
 
 	if (NULL == (request->handle = curl_easy_init()))
 	{
@@ -211,17 +186,12 @@ static duk_ret_t	es_httprequest_ctor(duk_context *ctx)
 	ZBX_CURL_SETOPT(ctx, request->handle, CURLOPT_HEADERDATA, request, err);
 	ZBX_CURL_SETOPT(ctx, request->handle, CURLOPT_INTERFACE, CONFIG_SOURCE_IP, err);
 
-	duk_push_string(ctx, "\xff""\xff""d");
-	duk_push_pointer(ctx, ref);
-	duk_def_prop(ctx, -3, DUK_DEFPROP_HAVE_VALUE | DUK_DEFPROP_CLEAR_WRITABLE | DUK_DEFPROP_HAVE_ENUMERABLE |
-			DUK_DEFPROP_HAVE_CONFIGURABLE);
-
 	duk_push_c_function(ctx, es_httprequest_dtor, 1);
 	duk_set_finalizer(ctx, -2);
 out:
 	if (-1 != err_index)
 	{
-		es_remove_ptr(env, ref);
+		es_obj_detach_data(env);
 
 		if (NULL != request->handle)
 			curl_easy_cleanup(request->handle);
-- 
2.39.3 (Apple Git-146)

Places

File 0003-.PS.-DEV-3755-replaced-js-object-mapping-by-hardcode.patch of Package zabbix (Revision 4c77b783472de5e48bc06219d99f7fbd)

Places