Changeset f14291b in mainline for uspace/lib/packet

Timestamp:

2010-10-19T20:55:53Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a93d79a

Parents:

1882525 (diff), a7a85d16 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

uspace/lib/packet

Files:

• Makefile (moved) (moved from uspace/lib/socket/Makefile ) (1 diff)
• generic/packet_server.c (moved) (moved from uspace/lib/socket/packet/packet_server.c ) (2 diffs)
• include/net_byteorder.h (moved) (moved from uspace/lib/socket/include/net_byteorder.h )
• include/net_err.h (moved) (moved from uspace/lib/socket/include/net_err.h )
• include/netdb.h (moved) (moved from uspace/lib/socket/include/netdb.h )
• include/packet_local.h (added)
• include/packet_server.h (moved) (moved from uspace/lib/socket/include/packet/packet_server.h )
• include/socket_errno.h (moved) (moved from uspace/lib/socket/include/socket_errno.h )
• include/tcp_codes.h (moved) (moved from uspace/lib/socket/include/tcp_codes.h )

uspace/lib/packet/Makefile

@@ -30 +30 @@
 USPACE_PREFIX = ../..
 EXTRA_CFLAGS = -Iinclude
-LIBRARY = libsocket
+LIBRARY = libpacket
 
 SOURCES = \
-        generic/socket_client.c \
-        generic/socket_core.c \
-        generic/socket_parse.c \
-        generic/inet.c \
-        generic/net_modules.c \
-        generic/icmp_common.c \
-        generic/icmp_api.c \
-        packet/packet.c \
-        packet/packet_client.c \
-        packet/packet_server.c \
-        adt/dynamic_fifo.c \
-        adt/measured_strings.c \
-        adt/char_map.c
+        generic/packet_server.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/lib/packet/generic/packet_server.c

@@ -39 +39 @@
 #include <async.h>
 #include <errno.h>
+#include <err.h>
 #include <fibril_synch.h>
 #include <unistd.h>
+#include <sys/mman.h>
 
 #include <ipc/ipc.h>
-#include <sys/mman.h>
-
-#include <net_err.h>
-#include <net_messages.h>
-#include <packet/packet.h>
-#include <packet/packet_client.h>
-#include <packet/packet_header.h>
-#include <packet/packet_messages.h>
-#include <packet/packet_server.h>
+#include <ipc/packet.h>
+#include <ipc/net.h>
+
+#include <net/packet.h>
+#include <net/packet_header.h>
+
+#include <packet_server.h>
+#include <packet_local.h>
 
 #define FREE_QUEUES_COUNT       7
@@ -85 +86 @@
         unsigned int count;
 } ps_globals = {
-        .lock = {
-                .counter = 1,
-                .waiters = {
-                        .prev = &ps_globals.lock.waiters,
-                        .next = &ps_globals.lock.waiters,
-                }
-        },
+        .lock = FIBRIL_MUTEX_INITIALIZER(ps_globals.lock),
         .free = {NULL, NULL, NULL, NULL, NULL, NULL, NULL},
         .sizes = {PAGE_SIZE, PAGE_SIZE * 2, PAGE_SIZE * 4, PAGE_SIZE * 8, PAGE_SIZE * 16, PAGE_SIZE * 32, PAGE_SIZE * 64},