correct redis usage

Author: DvirDukhan

src/backends/torch.c

@@ -12,14 +12,17 @@ int RAI_InitBackendTorch(int (*get_api_fn)(const char *, void *)) {
     get_api_fn("RedisModule_Realloc", ((void **)&RedisModule_Realloc));
     get_api_fn("RedisModule_Strdup", ((void **)&RedisModule_Strdup));
     get_api_fn("RedisModule_CreateString", ((void **)&RedisModule_CreateString));
-    get_api_fn("RedisModule_GetThreadSafeContext", ((void **)&RedisModule_GetThreadSafeContext));
+    get_api_fn("RedisModule_FreeString", ((void **)&RedisModule_FreeString));
     get_api_fn("RedisModule_Call", ((void **)&RedisModule_Call));
     get_api_fn("RedisModule_CallReplyType", ((void **)&RedisModule_CallReplyType));
     get_api_fn("RedisModule_CallReplyStringPtr", ((void **)&RedisModule_CallReplyStringPtr));
     get_api_fn("RedisModule_CallReplyInteger", ((void **)&RedisModule_CallReplyInteger));
     get_api_fn("RedisModule_CallReplyLength", ((void **)&RedisModule_CallReplyLength));
     get_api_fn("RedisModule_CallReplyArrayElement", ((void **)&RedisModule_CallReplyArrayElement));
     get_api_fn("RedisModule_FreeCallReply", ((void **)&RedisModule_FreeCallReply));
+    get_api_fn("RedisModule_GetThreadSafeContext", ((void **)&RedisModule_GetThreadSafeContext));
+    get_api_fn("RedisModule_ThreadSafeContextLock",  ((void **)&RedisModule_ThreadSafeContextLock));
+    get_api_fn("RedisModule_ThreadSafeContextUnlock",  ((void **)&RedisModule_ThreadSafeContextUnlock));
     get_api_fn("RedisModule_FreeThreadSafeContext", ((void **)&RedisModule_FreeThreadSafeContext));
 
     return REDISMODULE_OK;

src/libtorch_c/torch_extensions/torch_redis.cpp

@@ -42,25 +42,28 @@ torch::IValue IValueFromRedisReply(RedisModuleCallReply *reply){
 }
 
 torch::IValue redisExecute(std::string fn_name, std::vector<std::string> args ) {
-  RedisModuleCtx* ctx = RedisModule_GetThreadSafeContext(NULL);
-  size_t len = args.size();
-  RedisModuleString* arguments[len];
-  len = 0;
-  for (std::vector<std::string>::iterator it = args.begin(); it != args.end(); it++) {
-      const std::string arg = *it;
-      const char* str = arg.c_str();
-      arguments[len++] = RedisModule_CreateString(ctx, str, strlen(str));
-  }
+    RedisModuleCtx* ctx = RedisModule_GetThreadSafeContext(NULL);
+    RedisModule_ThreadSafeContextLock(ctx);
+    size_t len = args.size();
+    RedisModuleString* arguments[len];
+    len = 0;
+    for (std::vector<std::string>::iterator it = args.begin(); it != args.end(); it++) {
+        const std::string arg = *it;
+        const char* str = arg.c_str();
+        arguments[len++] = RedisModule_CreateString(ctx, str, strlen(str));
+    }
 
-    RedisModuleCallReply *reply = RedisModule_Call(ctx, fn_name.c_str(), "v", arguments, len);
-//   RedisValue value = RedisValue::fromRedisReply(RedisModule_Call(ctx, fn_name.c_str(), "v", arguments, len));
-  torch::IValue value = IValueFromRedisReply(reply);
-  RedisModule_FreeThreadSafeContext(ctx);
-  RedisModule_FreeCallReply(reply);
-  return value;
+    RedisModuleCallReply *reply = RedisModule_Call(ctx, fn_name.c_str(), "!v", arguments, len);
+    RedisModule_ThreadSafeContextUnlock(ctx);
+    torch::IValue value = IValueFromRedisReply(reply);
+    RedisModule_FreeThreadSafeContext(ctx);
+    RedisModule_FreeCallReply(reply);
+    for(int i= 0; i < len; i++){
+        RedisModule_FreeString(NULL, arguments[i]);
+    }
+    return value;
 }
 
-
 torch::List<torch::IValue> asList(torch::IValue v) {
     return v.toList();
-}
+}

src/libtorch_c/torch_extensions/torch_redis.h

@@ -26,11 +26,8 @@ inline std::shared_ptr<RedisResolver> redisResolver() { return std::make_shared<
 } // namespace jit
 } // namespace torch
 
-// c10::intrusive_ptr<RedisValue> redisExecute(std::string fn_name, std::vector<std::string> args );
-
 torch::IValue redisExecute(std::string fn_name, std::vector<std::string> args);
 torch::List<torch::IValue> asList(torch::IValue);
 
 static auto registry =
     torch::RegisterOperators("redis::execute", &redisExecute).op("redis::asList", &asList);
-// registry = torch::RegisterOperators("torch::asList", &asList);