refresh (create temporary patch)

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

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..3f0212c
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,40 @@
+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);