cadcdev-svn-commits Mailing List for Cryptic Allusion DCDev (Page 65)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 411
          http://svn.sourceforge.net/cadcdev/?rev=411&view=rev
Author:   ljsebald
Date:     2007-05-25 07:37:18 -0700 (Fri, 25 May 2007)

Log Message:
-----------
Made the UDP code so that it works in an irq properly.

Modified Paths:
--------------
    kos/kernel/net/net_udp.c

Modified: kos/kernel/net/net_udp.c
===================================================================

--- kos/kernel/net/net_udp.c	2007-05-25 14:28:34 UTC (rev 410)
+++ kos/kernel/net/net_udp.c	2007-05-25 14:37:18 UTC (rev 411)
@@ -15,6 +15,7 @@
 #include <sys/queue.h>
 #include <kos/dbgio.h>
 #include <kos/fs_socket.h>
+#include <arch/irq.h>
 #include <sys/socket.h>
 #include <errno.h>
 #include "net_ipv4.h"
@@ -70,7 +71,15 @@
     /* Get the sockaddr_in structure, rather than the sockaddr one */
     realaddr = (struct sockaddr_in *) addr;
 
-    mutex_lock(udp_mutex);
+    if(irq_inside_int()) {
+        if(mutex_trylock(udp_mutex) == -1) {
+            errno = EWOULDBLOCK;
+            return -1;
+        }
+    }
+    else {
+        mutex_lock(udp_mutex);
+    }
 
     udpsock = (struct udp_sock *)hnd->data;
     if(udpsock == NULL) {
@@ -133,7 +142,15 @@
         return -1;
     }
 
-    mutex_lock(udp_mutex);
+    if(irq_inside_int()) {
+        if(mutex_trylock(udp_mutex) == -1) {
+            errno = EWOULDBLOCK;
+            return -1;
+        }
+    }
+    else {
+        mutex_lock(udp_mutex);
+    }
 
     udpsock = (struct udp_sock *)hnd->data;
     if(udpsock == NULL) {
@@ -172,7 +189,15 @@
     struct udp_sock *udpsock;
     struct udp_pkt *pkt;
 
-    mutex_lock(udp_mutex);
+    if(irq_inside_int()) {
+        if(mutex_trylock(udp_mutex) == -1) {
+            errno = EWOULDBLOCK;
+            return -1;
+        }
+    }
+    else {
+        mutex_lock(udp_mutex);
+    }
 
     udpsock = (struct udp_sock *)hnd->data;
     if(udpsock == NULL) {
@@ -199,7 +224,8 @@
         return -1;
     }
 
-    if(TAILQ_EMPTY(&udpsock->packets) && (udpsock->flags & O_NONBLOCK)) {
+    if(TAILQ_EMPTY(&udpsock->packets) && ((udpsock->flags & O_NONBLOCK) ||
+                                           irq_inside_int())) {
         mutex_unlock(udp_mutex);
         errno = EWOULDBLOCK;
         return -1;
@@ -234,7 +260,15 @@
     struct udp_sock *udpsock;
     struct udp_pkt *pkt;
 
-    mutex_lock(udp_mutex);
+    if(irq_inside_int()) {
+        if(mutex_trylock(udp_mutex) == -1) {
+            errno = EWOULDBLOCK;
+            return -1;
+        }
+    }
+    else {
+        mutex_lock(udp_mutex);
+    }
 
     udpsock = (struct udp_sock *)hnd->data;
     if(udpsock == NULL) {
@@ -254,7 +288,8 @@
         return -1;
     }
 
-    if(TAILQ_EMPTY(&udpsock->packets) && (udpsock->flags & O_NONBLOCK)) {
+    if(TAILQ_EMPTY(&udpsock->packets) && ((udpsock->flags & O_NONBLOCK) ||
+                                           irq_inside_int())) {
         mutex_unlock(udp_mutex);
         errno = EWOULDBLOCK;
         return -1;
@@ -304,7 +339,15 @@
                      int flags) {
     struct udp_sock *udpsock;
 
-    mutex_lock(udp_mutex);
+    if(irq_inside_int()) {
+        if(mutex_trylock(udp_mutex) == -1) {
+            errno = EWOULDBLOCK;
+            return -1;
+        }
+    }
+    else {
+        mutex_lock(udp_mutex);
+    }
 
     udpsock = (struct udp_sock *)hnd->data;
     if(udpsock == NULL) {
@@ -366,7 +409,15 @@
     struct udp_sock *udpsock;
     struct sockaddr_in *realaddr;
 
-    mutex_lock(udp_mutex);
+    if(irq_inside_int()) {
+        if(mutex_trylock(udp_mutex) == -1) {
+            errno = EWOULDBLOCK;
+            return -1;
+        }
+    }
+    else {
+        mutex_lock(udp_mutex);
+    }
 
     udpsock = (struct udp_sock *)hnd->data;
     if(udpsock == NULL) {
@@ -419,7 +470,15 @@
 int net_udp_shutdownsock(net_socket_t *hnd, int how) {
     struct udp_sock *udpsock;
 
-    mutex_lock(udp_mutex);
+    if(irq_inside_int()) {
+        if(mutex_trylock(udp_mutex) == -1) {
+            errno = EWOULDBLOCK;
+            return -1;
+        }
+    }
+    else {
+        mutex_lock(udp_mutex);
+    }
 
     udpsock = (struct udp_sock *)hnd->data;
     if(udpsock == NULL) {
@@ -461,7 +520,16 @@
 
     TAILQ_INIT(&udpsock->packets);
 
-    mutex_lock(udp_mutex);
+    if(irq_inside_int()) {
+        if(mutex_trylock(udp_mutex) == -1) {
+            errno = EWOULDBLOCK;
+            return -1;
+        }
+    }
+    else {
+        mutex_lock(udp_mutex);
+    }
+
     LIST_INSERT_HEAD(&net_udp_sockets, udpsock, sock_list);
     mutex_unlock(udp_mutex);
 
@@ -474,12 +542,21 @@
     struct udp_sock *udpsock;
     struct udp_pkt *pkt;
 
-    mutex_lock(udp_mutex);
+    if(irq_inside_int()) {
+        if(mutex_trylock(udp_mutex) == -1) {
+            errno = EWOULDBLOCK;
+            return;
+        }
+    }
+    else {
+        mutex_lock(udp_mutex);
+    }
 
     udpsock = (struct udp_sock *)hnd->data;
     if(udpsock == NULL) {
         mutex_unlock(udp_mutex);
         errno = EBADF;
+        return;
     }
 
     TAILQ_FOREACH(pkt, &udpsock->packets, pkt_queue) {
@@ -497,7 +574,15 @@
 int net_udp_setflags(net_socket_t *hnd, int flags) {
     struct udp_sock *udpsock;
 
-    mutex_lock(udp_mutex);
+    if(irq_inside_int()) {
+        if(mutex_trylock(udp_mutex) == -1) {
+            errno = EWOULDBLOCK;
+            return -1;
+        }
+    }
+    else {
+        mutex_lock(udp_mutex);
+    }
 
     udpsock = (struct udp_sock *) hnd->data;
     if(udpsock == NULL) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2003	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (35)	Dec (2)
2004	Jan (37)	Feb (10)	Mar	Apr (2)	May (17)	Jun (1)	Jul (14)	Aug (14)	Sep (4)	Oct	Nov (14)	Dec (4)
2005	Jan (6)	Feb	Mar	Apr (6)	May	Jun	Jul	Aug	Sep (1)	Oct	Nov (92)	Dec (12)
2006	Jan (3)	Feb (4)	Mar	Apr (5)	May (3)	Jun (15)	Jul (3)	Aug (1)	Sep (29)	Oct (1)	Nov (6)	Dec (5)
2007	Jan (2)	Feb (2)	Mar	Apr (3)	May (14)	Jun (2)	Jul (16)	Aug (73)	Sep (12)	Oct (9)	Nov (27)	Dec (3)
2008	Jan (4)	Feb (4)	Mar (3)	Apr (8)	May (23)	Jun (4)	Jul (1)	Aug (3)	Sep (7)	Oct (5)	Nov (1)	Dec (1)
2009	Jan	Feb (10)	Mar	Apr (4)	May (4)	Jun (10)	Jul	Aug (1)	Sep	Oct (7)	Nov	Dec (1)
2010	Jan	Feb (1)	Mar	Apr (6)	May	Jun (3)	Jul (11)	Aug (1)	Sep	Oct (15)	Nov (1)	Dec (5)
2011	Jan (4)	Feb (1)	Mar (6)	Apr	May (22)	Jun	Jul (8)	Aug (2)	Sep	Oct	Nov	Dec (2)
2012	Jan	Feb (10)	Mar (1)	Apr (6)	May (27)	Jun (48)	Jul (30)	Aug (4)	Sep	Oct (3)	Nov (1)	Dec (11)
2013	Jan (4)	Feb (7)	Mar (6)	Apr (18)	May (28)	Jun (20)	Jul	Aug (4)	Sep (1)	Oct (1)	Nov (2)	Dec (7)
2014	Jan (3)	Feb (2)	Mar (4)	Apr (9)	May (11)	Jun (10)	Jul	Aug (18)	Sep (12)	Oct (17)	Nov (10)	Dec (16)
2015	Jan (5)	Feb (1)	Mar (5)	Apr (4)	May (28)	Jun (2)	Jul	Aug	Sep (6)	Oct	Nov (2)	Dec (1)
2016	Jan (14)	Feb	Mar (3)	Apr	May	Jun (3)	Jul (4)	Aug (4)	Sep (1)	Oct (1)	Nov	Dec (1)
2017	Jan (11)	Feb	Mar (21)	Apr	May (1)	Jun	Jul	Aug	Sep	Oct	Nov	Dec (1)
2018	Jan	Feb	Mar (1)	Apr	May (1)	Jun	Jul	Aug (2)	Sep (4)	Oct (4)	Nov	Dec (1)
2019	Jan (1)	Feb	Mar	Apr (1)	May	Jun	Jul	Aug (13)	Sep (4)	Oct	Nov	Dec
2020	Jan (10)	Feb (9)	Mar (5)	Apr (4)	May (3)	Jun (18)	Jul (4)	Aug (2)	Sep (20)	Oct (2)	Nov	Dec
2021	Jan	Feb	Mar	Apr (2)	May (1)	Jun (2)	Jul (1)	Aug (2)	Sep	Oct	Nov	Dec (2)
2022	Jan (1)	Feb (2)	Mar (2)	Apr (1)	May	Jun	Jul	Aug (5)	Sep	Oct (1)	Nov	Dec (1)
2023	Jan (10)	Feb (7)	Mar (29)	Apr (31)	May (29)	Jun (34)	Jul (3)	Aug (24)	Sep (22)	Oct (10)	Nov (38)	Dec (27)
2024	Jan (15)	Feb (8)	Mar (4)	Apr (20)	May (33)	Jun (18)	Jul (15)	Aug (23)	Sep (26)	Oct (32)	Nov (6)	Dec (4)
2025	Jan (7)	Feb (1)	Mar (1)	Apr (4)	May (46)	Jun (19)	Jul (26)	Aug (48)	Sep (30)	Oct (8)	Nov (9)	Dec

cadcdev-svn-commits Mailing List for Cryptic Allusion DCDev (Page 65)

cadcdev-svn-commits — Source Code Repository Updates