Changeset 973ef9fc in mainline for uspace/lib/packet/generic/packet_server.c

Timestamp:

2010-12-25T21:20:28Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

631ee0c

Parents:

1bfd3d3 (diff), 09178b7f (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/packet/generic/packet_server.c (modified) (16 diffs)

uspace/lib/packet/generic/packet_server.c

@@ -36 +36 @@
 
 #include <packet_server.h>
-#include <packet_local.h>
 
 #include <align.h>
@@ -69 +68 @@
         fibril_mutex_t lock;
         /** Free packet queues. */
-        packet_t free[FREE_QUEUES_COUNT];
+        packet_t *free[FREE_QUEUES_COUNT];
         
         /**
@@ -103 +102 @@
 };
 
-int packet_translate_local(int phone, packet_t *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.
  *
@@ -122 +112 @@
  */
 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));
+        bzero(((void *) packet) + sizeof(packet_t),
+            packet->length - sizeof(packet_t));
         
         // clear the packet header
@@ -135 +125 @@
         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;
@@ -144 +134 @@
 
 /** 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,
@@ -157 +145 @@
  * @return              NULL if there is not enough memory left.
  */
-static packet_t
+static packet_t *
 packet_create(size_t length, size_t addr_len, size_t max_prefix,
     size_t max_content, size_t max_suffix)
 {
-        packet_t packet;
+        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,
+        packet = (packet_t *) mmap(NULL, length, PROTO_READ | PROTO_WRITE,
             MAP_SHARED | MAP_ANONYMOUS, 0, 0);
         if (packet == MAP_FAILED)
@@ -198 +188 @@
  * @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;
         
@@ -241 +231 @@
 }
 
-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) &&
@@ -283 +261 @@
 static int packet_release_wrapper(packet_id_t packet_id)
 {
-        packet_t packet;
+        packet_t *packet;
 
         packet = pm_find(packet_id);
@@ -294 +272 @@
 
         return EOK;
-}
-
-void pq_release_local(int phone, packet_id_t packet_id)
-{
-        (void) packet_release_wrapper(packet_id);
 }
 
@@ -310 +283 @@
  *                      async_share_in_finalize() function.
  */
-static int packet_reply(const packet_t packet)
+static int packet_reply(packet_t *packet)
 {
         ipc_callid_t callid;
@@ -351 +324 @@
     int *answer_count)
 {
-        packet_t packet;
+        packet_t *packet;
 
         *answer_count = 0;
-        switch (IPC_GET_METHOD(*call)) {
+        switch (IPC_GET_IMETHOD(*call)) {
         case IPC_M_PHONE_HUNGUP:
                 return EOK;
@@ -364 +337 @@
                         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;
         
@@ -378 +351 @@
                         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;
         
@@ -392 +365 @@
                 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;