Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/net/generic/packet_remote.c

    r6b82009 r79ae36dd  
    3737
    3838#include <async.h>
     39#include <async_obsolete.h>
    3940#include <errno.h>
    4041#include <ipc/packet.h>
    … …  
    5152 * Create the local packet mapping as well.
    5253 *
    53  * @param[in]  sess      Packet server module session.
    54  * @param[out] packet    Packet reference pointer to store the received
     54 * @param[in]  phone     The packet server module phone.
     55 * @param[out] packet    The packet reference pointer to store the received
    5556 *                       packet reference.
    56  * @param[in]  packet_id Packet identifier.
    57  * @param[in]  size      Packet total size in bytes.
     57 * @param[in]  packet_id The packet identifier.
     58 * @param[in]  size      The packet total size in bytes.
    5859 *
    5960 * @return EOK on success.
    6061 * @return Other error codes as defined for the pm_add() function.
    61  * @return Other error codes as defined for the async_share_in_start()
    62  *         function.
    63  *
    64  */
    65 static int packet_return(async_sess_t *sess, packet_t **packet,
    66     packet_id_t packet_id, size_t size)
    67 {
     62 * @return Other error codes as defined for the async_obsolete_share_in_start() function.
     63 *
     64 */
     65static int
     66packet_return(int phone, packet_t **packet, packet_id_t packet_id, size_t size)
     67{
     68        ipc_call_t answer;
     69        aid_t message;
     70        int rc;
     71       
     72        message = async_obsolete_send_1(phone, NET_PACKET_GET, packet_id, &answer);
     73
    6874        *packet = (packet_t *) as_get_mappable_page(size);
    69        
    70         async_exch_t *exch = async_exchange_begin(sess);
    71         ipc_call_t answer;
    72         aid_t message = async_send_1(exch, NET_PACKET_GET, packet_id, &answer);
    73         int rc = async_share_in_start_0_0(exch, *packet, size);
    74         async_exchange_end(exch);
    75        
    76         sysarg_t result;
    77         async_wait_for(message, &result);
    78        
     75        rc = async_obsolete_share_in_start_0_0(phone, *packet, size);
    7976        if (rc != EOK) {
    8077                munmap(*packet, size);
     78                async_wait_for(message, NULL);
    8179                return rc;
    8280        }
    83        
    8481        rc = pm_add(*packet);
    8582        if (rc != EOK) {
    8683                munmap(*packet, size);
     84                async_wait_for(message, NULL);
    8785                return rc;
    8886        }
    8987       
     88        sysarg_t result;
     89        async_wait_for(message, &result);
     90       
    9091        return result;
    9192}
    9293
    93 /** Translate the packet identifier to the packet reference.
    94  *
    95  * Try to find mapping first. The packet server is asked to share
    96  * the packet if the mapping is not present.
    97  *
    98  * @param[in]  sess      Packet server module session.
    99  * @param[out] packet    Packet reference.
    100  * @param[in]  packet_id Packet identifier.
    101  *
    102  * @return EOK on success.
    103  * @return EINVAL if the packet parameter is NULL.
    104  * @return Other error codes as defined for the NET_PACKET_GET_SIZE
    105  *         message.
    106  * @return Other error codes as defined for the packet_return()
    107  *         function.
    108  *
    109  */
    110 int packet_translate_remote(async_sess_t *sess, packet_t **packet,
    111     packet_id_t packet_id)
    112 {
     94/** Translates the packet identifier to the packet reference.
     95 *
     96 * Tries to find mapping first.
     97 * Contacts the packet server to share the packet if the mapping is not present.
     98 *
     99 * @param[in] phone     The packet server module phone.
     100 * @param[out] packet   The packet reference.
     101 * @param[in] packet_id The packet identifier.
     102 * @return              EOK on success.
     103 * @return              EINVAL if the packet parameter is NULL.
     104 * @return              Other error codes as defined for the NET_PACKET_GET_SIZE
     105 *                      message.
     106 * @return              Other error codes as defined for the packet_return()
     107 *                      function.
     108 */
     109int packet_translate_remote(int phone, packet_t **packet, packet_id_t packet_id)
     110{
     111        int rc;
     112       
    113113        if (!packet)
    114114                return EINVAL;
    … …  
    116116        *packet = pm_find(packet_id);
    117117        if (!*packet) {
    118                 async_exch_t *exch = async_exchange_begin(sess);
    119118                sysarg_t size;
    120                 int rc = async_req_1_1(exch, NET_PACKET_GET_SIZE, packet_id,
     119               
     120                rc = async_obsolete_req_1_1(phone, NET_PACKET_GET_SIZE, packet_id,
    121121                    &size);
    122                 async_exchange_end(exch);
    123                
    124122                if (rc != EOK)
    125123                        return rc;
    126                
    127                 rc = packet_return(sess, packet, packet_id, size);
     124                rc = packet_return(phone, packet, packet_id, size);
    128125                if (rc != EOK)
    129126                        return rc;
    130127        }
    131        
    132128        if ((*packet)->next) {
    133129                packet_t *next;
    134                 return packet_translate_remote(sess, &next, (*packet)->next);
     130               
     131                return packet_translate_remote(phone, &next, (*packet)->next);
    135132        }
    136133       
    … …  
    138135}
    139136
    140 /** Obtain the packet of given dimensions.
    141  *
    142  * Contact the packet server to return the appropriate packet.
    143  *
    144  * @param[in] sess        Packet server module session.
    145  * @param[in] addr_len    Source and destination addresses maximal length
    146  *                        in bytes.
    147  * @param[in] max_prefix  Maximal prefix length in bytes.
    148  * @param[in] max_content Maximal content length in bytes.
    149  * @param[in] max_suffix  Maximal suffix length in bytes.
    150  *
    151  * @return The packet reference.
    152  * @return NULL on error.
    153  *
    154  */
    155 packet_t *packet_get_4_remote(async_sess_t *sess, size_t max_content,
    156     size_t addr_len, size_t max_prefix, size_t max_suffix)
    157 {
    158         async_exch_t *exch = async_exchange_begin(sess);
     137/** Obtains the packet of the given dimensions.
     138 *
     139 * Contacts the packet server to return the appropriate packet.
     140 *
     141 * @param[in] phone     The packet server module phone.
     142 * @param[in] addr_len  The source and destination addresses maximal length in
     143 *                      bytes.
     144 * @param[in] max_prefix The maximal prefix length in bytes.
     145 * @param[in] max_content The maximal content length in bytes.
     146 * @param[in] max_suffix The maximal suffix length in bytes.
     147 * @return              The packet reference.
     148 * @return              NULL on error.
     149 */
     150packet_t *packet_get_4_remote(int phone, size_t max_content, size_t addr_len,
     151    size_t max_prefix, size_t max_suffix)
     152{
    159153        sysarg_t packet_id;
    160154        sysarg_t size;
    161         int rc = async_req_4_2(exch, NET_PACKET_CREATE_4, max_content, addr_len,
     155        int rc;
     156       
     157        rc = async_obsolete_req_4_2(phone, NET_PACKET_CREATE_4, max_content, addr_len,
    162158            max_prefix, max_suffix, &packet_id, &size);
    163         async_exchange_end(exch);
    164        
    165159        if (rc != EOK)
    166160                return NULL;
    167161       
     162       
    168163        packet_t *packet = pm_find(packet_id);
    169164        if (!packet) {
    170                 rc = packet_return(sess, &packet, packet_id, size);
     165                rc = packet_return(phone, &packet, packet_id, size);
    171166                if (rc != EOK)
    172167                        return NULL;
    … …  
    176171}
    177172
    178 /** Obtain the packet of given content size.
    179  *
    180  * Contact the packet server to return the appropriate packet.
    181  *
    182  * @param[in] sess    Packet server module session.
    183  * @param[in] content Maximal content length in bytes.
    184  *
    185  * @return The packet reference.
    186  * @return NULL on error.
    187  *
    188  */
    189 packet_t *packet_get_1_remote(async_sess_t *sess, size_t content)
    190 {
    191         async_exch_t *exch = async_exchange_begin(sess);
     173/** Obtains the packet of the given content size.
     174 *
     175 * Contacts the packet server to return the appropriate packet.
     176 *
     177 * @param[in] phone     The packet server module phone.
     178 * @param[in] content   The maximal content length in bytes.
     179 * @return              The packet reference.
     180 * @return              NULL on error.
     181 */
     182packet_t *packet_get_1_remote(int phone, size_t content)
     183{
    192184        sysarg_t packet_id;
    193185        sysarg_t size;
    194         int rc = async_req_1_2(exch, NET_PACKET_CREATE_1, content, &packet_id,
     186        int rc;
     187       
     188        rc = async_obsolete_req_1_2(phone, NET_PACKET_CREATE_1, content, &packet_id,
    195189            &size);
    196         async_exchange_end(exch);
    197        
    198190        if (rc != EOK)
    199191                return NULL;
    … …  
    201193        packet_t *packet = pm_find(packet_id);
    202194        if (!packet) {
    203                 rc = packet_return(sess, &packet, packet_id, size);
     195                rc = packet_return(phone, &packet, packet_id, size);
    204196                if (rc != EOK)
    205197                        return NULL;
    … …  
    209201}
    210202
    211 /** Release the packet queue.
     203/** Releases the packet queue.
    212204 *
    213205 * All packets in the queue are marked as free for use.
    … …  
    216208 * received or obtained again.
    217209 *
    218  * @param[in] sess      Packet server module session.
    219  * @param[in] packet_id Packet identifier.
    220  *
    221  */
    222 void pq_release_remote(async_sess_t *sess, packet_id_t packet_id)
    223 {
    224         async_exch_t *exch = async_exchange_begin(sess);
    225         async_msg_1(exch, NET_PACKET_RELEASE, packet_id);
    226         async_exchange_end(exch);
     210 * @param[in] phone     The packet server module phone.
     211 * @param[in] packet_id The packet identifier.
     212 */
     213void pq_release_remote(int phone, packet_id_t packet_id)
     214{
     215        async_obsolete_msg_1(phone, NET_PACKET_RELEASE, packet_id);
    227216}
    228217
Note: See TracChangeset for help on using the changeset viewer.