.......... [ZBX-11422] updated to the latest trunk

47 files changed, 98 insertions, 101 deletions

diff --git a/include/alias.h b/include/alias.h
index bb8bec43269..5b5ef69c6f9 100644
--- a/include/alias.h
+++ b/include/alias.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/base64.h b/include/base64.h
index 58c04ba3029..f731fd45c1d 100644
--- a/include/base64.h
+++ b/include/base64.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/cfg.h b/include/cfg.h
index 3461cbad227..02a2cada622 100644
--- a/include/cfg.h
+++ b/include/cfg.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/common.h b/include/common.h
index 200dc0db6bd..d0c4bc7e4e4 100644
--- a/include/common.h
+++ b/include/common.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
@@ -497,6 +497,40 @@ zbx_group_status_type_t;
 #define ZBX_PROGRAM_TYPE_GET		0x20
 const char	*get_program_type_string(unsigned char program_type);
 
+/* process type */
+#define ZBX_PROCESS_TYPE_POLLER		0
+#define ZBX_PROCESS_TYPE_UNREACHABLE	1
+#define ZBX_PROCESS_TYPE_IPMIPOLLER	2
+#define ZBX_PROCESS_TYPE_PINGER		3
+#define ZBX_PROCESS_TYPE_JAVAPOLLER	4
+#define ZBX_PROCESS_TYPE_HTTPPOLLER	5
+#define ZBX_PROCESS_TYPE_TRAPPER	6
+#define ZBX_PROCESS_TYPE_SNMPTRAPPER	7
+#define ZBX_PROCESS_TYPE_PROXYPOLLER	8
+#define ZBX_PROCESS_TYPE_ESCALATOR	9
+#define ZBX_PROCESS_TYPE_HISTSYNCER	10
+#define ZBX_PROCESS_TYPE_DISCOVERER	11
+#define ZBX_PROCESS_TYPE_ALERTER	12
+#define ZBX_PROCESS_TYPE_TIMER		13
+#define ZBX_PROCESS_TYPE_HOUSEKEEPER	14
+#define ZBX_PROCESS_TYPE_DATASENDER	15
+#define ZBX_PROCESS_TYPE_CONFSYNCER	16
+#define ZBX_PROCESS_TYPE_HEARTBEAT	17
+#define ZBX_PROCESS_TYPE_SELFMON	18
+#define ZBX_PROCESS_TYPE_VMWARE		19
+#define ZBX_PROCESS_TYPE_COLLECTOR	20
+#define ZBX_PROCESS_TYPE_LISTENER	21
+#define ZBX_PROCESS_TYPE_ACTIVE_CHECKS	22
+#define ZBX_PROCESS_TYPE_TASKMANAGER	23
+#define ZBX_PROCESS_TYPE_IPMIMANAGER	24
+#define ZBX_PROCESS_TYPE_ALERTMANAGER	25
+#define ZBX_PROCESS_TYPE_PREPROCMAN	26
+#define ZBX_PROCESS_TYPE_PREPROCESSOR	27
+#define ZBX_PROCESS_TYPE_COUNT		28	/* number of process types */
+#define ZBX_PROCESS_TYPE_UNKNOWN	255
+const char	*get_process_type_string(unsigned char process_type);
+int		get_process_type_by_name(const char *proc_type_str);
+
 /* maintenance */
 typedef enum
 {
diff --git a/include/comms.h b/include/comms.h
index 657e4a130ae..f0c8ffa3ed6 100644
--- a/include/comms.h
+++ b/include/comms.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/daemon.h b/include/daemon.h
index 0205234c8ed..eb6e8d39a07 100644
--- a/include/daemon.h
+++ b/include/daemon.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
@@ -32,6 +32,7 @@ int	daemon_start(int allow_root, const char *user, unsigned int flags);
 void	daemon_stop(void);
 
 int	zbx_sigusr_send(int flags);
+void	zbx_set_sigusr_handler(void (*handler)(int flags));
 
 #define ZBX_IS_RUNNING()	1
 #define ZBX_DO_EXIT()
diff --git a/include/db.h b/include/db.h
index ba9bc9780d5..6658dc4eb2a 100644
--- a/include/db.h
+++ b/include/db.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/dbcache.h b/include/dbcache.h
index 467ff01fd37..95bf4e43113 100644
--- a/include/dbcache.h
+++ b/include/dbcache.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/dbschema.h b/include/dbschema.h
index 279f7a0c630..0a41c8b97b3 100644
--- a/include/dbschema.h
+++ b/include/dbschema.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/discovery.h b/include/discovery.h
index fffccea3d7b..e7c61068826 100644
--- a/include/discovery.h
+++ b/include/discovery.h
@@ -1,7 +1,7 @@
 
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/disk.h b/include/disk.h
index 1b11c6a9289..9d370d8afcf 100644
--- a/include/disk.h
+++ b/include/disk.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/ipc.h b/include/ipc.h
index b1fcefeadee..46b5b525ae2 100644
--- a/include/ipc.h
+++ b/include/ipc.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/log.h b/include/log.h
index dc6e9084fde..5857cf604a0 100644
--- a/include/log.h
+++ b/include/log.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/memalloc.h b/include/memalloc.h
index 3130bcca4bd..f6f760e4cf4 100644
--- a/include/memalloc.h
+++ b/include/memalloc.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/module.h b/include/module.h
index a7e7d872318..58bddb6b8e6 100644
--- a/include/module.h
+++ b/include/module.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/mutexs.h b/include/mutexs.h
index 7df360107eb..c227ff4ac17 100644
--- a/include/mutexs.h
+++ b/include/mutexs.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/perfmon.h b/include/perfmon.h
index 300bf4f9c96..ba9c303ddba 100644
--- a/include/perfmon.h
+++ b/include/perfmon.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/pid.h b/include/pid.h
index d031c014b0a..cdff9b72c44 100644
--- a/include/pid.h
+++ b/include/pid.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/preproc.h b/include/preproc.h
index 6c52c63dd1d..9c633af9ffb 100644
--- a/include/preproc.h
+++ b/include/preproc.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/proxy.h b/include/proxy.h
index 5679cdc1eef..386b559dd18 100644
--- a/include/proxy.h
+++ b/include/proxy.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/service.h b/include/service.h
index 8e3c8f2b8b0..5f3da0f4d32 100644
--- a/include/service.h
+++ b/include/service.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/setproctitle.h b/include/setproctitle.h
index ff0b23bb09d..a3735f744e8 100644
--- a/include/setproctitle.h
+++ b/include/setproctitle.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/sighandler.h b/include/sighandler.h
index 09ec23193c8..daf02678c32 100644
--- a/include/sighandler.h
+++ b/include/sighandler.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/symbols.h b/include/symbols.h
index 7f292442cd7..72ac1a8f8a4 100644
--- a/include/symbols.h
+++ b/include/symbols.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/sysinc.h b/include/sysinc.h
index 7e75f9420a0..b05bd106af1 100644
--- a/include/sysinc.h
+++ b/include/sysinc.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/sysinfo.h b/include/sysinfo.h
index 233f32402b6..126c4814750 100644
--- a/include/sysinfo.h
+++ b/include/sysinfo.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/telnet.h b/include/telnet.h
index 49ca1d9cee3..1550b3ce278 100644
--- a/include/telnet.h
+++ b/include/telnet.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/threads.h b/include/threads.h
index e1a7f8e8538..9bc0812b499 100644
--- a/include/threads.h
+++ b/include/threads.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/version.h b/include/version.h
index 8ba51d65734..d5df34fc871 100644
--- a/include/version.h
+++ b/include/version.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
@@ -24,12 +24,12 @@
 #define ZBX_STR(str)	ZBX_STR2(str)
 
 #define APPLICATION_NAME	"Zabbix Agent"
-#define ZABBIX_REVDATE		"20 December 2017"
+#define ZABBIX_REVDATE		"8 January 2018"
 #define ZABBIX_VERSION_MAJOR	4
 #define ZABBIX_VERSION_MINOR	0
 #define ZABBIX_VERSION_PATCH	0
 #define ZABBIX_VERSION_REVISION	{ZABBIX_REVISION}
-#define ZABBIX_VERSION_RC	"alpha2"
+#define ZABBIX_VERSION_RC	"alpha3"
 #define ZABBIX_VERSION		ZBX_STR(ZABBIX_VERSION_MAJOR) "." ZBX_STR(ZABBIX_VERSION_MINOR) "." \
 				ZBX_STR(ZABBIX_VERSION_PATCH) ZABBIX_VERSION_RC
 #define ZABBIX_REVISION		ZBX_STR(ZABBIX_VERSION_REVISION)
diff --git a/include/zbxalgo.h b/include/zbxalgo.h
index fca1228a3e6..181cead1766 100644
--- a/include/zbxalgo.h
+++ b/include/zbxalgo.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxdb.h b/include/zbxdb.h
index e95d6f977cf..03cbedbd7ff 100644
--- a/include/zbxdb.h
+++ b/include/zbxdb.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxdbupgrade.h b/include/zbxdbupgrade.h
index 204155f7b8c..79570363600 100644
--- a/include/zbxdbupgrade.h
+++ b/include/zbxdbupgrade.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxexec.h b/include/zbxexec.h
index 336a0fedffd..17df089a6fa 100644
--- a/include/zbxexec.h
+++ b/include/zbxexec.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxhistory.h b/include/zbxhistory.h
index 940911d1b74..f995865aa88 100644
--- a/include/zbxhistory.h
+++ b/include/zbxhistory.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxhttp.h b/include/zbxhttp.h
index e46aa08b09b..db2c7c45858 100644
--- a/include/zbxhttp.h
+++ b/include/zbxhttp.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxicmpping.h b/include/zbxicmpping.h
index 5c29f464789..41a7fabd564 100644
--- a/include/zbxicmpping.h
+++ b/include/zbxicmpping.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxipcservice.h b/include/zbxipcservice.h
index 826dccde070..87e5f366e38 100644
--- a/include/zbxipcservice.h
+++ b/include/zbxipcservice.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxjson.h b/include/zbxjson.h
index 06e9497caa6..22ad4f7a6df 100644
--- a/include/zbxjson.h
+++ b/include/zbxjson.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxmedia.h b/include/zbxmedia.h
index 7562a5f824c..a2765316019 100644
--- a/include/zbxmedia.h
+++ b/include/zbxmedia.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxmodules.h b/include/zbxmodules.h
index e3b28d33c6f..74c77239f4e 100644
--- a/include/zbxmodules.h
+++ b/include/zbxmodules.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxnix.h b/include/zbxnix.h
index cba7e2b5299..ad494f21920 100644
--- a/include/zbxnix.h
+++ b/include/zbxnix.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxregexp.h b/include/zbxregexp.h
index 34a7fa32e1f..651c714a5fd 100644
--- a/include/zbxregexp.h
+++ b/include/zbxregexp.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxself.h b/include/zbxself.h
index 5dd71302f00..a165a27a76b 100644
--- a/include/zbxself.h
+++ b/include/zbxself.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
@@ -20,44 +20,9 @@
 #ifndef ZABBIX_ZBXSELF_H
 #define ZABBIX_ZBXSELF_H
 
-#define ZBX_PROCESS_STATE_IDLE			0
-#define ZBX_PROCESS_STATE_BUSY			1
-#define ZBX_PROCESS_STATE_COUNT			2	/* number of process states */
-
-#define ZBX_PROCESS_TYPE_POLLER		0
-#define ZBX_PROCESS_TYPE_UNREACHABLE	1
-#define ZBX_PROCESS_TYPE_IPMIPOLLER	2
-#define ZBX_PROCESS_TYPE_PINGER		3
-#define ZBX_PROCESS_TYPE_JAVAPOLLER	4
-#define ZBX_PROCESS_TYPE_HTTPPOLLER	5
-#define ZBX_PROCESS_TYPE_TRAPPER	6
-#define ZBX_PROCESS_TYPE_SNMPTRAPPER	7
-#define ZBX_PROCESS_TYPE_PROXYPOLLER	8
-#define ZBX_PROCESS_TYPE_ESCALATOR	9
-#define ZBX_PROCESS_TYPE_HISTSYNCER	10
-#define ZBX_PROCESS_TYPE_DISCOVERER	11
-#define ZBX_PROCESS_TYPE_ALERTER	12
-#define ZBX_PROCESS_TYPE_TIMER		13
-#define ZBX_PROCESS_TYPE_HOUSEKEEPER	14
-#define ZBX_PROCESS_TYPE_DATASENDER	15
-#define ZBX_PROCESS_TYPE_CONFSYNCER	16
-#define ZBX_PROCESS_TYPE_HEARTBEAT	17
-#define ZBX_PROCESS_TYPE_SELFMON	18
-#define ZBX_PROCESS_TYPE_VMWARE		19
-#define ZBX_PROCESS_TYPE_COLLECTOR	20
-#define ZBX_PROCESS_TYPE_LISTENER	21
-#define ZBX_PROCESS_TYPE_ACTIVE_CHECKS	22
-#define ZBX_PROCESS_TYPE_TASKMANAGER	23
-#define ZBX_PROCESS_TYPE_IPMIMANAGER	24
-#define ZBX_PROCESS_TYPE_ALERTMANAGER	25
-#define ZBX_PROCESS_TYPE_PREPROCMAN	26
-#define ZBX_PROCESS_TYPE_PREPROCESSOR	27
-#define ZBX_PROCESS_TYPE_COUNT		28	/* number of process types */
-#define ZBX_PROCESS_TYPE_UNKNOWN	255
-
-#define ZBX_RTC_LOG_SCOPE_FLAG		0x80
-#define ZBX_RTC_LOG_SCOPE_PROC		0
-#define ZBX_RTC_LOG_SCOPE_PID		1
+#define ZBX_PROCESS_STATE_IDLE		0
+#define ZBX_PROCESS_STATE_BUSY		1
+#define ZBX_PROCESS_STATE_COUNT		2	/* number of process states */
 
 #define ZBX_AGGR_FUNC_ONE		0
 #define ZBX_AGGR_FUNC_AVG		1
@@ -66,22 +31,19 @@
 
 #define ZBX_SELFMON_DELAY		1
 
-int		get_process_type_by_name(const char *proc_type_str);
-int		get_process_type_forks(unsigned char process_type);
-const char	*get_process_type_string(unsigned char process_type);
+int	get_process_type_forks(unsigned char process_type);
 
 #ifndef _WINDOWS
-int		init_selfmon_collector(char **error);
-void		free_selfmon_collector(void);
-void		update_selfmon_counter(unsigned char state);
-void		collect_selfmon_stats(void);
-void		get_selfmon_stats(unsigned char process_type, unsigned char aggr_func, int process_num,
-			unsigned char state, double *value);
-void		zbx_sleep_loop(int sleeptime);
-void		zbx_sleep_forever(void);
-void		zbx_wakeup(void);
-int		zbx_sleep_get_remainder(void);
-void		zbx_set_sigusr_handler(void (*handler)(int flags));
+int	init_selfmon_collector(char **error);
+void	free_selfmon_collector(void);
+void	update_selfmon_counter(unsigned char state);
+void	collect_selfmon_stats(void);
+void	get_selfmon_stats(unsigned char process_type, unsigned char aggr_func, int process_num,
+		unsigned char state, double *value);
+void	zbx_sleep_loop(int sleeptime);
+void	zbx_sleep_forever(void);
+void	zbx_wakeup(void);
+int	zbx_sleep_get_remainder(void);
 #endif
 
 #endif	/* ZABBIX_ZBXSELF_H */
diff --git a/include/zbxserialize.h b/include/zbxserialize.h
index 5af9212d6dc..35167a2ad38 100644
--- a/include/zbxserialize.h
+++ b/include/zbxserialize.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxserver.h b/include/zbxserver.h
index ddf80ae0cf9..5a1da4675de 100644
--- a/include/zbxserver.h
+++ b/include/zbxserver.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxtasks.h b/include/zbxtasks.h
index bddee908fba..aaf1a300a82 100644
--- a/include/zbxtasks.h
+++ b/include/zbxtasks.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxtypes.h b/include/zbxtypes.h
index 7ff09649abf..afc8d46afa1 100644
--- a/include/zbxtypes.h
+++ b/include/zbxtypes.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
+** Copyright (C) 2001-2018 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by