X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/8f6c56a50524aa785f7e596d52dddfb331e18961..4452a7af2eac33dbad800bcc91f2399d62c18f53:/bsd/netinet/udp_usrreq.c

diff --git a/bsd/netinet/udp_usrreq.c b/bsd/netinet/udp_usrreq.c
index c0376e448..8d3f88735 100644
--- a/bsd/netinet/udp_usrreq.c
+++ b/bsd/netinet/udp_usrreq.c
@@ -205,12 +205,10 @@ udp_init()
 	 * allocate lock group attribute and group for udp pcb mutexes
 	 */
 	pcbinfo->mtx_grp_attr = lck_grp_attr_alloc_init();
-	lck_grp_attr_setdefault(pcbinfo->mtx_grp_attr);
 
 	pcbinfo->mtx_grp = lck_grp_alloc_init("udppcb", pcbinfo->mtx_grp_attr);
 		
 	pcbinfo->mtx_attr = lck_attr_alloc_init();
-	lck_attr_setdefault(pcbinfo->mtx_attr);
 
 	if ((pcbinfo->mtx = lck_rw_alloc_init(pcbinfo->mtx_grp, pcbinfo->mtx_attr)) == NULL)
 		return;	/* pretty much dead if this fails... */
@@ -1228,27 +1226,22 @@ udp_lock(so, refcount, debug)
 	int refcount, debug;
 {
 	int lr_saved;
-#ifdef __ppc__
-	if (debug == 0) {
-		__asm__ volatile("mflr %0" : "=r" (lr_saved));
-	}
+	if (debug == 0) 
+		lr_saved = (unsigned int) __builtin_return_address(0);
 	else lr_saved = debug;
-#endif
 
 	if (so->so_pcb) {
 		lck_mtx_assert(((struct inpcb *)so->so_pcb)->inpcb_mtx, LCK_MTX_ASSERT_NOTOWNED);
 		lck_mtx_lock(((struct inpcb *)so->so_pcb)->inpcb_mtx);
 	}
-	else {
+	else 
 		panic("udp_lock: so=%x NO PCB! lr=%x\n", so, lr_saved);
-		lck_mtx_assert(so->so_proto->pr_domain->dom_mtx, LCK_MTX_ASSERT_NOTOWNED);
-		lck_mtx_lock(so->so_proto->pr_domain->dom_mtx);
-	}
 
 	if (refcount) 
 		so->so_usecount++;
 
-	so->reserved3= lr_saved;
+	so->lock_lr[so->next_lock_lr] = (void *)lr_saved;
+	so->next_lock_lr = (so->next_lock_lr+1) % SO_LCKDBG_MAX;
 	return (0);
 }
 
@@ -1261,12 +1254,11 @@ udp_unlock(so, refcount, debug)
 	int lr_saved;
 	struct inpcb *inp = sotoinpcb(so);
     	struct inpcbinfo *pcbinfo	= &udbinfo;
-#ifdef __ppc__
-	if (debug == 0) {
-		__asm__ volatile("mflr %0" : "=r" (lr_saved));
-	}
+
+	if (debug == 0) 
+		lr_saved = (unsigned int) __builtin_return_address(0);
 	else lr_saved = debug;
-#endif
+
 	if (refcount) {
 		so->so_usecount--;
 #if 0
@@ -1279,18 +1271,16 @@ udp_unlock(so, refcount, debug)
 		}
 #endif
 	}
-	if (so->so_pcb == NULL) {
+	if (so->so_pcb == NULL) 
 		panic("udp_unlock: so=%x NO PCB! lr=%x\n", so, lr_saved);
-		lck_mtx_assert(so->so_proto->pr_domain->dom_mtx, LCK_MTX_ASSERT_OWNED);
-		lck_mtx_unlock(so->so_proto->pr_domain->dom_mtx);
-	}
 	else {
 		lck_mtx_assert(((struct inpcb *)so->so_pcb)->inpcb_mtx, LCK_MTX_ASSERT_OWNED);
+		so->unlock_lr[so->next_unlock_lr] = (void *)lr_saved;
+		so->next_unlock_lr = (so->next_unlock_lr+1) % SO_LCKDBG_MAX;
 		lck_mtx_unlock(((struct inpcb *)so->so_pcb)->inpcb_mtx);
 	}
 
 
-	so->reserved4 = lr_saved;
 	return (0);
 }