From 70c6196c2c9777ba0fb7a64658d879fb4a9f9399 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Mon, 8 Oct 2012 10:37:43 -0700 Subject: [PATCH] refresh --- meta | 7 +++---- patches/acm-port | 44 ++++++++++++++++++++++++++++++++++++-- patches/refresh-temp | 50 -------------------------------------------- 3 files changed, 45 insertions(+), 56 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index 95898e7f..ec7df680 100644 --- a/meta +++ b/meta @@ -1,9 +1,8 @@ Version: 1 -Previous: 5a25485d097fc43e7b7a410aa33c65a0b02bb515 -Head: 43a13a57e9c93239954ae6c82c56c7cb5a87a015 +Previous: 8ab48259d740d9240ab0da77ee1807385baedd20 +Head: f78da7e7e15c7786585a18457d65d86959326229 Applied: - acm-port: 6f60d8310bc350dea09cf8a8a0a573d4c54a3851 - refresh-temp: 43a13a57e9c93239954ae6c82c56c7cb5a87a015 + acm-port: f78da7e7e15c7786585a18457d65d86959326229 Unapplied: af-ib-conn: 70cdbcec6986d1fcc8146a73cf2d8b6a537e71f5 addrtype: fffb812c9cbe707f830d1e7e713feb3ae3e2e8ec diff --git a/patches/acm-port b/patches/acm-port index bb2c17ab..d38f5b67 100644 --- a/patches/acm-port +++ b/patches/acm-port @@ -1,5 +1,5 @@ Bottom: 7a63e115cc4adf073292cd3edca568d9910e1a6e -Top: 7a63e115cc4adf073292cd3edca568d9910e1a6e +Top: 617f5069912b4aeedf6a0bfe0178722f4aa39039 Author: Sean Hefty Date: 2012-10-08 10:33:21 -0700 @@ -19,4 +19,44 @@ Signed-off-by: Sean Hefty --- - +diff --git a/src/acm.c b/src/acm.c +index 3d8c912..c9ca5b5 100755 +--- a/src/acm.c ++++ b/src/acm.c +@@ -62,7 +62,7 @@ typedef struct acm_msg cma_acm_msg_t; + + static pthread_mutex_t acm_lock = PTHREAD_MUTEX_INITIALIZER; + static int sock = -1; +-static short server_port = 6125; ++static short server_port; + + struct ib_connect_hdr { + uint8_t cma_version; +@@ -76,7 +76,7 @@ struct ib_connect_hdr { + #define cma_dst_ip6 dst_addr[0] + }; + +-static void ucma_set_server_port(void) ++static int ucma_set_server_port(void) + { + FILE *f; + +@@ -84,6 +84,7 @@ static void ucma_set_server_port(void) + fscanf(f, "%hu", (unsigned short *) &server_port); + fclose(f); + } ++ return server_port; + } + + void ucma_ib_init(void) +@@ -96,7 +97,9 @@ void ucma_ib_init(void) + return; + + pthread_mutex_lock(&acm_lock); +- ucma_set_server_port(); ++ if (!ucma_set_server_port()) ++ goto out; ++ + sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + if (sock < 0) + goto out; diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 9763e98e..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,50 +0,0 @@ -Bottom: 7a63e115cc4adf073292cd3edca568d9910e1a6e -Top: 617f5069912b4aeedf6a0bfe0178722f4aa39039 -Author: Sean Hefty -Date: 2012-10-08 10:37:43 -0700 - -Refresh of acm-port - ---- - -diff --git a/src/acm.c b/src/acm.c -index 3d8c912..c9ca5b5 100755 ---- a/src/acm.c -+++ b/src/acm.c -@@ -62,7 +62,7 @@ typedef struct acm_msg cma_acm_msg_t; - - static pthread_mutex_t acm_lock = PTHREAD_MUTEX_INITIALIZER; - static int sock = -1; --static short server_port = 6125; -+static short server_port; - - struct ib_connect_hdr { - uint8_t cma_version; -@@ -76,7 +76,7 @@ struct ib_connect_hdr { - #define cma_dst_ip6 dst_addr[0] - }; - --static void ucma_set_server_port(void) -+static int ucma_set_server_port(void) - { - FILE *f; - -@@ -84,6 +84,7 @@ static void ucma_set_server_port(void) - fscanf(f, "%hu", (unsigned short *) &server_port); - fclose(f); - } -+ return server_port; - } - - void ucma_ib_init(void) -@@ -96,7 +97,9 @@ void ucma_ib_init(void) - return; - - pthread_mutex_lock(&acm_lock); -- ucma_set_server_port(); -+ if (!ucma_set_server_port()) -+ goto out; -+ - sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - if (sock < 0) - goto out; -- 2.46.0