Replace all instances of perror() with ODP_ERR() so that output may be redirected to odp_override_log().
Signed-off-by: Stuart Haslam <[email protected]> --- platform/linux-generic/odp_packet_socket.c | 39 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/platform/linux-generic/odp_packet_socket.c b/platform/linux-generic/odp_packet_socket.c index 3d3f4cb..e32ca22 100644 --- a/platform/linux-generic/odp_packet_socket.c +++ b/platform/linux-generic/odp_packet_socket.c @@ -129,7 +129,7 @@ static int set_pkt_sock_fanout_mmap(pkt_sock_mmap_t *const pkt_sock, err = setsockopt(sockfd, SOL_PACKET, PACKET_FANOUT, &val, sizeof(val)); if (err != 0) { - perror("set_pkt_sock_fanout() - setsockopt(PACKET_FANOUT)"); + ODP_ERR("setsockopt(PACKET_FANOUT): %s\n", strerror(errno)); return -1; } return 0; @@ -231,7 +231,7 @@ int setup_pkt_sock(pkt_sock_t *const pkt_sock, const char *netdev, sockfd = socket(AF_PACKET, SOCK_RAW, htons(ETH_P_ALL)); if (sockfd == -1) { - perror("setup_pkt_sock() - socket()"); + ODP_ERR("socket(): %s\n", strerror(errno)); goto error; } pkt_sock->sockfd = sockfd; @@ -241,7 +241,7 @@ int setup_pkt_sock(pkt_sock_t *const pkt_sock, const char *netdev, snprintf(ethreq.ifr_name, IFNAMSIZ, "%s", netdev); err = ioctl(sockfd, SIOCGIFINDEX, ðreq); if (err != 0) { - perror("setup_pkt_sock() - ioctl(SIOCGIFINDEX)"); + ODP_ERR("ioctl(SIOCGIFINDEX): %s\n", strerror(errno)); goto error; } if_idx = ethreq.ifr_ifindex; @@ -251,7 +251,7 @@ int setup_pkt_sock(pkt_sock_t *const pkt_sock, const char *netdev, snprintf(ethreq.ifr_name, IFNAMSIZ, "%s", netdev); err = ioctl(sockfd, SIOCGIFHWADDR, ðreq); if (err != 0) { - perror("setup_pkt_sock() - ioctl(SIOCGIFHWADDR)"); + ODP_ERR("ioctl(SIOCGIFHWADDR): %s\n", strerror(errno)); goto error; } ethaddr_copy(pkt_sock->if_mac, @@ -263,7 +263,7 @@ int setup_pkt_sock(pkt_sock_t *const pkt_sock, const char *netdev, sa_ll.sll_ifindex = if_idx; sa_ll.sll_protocol = htons(ETH_P_ALL); if (bind(sockfd, (struct sockaddr *)&sa_ll, sizeof(sa_ll)) < 0) { - perror("setup_pkt_sock() - bind(to IF)"); + ODP_ERR("bind(to IF): %s\n", strerror(errno)); goto error; } @@ -289,7 +289,7 @@ int close_pkt_sock(pkt_sock_t *const pkt_sock) odp_spinlock_unlock(&raw_sockets_lock); if (ret == 0 && close(pkt_sock->sockfd) != 0) { - perror("close_pkt_sock() - close(sockfd)"); + ODP_ERR("close(sockfd): %s\n", strerror(errno)); return -1; } @@ -524,14 +524,14 @@ static int mmap_pkt_socket(void) int ret, sock = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL)); if (sock == -1) { - perror("pkt_socket() - socket(SOCK_RAW)"); + ODP_ERR("socket(SOCK_RAW): %s\n", strerror(errno)); return -1; } ret = setsockopt(sock, SOL_PACKET, PACKET_VERSION, &ver, sizeof(ver)); if (ret == -1) { + ODP_ERR("setsockopt(PACKET_VERSION): %s\n", strerror(errno)); close(sock); - perror("pkt_socket() - setsockopt(PACKET_VERSION)"); return -1; } @@ -662,7 +662,7 @@ static inline unsigned pkt_mmap_v2_tx(int sock, struct ring *ring, ret = sendto(sock, NULL, 0, MSG_DONTWAIT, NULL, 0); if (ret == -1) { if (errno != EAGAIN) { - perror("pkt_mmap_v2_tx() - sendto(pkt mmap)"); + ODP_ERR("sendto(pkt mmap): %s\n", strerror(errno)); return -1; } } @@ -691,7 +691,7 @@ static int mmap_set_packet_loss_discard(int sock) ret = setsockopt(sock, SOL_PACKET, PACKET_LOSS, (void *)&discard, sizeof(discard)); if (ret == -1) { - perror("set_packet_loss_discard() - setsockopt(PACKET_LOSS)"); + ODP_ERR("setsockopt(PACKET_LOSS): %s\n", strerror(errno)); return -1; } @@ -717,14 +717,14 @@ static int mmap_setup_ring(int sock, struct ring *ring, int type) ret = setsockopt(sock, SOL_PACKET, type, &ring->req, sizeof(ring->req)); if (ret == -1) { - perror("setup_ring() - setsockopt(pkt mmap)"); + ODP_ERR("setsockopt(pkt mmap): %s\n", strerror(errno)); return -1; } ring->rd_len = ring->rd_num * sizeof(*ring->rd); ring->rd = malloc(ring->rd_len); if (ring->rd == NULL) { - perror("setup_ring() - env_shared_malloc()"); + ODP_ERR("malloc(): %s\n", strerror(errno)); return -1; } @@ -748,7 +748,7 @@ static int mmap_sock(pkt_sock_mmap_t *pkt_sock) MAP_SHARED | MAP_LOCKED | MAP_POPULATE, sock, 0); if (pkt_sock->mmap_base == MAP_FAILED) { - perror("mmap_sock() - mmap rx&tx buffer failed"); + ODP_ERR("mmap rx&tx buffer failed: %s\n", strerror(errno)); return -1; } @@ -792,11 +792,10 @@ static int mmap_bind_sock(pkt_sock_mmap_t *pkt_sock, const char *netdev) pkt_sock->ll.sll_pkttype = 0; pkt_sock->ll.sll_halen = 0; - ret = - bind(pkt_sock->sockfd, (struct sockaddr *)&pkt_sock->ll, - sizeof(pkt_sock->ll)); + ret = bind(pkt_sock->sockfd, (struct sockaddr *)&pkt_sock->ll, + sizeof(pkt_sock->ll)); if (ret == -1) { - perror("bind_sock() - bind(to IF)"); + ODP_ERR("bind(to IF): %s\n", strerror(errno)); return -1; } @@ -814,7 +813,7 @@ static int mmap_store_hw_addr(pkt_sock_mmap_t *const pkt_sock, snprintf(ethreq.ifr_name, IFNAMSIZ, "%s", netdev); ret = ioctl(pkt_sock->sockfd, SIOCGIFHWADDR, ðreq); if (ret != 0) { - perror("store_hw_addr() - ioctl(SIOCGIFHWADDR)"); + ODP_ERR("ioctl(SIOCGIFHWADDR): %s\n", strerror(errno)); return -1; } @@ -870,7 +869,7 @@ int setup_pkt_sock_mmap(pkt_sock_mmap_t *const pkt_sock, const char *netdev, if_idx = if_nametoindex(netdev); if (if_idx == 0) { - perror("setup_pkt_sock(): if_nametoindex()"); + ODP_ERR("if_nametoindex(): %s\n", strerror(errno)); return -1; } @@ -891,7 +890,7 @@ int close_pkt_sock_mmap(pkt_sock_mmap_t *const pkt_sock) { mmap_unmap_sock(pkt_sock); if (close(pkt_sock->sockfd) != 0) { - perror("close_pkt_sock_mmap() - close(sockfd)"); + ODP_ERR("close(sockfd): %s\n", strerror(errno)); return -1; } -- 2.1.1 _______________________________________________ lng-odp mailing list [email protected] http://lists.linaro.org/mailman/listinfo/lng-odp
