refresh

diff --git a/meta b/meta
index c8ce30b45a8212d8328037372f3a9856cb8ba916..19219da716a9eedccc0921aae506804e724648d5 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: adafc5588887399e53d70c7a81da2ccc3c9b9c87
-Head: c4996e3dc8ae47af9087d6f1e01f742a2d23320e
+Previous: 8658ee430ee4fe657a0b7460c24d627de892d0d9
+Head: 3a6b07956952356b1ee5ebd415d8047d4d7c2200
 Applied:
   epdisc: 66cc200ece77ae6e35f97d834367a58a84c710cd
-  debug: b396590d184989f88f718c98efb45db39bfd8d4e
-  refresh-temp: c4996e3dc8ae47af9087d6f1e01f742a2d23320e
+  debug: 3a6b07956952356b1ee5ebd415d8047d4d7c2200
 Unapplied:
 Hidden:

diff --git a/patches/debug b/patches/debug
index db61015eabf446883cec3e0f45d877dfc30eaf38..7bc4067682f4013bbe71cf2fbcc3a49fff63154d 100644 (file)
--- a/patches/debug
+++ b/patches/debug
@@ -1,5 +1,5 @@
 Bottom: 270c0464a4e35f6c3aca3fdf4148f6d997909cc7
-Top:    3b5e1a76ae1d8ad2397f01e61749083ee7a6dfa0
+Top:    0c89e024c4bfe8ad32fa2a3126a05065e8804f95
 Author: U-AMR\MSHEFTY <MSHEFTY@mshefty-MOBL2.amr.corp.intel.com>
 Date:   2009-12-07 10:36:50 -0800
 
@@ -9,10 +9,41 @@ debug prints
 ---
 
 diff --git a/trunk/core/al/kernel/al_cm.c b/trunk/core/al/kernel/al_cm.c
-index 48b0cb5..673e9bd 100644
+index 48b0cb5..a571624 100644
 --- a/trunk/core/al/kernel/al_cm.c
 +++ b/trunk/core/al/kernel/al_cm.c
-@@ -137,10 +137,18 @@ static void
+@@ -37,7 +37,8 @@
+ typedef struct _iba_cm_id_priv\r
+ {\r
+       iba_cm_id       id;\r
+-      KEVENT          destroy_event;  \r
++      KEVENT          destroy_event;\r
++int destroyed;\r
+ \r
+ }     iba_cm_id_priv;\r
+ \r
+@@ -55,6 +56,7 @@ cm_alloc_id(NTSTATUS (*callback)(iba_cm_id *p_id, iba_cm_event *p_event),
+       KeInitializeEvent(&id->destroy_event, NotificationEvent, FALSE);\r
+       id->id.callback = callback;\r
+       id->id.context = context;\r
++id->destroyed =  0;\r
+       return &id->id;\r
+ }\r
+ \r
+@@ -68,6 +70,12 @@ static void
+ cm_destroy_handler(void *context)\r
+ {\r
+       iba_cm_id_priv  *id = context;\r
++if (id->destroyed) {\r
++ DbgPrintEx(DPFLTR_IHVDRIVER_ID, 0, "cm_destroy_handler cid 0x%x already gave up\n",\r
++   id->id.cid);\r
++ cm_free_id(&id->id);\r
++}\r
++\r
+       KeSetEvent(&id->destroy_event, 0, FALSE);\r
+ }\r
+ \r
+@@ -137,10 +145,19 @@ static void
  cm_destroy_id(iba_cm_id *p_id)\r
  {\r
        iba_cm_id_priv  *id;\r
@@ -22,18 +53,19 @@ index 48b0cb5..673e9bd 100644
        id = CONTAINING_RECORD(p_id, iba_cm_id_priv, id);\r
        kal_cep_destroy(gh_al, p_id->cid, STATUS_SUCCESS);\r
 -      KeWaitForSingleObject(&id->destroy_event, Executive, KernelMode, FALSE, NULL);\r
-+timeout.QuadPart = -10 * 1000000 * 10;\r
++timeout.QuadPart = -20 * 1000000 * 10;\r
 +status =\r
 +      KeWaitForSingleObject(&id->destroy_event, Executive, KernelMode, FALSE, &timeout);\r
++id->destroyed = 1;\r
 +if (status != STATUS_SUCCESS)\r
-+  DbgPrintEx(DPFLTR_IHVDRIVER_ID, 0, "cm_destroy_id 0x%x cid 0x%x\n",\r
++  DbgPrintEx(DPFLTR_IHVDRIVER_ID, 0, "cm_destroy_id wait error 0x%x cid 0x%x\n",\r
 +   status, p_id->cid);\r
-+ \r
++else\r
        cm_free_id(p_id);\r
  }\r
  \r
 diff --git a/trunk/core/al/kernel/al_cm_cep.c b/trunk/core/al/kernel/al_cm_cep.c
-index 49fa417..755371e 100644
+index 49fa417..c52cc71 100644
 --- a/trunk/core/al/kernel/al_cm_cep.c
 +++ b/trunk/core/al/kernel/al_cm_cep.c
 @@ -27,7 +27,7 @@
@@ -69,8 +101,8 @@ index 49fa417..755371e 100644
        KeReleaseInStackQueuedSpinLock( &hdl );\r
  \r
 +if (pfn_destroy_cb && ref_cnt)\r
-+ DbgPrintEx(DPFLTR_IHVDRIVER_ID, 0, "kal_cep_destroy %p 0x%x ref 0x%x signal %d\n",\r
-+   p_cep, cid, ref_cnt, signalled);\r
++ DbgPrintEx(DPFLTR_IHVDRIVER_ID, 0, "kal_cep_destroy cid 0x%x retries %d timeout 0x%x ref 0x%x signal %d\n",\r
++   cid, p_cep->max_cm_retries, p_cep->retry_timeout, ref_cnt, signalled);\r
 +\r
        if( !ref_cnt && pfn_destroy_cb )\r
                pfn_destroy_cb( context );\r

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 5fa2940..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,77 +0,0 @@
-Bottom: 3b5e1a76ae1d8ad2397f01e61749083ee7a6dfa0
-Top:    0c89e024c4bfe8ad32fa2a3126a05065e8804f95
-Author: U-AMR\MSHEFTY <MSHEFTY@mshefty-MOBL2.amr.corp.intel.com>
-Date:   2009-12-07 14:55:18 -0800
-
-Refresh of debug
-
----
-
-diff --git a/trunk/core/al/kernel/al_cm.c b/trunk/core/al/kernel/al_cm.c
-index 673e9bd..a571624 100644
---- a/trunk/core/al/kernel/al_cm.c
-+++ b/trunk/core/al/kernel/al_cm.c
-@@ -37,7 +37,8 @@
- typedef struct _iba_cm_id_priv\r
- {\r
-       iba_cm_id       id;\r
--      KEVENT          destroy_event;  \r
-+      KEVENT          destroy_event;\r
-+int destroyed;\r
- \r
- }     iba_cm_id_priv;\r
- \r
-@@ -55,6 +56,7 @@ cm_alloc_id(NTSTATUS (*callback)(iba_cm_id *p_id, iba_cm_event *p_event),
-       KeInitializeEvent(&id->destroy_event, NotificationEvent, FALSE);\r
-       id->id.callback = callback;\r
-       id->id.context = context;\r
-+id->destroyed =  0;\r
-       return &id->id;\r
- }\r
- \r
-@@ -68,6 +70,12 @@ static void
- cm_destroy_handler(void *context)\r
- {\r
-       iba_cm_id_priv  *id = context;\r
-+if (id->destroyed) {\r
-+ DbgPrintEx(DPFLTR_IHVDRIVER_ID, 0, "cm_destroy_handler cid 0x%x already gave up\n",\r
-+   id->id.cid);\r
-+ cm_free_id(&id->id);\r
-+}\r
-+\r
-       KeSetEvent(&id->destroy_event, 0, FALSE);\r
- }\r
- \r
-@@ -142,13 +150,14 @@ NTSTATUS status;
- \r
-       id = CONTAINING_RECORD(p_id, iba_cm_id_priv, id);\r
-       kal_cep_destroy(gh_al, p_id->cid, STATUS_SUCCESS);\r
--timeout.QuadPart = -10 * 1000000 * 10;\r
-+timeout.QuadPart = -20 * 1000000 * 10;\r
- status =\r
-       KeWaitForSingleObject(&id->destroy_event, Executive, KernelMode, FALSE, &timeout);\r
-+id->destroyed = 1;\r
- if (status != STATUS_SUCCESS)\r
--  DbgPrintEx(DPFLTR_IHVDRIVER_ID, 0, "cm_destroy_id 0x%x cid 0x%x\n",\r
-+  DbgPrintEx(DPFLTR_IHVDRIVER_ID, 0, "cm_destroy_id wait error 0x%x cid 0x%x\n",\r
-    status, p_id->cid);\r
-- \r
-+else\r
-       cm_free_id(p_id);\r
- }\r
- \r
-diff --git a/trunk/core/al/kernel/al_cm_cep.c b/trunk/core/al/kernel/al_cm_cep.c
-index 755371e..c52cc71 100644
---- a/trunk/core/al/kernel/al_cm_cep.c
-+++ b/trunk/core/al/kernel/al_cm_cep.c
-@@ -4199,8 +4199,8 @@ signalled = p_cep->signalled;
-       KeReleaseInStackQueuedSpinLock( &hdl );\r
- \r
- if (pfn_destroy_cb && ref_cnt)\r
-- DbgPrintEx(DPFLTR_IHVDRIVER_ID, 0, "kal_cep_destroy %p 0x%x ref 0x%x signal %d\n",\r
--   p_cep, cid, ref_cnt, signalled);\r
-+ DbgPrintEx(DPFLTR_IHVDRIVER_ID, 0, "kal_cep_destroy cid 0x%x retries %d timeout 0x%x ref 0x%x signal %d\n",\r
-+   cid, p_cep->max_cm_retries, p_cep->retry_timeout, ref_cnt, signalled);\r
- \r
-       if( !ref_cnt && pfn_destroy_cb )\r
-               pfn_destroy_cb( context );