Changeset cc8d91a in mainline

Timestamp:

2010-10-24T22:17:02Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b14b71e

Parents:

dfda6a1 (diff), a649e73f (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 from lp:~jakub/helenos/net.

Location:

uspace/lib

Files:

• net/include/protocol_map.h (modified) (1 diff)
• packet/generic/packet_server.c (modified) (9 diffs)
• packet/include/packet_local.h (modified) (2 diffs)
• packet/include/packet_server.h (modified) (1 diff)

uspace/lib/net/include/protocol_map.h

@@ -45 +45 @@
 #include <ipc/services.h>
 
-eth_type_t protocol_map(services_t, services_t);
-services_t protocol_unmap(services_t, int);
-eth_type_t lsap_map(eth_lsap_t);
-eth_lsap_t lsap_unmap(eth_type_t);
-hw_type_t hardware_map(services_t);
+extern eth_type_t protocol_map(services_t, services_t);
+extern services_t protocol_unmap(services_t, int);
+extern eth_type_t lsap_map(eth_lsap_t);
+extern eth_lsap_t lsap_unmap(eth_type_t);
+extern hw_type_t hardware_map(services_t);
 
 #endif

uspace/lib/packet/generic/packet_server.c

@@ -27 +27 @@
  */
 
-/** @addtogroup packet
+/** @addtogroup libpacket
  *  @{
  */
 
 /** @file
- *  Packet server implementation.
- */
+ * Packet server implementation.
+ */
+
+#include <packet_server.h>
+#include <packet_local.h>
 
 #include <align.h>
@@ -51 +54 @@
 #include <net/packet_header.h>
 
-#include <packet_server.h>
-#include <packet_local.h>
-
 #define FREE_QUEUES_COUNT       7
 
-/** The default address length reserved for new packets.
- */
+/** The default address length reserved for new packets. */
 #define DEFAULT_ADDR_LEN        32
 
-/** The default prefix reserved for new packets.
- */
+/** The default prefix reserved for new packets. */
 #define DEFAULT_PREFIX          64
 
-/** The default suffix reserved for new packets.
- */
+/** The default suffix reserved for new packets. */
 #define DEFAULT_SUFFIX          64
 
-/** Packet server global data.
- */
-static struct{
-        /** Safety lock.
-         */
+/** Packet server global data. */
+static struct {
+        /** Safety lock. */
         fibril_mutex_t lock;
-        /** Free packet queues.
-         */
+        /** Free packet queues. */
         packet_t free[FREE_QUEUES_COUNT];
-        /** Packet length upper bounds of the free packet queues.
-         *  The maximal lengths of packets in each queue in the ascending order.
-         *  The last queue is not limited.
+        
+        /**
+         * Packet length upper bounds of the free packet queues. The maximal
+         * lengths of packets in each queue in the ascending order. The last
+         * queue is not limited.
          */
         size_t sizes[FREE_QUEUES_COUNT];
-        /** Total packets allocated.
-         */
+        
+        /** Total packets allocated. */
         unsigned int count;
 } ps_globals = {
         .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},
+        .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
+        },
         .count = 0
 };
@@ -102 +114 @@
 
 /** Clears and initializes the packet according to the given dimensions.
- *  @param[in] packet The packet to be initialized.
- *  @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.
- */
-static void packet_init(packet_t packet, size_t addr_len, size_t max_prefix, size_t max_content, size_t max_suffix){
+ *
+ * @param[in] packet    The packet to be initialized.
+ * @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.
+ */
+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));
+        bzero(((void *) packet) + sizeof(struct packet),
+            packet->length - sizeof(struct packet));
+        
         // clear the packet header
         packet->order = 0;
@@ -125 +144 @@
 }
 
-/** 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){
+/** Creates a 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;
 
@@ -141 +167 @@
 
         // already locked
-        packet = (packet_t) mmap(NULL, length, PROTO_READ | PROTO_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-        if(packet == MAP_FAILED){
+        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;
+
+        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))){
+        if (ERROR_OCCURRED(pm_add(packet))) {
                 munmap(packet, packet->length);
                 return NULL;
         }
+        
         return packet;
 }
@@ -163 +191 @@
  * Lock 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] 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.
- *
- * @return The packet of dimensions at least as given.
- * @return NULL if there is not enough memory left.
- *
- */
-static packet_t packet_get_local(size_t addr_len, size_t max_prefix,
-    size_t max_content, size_t max_suffix)
-{
-        size_t length = ALIGN_UP(sizeof(struct packet) + 2 * addr_len + max_prefix
-            + max_content + max_suffix, PAGE_SIZE);
+ * @param[in] max_suffix The maximal suffix length in bytes.
+ * @return              The packet of dimensions at least as given.
+ * @return              NULL if there is not enough memory left.
+ */
+static packet_t
+packet_get_local(size_t addr_len, size_t max_prefix, size_t max_content,
+    size_t max_suffix)
+{
+        size_t length = ALIGN_UP(sizeof(struct packet) + 2 * addr_len +
+            max_prefix + max_content + max_suffix, PAGE_SIZE);
         
         fibril_mutex_lock(&ps_globals.lock);
@@ -184 +211 @@
         unsigned int index;
         
-        for (index = 0; index < FREE_QUEUES_COUNT - 1; index++) {
-                if (length <= ps_globals.sizes[index]) {
-                        packet = ps_globals.free[index];
+        for (index = 0; index < FREE_QUEUES_COUNT; index++) {
+                if (length > ps_globals.sizes[index])
+                        continue;
+                
+                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);
                         
-                        while (packet_is_valid(packet) && (packet->length < length))
-                                packet = pm_find(packet->next);
+                        packet_init(packet, addr_len, max_prefix, max_content,
+                            max_suffix);
+                        fibril_mutex_unlock(&ps_globals.lock);
                         
-                        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);
-                                
-                                return packet;
-                        }
+                        return packet;
                 }
         }
@@ -228 +255 @@
 /** Release 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){
+ * 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);
+        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){
+ *
+ * @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)){
+        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;
 }
@@ -268 +302 @@
 
 /** 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){
+ * @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;
 
-        if(! packet_is_valid(packet)){
+        if (!packet_is_valid(packet))
                 return EINVAL;
-        }
-        if(async_share_in_receive(&callid, &size) <= 0) return EINVAL;
-        if(size != packet->length){
+
+        if (!async_share_in_receive(&callid, &size)) {
+                ipc_answer_0(callid, EINVAL);
+                return EINVAL;
+        }
+
+        if (size != packet->length) {
+                ipc_answer_0(callid, ENOMEM);
                 return ENOMEM;
         }
-        return async_share_in_finalize(callid, packet, PROTO_READ | PROTO_WRITE);
-}
-
-int packet_server_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
+        
+        return async_share_in_finalize(callid, packet,
+            PROTO_READ | PROTO_WRITE);
+}
+
+/** Processes the packet server message.
+ *
+ * @param[in] callid    The message identifier.
+ * @param[in] call      The message parameters.
+ * @param[out] answer   The message answer parameters.
+ * @param[out] answer_count The last parameter for the actual answer in the
+ *                      answer parameter.
+ * @returns             EOK on success.
+ * @returns             ENOMEM if there is not enough memory left.
+ * @returns             ENOENT if there is no such packet as in the packet
+ *                      message parameter.
+ * @returns             ENOTSUP if the message is not known.
+ * @returns             Other error codes as defined for the
+ *                      packet_release_wrapper() function.
+ */
+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_local(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_local(((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));
-        }
+        switch (IPC_GET_METHOD(*call)) {
+        case IPC_M_PHONE_HUNGUP:
+                return EOK;
+        
+        case NET_PACKET_CREATE_1:
+                packet = packet_get_local(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_local(
+                    ((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;
 }

uspace/lib/packet/include/packet_local.h

@@ -27 +27 @@
  */
 
-/** @addtogroup packet
- *  @{
+/** @addtogroup libpacket
+ * @{
  */
 
@@ -34 +34 @@
  */
 
-#ifndef __NET_PACKET_LOCAL_H__
-#define __NET_PACKET_LOCAL_H__
+#ifndef LIBPACKET_PACKET_LOCAL_H_
+#define LIBPACKET_PACKET_LOCAL_H_
 
 #include <net/packet.h>

uspace/lib/packet/include/packet_server.h

@@ -27 +27 @@
  */
 
-/** @addtogroup packet
- *  @{
+/** @addtogroup libpacket
+ * @{
  */
 
 /** @file
- *  Packet server.
- *  The hosting module has to be compiled with both the packet.c and the packet_server.c source files.
- *  To function correctly, initialization of the packet map by the pm_init() function has to happen at the first place.
- *  Then the packet messages have to be processed by the packet_server_message() function.
- *  The packet map should be released by the pm_destroy() function during the module termination.
- *  @see IS_NET_PACKET_MESSAGE()
+ * Packet server.
+ * The hosting module has to be compiled with both the packet.c and the
+ * packet_server.c source files. To function correctly, initialization of the
+ * packet map by the pm_init() function has to happen at the first place. Then
+ * the packet messages have to be processed by the packet_server_message()
+ * function. The packet map should be released by the pm_destroy() function
+ * during the module termination.
+ * @see IS_NET_PACKET_MESSAGE()
  */
 
-#ifndef __NET_PACKET_SERVER_H__
-#define __NET_PACKET_SERVER_H__
+#ifndef LIBPACKET_PACKET_SERVER_H_
+#define LIBPACKET_PACKET_SERVER_H_
 
 #include <ipc/ipc.h>
 
-/** Processes the packet server message.
- *  @param[in] callid The message identifier.
- *  @param[in] call The message parameters.
- *  @param[out] answer The message answer parameters.
- *  @param[out] answer_count The last parameter for the actual answer in the answer parameter.
- *  @returns EOK on success.
- *  @returns ENOMEM if there is not enough memory left.
- *  @returns ENOENT if there is no such packet as in the packet message parameter..
- *  @returns ENOTSUP if the message is not known.
- *  @returns Other error codes as defined for the packet_release_wrapper() function.
- */
-extern int packet_server_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count);
+extern int packet_server_message(ipc_callid_t, ipc_call_t *, ipc_call_t *,
+    int *);
 
 #endif