From 24ca0db2c5812f24a29c234d6b40aafadad2892d Mon Sep 17 00:00:00 2001
From: yitter <yitter@126.com>
Date: Sun, 28 Mar 2021 14:58:18 +0800
Subject: [PATCH] auto commit

---
 C/source/CMakeLists.txt            |  6 +++---
 C/source/{ => idgen}/YitIdHelper.c | 17 +++++++++--------
 C/source/{ => idgen}/YitIdHelper.h |  4 ++--
 C/source/main.c                    |  2 +-
 4 files changed, 15 insertions(+), 14 deletions(-)
 rename C/source/{ => idgen}/YitIdHelper.c (52%)
 rename C/source/{ => idgen}/YitIdHelper.h (80%)

diff --git a/C/source/CMakeLists.txt b/C/source/CMakeLists.txt
index 948d2f7..9989f87 100644
--- a/C/source/CMakeLists.txt
+++ b/C/source/CMakeLists.txt
@@ -18,11 +18,11 @@ add_subdirectory(idgen)
 #        PREFIX "")
 
 ##编译执行文件
-set(LIB_SRC YitIdHelper.h YitIdHelper.c)
-add_library(YitIdHelper ${LIB_SRC})
+#set(LIB_SRC idgen/YitIdHelper.h idgen/YitIdHelper.c)
+#add_library(YitIdHelper ${LIB_SRC})
 
 add_executable(YitIdGen main.c)
-target_link_libraries(YitIdGen YitIdHelper)
+#target_link_libraries(YitIdGen YitIdHelper)
 target_link_libraries(YitIdGen idgen)
 
 
diff --git a/C/source/YitIdHelper.c b/C/source/idgen/YitIdHelper.c
similarity index 52%
rename from C/source/YitIdHelper.c
rename to C/source/idgen/YitIdHelper.c
index 3a84292..0db2d5a 100644
--- a/C/source/YitIdHelper.c
+++ b/C/source/idgen/YitIdHelper.c
@@ -5,23 +5,24 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include "YitIdHelper.h"
-#include "idgen/IdGenerator.h"
+#include "IdGenerator.h"
 
 extern void SetIdGenerator(IdGeneratorOptions options) {
     SetOptions(options);
 }
 
 extern void SetWorkerId(uint32_t workerId) {
-    IdGeneratorOptions options = BuildIdGenOptions(workerId);
-    SetOptions(options);
-    //SetIdGenerator(options);
+//    IdGeneratorOptions options = BuildIdGenOptions(workerId);
+//    SetOptions(options);
+    SetIdGenerator(options);
 }
 
 extern uint64_t NextId() {
-    IdGenerator *generator = GetIdGenInstance();
-    uint64_t id = generator->NextId();
-    free(generator);
-    return id;
+    return GetIdGenInstance()->NextId();
+//    IdGenerator *generator = GetIdGenInstance();
+//    uint64_t id = generator->NextId();
+//    free(generator);
+//    return id;
 }
 
 extern uint64_t TestId() {
diff --git a/C/source/YitIdHelper.h b/C/source/idgen/YitIdHelper.h
similarity index 80%
rename from C/source/YitIdHelper.h
rename to C/source/idgen/YitIdHelper.h
index 1a53560..db1af35 100644
--- a/C/source/YitIdHelper.h
+++ b/C/source/idgen/YitIdHelper.h
@@ -4,8 +4,8 @@
  */
 #pragma once
 
-#include "idgen/IdGenOptions.h"
-#include "idgen/common.h"
+#include "IdGenOptions.h"
+#include "common.h"
 
 
 TAP_DLLEXPORT
diff --git a/C/source/main.c b/C/source/main.c
index 39cf21e..88c8803 100644
--- a/C/source/main.c
+++ b/C/source/main.c
@@ -12,7 +12,7 @@
 #include <stdbool.h>
 #include "idgen/SnowWorkerM1.h"
 #include "idgen/IdGenerator.h"
-#include "YitIdHelper.h"
+#include "idgen/YitIdHelper.h"
 
 
 const int GenIdCount = 50000;
-- 
GitLab