refresh

diff --git a/meta b/meta
index 05e108ccbf86f902005885f300e661b81997356f..59c69eecfcc999318f2e5f04fdb551199b54e588 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: ce342127e9fa600e47e5ea3e78b2409b297ab914
-Head: a968ab8edce6bc96899c688aef1074aca6b5a91d
+Previous: a74236b4b519c9bda274c6de7cd6a35c4480e59d
+Head: 9919a1d954f16ef29ae5d9674855c61710af5a27
 Applied:
   logging: 88d1bcda7ee4d64fe55e1e639cd485422a30c23b
   acm_snoop: bfcb41cccea5442ff7996133c7dd8e11362b041e
-  logging2: 7e0a5a5572763ba3fe86d256063458462217a201
-  refresh-temp: a968ab8edce6bc96899c688aef1074aca6b5a91d
+  logging2: 9919a1d954f16ef29ae5d9674855c61710af5a27
 Unapplied:
   loopback: 8c3473645ff2d6097b6a9c351a726ea48c1d8165
 Hidden:

diff --git a/patches/logging2 b/patches/logging2
index 0516b1a97e2a3e16fe93a797d8276d496d4d1a97..8e6924af729613daa835820d64eba7fe06725099 100644 (file)
--- a/patches/logging2
+++ b/patches/logging2
@@ -1,5 +1,5 @@
 Bottom: 0f063c91893feaff89b12fc524a41fee5462240a
-Top:    98a5749e2dc00110fe15d356965cd76d268ec358
+Top:    9962a940efd219c52418715f8e1c4d496699b292
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-15 12:37:47 -0800
 
@@ -11,10 +11,37 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index 41eb64e..4278489 100644
+index 41eb64e..daa0985 100644
 --- a/src/acm.c
 +++ b/src/acm.c
-@@ -931,9 +931,11 @@ acm_dest_sa_resp(struct acm_send_msg *msg, struct ibv_wc *wc, struct acm_mad *ma
+@@ -254,6 +254,7 @@ static void acm_log_addr(int level, const char *msg, uint16_t addr_type, uint8_t
+               fprintf(flog, "%s\n", ip_addr);
+               break;
+       case ACM_EP_INFO_ADDRESS_IP6:
++      case ACM_ADDRESS_GID:
+               inet_ntop(AF_INET6, addr, ip_addr, ACM_MAX_ADDRESS);
+               fprintf(flog, "%s\n", ip_addr);
+               break;
+@@ -262,6 +263,9 @@ static void acm_log_addr(int level, const char *msg, uint16_t addr_type, uint8_t
+               fprintf(flog, "path record, SLID 0x%x, DLID 0x%x\n",
+                       ntohs(path->slid), ntohs(path->dlid));
+               break;
++      case ACM_ADDRESS_LID:
++              fprintf(flog, "LID 0x%x\n", *((uint16_t *) addr));
++              break;
+       default:
+               fprintf(flog, "unknown address 0x%x\n", addr_type);
+       }
+@@ -908,7 +912,7 @@ acm_complete_queued_req(struct acm_dest *dest, uint8_t status)
+               req = container_of(entry, struct acm_request, entry);
+               lock_release(&dest->lock);
+ 
+-              acm_log(2, "completing client request\n");
++              acm_log(2, "completing request, client %d\n", req->client->index);
+               acm_client_resolve_resp(req->client,
+                       (struct acm_resolve_msg *) &req->msg, dest, status);
+               acm_free_req(req);
+@@ -931,9 +935,11 @@ acm_dest_sa_resp(struct acm_send_msg *msg, struct ibv_wc *wc, struct acm_mad *ma
                status = ACM_STATUS_ETIMEDOUT;
        }
        acm_log(2, "resp status 0x%x\n", status);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 3f0212c..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,40 +0,0 @@
-Bottom: 98a5749e2dc00110fe15d356965cd76d268ec358
-Top:    9962a940efd219c52418715f8e1c4d496699b292
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-11-15 14:01:50 -0800
-
-Refresh of logging2
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 4278489..daa0985 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -254,6 +254,7 @@ static void acm_log_addr(int level, const char *msg, uint16_t addr_type, uint8_t
-               fprintf(flog, "%s\n", ip_addr);
-               break;
-       case ACM_EP_INFO_ADDRESS_IP6:
-+      case ACM_ADDRESS_GID:
-               inet_ntop(AF_INET6, addr, ip_addr, ACM_MAX_ADDRESS);
-               fprintf(flog, "%s\n", ip_addr);
-               break;
-@@ -262,6 +263,9 @@ static void acm_log_addr(int level, const char *msg, uint16_t addr_type, uint8_t
-               fprintf(flog, "path record, SLID 0x%x, DLID 0x%x\n",
-                       ntohs(path->slid), ntohs(path->dlid));
-               break;
-+      case ACM_ADDRESS_LID:
-+              fprintf(flog, "LID 0x%x\n", *((uint16_t *) addr));
-+              break;
-       default:
-               fprintf(flog, "unknown address 0x%x\n", addr_type);
-       }
-@@ -908,7 +912,7 @@ acm_complete_queued_req(struct acm_dest *dest, uint8_t status)
-               req = container_of(entry, struct acm_request, entry);
-               lock_release(&dest->lock);
- 
--              acm_log(2, "completing client request\n");
-+              acm_log(2, "completing request, client %d\n", req->client->index);
-               acm_client_resolve_resp(req->client,
-                       (struct acm_resolve_msg *) &req->msg, dest, status);
-               acm_free_req(req);