WIP: pybind wrapper App

Author: lkpworkspace

python/CMakeLists.txt

@@ -11,7 +11,7 @@ project(pymyframe)
 include(${SWIG_USE_FILE})
 
 set(dot_i_srcs
-  swig/test.i
+  swig/pymyframe.i
 )
 set_property(SOURCE ${dot_i_srcs} PROPERTY CPLUSPLUS ON)
 swig_add_library(${PROJECT_NAME}
@@ -20,15 +20,18 @@ swig_add_library(${PROJECT_NAME}
   SOURCES ${dot_i_srcs}
 )
 set_property(TARGET ${PROJECT_NAME} PROPERTY SWIG_INCLUDE_DIRECTORIES
+  ${CMAKE_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
 target_include_directories(${PROJECT_NAME}
   PRIVATE
+  ${CMAKE_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${Python_INCLUDE_DIRS}
 )
 target_link_libraries(${PROJECT_NAME}
   PRIVATE
+  myframe
   ${Python_LIBRARIES}
 )
 
@@ -40,8 +43,9 @@ install(TARGETS
 )
 file(TOUCH "${CMAKE_CURRENT_BINARY_DIR}/__init__.py")
 install(FILES
-  "${CMAKE_CURRENT_BINARY_DIR}/myframe.py"
+  "${CMAKE_CURRENT_BINARY_DIR}/pymyframe.py"
   "${CMAKE_CURRENT_BINARY_DIR}/__init__.py"
+  "${CMAKE_CURRENT_SOURCE_DIR}/launcher.py"
   PERMISSIONS
   OWNER_READ OWNER_WRITE
   GROUP_READ

python/launcher.py

@@ -0,0 +1,20 @@
+#!/usr/bin/python3
+# -*- coding: UTF-8 -*-
+import time
+import pymyframe as myframe
+
+app = myframe.App()
+app_conf = myframe.AppConf()
+
+res = app.init(app_conf)
+if res == False:
+    exit(-1)
+
+res = app.loadServiceFromDir("service")
+if res == False:
+    exit(-1)
+
+app.start()
+
+while True:
+    time.sleep(1)

python/py_test.h

@@ -0,0 +1,129 @@
+/****************************************************************************
+Copyright (c) 2019, 李柯鹏
+All rights reserved.
+
+Author: 李柯鹏 <likepeng0418@163.com>
+****************************************************************************/
+#pragma once
+#include <iostream>
+#include <thread>
+#include "myframe/common.h"
+#include "myframe/log.h"
+#include "myframe/app.h"
+
+namespace pymyframe {
+
+class App;
+class AppConf {
+  friend class App;
+ public:
+  AppConf() {
+    log_dir_ = myframe::Common::GetAbsolutePath(log_dir_);
+    std::cout << "appconf construct\n";
+  }
+  ~AppConf() {
+    std::cout << "appconf deconstruct\n";
+  }
+
+  void setProcessName(const std::string& name) {
+    process_name_ = name;
+  }
+
+  void setLibDir(const std::string& dir) {
+    args_.SetStr(MYFRAME_KEY_SERVICE_LIB_DIR,
+      myframe::Common::GetAbsolutePath(dir));
+  }
+
+  void setLogDir(const std::string& dir) {
+    log_dir_ = myframe::Common::GetAbsolutePath(dir);
+  }
+
+  void setLogMaxSizeMB(int sz) {
+    log_max_size_ = sz;
+  }
+
+  void setThreadPoolSize(int sz) {
+    args_.SetInt(MYFRAME_KEY_THREAD_POOL_SIZE, sz);
+  }
+
+  void setPendingQueueSize(int sz) {
+    args_.SetInt(MYFRAME_KEY_PENDING_QUEUE_SIZE, sz);
+  }
+
+  void setRunQueueSize(int sz) {
+    args_.SetInt(MYFRAME_KEY_RUN_QUEUE_SIZE, sz);
+  }
+
+ private:
+  int log_max_size_{100};
+  std::string log_dir_{"log"};
+  std::string process_name_{"launcher"};
+  myframe::Arguments args_;
+};
+
+class App {
+ public:
+  App() {
+    std::cout << "pyapp construct\n";
+  }
+
+  ~App() {
+    if (app_) {
+      app_->Quit();
+    }
+    if (th_.joinable()) {
+      th_.join();
+    }
+    std::cout << "pyapp deconstruct\n";
+  }
+
+  bool init(const AppConf& conf) {
+    myframe::InitLog(
+      conf.log_dir_,
+      conf.process_name_,
+      conf.log_max_size_);
+    app_ = std::make_shared<myframe::App>();
+    int res = app_->Init(conf.args_);
+    if (res == false) {
+      return false;
+    }
+    return res;
+  }
+
+  bool loadServiceFromDir(const std::string& path) {
+    if (app_ == nullptr) {
+      return false;
+    }
+    return app_->LoadServiceFromDir(
+      myframe::Common::GetAbsolutePath(path)
+    );
+  }
+
+  bool loadServiceFromFile(const std::string& filepath) {
+    if (app_ == nullptr) {
+      return false;
+    }
+    return app_->LoadServiceFromFile(
+      myframe::Common::GetAbsolutePath(filepath)
+    );
+  }
+
+  // int send(msg);
+  // msg sendRequest(msg);
+  // bool addActor(PyObject* obj);
+
+  void start() {
+    if (app_ == nullptr) {
+      return;
+    }
+    th_ = std::thread([this](){
+      app_->Exec();
+    });
+  }
+
+ private:
+  std::shared_ptr<myframe::App> app_;
+  std::thread th_;
+};
+
+}  // namespace pymyframe

python/pymyframe.h

@@ -0,0 +1,10 @@
+%module pymyframe
+
+%{
+#include "pymyframe.h"
+%}
+
+%include <std_shared_ptr.i>
+%include <std_string.i>
+
+%include "pymyframe.h"