Changeset 59ecd4a in mainline for uspace/lib/socket/packet/packet_server.c

Timestamp:

2010-04-04T21:41:47Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5db9084

Parents:

36a75a2 (diff), ee7e82a9 (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.

File:

• uspace/lib/socket/packet/packet_server.c (moved) (moved from uspace/srv/net/structures/packet/packet_server.c ) (5 diffs)

uspace/lib/socket/packet/packet_server.c

@@ -45 +45 @@
 #include <sys/mman.h>
 
-#include "../../err.h"
-#include "../../messages.h"
-
-#include "packet.h"
-#include "packet_client.h"
-#include "packet_header.h"
-#include "packet_messages.h"
-#include "packet_server.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>
 
 #define FREE_QUEUES_COUNT       7
@@ -98 +97 @@
 };
 
-/** @name Packet server support functions
- */
-/*@{*/
-
-/** Returns the packet of dimensions at least as given.
- *  Tries to reuse free packets first.
- *  Creates a&nbsp;new packet aligned to the memory page size if none available.
- *  Locks the global data during its processing.
- *  @param[in] addr_len The source and destination addresses maximal length in bytes.
- *  @param[in] max_prefix The maximal prefix length in bytes.
- *  @param[in] max_content The maximal content length in bytes.
- *  @param[in] max_suffix The maximal suffix length in bytes.
- *  @returns The packet of dimensions at least as given.
- *  @returns NULL if there is not enough memory left.
- */
-packet_t packet_get(size_t addr_len, size_t max_prefix, size_t max_content, size_t max_suffix);
-
-/** Releases the packet queue.
- *  @param[in] packet_id The first packet identifier.
- *  @returns EOK on success.
- *  @returns ENOENT if there is no such packet.
- */
-int packet_release_wrapper(packet_id_t packet_id);
-
-/** Releases the packet and returns it to the appropriate free packet queue.
- *  Should be used only when the global data are locked.
- *  @param[in] packet The packet to be released.
- */
-void packet_release(packet_t packet);
-
-/** Creates a&nbsp;new packet of dimensions at least as given.
- *  Should be used only when the global data are locked.
- *  @param[in] length The total length of the packet, including the header, the addresses and the data of the packet.
- *  @param[in] addr_len The source and destination addresses maximal length in bytes.
- *  @param[in] max_prefix The maximal prefix length in bytes.
- *  @param[in] max_content The maximal content length in bytes.
- *  @param[in] max_suffix The maximal suffix length in bytes.
- *  @returns The packet of dimensions at least as given.
- *  @returns NULL if there is not enough memory left.
- */
-packet_t packet_create(size_t length, size_t addr_len, size_t max_prefix, size_t max_content, size_t max_suffix);
+int packet_translate(int phone, packet_ref packet, packet_id_t packet_id){
+        if(! packet){
+                return EINVAL;
+        }
+        *packet = pm_find(packet_id);
+        return (*packet) ? EOK : ENOENT;
+}
 
 /** Clears and initializes the packet according to the given dimensions.
@@ -147 +112 @@
  *  @param[in] max_suffix The maximal suffix length in bytes.
  */
-void packet_init(packet_t packet, size_t addr_len, size_t max_prefix, size_t max_content, size_t max_suffix);
-
-/** Shares the packet memory block.
- *  @param[in] packet The packet to be shared.
- *  @returns EOK on success.
- *  @returns EINVAL if the packet is not valid.
- *  @returns EINVAL if the calling module does not accept the memory.
- *  @returns ENOMEM if the desired and actual sizes differ.
- *  @returns Other error codes as defined for the async_share_in_finalize() function.
- */
-int packet_reply(const packet_t packet);
-
-/*@}*/
-
-int packet_translate(int phone, packet_ref packet, packet_id_t packet_id){
-        if(! packet){
-                return EINVAL;
-        }
-        *packet = pm_find(packet_id);
-        return (*packet) ? EOK : ENOENT;
-}
-
-packet_t packet_get_4(int phone, size_t max_content, size_t addr_len, size_t max_prefix, size_t max_suffix){
-        return packet_get(addr_len, max_prefix, max_content, max_suffix);
-}
-
-packet_t packet_get_1(int phone, size_t content){
-        return packet_get(DEFAULT_ADDR_LEN, DEFAULT_PREFIX, content, DEFAULT_SUFFIX);
-}
-
-void pq_release(int phone, packet_id_t packet_id){
-        (void) packet_release_wrapper(packet_id);
-}
-
-int packet_server_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
-        packet_t packet;
-
-        *answer_count = 0;
-        switch(IPC_GET_METHOD(*call)){
-                case IPC_M_PHONE_HUNGUP:
-                        return EOK;
-                case NET_PACKET_CREATE_1:
-                        packet = packet_get(DEFAULT_ADDR_LEN, DEFAULT_PREFIX, IPC_GET_CONTENT(call), DEFAULT_SUFFIX);
-                        if(! packet){
-                                return ENOMEM;
-                        }
-                        *answer_count = 2;
-                        IPC_SET_ARG1(*answer, (ipcarg_t) packet->packet_id);
-                        IPC_SET_ARG2(*answer, (ipcarg_t) packet->length);
-                        return EOK;
-                case NET_PACKET_CREATE_4:
-                        packet = packet_get(((DEFAULT_ADDR_LEN < IPC_GET_ADDR_LEN(call)) ? IPC_GET_ADDR_LEN(call) : DEFAULT_ADDR_LEN), DEFAULT_PREFIX + IPC_GET_PREFIX(call), IPC_GET_CONTENT(call), DEFAULT_SUFFIX + IPC_GET_SUFFIX(call));
-                        if(! packet){
-                                return ENOMEM;
-                        }
-                        *answer_count = 2;
-                        IPC_SET_ARG1(*answer, (ipcarg_t) packet->packet_id);
-                        IPC_SET_ARG2(*answer, (ipcarg_t) packet->length);
-                        return EOK;
-                case NET_PACKET_GET:
-                        packet = pm_find(IPC_GET_ID(call));
-                        if(! packet_is_valid(packet)){
-                                return ENOENT;
-                        }
-                        return packet_reply(packet);
-                case NET_PACKET_GET_SIZE:
-                        packet = pm_find(IPC_GET_ID(call));
-                        if(! packet_is_valid(packet)){
-                                return ENOENT;
-                        }
-                        IPC_SET_ARG1(*answer, (ipcarg_t) packet->length);
-                        *answer_count = 1;
-                        return EOK;
-                case NET_PACKET_RELEASE:
-                        return packet_release_wrapper(IPC_GET_ID(call));
-        }
-        return ENOTSUP;
-}
-
-int packet_release_wrapper(packet_id_t packet_id){
-        packet_t packet;
-
-        packet = pm_find(packet_id);
-        if(! packet_is_valid(packet)){
-                return ENOENT;
-        }
-        fibril_mutex_lock(&ps_globals.lock);
-        pq_destroy(packet, packet_release);
-        fibril_mutex_unlock(&ps_globals.lock);
-        return EOK;
-}
-
-void packet_release(packet_t packet){
-        int index;
-        int result;
-
-        // remove debug dump
-//      printf("packet %d released\n", packet->packet_id);
-        for(index = 0; (index < FREE_QUEUES_COUNT - 1) && (packet->length > ps_globals.sizes[index]); ++ index);
-        result = pq_add(&ps_globals.free[index], packet, packet->length, packet->length);
-        assert(result == EOK);
-}
-
-packet_t packet_get(size_t addr_len, size_t max_prefix, size_t max_content, size_t max_suffix){
-        int index;
-        packet_t packet;
-        size_t length;
-
-        length = ALIGN_UP(sizeof(struct packet) + 2 * addr_len + max_prefix + max_content + max_suffix, PAGE_SIZE);
-        fibril_mutex_lock(&ps_globals.lock);
-        for(index = 0; index < FREE_QUEUES_COUNT - 1; ++ index){
-                if(length <= ps_globals.sizes[index]){
-                        packet = ps_globals.free[index];
-                        while(packet_is_valid(packet) && (packet->length < length)){
-                                packet = pm_find(packet->next);
-                        }
-                        if(packet_is_valid(packet)){
-                                if(packet == ps_globals.free[index]){
-                                        ps_globals.free[index] = pq_detach(packet);
-                                }else{
-                                        pq_detach(packet);
-                                }
-                                packet_init(packet, addr_len, max_prefix, max_content, max_suffix);
-                                fibril_mutex_unlock(&ps_globals.lock);
-                                // remove debug dump
-//                              printf("packet %d got\n", packet->packet_id);
-                                return packet;
-                        }
-                }
-        }
-        packet = packet_create(length, addr_len, max_prefix, max_content, max_suffix);
-        fibril_mutex_unlock(&ps_globals.lock);
-        // remove debug dump
-//      printf("packet %d created\n", packet->packet_id);
-        return packet;
-}
-
-packet_t packet_create(size_t length, size_t addr_len, size_t max_prefix, size_t max_content, size_t max_suffix){
-        ERROR_DECLARE;
-
-        packet_t packet;
-
-        // already locked
-        packet = (packet_t) mmap(NULL, length, PROTO_READ | PROTO_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-        if(packet == MAP_FAILED){
-                return NULL;
-        }
-        ++ ps_globals.count;
-        packet->packet_id = ps_globals.count;
-        packet->length = length;
-        packet_init(packet, addr_len, max_prefix, max_content, max_suffix);
-        packet->magic_value = PACKET_MAGIC_VALUE;
-        if(ERROR_OCCURRED(pm_add(packet))){
-                munmap(packet, packet->length);
-                return NULL;
-        }
-        return packet;
-}
-
-void packet_init(packet_t packet, size_t addr_len, size_t max_prefix, size_t max_content, size_t max_suffix){
+static void packet_init(packet_t packet, size_t addr_len, size_t max_prefix, size_t max_content, size_t max_suffix){
         // clear the packet content
         bzero(((void *) packet) + sizeof(struct packet), packet->length - sizeof(struct packet));
@@ -323 +129 @@
 }
 
-int packet_reply(const packet_t packet){
+/** Creates a&nbsp;new packet of dimensions at least as given.
+ *  Should be used only when the global data are locked.
+ *  @param[in] length The total length of the packet, including the header, the addresses and the data of the packet.
+ *  @param[in] addr_len The source and destination addresses maximal length in bytes.
+ *  @param[in] max_prefix The maximal prefix length in bytes.
+ *  @param[in] max_content The maximal content length in bytes.
+ *  @param[in] max_suffix The maximal suffix length in bytes.
+ *  @returns The packet of dimensions at least as given.
+ *  @returns NULL if there is not enough memory left.
+ */
+static packet_t packet_create(size_t length, size_t addr_len, size_t max_prefix, size_t max_content, size_t max_suffix){
+        ERROR_DECLARE;
+
+        packet_t packet;
+
+        // already locked
+        packet = (packet_t) mmap(NULL, length, PROTO_READ | PROTO_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+        if(packet == MAP_FAILED){
+                return NULL;
+        }
+        ++ ps_globals.count;
+        packet->packet_id = ps_globals.count;
+        packet->length = length;
+        packet_init(packet, addr_len, max_prefix, max_content, max_suffix);
+        packet->magic_value = PACKET_MAGIC_VALUE;
+        if(ERROR_OCCURRED(pm_add(packet))){
+                munmap(packet, packet->length);
+                return NULL;
+        }
+        return packet;
+}
+
+/** Returns the packet of dimensions at least as given.
+ *  Tries to reuse free packets first.
+ *  Creates a&nbsp;new packet aligned to the memory page size if none available.
+ *  Locks the global data during its processing.
+ *  @param[in] addr_len The source and destination addresses maximal length in bytes.
+ *  @param[in] max_prefix The maximal prefix length in bytes.
+ *  @param[in] max_content The maximal content length in bytes.
+ *  @param[in] max_suffix The maximal suffix length in bytes.
+ *  @returns The packet of dimensions at least as given.
+ *  @returns NULL if there is not enough memory left.
+ */
+static packet_t packet_get(size_t addr_len, size_t max_prefix, size_t max_content, size_t max_suffix){
+        int index;
+        packet_t packet;
+        size_t length;
+
+        length = ALIGN_UP(sizeof(struct packet) + 2 * addr_len + max_prefix + max_content + max_suffix, PAGE_SIZE);
+        fibril_mutex_lock(&ps_globals.lock);
+        for(index = 0; index < FREE_QUEUES_COUNT - 1; ++ index){
+                if(length <= ps_globals.sizes[index]){
+                        packet = ps_globals.free[index];
+                        while(packet_is_valid(packet) && (packet->length < length)){
+                                packet = pm_find(packet->next);
+                        }
+                        if(packet_is_valid(packet)){
+                                if(packet == ps_globals.free[index]){
+                                        ps_globals.free[index] = pq_detach(packet);
+                                }else{
+                                        pq_detach(packet);
+                                }
+                                packet_init(packet, addr_len, max_prefix, max_content, max_suffix);
+                                fibril_mutex_unlock(&ps_globals.lock);
+                                // remove debug dump
+//                              printf("packet %d got\n", packet->packet_id);
+                                return packet;
+                        }
+                }
+        }
+        packet = packet_create(length, addr_len, max_prefix, max_content, max_suffix);
+        fibril_mutex_unlock(&ps_globals.lock);
+        // remove debug dump
+//      printf("packet %d created\n", packet->packet_id);
+        return packet;
+}
+
+packet_t packet_get_4(int phone, size_t max_content, size_t addr_len, size_t max_prefix, size_t max_suffix){
+        return packet_get(addr_len, max_prefix, max_content, max_suffix);
+}
+
+packet_t packet_get_1(int phone, size_t content){
+        return packet_get(DEFAULT_ADDR_LEN, DEFAULT_PREFIX, content, DEFAULT_SUFFIX);
+}
+
+/** Releases the packet and returns it to the appropriate free packet queue.
+ *  Should be used only when the global data are locked.
+ *  @param[in] packet The packet to be released.
+ */
+static void packet_release(packet_t packet){
+        int index;
+        int result;
+
+        // remove debug dump
+//      printf("packet %d released\n", packet->packet_id);
+        for(index = 0; (index < FREE_QUEUES_COUNT - 1) && (packet->length > ps_globals.sizes[index]); ++ index);
+        result = pq_add(&ps_globals.free[index], packet, packet->length, packet->length);
+        assert(result == EOK);
+}
+
+/** Releases the packet queue.
+ *  @param[in] packet_id The first packet identifier.
+ *  @returns EOK on success.
+ *  @returns ENOENT if there is no such packet.
+ */
+static int packet_release_wrapper(packet_id_t packet_id){
+        packet_t packet;
+
+        packet = pm_find(packet_id);
+        if(! packet_is_valid(packet)){
+                return ENOENT;
+        }
+        fibril_mutex_lock(&ps_globals.lock);
+        pq_destroy(packet, packet_release);
+        fibril_mutex_unlock(&ps_globals.lock);
+        return EOK;
+}
+
+void pq_release(int phone, packet_id_t packet_id){
+        (void) packet_release_wrapper(packet_id);
+}
+
+/** Shares the packet memory block.
+ *  @param[in] packet The packet to be shared.
+ *  @returns EOK on success.
+ *  @returns EINVAL if the packet is not valid.
+ *  @returns EINVAL if the calling module does not accept the memory.
+ *  @returns ENOMEM if the desired and actual sizes differ.
+ *  @returns Other error codes as defined for the async_share_in_finalize() function.
+ */
+static int packet_reply(const packet_t packet){
         ipc_callid_t callid;
         size_t size;
@@ -337 +273 @@
 }
 
+int packet_server_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
+        packet_t packet;
+
+        *answer_count = 0;
+        switch(IPC_GET_METHOD(*call)){
+                case IPC_M_PHONE_HUNGUP:
+                        return EOK;
+                case NET_PACKET_CREATE_1:
+                        packet = packet_get(DEFAULT_ADDR_LEN, DEFAULT_PREFIX, IPC_GET_CONTENT(call), DEFAULT_SUFFIX);
+                        if(! packet){
+                                return ENOMEM;
+                        }
+                        *answer_count = 2;
+                        IPC_SET_ARG1(*answer, (ipcarg_t) packet->packet_id);
+                        IPC_SET_ARG2(*answer, (ipcarg_t) packet->length);
+                        return EOK;
+                case NET_PACKET_CREATE_4:
+                        packet = packet_get(((DEFAULT_ADDR_LEN < IPC_GET_ADDR_LEN(call)) ? IPC_GET_ADDR_LEN(call) : DEFAULT_ADDR_LEN), DEFAULT_PREFIX + IPC_GET_PREFIX(call), IPC_GET_CONTENT(call), DEFAULT_SUFFIX + IPC_GET_SUFFIX(call));
+                        if(! packet){
+                                return ENOMEM;
+                        }
+                        *answer_count = 2;
+                        IPC_SET_ARG1(*answer, (ipcarg_t) packet->packet_id);
+                        IPC_SET_ARG2(*answer, (ipcarg_t) packet->length);
+                        return EOK;
+                case NET_PACKET_GET:
+                        packet = pm_find(IPC_GET_ID(call));
+                        if(! packet_is_valid(packet)){
+                                return ENOENT;
+                        }
+                        return packet_reply(packet);
+                case NET_PACKET_GET_SIZE:
+                        packet = pm_find(IPC_GET_ID(call));
+                        if(! packet_is_valid(packet)){
+                                return ENOENT;
+                        }
+                        IPC_SET_ARG1(*answer, (ipcarg_t) packet->length);
+                        *answer_count = 1;
+                        return EOK;
+                case NET_PACKET_RELEASE:
+                        return packet_release_wrapper(IPC_GET_ID(call));
+        }
+        return ENOTSUP;
+}
+
 /** @}
  */