1.由于郭海龙修改了提供的库,导致增加了大量南瑞的头文件, 所以新建include目录用于存放所有的南瑞提供的同文件。 2. 修复sys_nicmonitor进程重启后,调用接口告警问题。 3. 增加USER_NUSP宏,用于nusp用户。 4. 由于新增了许多头文件且需交接给郭海龙,所以独立了一版2.0版本以用于区分。 修改: code/README 新文件: code/dep/42/dotconf#1.0.13-1.pkg.tar.gz 新文件: code/dep/42/run.sh 新文件: code/dep/90/libdotconf-dev_1.3-0.2_amd64.deb 新文件: code/dep/90/libdotconf-dev_1.3-0.2_arm64.deb 新文件: code/dep/90/libdotconf0_1.3-0.2_amd64.deb 新文件: code/dep/90/libdotconf0_1.3-0.2_arm64.deb 新文件: code/dep/90/run.sh 新文件: code/dep/libproc_common.so 新文件: code/dep/old/libman.so 新文件: code/dep/proc_common.cpp 新文件: code/sys_nicmonitor-code.tar.gz 修改: code/sys_nicmonitor/Makefile 修改: code/sys_nicmonitor/README 新文件: code/sys_nicmonitor/include/common_types.h 新文件: code/sys_nicmonitor/include/d5000_err.h 新文件: code/sys_nicmonitor/include/db_api/DeleteRecorder.h 新文件: code/sys_nicmonitor/include/db_api/codb_net.h 新文件: code/sys_nicmonitor/include/db_api/mc_rtdb_m.h 新文件: code/sys_nicmonitor/include/db_api/mc_rtdb_mng.h 新文件: code/sys_nicmonitor/include/db_api/odb_apinet.h 新文件: code/sys_nicmonitor/include/db_api/odb_apinet_rtdb_key.h 新文件: code/sys_nicmonitor/include/db_api/odb_apiop.h 新文件: code/sys_nicmonitor/include/db_api/odb_apiop.h.old 新文件: code/sys_nicmonitor/include/db_api/odb_app2id.h 新文件: code/sys_nicmonitor/include/db_api/odb_autolock.h 新文件: code/sys_nicmonitor/include/db_api/odb_baseindex.h 新文件: code/sys_nicmonitor/include/db_api/odb_ckeymanager.h 新文件: code/sys_nicmonitor/include/db_api/odb_common.h 新文件: code/sys_nicmonitor/include/db_api/odb_define.h 新文件: code/sys_nicmonitor/include/db_api/odb_double_overflow_hashindex.h 新文件: code/sys_nicmonitor/include/db_api/odb_field.h 新文件: code/sys_nicmonitor/include/db_api/odb_hashindex.h 新文件: code/sys_nicmonitor/include/db_api/odb_hashpk.h 新文件: code/sys_nicmonitor/include/db_api/odb_intel_ptr.h 新文件: code/sys_nicmonitor/include/db_api/odb_lock.h 新文件: code/sys_nicmonitor/include/db_api/odb_net.h 新文件: code/sys_nicmonitor/include/db_api/odb_net_m.h 新文件: code/sys_nicmonitor/include/db_api/odb_netfactory.h 新文件: code/sys_nicmonitor/include/db_api/odb_nooverflow_pk.h 新文件: code/sys_nicmonitor/include/db_api/odb_orbmgr.h 新文件: code/sys_nicmonitor/include/db_api/odb_profile.h 新文件: code/sys_nicmonitor/include/db_api/odb_prv_struct.h 新文件: code/sys_nicmonitor/include/db_api/odb_public.h 新文件: code/sys_nicmonitor/include/db_api/odb_rtdbbase.h 新文件: code/sys_nicmonitor/include/db_api/odb_rtdbfactory.h 新文件: code/sys_nicmonitor/include/db_api/odb_rtdbop.h 新文件: code/sys_nicmonitor/include/db_api/odb_rtdbtable.h 新文件: code/sys_nicmonitor/include/db_api/odb_struct.h 新文件: code/sys_nicmonitor/include/db_api/odb_system.h 新文件: code/sys_nicmonitor/include/db_api/odb_table.h 新文件: code/sys_nicmonitor/include/db_api/odb_tablebase.h 新文件: code/sys_nicmonitor/include/db_api/odb_tablemgr.h 新文件: code/sys_nicmonitor/include/db_api/odb_tablenet.h 新文件: code/sys_nicmonitor/include/db_api/odb_tableop.h 新文件: code/sys_nicmonitor/include/db_api/odb_where.h 新文件: code/sys_nicmonitor/include/db_api/pub_buf.h 新文件: code/sys_nicmonitor/include/db_api/rtdb_graph_name_list.h 新文件: code/sys_nicmonitor/include/db_api/server2proto.h 新文件: code/sys_nicmonitor/include/db_api/tab2idx.h 新文件: code/sys_nicmonitor/include/db_api/vl_get_data.h 新文件: code/sys_nicmonitor/include/db_api/vl_struct.h 新文件: code/sys_nicmonitor/include/db_api/vl_struct_m.cpp 新文件: code/sys_nicmonitor/include/db_api/vl_struct_m.h 新文件: code/sys_nicmonitor/include/db_com/CAppNo.h 新文件: code/sys_nicmonitor/include/db_com/CCharArray.h 新文件: code/sys_nicmonitor/include/db_com/CDataStream.h 新文件: code/sys_nicmonitor/include/db_com/CDbCommitClient.h 新文件: code/sys_nicmonitor/include/db_com/CDbMonitorClient.h 新文件: code/sys_nicmonitor/include/db_com/CDbMonitorLocal.h 新文件: code/sys_nicmonitor/include/db_com/CDbMonitorShm.h 新文件: code/sys_nicmonitor/include/db_com/CDbRepSet.h 新文件: code/sys_nicmonitor/include/db_com/CDbSem.h 新文件: code/sys_nicmonitor/include/db_com/CDbSemUse.h 新文件: code/sys_nicmonitor/include/db_com/CDbShm.h 新文件: code/sys_nicmonitor/include/db_com/CDyCfgLocal.h 新文件: code/sys_nicmonitor/include/db_com/CDyCommitClient.h 新文件: code/sys_nicmonitor/include/db_com/CDyMonitorClient.h 新文件: code/sys_nicmonitor/include/db_com/CDyMonitorLocal.h 新文件: code/sys_nicmonitor/include/db_com/CDyMonitorShm.h 新文件: code/sys_nicmonitor/include/db_com/CDySem.h 新文件: code/sys_nicmonitor/include/db_com/CDySemUse.h 新文件: code/sys_nicmonitor/include/db_com/CDyShm.h 新文件: code/sys_nicmonitor/include/db_com/CDyTagShmInfo.h 新文件: code/sys_nicmonitor/include/db_com/CErrorLog.h 新文件: code/sys_nicmonitor/include/db_com/CFindFile.h 新文件: code/sys_nicmonitor/include/db_com/CPrecTime.h 新文件: code/sys_nicmonitor/include/db_com/CRecordSet.h 新文件: code/sys_nicmonitor/include/db_com/CRedisAccess.h 新文件: code/sys_nicmonitor/include/db_com/CRepSet.h 新文件: code/sys_nicmonitor/include/db_com/CSaveReCommitSql.h 新文件: code/sys_nicmonitor/include/db_com/CSqlResultAlign.h 新文件: code/sys_nicmonitor/include/db_com/CSqlResultAlignClient.h 新文件: code/sys_nicmonitor/include/db_com/CSqlResultAlignClient2.h 新文件: code/sys_nicmonitor/include/db_com/DBAccess.h 新文件: code/sys_nicmonitor/include/db_com/DBCipher.h 新文件: code/sys_nicmonitor/include/db_com/DBConnectPool.h 新文件: code/sys_nicmonitor/include/db_com/DbFileNetIf.h 新文件: code/sys_nicmonitor/include/db_com/Hbase.h 新文件: code/sys_nicmonitor/include/db_com/Hbase_constants.h 新文件: code/sys_nicmonitor/include/db_com/Hbase_types.h 新文件: code/sys_nicmonitor/include/db_com/MyMutex.h 新文件: code/sys_nicmonitor/include/db_com/cross_region_sync_client.h 新文件: code/sys_nicmonitor/include/db_com/database_rep_m.h 新文件: code/sys_nicmonitor/include/db_com/db_commit_define.h 新文件: code/sys_nicmonitor/include/db_com/db_commit_m.h 新文件: code/sys_nicmonitor/include/db_com/db_error_define.h 新文件: code/sys_nicmonitor/include/db_com/db_extern.h 新文件: code/sys_nicmonitor/include/db_com/db_global.h 新文件: code/sys_nicmonitor/include/db_com/db_micro_define.h 新文件: code/sys_nicmonitor/include/db_com/db_monitor_define.h 新文件: code/sys_nicmonitor/include/db_com/db_monitor_define.h.old 新文件: code/sys_nicmonitor/include/db_com/db_monitor_extern.h 新文件: code/sys_nicmonitor/include/db_com/db_monitor_global.h 新文件: code/sys_nicmonitor/include/db_com/db_monitor_m.h 新文件: code/sys_nicmonitor/include/db_com/db_monitor_m.h.old 新文件: code/sys_nicmonitor/include/db_com/db_rep_lib_define.h 新文件: code/sys_nicmonitor/include/db_com/db_stat_m.h 新文件: code/sys_nicmonitor/include/db_com/db_stat_service_interface.h 新文件: code/sys_nicmonitor/include/db_com/ds_log.h 新文件: code/sys_nicmonitor/include/db_com/dy_commit_m.h 新文件: code/sys_nicmonitor/include/db_com/dy_monitor_define.h 新文件: code/sys_nicmonitor/include/db_com/dy_monitor_m.h 新文件: code/sys_nicmonitor/include/db_com/dy_public_m.h 新文件: code/sys_nicmonitor/include/db_com/dy_sample_define_m.h 新文件: code/sys_nicmonitor/include/db_com/dy_sample_define_service_interface.h 新文件: code/sys_nicmonitor/include/db_com/dy_stat_m.h 新文件: code/sys_nicmonitor/include/db_com/dy_stat_service_interface.h 新文件: code/sys_nicmonitor/include/db_com/hiredis.h 新文件: code/sys_nicmonitor/include/db_com/interpreter_define.h 新文件: code/sys_nicmonitor/include/db_com/interpreter_struct.h 新文件: code/sys_nicmonitor/include/db_com/lexical_anls.h 新文件: code/sys_nicmonitor/include/db_com/public_m.h 新文件: code/sys_nicmonitor/include/db_com/query_sample_m.h 新文件: code/sys_nicmonitor/include/db_com/query_sample_pi.h 新文件: code/sys_nicmonitor/include/db_com/query_sample_pi_m.h 新文件: code/sys_nicmonitor/include/db_com/query_sample_service_interface.h 新文件: code/sys_nicmonitor/include/db_com/query_sample_service_pi_interface.h 新文件: code/sys_nicmonitor/include/db_com/query_stat_m.h 新文件: code/sys_nicmonitor/include/db_com/query_stat_service_interface.h 新文件: code/sys_nicmonitor/include/db_com/rdb_commit_client.h 新文件: code/sys_nicmonitor/include/db_com/rdb_commit_m.h 新文件: code/sys_nicmonitor/include/db_com/rdb_define.pb.h 新文件: code/sys_nicmonitor/include/db_com/read.h 新文件: code/sys_nicmonitor/include/db_com/rtdbkey_defs.h 新文件: code/sys_nicmonitor/include/db_com/sample_data_client_base.h 新文件: code/sys_nicmonitor/include/db_com/sample_data_m.h 新文件: code/sys_nicmonitor/include/db_com/sample_define_m.h 新文件: code/sys_nicmonitor/include/db_com/sample_define_service_interface.h 新文件: code/sys_nicmonitor/include/db_com/sample_modify_m.h 新文件: code/sys_nicmonitor/include/db_com/sample_modify_service_interface.h 新文件: code/sys_nicmonitor/include/db_com/sds.h 新文件: code/sys_nicmonitor/include/db_com/server_define.h 新文件: code/sys_nicmonitor/include/db_com/sheetdataclient.h 新文件: code/sys_nicmonitor/include/db_com/sheetdataclient.h0604 新文件: code/sys_nicmonitor/include/db_com/sql_sp_client_base.h 新文件: code/sys_nicmonitor/include/db_com/sql_sp_define.h 新文件: code/sys_nicmonitor/include/db_com/sql_sp_m.h 新文件: code/sys_nicmonitor/include/db_com/sql_sp_send_client_base.h 新文件: code/sys_nicmonitor/include/db_com/sql_syntax_anls.h 新文件: code/sys_nicmonitor/include/db_com/sql_to_cime.h 新文件: code/sys_nicmonitor/include/db_com/sqlite_access.h 新文件: code/sys_nicmonitor/include/db_com/sqlite_server_client.h 新文件: code/sys_nicmonitor/include/db_com/sqlite_srv_m.h 新文件: code/sys_nicmonitor/include/db_com/store_access_client.h 新文件: code/sys_nicmonitor/include/db_com/trigger_sample_m.h 新文件: code/sys_nicmonitor/include/db_com/trigger_sample_service_interface.h 新文件: code/sys_nicmonitor/include/db_com/wholepubtools.h 新文件: code/sys_nicmonitor/include/db_com/wholesampledata.h 新文件: code/sys_nicmonitor/include/db_com/wholesqlsp.h 新文件: code/sys_nicmonitor/include/log_api.h 新文件: code/sys_nicmonitor/include/log_define.h 新文件: code/sys_nicmonitor/include/logclient.h 新文件: code/sys_nicmonitor/include/port_def.h 新文件: code/sys_nicmonitor/include/proc_common.h 新文件: code/sys_nicmonitor/include/scn_common.h 新文件: code/sys_nicmonitor/include/sysadm/proc_define.h 新文件: code/sys_nicmonitor/include/sysadm/scn_define.h 新文件: code/sys_nicmonitor/include/system.h 修改: code/sys_nicmonitor/mnic.c 修改: code/sys_nicmonitor/nicinfo_shm.c 修改: code/sys_nicmonitor/test.c 修改: code/sys_nicmonitor/version.h 新文件: code/test/test_nic 新文件: code/test/test_nic.cpp 新文件: packages/sys_nicmonitor-2.0-linx90-aarch64-bin-d5000.tar.gz 新文件: packages/sys_nicmonitor-2.0-linx90-aarch64-bin-nusp.tar.gz 新文件: packages/sys_nicmonitor-2.0-linx90-x86_64-bin-d5000.tar.gz 新文件: packages/sys_nicmonitor-2.0-linx90-x86_64-bin-nusp.tar.gz 重命名: sys_nicmonitor-arm-bin.tar.gz -> packages/sys_nicmonitor-arm-bin.tar.gz 重命名: sys_nicmonitor-arm.tar.gz -> packages/sys_nicmonitor-arm.tar.gz 新文件: packages/sys_nicmonitor-mips64-bin.tar.gz 新文件: packages/sys_nicmonitor-mips64.tar.gz Signed-off-by: Wei, Jing <jwei@linx-info.com>
152 lines
5.2 KiB
C++
152 lines
5.2 KiB
C++
/*********************************************************************
|
||
*Copyright(c) 2018,国电南瑞科技股份公司
|
||
*All rights reserved.
|
||
*
|
||
*Filename:
|
||
proc_common.h
|
||
*Modulename:
|
||
libproc_common.so
|
||
*Description:
|
||
proc manager
|
||
*Author:
|
||
chenboyu guwenjie
|
||
*Date Version Description of modification
|
||
====================================================================
|
||
*2018/08/20 1.0 Create
|
||
*2018/11/12 1.1 modify
|
||
********************************************************************/
|
||
|
||
#ifndef _PROC_COMMON_H_
|
||
#define _PROC_COMMON_H_
|
||
|
||
#ifndef _WINDOWS64
|
||
#include "sysadm/proc_define.h"
|
||
#endif
|
||
|
||
#include <vector>
|
||
using std::vector;
|
||
|
||
namespace NS_SYSADMIN
|
||
{
|
||
|
||
#ifndef _WINDOWS64
|
||
struct ProcAdmInfo
|
||
{
|
||
char scn_name[SCN_MAX_NAME_LEN];//场景名
|
||
char subscn_name[SCN_MAX_NAME_LEN];//子场景名
|
||
char label[Length::StringLen];//标识
|
||
int scn_id;//场景号
|
||
int subscn_id;//子场景号
|
||
int scn_inst;//场景实例号
|
||
int subscn_inst;//子场景实例号
|
||
char subscn_label[Length::StringLen];//子场景标识,为了扩展用
|
||
char proc_name[Length:: NameLen];//进程名
|
||
pid_t proc_pid;//进程号
|
||
char cmd[Length::SentenceLen];
|
||
|
||
public:
|
||
int copyFrom(ProcessInfo proc)
|
||
{
|
||
strcpy(scn_name,proc.m_scn_name);
|
||
strcpy(subscn_name,proc.m_subscn_name);
|
||
strcpy(label,proc.m_scn_label);
|
||
scn_id=proc.m_scn_id;
|
||
subscn_id=proc.m_subscn_id;
|
||
scn_inst=proc.m_scn_inst;
|
||
subscn_inst=proc.m_subscn_inst;
|
||
strcpy(subscn_label,proc.m_scn_label);
|
||
strcpy(proc_name,proc.m_process_name);
|
||
proc_pid=proc.m_process_id;
|
||
strcpy(cmd,proc.m_cmd);
|
||
return 1;
|
||
}
|
||
bool scn_match(int tmp_scn_id,int tmp_subscn_id,int tmp_scn_inst,int tmp_subscn_inst)
|
||
{
|
||
return ((tmp_scn_id == scn_id) && (tmp_subscn_id == subscn_id) && (tmp_scn_inst == scn_inst) && (tmp_subscn_inst== subscn_inst));
|
||
|
||
}
|
||
|
||
};
|
||
#endif
|
||
|
||
class CProcCommonImpl;
|
||
|
||
|
||
#ifdef _WINDOWS64
|
||
#ifdef PROC_COMMON_EXPORTS
|
||
#define PROC_COMMON_API __declspec(dllexport)
|
||
#else
|
||
#define PROC_COMMON_API __declspec(dllimport)
|
||
#endif
|
||
#else
|
||
#define PROC_COMMON_API
|
||
#endif
|
||
|
||
class PROC_COMMON_API CProcCommon
|
||
{
|
||
public:
|
||
CProcCommon (int rw = 1);
|
||
~CProcCommon();
|
||
#ifndef _WINDOWS64
|
||
//一下4个running接口 -1:not running, 1:running
|
||
int is_proc_running(const int proc_id);
|
||
int is_proc_running(const char* cmd);//返回的是此cmd在运行的个数,要注意
|
||
int is_proc_running(ProcessInfo& proc_info);
|
||
int is_proc_running(int scn_id, int scn_inst,int subscn_id,int subscn_inst, char* process_name,pid_t & proc_id);
|
||
int proc_init (int scn_id, int subscn_id, char* process_name, int scn_inst = 1,int subscn_inst = 1);
|
||
int proc_init (const char* scn_name, const char* subscn_name,
|
||
char* process_name, const char* label = NULL, const char* subscn_lable = NULL);
|
||
int proc_init (const char* scn_name, const char* subscn_name,
|
||
char* process_name, int subscn_inst, int scn_inst = 1, const char* label = NULL,
|
||
const char* subscn_lable = NULL);
|
||
|
||
int proc_init (long cluster_id, int task_id, int number_no, char* process_name,long container_id = 0);
|
||
int proc_init (char* process_name,long container_id); //必须容器中进程使用,container_id不能为0
|
||
int proc_insert (ProcessInfo& proc_info);
|
||
int proc_insert (char* process_name, long container_id);
|
||
int proc_insert (int info_nums,vector<struct ProcessInfo>& proc_infos);
|
||
int proc_get (vector<struct ProcAdmInfo>& proc_info);
|
||
int proc_get (vector<ProcessInfo>& proc_info);
|
||
int proc_get (long container_id, vector<ProcessInfo>& proc_info);
|
||
int proc_get(char *process_name,long container_id,ProcessInfo& proc_info);
|
||
int proc_get(int scn_id, int scn_inst,int subscn_id,int subscn_inst,vector<struct ProcAdmInfo>& proc_info);
|
||
int proc_get(int scn_id, int scn_inst,int subscn_id,int subscn_inst,char* process_name, long container_id,ProcessInfo& proc_info);
|
||
int proc_get(int position,ProcAdmInfo& proc_info);
|
||
int proc_get(int position,struct ProcessInfo& proc_info);
|
||
int proc_update (char* process_name, long container_id,unsigned char run_status);
|
||
int proc_update (char* process_name, long container_id, ProcessInfo& proc_info);
|
||
int proc_update(int scn_id, int scn_inst,int subscn_id,int subscn_inst,char* process_name,long container_id,ProcessInfo& proc_info);
|
||
int proc_update(int scn_id, int scn_inst,int subscn_id,int subscn_inst,char* process_name,unsigned char run_status);
|
||
int proc_update(ProcessInfo& proc_info,float cpu_occupy,int mem_occupy);
|
||
int proc_update(ProcessInfo& proc_info,time_t start_time);
|
||
int proc_update(ProcessInfo& proc_info,int value,int location);
|
||
int proc_shut (char* process_name, long container_id);
|
||
int proc_shut(int scn_id, int scn_inst,int subscn_id,int subscn_inst, char* process_name);
|
||
int proc_shut(int pid);
|
||
int proc_exit(int position);
|
||
int proc_report (int position,unsigned char run_status, int period);
|
||
int proc_clear_all();
|
||
int proc_show_mem();
|
||
int get_active_pid(int &num, int *pid_list);
|
||
int clear_exit_proc_info(int position);
|
||
int clear_oneproc_shm(int scn_id, int scn_inst,int subscn_id,int subscn_inst, char* process_name);
|
||
int set_procshm_check(int check_value);
|
||
int proc_add(struct ProcessInfo& proc_info);
|
||
#endif
|
||
|
||
private:
|
||
CProcCommonImpl *m_impl;
|
||
|
||
public:
|
||
//windows or linux,cmd是进程名 不是cmdline
|
||
int is_proc_running(const char *cmd,vector<int> &pid_vec);
|
||
};
|
||
|
||
}
|
||
|
||
|
||
|
||
|
||
#endif
|
||
|