Script fixes and enhancement (#93)

* Minor fix to comment

Signed-off-by: Itamar Haber <itamar@redislabs.com>

* Tries to prevent a leak

Signed-off-by: Itamar Haber <itamar@redislabs.com>

* Adds RAI_ScriptRunCtxCreateEx

Perhaps should just be in RAI_ScriptRunCtxCreate

Signed-off-by: Itamar Haber <itamar@redislabs.com>

* Refactors Ex to nonEx

Signed-off-by: Itamar Haber <itamar@redislabs.com>

Author: itamarhaber

src/redisai.c

@@ -809,7 +809,7 @@ int RedisAI_StartRunThread() {
   return REDISMODULE_OK;
 }
 
-// script key, INPUTS, key1, key2 ... OUTPUTS, key1, key2 ...
+// script key, fnname, INPUTS, key1, key2 ... OUTPUTS, key1, key2 ...
 int RedisAI_ScriptRun_RedisCommand(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) {
   if (RedisModule_IsKeysPositionRequest(ctx)) {
     RedisModule_KeyAtPos(ctx, 1);
@@ -834,11 +834,7 @@ int RedisAI_ScriptRun_RedisCommand(RedisModuleCtx *ctx, RedisModuleString **argv
 
   RAI_Script *sto = RedisModule_ModuleTypeGetValue(key);
 
-  RAI_ScriptRunCtx *sctx = RAI_ScriptRunCtxCreate(sto);
-
-  size_t fnname_len = strlen(fnname);
-  sctx->fnname = RedisModule_Calloc(fnname_len, sizeof(char));
-  memcpy(sctx->fnname, fnname, fnname_len);
+  RAI_ScriptRunCtx *sctx = RAI_ScriptRunCtxCreate(sto, fnname);
 
   RedisModuleString **outkeys;
 

src/redisai.h

@@ -53,7 +53,7 @@ RAI_Model* MODULE_API_FUNC(RedisAI_ModelGetShallowCopy)(RAI_Model* model);
 
 RAI_Script* MODULE_API_FUNC(RedisAI_ScriptCreate)(int backend, int device, const char* modeldef, size_t modellen);
 void MODULE_API_FUNC(RedisAI_ScriptFree)(RAI_Script* model);
-RAI_ScriptRunCtx* MODULE_API_FUNC(RedisAI_ScriptRunCtxCreate)(RAI_Script* model);
+RAI_ScriptRunCtx* MODULE_API_FUNC(RedisAI_ScriptRunCtxCreate)(RAI_Script* model, const char *fnname);
 int MODULE_API_FUNC(RedisAI_ScriptRunCtxAddInput)(RAI_ScriptRunCtx* mctx, const char* inputName, RAI_Tensor* inputTensor);
 int MODULE_API_FUNC(RedisAI_ScriptRunCtxAddOutput)(RAI_ScriptRunCtx* mctx, const char* outputName);
 size_t MODULE_API_FUNC(RedisAI_ScriptRunCtxNumOutputs)(RAI_ScriptRunCtx* mctx);

src/script.c

@@ -87,12 +87,15 @@ void RAI_ScriptFree(RAI_Script* script, RAI_Error* err) {
   RAI_ScriptFreeTorch(script, err);
 }
 
-RAI_ScriptRunCtx* RAI_ScriptRunCtxCreate(RAI_Script* script) {
+RAI_ScriptRunCtx* RAI_ScriptRunCtxCreate(RAI_Script* script, const char *fnname) {
 #define PARAM_INITIAL_SIZE 10
   RAI_ScriptRunCtx* sctx = RedisModule_Calloc(1, sizeof(*sctx));
   sctx->script = RAI_ScriptGetShallowCopy(script);
   sctx->inputs = array_new(RAI_ScriptCtxParam, PARAM_INITIAL_SIZE);
   sctx->outputs = array_new(RAI_ScriptCtxParam, PARAM_INITIAL_SIZE);
+  size_t fnname_len = strlen(fnname);
+  sctx->fnname = RedisModule_Calloc(fnname_len, sizeof(char));
+  memcpy(sctx->fnname, fnname, fnname_len);
   return sctx;
 }
 
@@ -136,6 +139,8 @@ void RAI_ScriptRunCtxFree(RAI_ScriptRunCtx* sctx) {
   }
   array_free(sctx->outputs);
 
+  RedisModule_Free(sctx->fnname);
+
   RAI_Error err = {0};
   RAI_ScriptFree(sctx->script, &err);
 

src/script.h

@@ -13,7 +13,7 @@ int RAI_ScriptInit(RedisModuleCtx* ctx);
 RAI_Script* RAI_ScriptCreate(RAI_Device device, const char* scriptdef, RAI_Error* err);
 void RAI_ScriptFree(RAI_Script* script, RAI_Error* err);
 
-RAI_ScriptRunCtx* RAI_ScriptRunCtxCreate(RAI_Script* script);
+RAI_ScriptRunCtx* RAI_ScriptRunCtxCreate(RAI_Script* script, const char *fnname);
 int RAI_ScriptRunCtxAddInput(RAI_ScriptRunCtx* sctx, RAI_Tensor* inputTensor);
 int RAI_ScriptRunCtxAddOutput(RAI_ScriptRunCtx* sctx);
 size_t RAI_ScriptRunCtxNumOutputs(RAI_ScriptRunCtx* sctx);