diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-04-08 15:11:51 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-04-08 16:23:40 +0200 |
| commit | e5f9ecbf811daa035709ecc1827a5181f9ea323f (patch) | |
| tree | 4e784115882a43253f250eee1ceadd6c557cce62 | |
| parent | fa0fd7b653bc475f0786c7777e975da87bafdb3a (diff) | |
| download | NetworkManager-e5f9ecbf811daa035709ecc1827a5181f9ea323f.tar.gz | |
| -rw-r--r-- | .gitlab-ci.yml | 8 | ||||
| -rw-r--r-- | shared/n-acd/src/n-acd.c | 8 | ||||
| -rw-r--r-- | src/devices/nm-acd-manager.c | 2 |
3 files changed, 18 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 887ac2db44..9c37384110 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,15 @@ stages: stage: test script: - date '+%Y%m%d-%H%M%S'; uname -a + - date '+%Y%m%d-%H%M%S'; dnf -y install strace - date '+%Y%m%d-%H%M%S'; dnf list --installed + - date '+%Y%m%d-%H%M%S'; git clean -fdx + - date '+%Y%m%d-%H%M%S'; ulimit -a + - date '+%Y%m%d-%H%M%S'; ./autogen.sh + - date '+%Y%m%d-%H%M%S'; make -j 10 src/devices/tests/test-acd + - date '+%Y%m%d-%H%M%S'; ulimit -l unlimited && ./tools/run-nm-test.sh -m src/devices/tests/test-acd || true + - date '+%Y%m%d-%H%M%S'; ulimit -l unlimited && strace -s 10000 -f src/devices/tests/test-acd + - date '+%Y%m%d-%H%M%S'; ./tools/run-nm-test.sh -m src/devices/tests/test-acd - date '+%Y%m%d-%H%M%S'; git clean -fdx ; CI=gitlab BUILD_TYPE=autotools CC=gcc WITH_DOCS=1 contrib/scripts/nm-ci-run.sh - date '+%Y%m%d-%H%M%S'; rm -rf /tmp/nm-docs-html; mv build/INST/share/gtk-doc/html /tmp/nm-docs-html - date '+%Y%m%d-%H%M%S'; git clean -fdx ; CI=gitlab BUILD_TYPE=meson CC=gcc WITH_DOCS=1 contrib/scripts/nm-ci-run.sh diff --git a/shared/n-acd/src/n-acd.c b/shared/n-acd/src/n-acd.c index def56a2152..9494b35aa4 100644 --- a/shared/n-acd/src/n-acd.c +++ b/shared/n-acd/src/n-acd.c @@ -3,6 +3,7 @@ */ #include <assert.h> +#include <stdio.h> #include <c-list.h> #include <c-rbtree.h> #include <c-siphash.h> @@ -230,6 +231,7 @@ _public_ int n_acd_new(NAcd **acdp, NAcdConfig *config) { _cleanup_(n_acd_closep) int fd_bpf_prog = -1; int r; + printf (">>>nacd: n_acd_new() start\n"); if (config->ifindex <= 0 || config->transport != N_ACD_TRANSPORT_ETHERNET || config->n_mac != ETH_ALEN || @@ -245,24 +247,29 @@ _public_ int n_acd_new(NAcd **acdp, NAcdConfig *config) { memcpy(acd->mac, config->mac, ETH_ALEN); r = n_acd_get_random(&acd->seed); + printf (">>>nacd: get-random=%d\n", r); if (r) return r; acd->fd_epoll = epoll_create1(EPOLL_CLOEXEC); + printf (">>>nacd: epoll_create %s\n", acd->fd_epoll < 0 ? "failed" : "succeeded"); if (acd->fd_epoll < 0) return -n_acd_errno(); r = timer_init(&acd->timer); + printf (">>>nacd: timer-init=%d\n", r); if (r < 0) return r; acd->max_bpf_map = 8; r = n_acd_bpf_map_create(&acd->fd_bpf_map, acd->max_bpf_map); + printf (">>>nacd: call n_acd_bpf_map_create(): %d\n", r); if (r) return r; r = n_acd_bpf_compile(&fd_bpf_prog, acd->fd_bpf_map, (struct ether_addr*) acd->mac); + printf (">>>nacd: call n_acd_bpf_compile(): %d\n", r); if (r) return r; @@ -286,6 +293,7 @@ _public_ int n_acd_new(NAcd **acdp, NAcdConfig *config) { if (r < 0) return -n_acd_errno(); + printf (">>>nacd: created successfully\n"); *acdp = acd; acd = NULL; return 0; diff --git a/src/devices/nm-acd-manager.c b/src/devices/nm-acd-manager.c index f437ce3a84..30243b3bbc 100644 --- a/src/devices/nm-acd-manager.c +++ b/src/devices/nm-acd-manager.c @@ -392,7 +392,9 @@ nm_acd_manager_announce_addresses (NMAcdManager *self) int r; gboolean success = TRUE; + g_print (">>> calling acd_init()\n"); r = acd_init (self); + g_print (">>> calling acd_init() resulted in %d\n", r); if (r) { _LOGW ("couldn't init ACD for announcing addresses on interface '%s': %s", nm_platform_link_get_name (NM_PLATFORM_GET, self->ifindex), |