Refresh of timeout

diff --git a/linux/osd.h b/linux/osd.h
index 8723ff584084e3be92d92f4cf8dcdf2e2b260ea7..c8278aa175ccb80723aa90fb47586c6bd49b7d76 100644 (file)
--- a/linux/osd.h
+++ b/linux/osd.h
@@ -155,9 +155,9 @@ static inline uint64_t time_stamp_us(void)
        return (uint64_t) curtime.tv_sec * 1000000 + (uint64_t) curtime.tv_usec;\r
 }\r
 \r
-#define time_stamp_ms()  (time_stamp_us() / 1000)\r
-#define time_stamp_sec() (time_stamp_ms() / 1000)\r
-#define time_stamp_min() (time_stamp_sec() / 60)\r
+#define time_stamp_ms()  (time_stamp_us() / (uint64_t) 1000)\r
+#define time_stamp_sec() (time_stamp_ms() / (uint64_t) 1000)\r
+#define time_stamp_min() (time_stamp_sec() / (uint64_t) 60)\r
 \r
 #define PER_THREAD __thread\r
 static inline int beginthread(void (*func)(void *), void *arg)\r

diff --git a/src/acm.c b/src/acm.c
index 5f03f4139f2e6ec180161c8bd1e0c3c53bf2116d..00fc35d9857a712e9f8dc586c187244cacc3dfbb 100644 (file)
--- a/src/acm.c
+++ b/src/acm.c
@@ -809,8 +809,8 @@ acm_record_acm_route(struct acm_ep *ep, struct acm_dest *dest)
        dest->path = ep->mc_dest[i].path;
        dest->path.dgid = dest->av.grh.dgid;
        dest->path.dlid = htons(dest->av.dlid);
-       dest->addr_timeout = time_stamp_min() + (uint64_t) addr_timeout;
-       dest->route_timeout = time_stamp_min() + (uint64_t) route_timeout;
+       dest->addr_timeout = time_stamp_min() + (unsigned) addr_timeout;
+       dest->route_timeout = time_stamp_min() + (unsigned) route_timeout;
        dest->state = ACM_READY;
        return ACM_STATUS_SUCCESS;
 }
@@ -1117,8 +1117,8 @@ acm_dest_sa_resp(struct acm_send_msg *msg, struct ibv_wc *wc, struct acm_mad *ma
        if (!status) {
                memcpy(&dest->path, sa_mad->data, sizeof(dest->path));
                acm_init_path_av(msg->ep->port, dest);
-               dest->addr_timeout = time_stamp_min() + (uint64_t) addr_timeout;
-               dest->route_timeout = time_stamp_min() + (uint64_t) route_timeout;
+               dest->addr_timeout = time_stamp_min() + (unsigned) addr_timeout;
+               dest->route_timeout = time_stamp_min() + (unsigned) route_timeout;
                acm_log(2, "timeout addr %llu route %llu\n", dest->addr_timeout, dest->route_timeout);
                dest->state = ACM_READY;
        } else {
@@ -2651,8 +2651,8 @@ static int acm_init_ep_loopback(struct acm_ep *ep)
                dest->path.rate = (uint8_t) ep->port->rate;
 
                dest->remote_qpn = ep->qp->qp_num;
-               dest->addr_timeout = (uint64_t) -1;
-               dest->route_timeout = (uint64_t) -1;
+               dest->addr_timeout = (uint64_t) ~0ULL;
+               dest->route_timeout = (uint64_t) ~0ULL;
                dest->state = ACM_READY;
                acm_put_dest(dest);
                acm_log(1, "added loopback dest %s\n", dest->name);
@@ -3124,7 +3124,9 @@ static void acm_log_options(void)
        acm_log(0, "log level %d\n", log_level);
        acm_log(0, "lock file %s\n", lock_file);
        acm_log(0, "address resolution %d\n", addr_prot);
+       acm_log(0, "address timeout %d\n", addr_timeout);
        acm_log(0, "route resolution %d\n", route_prot);
+       acm_log(0, "route timeout %d\n", route_timeout);
        acm_log(0, "loopback resolution %d\n", loopback_prot);
        acm_log(0, "server_port %d\n", server_port);
        acm_log(0, "timeout %d ms\n", timeout);