refine object free

.gitignore

@@ -0,0 +1,6 @@
+*.swp
+*lockfile
+*.out
+**tags
+manager/deps/*
+deps/*

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "monitor/third/pink"]
+	path = monitor/third/pink
+	url = https://github.com/Qihoo360/pink.git
+[submodule "monitor/third/slash"]
+	path = monitor/third/slash
+	url = https://github.com/baotiao/slash.git

.travis.yml

@@ -0,0 +1,18 @@
+sudo: required
+dist: trusty
+language: cpp
+
+os:
+  - linux
+
+compiler: 
+  - gcc
+
+language: cpp
+notifications:
+  email:
+    - [email protected]
+
+script:
+  - cmake .
+  - make

README.md

@@ -1,16 +1,21 @@
 QConf
 =====
 
+[![Build Status](https://travis-ci.org/Qihoo360/QConf.svg?branch=master)](https://travis-ci.org/Qihoo360/QConf)
+
+We have build another interesting proect [pika](https://github.com/Qihoo360/pika). Pika is a nosql compatible with redis protocol with huge storage space. You can have a try.
+
 ## Introduction [中文](https://github.com/Qihoo360/QConf/blob/master/README_ZH.md)
-QConf is a Distrubuted Configuration Management System!
+
+QConf is a Distributed Configuration Management System!
 A better replacement of the traditional configuration file. As designed, configuration items which is constantly accessed and modified should be completely separated with application code, and QConf is where it should be.
 
 ## Features
 * Changes to any configuration will be synchronised to all client machines in real-time.
 * High query efficiency.
 * Convenient deployment and simple interface.
 * High robustness and  fault-tolerance.
-* support c/c++, shell, php, python, lua, java, go and etc.
+* support c/c++, shell, php, python, lua, java, go, node and etc.
 
 ## Install
 The QConf is built using CMake (version 2.6 or newer).
@@ -58,6 +63,10 @@ cd QCONF_INSTALL_PREFIX/bin && sh agent-cmd.sh start
  - **Code** to access QConf
 
 
+## Related
+* [zkdash](https://github.com/ireaderlab/zkdash) - An excellent dashboard for QConf or ZooKeeper provided by IReader Team
+
+
 ## Performance
 1.   statergy
  * **running times** :  ten million times altogether
@@ -95,6 +104,7 @@ cd QCONF_INSTALL_PREFIX/bin && sh agent-cmd.sh start
 
 ## Document
 * [Getting Started](https://github.com/Qihoo360/QConf/blob/master/doc/QConf%20Getting%20Started%20Guide.md) - a tutorial-style guide for developers to install, run, and program to QConf
+* [Implement](http://catkang.github.io/2015/06/23/qconf.html)
 * [wiki](https://github.com/Qihoo360/QConf/wiki)
 * [qconf video guide](https://github.com/Qihoo360/QConf/wiki/QConf-%E7%AE%80%E6%98%93%E9%83%A8%E7%BD%B2%E5%92%8C%E4%BD%BF%E7%94%A8)
 

README_ZH.md

@@ -1,6 +1,8 @@
 QConf
 =====
 
+我们团队开发了另外一个有意思的项目 [pika](https://github.com/Qihoo360/pika), pika 是一个兼容redis 协议的大容量的存储, 用来解决redis 内存不够的问题, 欢迎大家试试
+
 ## 简介 [English](https://github.com/Qihoo360/QConf/blob/master/README.md)
 QConf 是一个分布式配置管理工具。
 用来替代传统的配置文件，使得配置信息和程序代码分离，同时配置变化能够实时同步到客户端，而且保证用户高效读取配置，这使的工程师从琐碎的配置修改、代码提交、配置上线流程中解放出来，极大地简化了配置管理工作。
@@ -10,7 +12,7 @@ QConf 是一个分布式配置管理工具。
 * 高效读取配置
 * 安装部署方便，使用简单
 * 服务器宕机、网络中断、集群迁移等异常情况对用户透明
-* 支持c/c++、shell、php、python、lua、java、go 等语言
+* 支持c/c++、shell、php、python、lua、java、go、node 等语言
 
 
 ## 编译安装
@@ -57,6 +59,8 @@ cd QCONF_INSTALL_PREFIX/bin && sh agent-cmd.sh start
 ```
  - 编写代码访问QConf
 
+## 相关
+* [zkdash](https://github.com/ireaderlab/zkdash) - 由掌阅团队开发的dashboad平台，可以作为QConf或ZooKeeper的管理端
 
 ## 性能
 1. 测试策略
@@ -95,6 +99,7 @@ cd QCONF_INSTALL_PREFIX/bin && sh agent-cmd.sh start
 
 ## 文档
 * [Getting Started](https://github.com/Qihoo360/QConf/blob/master/doc/QConf%20Getting%20Started%20Guide.md) - QConf 使用说明，包括QConf的安装，运行，API等信息
+* [实现介绍](http://catkang.github.io/2015/06/23/qconf.html)
 * [wiki](https://github.com/Qihoo360/QConf/wiki)
 * [qconf video guide](https://github.com/Qihoo360/QConf/wiki/QConf-%E7%AE%80%E6%98%93%E9%83%A8%E7%BD%B2%E5%92%8C%E4%BD%BF%E7%94%A8)
 

agent/CMakeLists.txt

@@ -27,14 +27,9 @@ set_source_files_properties(../base/qlibc/md5.c PROPERTIES LANGUAGE CXX )
 set_source_files_properties(../base/qlibc/qhash.c PROPERTIES LANGUAGE CXX )
 set_source_files_properties(../base/qlibc/qhasharr.c PROPERTIES LANGUAGE CXX )
 
-#set( CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${AGENT_COMPILE_FLAGS}" )
-#set( CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} ${LINK_FLAGS}" )
-
 add_definitions(${AGENT_COMPILE_FLAGS})
 add_executable(qconf_agent ${DIR_SRCS})
 
-#execute_process(COMMAND echo "cmake install prefix : "${CMAKE_INSTALL_PREFIX})
-
 # link libpthread
 find_package (Threads)
 target_link_libraries (qconf_agent ${CMAKE_THREAD_LIBS_INIT})
@@ -51,7 +46,7 @@ ENDIF(WIN32)
 #build libcurl
 execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/../deps/curl COMMAND ./configure
     --prefix=${PROJECT_SOURCE_DIR}/../deps/curl/_install   --disable-ldap
-    --disable-ldaps --without-ssl --without-zlib --without-libidn)
+    --disable-ldaps --without-ssl --without-zlib --without-libidn --without-librtmp)
 execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/../deps/curl COMMAND
     make)
 execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/../deps/curl COMMAND

agent/bin/agent-cmd.sh

@@ -254,8 +254,8 @@ start () {
 
 stop () {
     chk_agent_exist
-    #kill $chdpid
-    killall -9 $agentpath
+    kill $chdpid
+    #killall -9 $agentpath
     echo "$agent stop."
 }
 

agent/conf/agent.conf

@@ -32,3 +32,6 @@ feedback_enable=0
 
 # feedback url
 #feedback_url=feedback_server:8360/feedback
+
+# size of lru memory
+shared_memory_size=100000

agent/qconf_agent.cc

@@ -21,6 +21,7 @@
 
 using namespace std;
 
+extern int maxSlotsNum;
 const string QCONF_PID_FILE("/pid");
 const string QCONF_LOG_FMT("/logs/qconf.log.%Y-%m-%d-%H");
 
@@ -31,14 +32,20 @@ static void qconf_agent_destroy();
 #define STRING_(str) #str
 #define STRING(str) STRING_(str)
 
-int main(int argc, char **arg)
+static void Usage() {
+  LOG_INFO("Usage: \n ./qconf_agent --localidc=idcname\n"
+           "We support one argument for now, idcname is "
+           "your idc name in agent.conf");
+}
+
+int main(int argc, char* argv[])
 {
     string agent_dir("..");
 #ifdef QCONF_AGENT_DIR
     agent_dir = STRING(QCONF_AGENT_DIR);
 #endif
 
-    qconf_set_log_level(QCONF_LOG_ERR);
+    qconf_set_log_level(QCONF_LOG_INFO);
     LOG_INFO("agent_dir:%s", agent_dir.c_str());
 
     // check whether agent is running
@@ -48,7 +55,22 @@ int main(int argc, char **arg)
     if (QCONF_OK != ret) return ret;
 
     // load configure
-    ret = qconf_load_conf(agent_dir);
+    // Check localidc argv
+    std::string localidc;
+    if (argc > 1) {
+      if (argc == 2) {
+        std::string localidc_s(argv[1]);
+        if (localidc_s.empty()) {
+          Usage();
+        }
+        size_t pos = localidc_s.find("=");
+        localidc.assign(localidc_s.substr(pos + 1));
+      } else {
+        Usage();
+      }
+      LOG_INFO("localidc: %s", localidc.c_str());
+    }
+    ret = qconf_load_conf(agent_dir, localidc);
     if (QCONF_OK != ret)
     {
         LOG_FATAL_ERR("Failed to load configure!");
@@ -97,13 +119,20 @@ int main(int argc, char **arg)
     signal(SIGUSR2, sig_handler);
 
     // Environment initialize
+    ret = get_agent_conf(SHARED_MEMORY_SIZE, value);
+    if (ret == QCONF_OK) {
+        maxSlotsNum = atoi(value.c_str());
+    }
+    else {
+        maxSlotsNum = QCONF_MAX_SLOTS_NUM;
+    }
+
     ret = qconf_agent_init(agent_dir, log_dir);
     if (QCONF_OK != ret)
     {
         LOG_ERR("Failed to init qconf agent!");
         return ret;
     }
-
     // main 
     watcher_setting_start();
 
@@ -241,8 +270,9 @@ static void sig_handler(int sig)
     case SIGTERM:
     case SIGUSR2:
         qconf_thread_exit();
-        qconf_agent_destroy();
-        exit(0);
+        //qconf_agent_destroy();
+        //exit(0);
+        break;
     case SIGHUP:
         break;
     case SIGUSR1:

agent/qconf_cmd.cc

@@ -7,6 +7,7 @@
 #include <dirent.h>
 #include <stdlib.h>
 #include <sys/stat.h>
+#include <sys/ipc.h>
 
 #include <vector>