Skip to content

Commit

Permalink
.......... [ZBXNEXT-2732] upgraded to master
Browse files Browse the repository at this point in the history
  • Loading branch information
Aleksejs Sestakovs committed Apr 19, 2023
2 parents 80472ce + 2b84696 commit 09d86cc
Show file tree
Hide file tree
Showing 1,464 changed files with 76,814 additions and 28,581 deletions.
10 changes: 7 additions & 3 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
!/src/modules/dummy/Makefile
*.a
*.o
*.gcda
*.gcno
/tests_results
.cproject
.deps
.dirstamp
Expand Down Expand Up @@ -81,6 +84,7 @@ m4/conf_tests.m4
frontend.mo
include/common/config.h
include/common/config.h.in
include/common/stamp-h1
include/stamp-h1
misc/images/inkscape.log.txt
misc/images/pngcrush.log.txt
Expand Down Expand Up @@ -238,9 +242,9 @@ tests/libs/zbxtrends/zbx_trends_parse_range
tests/libs/zbxsysinfo/process_http
tests/zabbix_server/pinger/zbx_pinger_test
tests/zabbix_server/poller/zbx_poller_test
tests/zabbix_server/preprocessor/item_preproc_csv_to_json
tests/zabbix_server/preprocessor/item_preproc_xpath
tests/zabbix_server/preprocessor/zbx_item_preproc
tests/libs/zbxpreproc/item_preproc_csv_to_json
tests/libs/zbxpreproc/item_preproc_xpath
tests/libs/zbxpreproc/zbx_item_preproc
tests/zabbix_server/service/service_get_rootcause_eventids
tests/zabbix_server/service/service_get_main_status
tests/zabbix_server/service/service_get_rule_status
Expand Down
568 changes: 533 additions & 35 deletions ChangeLog
View file

Large diffs are not rendered by default.

54 changes: 27 additions & 27 deletions build-backend.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,21 @@
<!-- Build Zabbix with all supported databases -->
<target name="make-db" depends="make-db-mysql,make-db-postgresql,make-db-oracle"/>

<target name="clean-tests">
<exec executable="make" failonerror="on">
<arg line="-s"/>
<arg line="-j5"/>
<arg line="clean"/>
</exec>
<exec executable="make" failonerror="on">
<arg line="-s"/>
<arg line="-j5"/>
<arg line="-C"/>
<arg line="tests"/>
<arg line="clean"/>
</exec>
</target>

<macrodef name="make-tests">
<!-- Build Zabbix cmocka tests with the specified command line arguments -->
<attribute name="conf"/>
Expand All @@ -197,33 +212,15 @@
<exec executable="./configure" failonerror="on">
<arg line="@{conf}"/>
</exec>
<trycatch>
<try>
<exec executable="make" failonerror="on">
<arg line="-s"/>
<arg line="-j5"/>
<arg line="tests_build"/>
</exec>
<mkdir dir="tests_results/@{conf-name}"/>
<exec executable="tests/tests_run.pl" failonerror="off" output="tests_results/@{conf-name}/output.xml">
<arg line="-x @{conf-name}"/>
</exec>
</try>
<finally>
<exec executable="make" failonerror="on">
<arg line="-s"/>
<arg line="-j5"/>
<arg line="clean"/>
</exec>
<exec executable="make" failonerror="on">
<arg line="-s"/>
<arg line="-j5"/>
<arg line="-C"/>
<arg line="tests"/>
<arg line="clean"/>
</exec>
</finally>
</trycatch>
<exec executable="make" failonerror="on">
<arg line="-s"/>
<arg line="-j5"/>
<arg line="tests_build"/>
</exec>
<mkdir dir="tests_results/@{conf-name}"/>
<exec executable="tests/tests_run.pl" failonerror="off" output="tests_results/@{conf-name}/output.xml">
<arg line="-x @{conf-name}"/>
</exec>
</sequential>
</macrodef>

Expand All @@ -250,6 +247,7 @@
<for list="${conf.list}" param="name" delimiter=",">
<sequential>
<make-tests conf="${cmocka-@{name}}" conf-name="@{name}"/>
<antcall target="clean-tests"/>
</sequential>
</for>
</target>
Expand Down Expand Up @@ -277,6 +275,7 @@
<for list="${conf.list}" param="name" delimiter=",">
<sequential>
<make-tests conf="${cmocka-ora-@{name}}" conf-name="@{name}"/>
<antcall target="clean-tests"/>
</sequential>
</for>
</target>
Expand Down Expand Up @@ -309,6 +308,7 @@
<arg line="tests_results/html"/>
<arg line="tests_results/html/app.info"/>
</exec>
<antcall target="clean-tests"/>
</target>

<target name="make-gcc" depends="init-conf-options,init-conf-options-2">
Expand Down
17 changes: 14 additions & 3 deletions build/mingw/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,12 @@ OBJS = \
$(OUTPUTDIR)\variant.o \
$(OUTPUTDIR)\sysinfo_system.o \
$(OUTPUTDIR)\sysinfo_dns.o \
$(OUTPUTDIR)\sysinfo_file.o \
$(OUTPUTDIR)\sysinfo_vfs_file.o \
$(OUTPUTDIR)\sysinfo_dir.o \
$(OUTPUTDIR)\sysinfo_alias.o \
$(OUTPUTDIR)\eventlog.o \
$(OUTPUTDIR)\symbols.o \
$(OUTPUTDIR)\win32_file.o \
$(TARGETDIR)\resource.syso

CFLAGS := $(CFLAGS) -O2 -g -DHAVE_STDINT_H=1 -DZBX_BUILD_AGENT2=1 -DHAVE_THREAD_LOCAL=1 \
Expand Down Expand Up @@ -128,7 +130,13 @@ $(OUTPUTDIR)\str.o: $(TOPDIR)\src\libs\zbxstr\str.c
$(OUTPUTDIR)\common_str.o: $(TOPDIR)\src\libs\zbxcommon\common_str.c
$(CC) $(CFLAGS) -DUNICODE -c $^ -o $@

$(OUTPUTDIR)\file.o: $(TOPDIR)\src\libs\zbxcommon\file.c
$(OUTPUTDIR)\file.o: $(TOPDIR)\src\libs\zbxfile\file.c
$(CC) $(CFLAGS) -DUNICODE -c $^ -o $@

$(OUTPUTDIR)\symbols.o: $(TOPDIR)\src\libs\zbxwin32\symbols.c
$(CC) $(CFLAGS) -DUNICODE -c $^ -o $@

$(OUTPUTDIR)\win32_file.o: $(TOPDIR)\src\libs\zbxfile\win32\win32_file.c
$(CC) $(CFLAGS) -DUNICODE -c $^ -o $@

$(OUTPUTDIR)\time.o: $(TOPDIR)\src\libs\zbxtime\time.c
Expand Down Expand Up @@ -206,7 +214,7 @@ $(OUTPUTDIR)\sysinfo_system.o: $(TOPDIR)\src\libs\zbxsysinfo\common\system.c
$(OUTPUTDIR)\sysinfo_dns.o: $(TOPDIR)\src\libs\zbxsysinfo\common\dns.c
$(CC) $(CFLAGS) -DUNICODE -c $^ -o $@

$(OUTPUTDIR)\sysinfo_file.o: $(TOPDIR)\src\libs\zbxsysinfo\common\file.c
$(OUTPUTDIR)\sysinfo_vfs_file.o: $(TOPDIR)\src\libs\zbxsysinfo\common\vfs_file.c
$(CC) $(CFLAGS) -DUNICODE -c $^ -o $@

$(OUTPUTDIR)\sysinfo_dir.o: $(TOPDIR)\src\libs\zbxsysinfo\common\dir.c
Expand All @@ -230,6 +238,9 @@ $(OUTPUTDIR)\algodefs.o: $(TOPDIR)\src\libs\zbxalgo\algodefs.c
$(OUTPUTDIR)\zbxregexp.o: $(TOPDIR)\src\libs\zbxregexp\zbxregexp.c
$(CC) $(CFLAGS) -DUNICODE -c $^ -o $@

$(OUTPUTDIR)\active_checks.o: $(TOPDIR)\src\zabbix_agent\active_checks\active_checks.c
$(CC) $(CFLAGS) -DUNICODE -c $^ -o $@

$(OUTPUTDIR)\persistent_state.o: $(TOPDIR)\src\zabbix_agent\logfiles\persistent_state.c
$(CC) $(CFLAGS) -DUNICODE -c $^ -o $@

Expand Down
14 changes: 8 additions & 6 deletions build/win32/project/Makefile_agent
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,17 @@ OBJS = \
..\..\..\src\libs\zbxalgo\algodefs.o \
..\..\..\src\libs\zbxalgo\vector.o \
..\..\..\src\libs\zbxalgo\hashset.o \
..\..\..\src\libs\zbxcommon\comms.o \
..\..\..\src\libs\zbxcrypto\endian.o \
..\..\..\src\libs\zbxcommon\setproctitle.o \
..\..\..\src\libs\zbxip\ip.o \
..\..\..\src\libs\zbxip\iprange.o \
..\..\..\src\libs\zbxcommon\misc.o \
..\..\..\src\libs\zbxnum\num.o \
..\..\..\src\libs\zbxstr\str.o \
..\..\..\src\libs\zbxcommon\common_str.o \
..\..\..\src\libs\zbxfile\file.o \
..\..\..\src\libs\zbxfile\win32\win32_file.o \
..\..\..\src\libs\zbxparam\param.o \
..\..\..\src\libs\zbxcommon\file.o \
..\..\..\src\libs\zbxtime\time.o \
..\..\..\src\libs\zbxexpr\expr.o \
..\..\..\src\libs\zbxexpr\function.o \
Expand All @@ -71,7 +73,6 @@ OBJS = \
..\..\..\src\libs\zbxjson\jsonobj.o \
..\..\..\src\libs\zbxlog\log.o \
..\..\..\src\libs\zbxmutexs\mutexs.o \
..\..\..\src\libs\zbxsymbols\symbols.o \
..\..\..\src\libs\zbxthreads\threads.o \
..\..\..\src\libs\zbxexec\execute.o \
..\..\..\src\libs\zbxhash\zbxhash.o \
Expand All @@ -83,7 +84,7 @@ OBJS = \
..\..\..\src\libs\zbxsysinfo\common\zbxsysinfo_common.o \
..\..\..\src\libs\zbxsysinfo\common\cpu.o \
..\..\..\src\libs\zbxsysinfo\common\dir.o \
..\..\..\src\libs\zbxsysinfo\common\file.o \
..\..\..\src\libs\zbxsysinfo\common\vfs_file.o \
..\..\..\src\libs\zbxsysinfo\common\http.o \
..\..\..\src\libs\zbxsysinfo\common\http_metrics.o \
..\..\..\src\libs\zbxsysinfo\common\net.o \
Expand Down Expand Up @@ -114,7 +115,7 @@ OBJS = \
..\..\..\src\libs\zbxversion\version.o \
..\..\..\src\libs\zbxwin32\perfmon.o \
..\..\..\src\libs\zbxwinservice\service.o \
..\..\..\src\zabbix_agent\active.o \
..\..\..\src\zabbix_agent\active_checks\active_checks.o \
..\..\..\src\zabbix_agent\cpustat.o \
..\..\..\src\zabbix_agent\eventlog.o \
..\..\..\src\zabbix_agent\listener.o \
Expand All @@ -127,7 +128,8 @@ OBJS = \
..\..\..\src\libs\zbxregexp\zbxregexp.o \
..\..\..\src\libs\zbxxml\xml.o \
..\..\..\src\libs\zbxwin32\fatal.o \
..\..\..\src\libs\zbxwin32\disk.o
..\..\..\src\libs\zbxwin32\disk.o \
..\..\..\src\libs\zbxwin32\symbols.o

LIBS = ws2_32.lib psapi.lib pdh.lib Wldap32.lib advapi32.lib uuid.lib Iphlpapi.lib delayimp.lib wevtapi.lib $(LIBS)

Expand Down
3 changes: 1 addition & 2 deletions build/win32/project/Makefile_get
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ OBJS = \
..\..\..\src\libs\zbxalgo\algodefs.o \
..\..\..\src\libs\zbxalgo\vector.o \
..\..\..\src\libs\zbxalgo\hashset.o \
..\..\..\src\libs\zbxcommon\comms.o \
..\..\..\src\libs\zbxcrypto\endian.o \
..\..\..\src\libs\zbxip\ip.o \
..\..\..\src\libs\zbxip\iprange.o \
..\..\..\src\libs\zbxcommon\misc.o \
Expand Down Expand Up @@ -61,7 +61,6 @@ OBJS = \
..\..\..\src\libs\zbxjson\jsonobj.o \
..\..\..\src\libs\zbxlog\log.o \
..\..\..\src\libs\zbxmutexs\mutexs.o \
..\..\..\src\libs\zbxsymbols\symbols.o \
..\..\..\src\libs\zbxvariant\variant.o \
..\..\..\src\libs\zbxversion\version.o \
..\..\..\src\libs\zbxthreads\threads.o \
Expand Down
3 changes: 1 addition & 2 deletions build/win32/project/Makefile_sender
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ ADD_RFLAGS = /d "ZABBIX_SENDER"
OBJS = \
..\..\..\src\libs\zbxnum\num.o \
..\..\..\src\libs\zbxparam\param.o \
..\..\..\src\libs\zbxcommon\comms.o \
..\..\..\src\libs\zbxcrypto\endian.o \
..\..\..\src\libs\zbxip\ip.o \
..\..\..\src\libs\zbxip\iprange.o \
..\..\..\src\libs\zbxcommon\misc.o \
Expand Down Expand Up @@ -60,7 +60,6 @@ OBJS = \
..\..\..\src\libs\zbxjson\jsonobj.o \
..\..\..\src\libs\zbxlog\log.o \
..\..\..\src\libs\zbxmutexs\mutexs.o \
..\..\..\src\libs\zbxsymbols\symbols.o \
..\..\..\src\libs\zbxthreads\threads.o \
..\..\..\src\libs\zbxvariant\variant.o \
..\..\..\src\libs\zbxwin32\fatal.o \
Expand Down
3 changes: 1 addition & 2 deletions build/win32/project/Makefile_sender_dll
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ ADD_RFLAGS = /d "ZABBIX_SENDER"
# the main object file must be already added in master Makefile
OBJS = \
..\..\..\src\libs\zbxnum\num.o \
..\..\..\src\libs\zbxcommon\comms.o \
..\..\..\src\libs\zbxcrypto\endian.o \
..\..\..\src\libs\zbxip\ip.o \
..\..\..\src\libs\zbxip\iprange.o \
..\..\..\src\libs\zbxcommon\misc.o \
Expand Down Expand Up @@ -64,7 +64,6 @@ OBJS = \
..\..\..\src\libs\zbxjson\jsonobj.o \
..\..\..\src\libs\zbxlog\log.o \
..\..\..\src\libs\zbxmutexs\mutexs.o \
..\..\..\src\libs\zbxsymbols\symbols.o \
..\..\..\src\libs\zbxthreads\threads.o \
..\..\..\src\libs\zbxvariant\variant.o \
..\..\..\src\libs\zbxwin32\fatal.o \
Expand Down
12 changes: 9 additions & 3 deletions build/win32/project/Makefile_targets.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ $(RESOURCE_RES): $(RESOURCE_RC) $(RESOURCE_H) $(DESC_H)
{..\..\..\src\libs\zbxstr}.c{..\..\..\src\libs\zbxstr}.o:
$(CC) $? /Fo"$@" $(CFLAGS)

{..\..\..\src\libs\zbxfile}.c{..\..\..\src\libs\zbxfile}.o:
$(CC) $? /Fo"$@" $(CFLAGS)

{..\..\..\src\libs\zbxfile\win32}.c{..\..\..\src\libs\zbxfile\win32}.o:
$(CC) $? /Fo"$@" $(CFLAGS)

{..\..\..\src\libs\zbxparam}.c{..\..\..\src\libs\zbxparam}.o:
$(CC) $? /Fo"$@" $(CFLAGS)

Expand Down Expand Up @@ -79,9 +85,6 @@ $(RESOURCE_RES): $(RESOURCE_RC) $(RESOURCE_H) $(DESC_H)
{..\..\..\src\libs\zbxmutexs}.c{..\..\..\src\libs\zbxmutexs}.o:
$(CC) $? /Fo"$@" $(CFLAGS)

{..\..\..\src\libs\zbxsymbols}.c{..\..\..\src\libs\zbxsymbols}.o:
$(CC) $? /Fo"$@" $(CFLAGS)

{..\..\..\src\libs\zbxexec}.c{..\..\..\src\libs\zbxexec}.o:
$(CC) $? /Fo"$@" $(CFLAGS)

Expand Down Expand Up @@ -121,6 +124,9 @@ $(RESOURCE_RES): $(RESOURCE_RC) $(RESOURCE_H) $(DESC_H)
{..\..\..\src\libs\zbxwinservice}.c{..\..\..\src\libs\zbxwinservice}.o:
$(CC) $? /Fo"$@" $(CFLAGS)

{..\..\..\src\zabbix_agent\active_checks}.c{..\..\..\src\zabbix_agent\active_checks}.o:
$(CC) $? /Fo"$@" $(CFLAGS)

{..\..\..\src\zabbix_agent\logfiles}.c{..\..\..\src\zabbix_agent\logfiles}.o:
$(CC) $? /Fo"$@" $(CFLAGS)

Expand Down
Loading

0 comments on commit 09d86cc

Please sign in to comment.