X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=service%2Fprotocol-plugin%2Fplugin-manager%2Fsrc%2FFelixAdapter.h;h=c19f458ab44705361e5daba7d30a908cc4228cbf;hb=8c01dff2c5bc5496f7dc1632c498943ec6ecb015;hp=7f03f7ff33052df0e3a59a40864732c53264784a;hpb=00b3660e45c56cb3db35dc2596a054f801b5591a;p=platform%2Fupstream%2Fiotivity.git diff --git a/service/protocol-plugin/plugin-manager/src/FelixAdapter.h b/service/protocol-plugin/plugin-manager/src/FelixAdapter.h index 7f03f7f..c19f458 100644 --- a/service/protocol-plugin/plugin-manager/src/FelixAdapter.h +++ b/service/protocol-plugin/plugin-manager/src/FelixAdapter.h @@ -24,7 +24,9 @@ #ifndef __FELIXADAPTER_H__ #define __FELIXADAPTER_H__ +#ifndef DLOPEN_POSIX #define DLOPEN_POSIX +#endif #include #include @@ -32,9 +34,8 @@ #include #include #include -#include -#include #include +#include #include "Plugin.h" #include "Config.h" @@ -166,11 +167,11 @@ namespace OIC * * @return OICPluginManager pointer Address. */ - static FelixAdapter *Getinstance() + static FelixAdapter *Getinstance(void *args = NULL) { if (NULL == s_pinstance) { - s_pinstance = new FelixAdapter(); + s_pinstance = new FelixAdapter((JavaVM *)args); } return s_pinstance; @@ -179,18 +180,11 @@ namespace OIC private: + JavaVM *jvm; Config *config; typedef std::map File_list; std::vector m_plugins; - boost::thread m_file_detect_thread; - /* - cp_context_t *m_context; - cp_status_t m_status; - cp_plugin_info_t **m_cp_plugins; - cp_plugin_info_t *m_plugin; - boost::thread_group m_thread_g; - std::string m_path; - */ + static FelixAdapter *s_pinstance; /** @@ -198,7 +192,7 @@ namespace OIC * During construction time, all plugins under the root plugin path will be loaded. * */ - FelixAdapter(); + FelixAdapter(JavaVM *); /** * Virtual destructor