added ActiveDataManagerTest.cpp

CMakeLists.txt

@@ -67,17 +67,22 @@ set_example_project_folder("DataType/DataArray" QueueTest)
 add_executable(PoolTest datatype/PoolTest.cpp)
 set_example_project_folder("DataType/DataArray" PoolTest)
 
-add_executable(ActiveIDManagerTest datatype/ActiveIDManagerTest.cpp)
-cm_example_project("DataType/DataArray" ActiveIDManagerTest)
-
-add_executable(ActiveDataManagerTest datatype/ActiveDataManagerTest.cpp)
-cm_example_project("DataType/DataArray" ActiveDataManagerTest)
-
 add_executable(MapTest datatype/MapTest.cpp)
 set_example_project_folder("DataType/DataArray" MapTest)
 
 ####################################################################################################
 
+add_executable(1_ActiveIDManagerTest datatype/ActiveIDManagerTest.cpp)
+cm_example_project("DataType/ActiveManager" 1_ActiveIDManagerTest)
+
+add_executable(2_ActiveMemoryBlockManagerTest datatype/ActiveMemoryBlockManagerTest.cpp)
+cm_example_project("DataType/ActiveManager" 2_ActiveMemoryBlockManagerTest)
+
+add_executable(3_ActiveDataManagerTest datatype/ActiveDataManagerTest.cpp)
+cm_example_project("DataType/ActiveManager" 3_ActiveDataManagerTest)
+
+####################################################################################################
+
 add_executable(FixFilenameTest filesystem/FixFilenameTest.cpp)
 cm_example_project("File System" FixFilenameTest)
 

datatype/ActiveDataManagerTest.cpp

@@ -0,0 +1,118 @@
+#include<hgl/type/ActiveDataManager.h>
+#include<iostream>
+#include"UserInfo.h"
+
+using namespace hgl;
+
+void DebugOutputArray(const char *hint,const int *id,const int count)
+{
+    cout<<"("<<hint<<':'<<count<<")";
+
+    if(count<=0)return;
+
+    const int *p=id;
+
+    for(int i=0;i<count;i++)
+    {
+        cout<<(!i?'[':',')<<*p;
+        ++p;
+    }
+
+    cout<<']';
+}
+
+void DebugOutputArray(const char *hint,UserInfo **ui,const int count)
+{
+    cout<<"("<<hint<<':'<<count<<")";
+
+    if(count<=0)return;
+
+    UserInfo **p=ui;
+
+    for(int i=0;i<count;i++)
+    {
+        cout<<(!i?'[':',')<<(*p)->name;
+        ++p;
+    }
+
+    cout<<']';
+}
+
+void DebugOutputArray(const char *hint,ActiveDataManager<UserInfo> &adm,const int *idp,const int count)
+{
+    if(!idp||count<=0)return;
+
+    UserInfo **ui=new UserInfo *[count];
+
+    adm.GetData(ui,idp,count);
+
+    DebugOutputArray(hint,ui,count);
+
+    delete[] ui;        
+}
+
+void DebugOutputArray(const char *hint,ActiveDataManager<UserInfo> &adm,const DataArray<int> &da)
+{
+    DebugOutputArray(hint,adm,da.GetData(),da.GetCount());
+}
+
+void DebugADMOutput(const char *hint,ActiveDataManager<UserInfo> &adm)
+{
+    cout<<hint<<' ';
+
+    DebugOutputArray("Active",adm,adm.GetActiveArray());
+    cout<<' ';
+    DebugOutputArray("Idle",adm,adm.GetIdleArray());
+
+    cout<<endl;
+}
+
+void WriteUserinfoToADM(ActiveDataManager<UserInfo> &adm,const int *idp,const int count,const int start)
+{
+    for(int i=0;i<count;i++)
+    {
+        adm.WriteData(user_info_array[start+i],*idp);
+
+        ++idp;
+    }
+}
+
+int os_main(int,os_char **)
+{
+    using namespace hgl;
+
+    ActiveDataManager<UserInfo> adm;
+
+    adm.Alloc(10);
+
+    int start=0;
+
+    int id0[5];
+    adm.CreateIdle(id0,5);
+    WriteUserinfoToADM(adm,id0,5,start);start+=5;
+    DebugADMOutput("CreateIdle(5)",adm);
+    std::cout<<std::endl;
+
+    int id1[5];
+    adm.CreateActive(id1,5);
+    WriteUserinfoToADM(adm,id1,5,start);start+=5;
+    DebugADMOutput("CreateActive(5)",adm);
+    std::cout<<std::endl;
+
+    int id2[3];
+    adm.Get(id2,3);
+    DebugADMOutput("Get(user2,3)",adm);
+    DebugOutputArray("user2",adm,id2,3);
+    std::cout<<std::endl;
+
+    adm.Release(id1,3);
+    DebugADMOutput("Release(user1,3)",adm);
+
+    adm.Release(id2,3);
+    DebugADMOutput("Release(user2,3)",adm);
+
+    adm.ReleaseAllActive();
+    DebugADMOutput("ReleaseAllActive()",adm);
+
+    return(0);
+}

datatype/ActiveMemoryBlockManagerTest.cpp

@@ -42,11 +42,11 @@ void DebugOutputArray(const char *hint,const char **str,const int count)
 
 void DebugOutputArray(const char *hint,const ActiveMemoryBlockManager &ambm,const int *idp,const int count)
 {
-    if(count<=0)return;
+    if(!idp||count<=0)return;
 
     char **data=new char *[count];
 
-    ambm.GetDataArrayPointer((void **)data,idp,count);
+    ambm.GetData((void **)data,idp,count);
 
     DebugOutputArray(hint,(const char **)data,count);