Changes in uspace/lib/packet/generic/packet_server.c [a649e73f:28a3e74] in mainline

File:

• uspace/lib/packet/generic/packet_server.c (modified) (17 diffs)

uspace/lib/packet/generic/packet_server.c

@@ -36 +36 @@
 
 #include <packet_server.h>
-#include <packet_local.h>
 
 #include <align.h>
@@ -42 +41 @@
 #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 <ipc/packet.h>
 #include <ipc/net.h>
-
 #include <net/packet.h>
 #include <net/packet_header.h>
@@ -70 +65 @@
         fibril_mutex_t lock;
         /** Free packet queues. */
-        packet_t free[FREE_QUEUES_COUNT];
+        packet_t *free[FREE_QUEUES_COUNT];
         
         /**
@@ -104 +99 @@
 };
 
-int packet_translate_local(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.
  *
@@ -123 +109 @@
  */
 static void
-packet_init(packet_t packet, size_t addr_len, size_t max_prefix,
+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));
-        
-        // clear the packet header
+        /* Clear the packet content */
+        bzero(((void *) packet) + sizeof(packet_t),
+            packet->length - sizeof(packet_t));
+        
+        /* Clear the packet header */
         packet->order = 0;
         packet->metric = 0;
@@ -136 +122 @@
         packet->next = 0;
         packet->addr_len = 0;
-        packet->src_addr = sizeof(struct packet);
+        packet->src_addr = sizeof(packet_t);
         packet->dest_addr = packet->src_addr + addr_len;
         packet->max_prefix = max_prefix;
@@ -145 +131 @@
 
 /** 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,
@@ -155 +139 @@
  * @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
+ * @return              The packet of dimensions at least as given.
+ * @return              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,
+        packet_t *packet;
+        int rc;
+
+        assert(fibril_mutex_is_locked(&ps_globals.lock));
+
+        /* Already locked */
+        packet = (packet_t *) mmap(NULL, length, PROTO_READ | PROTO_WRITE,
             MAP_SHARED | MAP_ANONYMOUS, 0, 0);
         if (packet == MAP_FAILED)
@@ -177 +162 @@
         packet_init(packet, addr_len, max_prefix, max_content, max_suffix);
         packet->magic_value = PACKET_MAGIC_VALUE;
-        if (ERROR_OCCURRED(pm_add(packet))) {
+        rc = pm_add(packet);
+        if (rc != EOK) {
                 munmap(packet, packet->length);
                 return NULL;
@@ -199 +185 @@
  * @return              NULL if there is not enough memory left.
  */
-static packet_t
+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 +
+        size_t length = ALIGN_UP(sizeof(packet_t) + 2 * addr_len +
             max_prefix + max_content + max_suffix, PAGE_SIZE);
         
         fibril_mutex_lock(&ps_globals.lock);
         
-        packet_t packet;
+        packet_t *packet;
         unsigned int index;
         
         for (index = 0; index < FREE_QUEUES_COUNT; index++) {
-                if (length > ps_globals.sizes[index])
+                if ((length > ps_globals.sizes[index]) &&
+                    (index < FREE_QUEUES_COUNT - 1))
                         continue;
                 
@@ -241 +228 @@
 }
 
-packet_t packet_get_4_local(int phone, size_t max_content, size_t addr_len,
-    size_t max_prefix, size_t max_suffix)
-{
-        return packet_get_local(addr_len, max_prefix, max_content, max_suffix);
-}
-
-packet_t packet_get_1_local(int phone, size_t content)
-{
-        return packet_get_local(DEFAULT_ADDR_LEN, DEFAULT_PREFIX, content,
-            DEFAULT_SUFFIX);
-}
-
 /** 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)
+static void packet_release(packet_t *packet)
 {
         int index;
         int result;
+
+        assert(fibril_mutex_is_locked(&ps_globals.lock));
 
         for (index = 0; (index < FREE_QUEUES_COUNT - 1) &&
@@ -278 +253 @@
  *
  * @param[in] packet_id The first packet identifier.
- * @returns             EOK on success.
- * @returns             ENOENT if there is no such packet.
+ * @return              EOK on success.
+ * @return              ENOENT if there is no such packet.
  */
 static int packet_release_wrapper(packet_id_t packet_id)
 {
-        packet_t packet;
+        packet_t *packet;
 
         packet = pm_find(packet_id);
@@ -296 +271 @@
 }
 
-void pq_release_local(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
+ * @return              EOK on success.
+ * @return              EINVAL if the packet is not valid.
+ * @return              EINVAL if the calling module does not accept the memory.
+ * @return              ENOMEM if the desired and actual sizes differ.
+ * @return              Other error codes as defined for the
  *                      async_share_in_finalize() function.
  */
-static int packet_reply(const packet_t packet)
+static int packet_reply(packet_t *packet)
 {
         ipc_callid_t callid;
@@ -319 +289 @@
 
         if (!async_share_in_receive(&callid, &size)) {
-                ipc_answer_0(callid, EINVAL);
+                async_answer_0(callid, EINVAL);
                 return EINVAL;
         }
 
         if (size != packet->length) {
-                ipc_answer_0(callid, ENOMEM);
+                async_answer_0(callid, ENOMEM);
                 return ENOMEM;
         }
@@ -339 +309 @@
  * @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
+ * @return              EOK on success.
+ * @return              ENOMEM if there is not enough memory left.
+ * @return              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
+ * @return              ENOTSUP if the message is not known.
+ * @return              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;
+    size_t *answer_count)
+{
+        packet_t *packet;
 
         *answer_count = 0;
-        switch (IPC_GET_METHOD(*call)) {
+        switch (IPC_GET_IMETHOD(*call)) {
         case IPC_M_PHONE_HUNGUP:
                 return EOK;
@@ -360 +330 @@
         case NET_PACKET_CREATE_1:
                 packet = packet_get_local(DEFAULT_ADDR_LEN, DEFAULT_PREFIX,
-                    IPC_GET_CONTENT(call), DEFAULT_SUFFIX);
+                    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);
+                IPC_SET_ARG1(*answer, (sysarg_t) packet->packet_id);
+                IPC_SET_ARG2(*answer, (sysarg_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));
+                    ((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);
+                IPC_SET_ARG1(*answer, (sysarg_t) packet->packet_id);
+                IPC_SET_ARG2(*answer, (sysarg_t) packet->length);
                 return EOK;
         
         case NET_PACKET_GET:
-                packet = pm_find(IPC_GET_ID(call));
+                packet = pm_find(IPC_GET_ID(*call));
                 if (!packet_is_valid(packet))
                         return ENOENT;
@@ -389 +359 @@
         
         case NET_PACKET_GET_SIZE:
-                packet = pm_find(IPC_GET_ID(call));
+                packet = pm_find(IPC_GET_ID(*call));
                 if (!packet_is_valid(packet))
                         return ENOENT;
-                IPC_SET_ARG1(*answer, (ipcarg_t) packet->length);
+                IPC_SET_ARG1(*answer, (sysarg_t) packet->length);
                 *answer_count = 1;
                 return EOK;
         
         case NET_PACKET_RELEASE:
-                return packet_release_wrapper(IPC_GET_ID(call));
+                return packet_release_wrapper(IPC_GET_ID(*call));
         }