Changeset 9934f7d in mainline for uspace/lib


Ignore:
Timestamp:
2011-06-13T19:53:48Z (14 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a07a454
Parents:
43ac0cc
Message:

Add extra argument to async connection handlers that can be used for passing
information from async_connect_to_me() to the handler.

Location:
uspace/lib
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/generic/async.c

    r43ac0cc r9934f7d  
    166166        /** Call data of the opening call. */
    167167        ipc_call_t call;
     168        /** Local argument or NULL if none. */
     169        void *carg;
    168170       
    169171        /** Identification of the closing call. */
    … …  
    171173       
    172174        /** Fibril function that will be used to handle the connection. */
    173         void (*cfibril)(ipc_callid_t, ipc_call_t *);
     175        async_client_conn_t cfibril;
    174176} connection_t;
    175177
    … …  
    211213 * This function is defined as a weak symbol - to be redefined in user code.
    212214 *
    213  * @param callid Hash of the incoming call.
    214  * @param call   Data of the incoming call.
    215  *
    216  */
    217 static void default_client_connection(ipc_callid_t callid, ipc_call_t *call)
     215 * @param callid        Hash of the incoming call.
     216 * @param call          Data of the incoming call.
     217 * @param arg           Local argument
     218 *
     219 */
     220static void default_client_connection(ipc_callid_t callid, ipc_call_t *call,
     221    void *arg)
    218222{
    219223        ipc_answer_0(callid, ENOENT);
    … …  
    224228 * This function is defined as a weak symbol - to be redefined in user code.
    225229 *
    226  * @param callid Hash of the incoming call.
    227  * @param call   Data of the incoming call.
     230 * @param callid        Hash of the incoming call.
     231 * @param call          Data of the incoming call.
     232 * @param arg           Local argument.
    228233 *
    229234 */
    … …  
    233238
    234239static async_client_conn_t client_connection = default_client_connection;
    235 static async_client_conn_t interrupt_received = default_interrupt_received;
     240static async_interrupt_handler_t interrupt_received = default_interrupt_received;
    236241
    237242/** Setter for client_connection function pointer.
    … …  
    250255 *             notification fibril.
    251256 */
    252 void async_set_interrupt_received(async_client_conn_t intr)
     257void async_set_interrupt_received(async_interrupt_handler_t intr)
    253258{
    254259        interrupt_received = intr;
    … …  
    633638         */
    634639        fibril_connection->cfibril(fibril_connection->callid,
    635             &fibril_connection->call);
     640            &fibril_connection->call, fibril_connection->carg);
    636641       
    637642        /*
    … …  
    704709 * @param cfibril       Fibril function that should be called upon opening the
    705710 *                      connection.
     711 * @param carg          Extra argument to pass to the connection fibril
    706712 *
    707713 * @return New fibril id or NULL on failure.
    … …  
    710716fid_t async_new_connection(sysarg_t in_task_hash, sysarg_t in_phone_hash,
    711717    ipc_callid_t callid, ipc_call_t *call,
    712     async_client_conn_t cfibril)
     718    async_client_conn_t cfibril, void *carg)
    713719{
    714720        connection_t *conn = malloc(sizeof(*conn));
    … …  
    725731        conn->callid = callid;
    726732        conn->close_callid = 0;
     733        conn->carg = carg;
    727734       
    728735        if (call)
    … …  
    779786                /* Open new connection with fibril, etc. */
    780787                async_new_connection(call->in_task_hash, IPC_GET_ARG5(*call),
    781                     callid, call, client_connection);
     788                    callid, call, client_connection, NULL);
    782789                return;
    783790        }
    … …  
    14141421 */
    14151422int async_connect_to_me(async_exch_t *exch, sysarg_t arg1, sysarg_t arg2,
    1416     sysarg_t arg3, async_client_conn_t client_receiver)
     1423    sysarg_t arg3, async_client_conn_t client_receiver, void *carg)
    14171424{
    14181425        if (exch == NULL)
    … …  
    14281435        if (client_receiver != NULL)
    14291436                async_new_connection(task_hash, phone_hash, 0, NULL,
    1430                     client_receiver);
     1437                    client_receiver, carg);
    14311438       
    14321439        return EOK;

  • uspace/lib/c/generic/async_obsolete.c

    r43ac0cc r9934f7d  
    240240 */
    241241int async_obsolete_connect_to_me(int phone, sysarg_t arg1, sysarg_t arg2,
    242     sysarg_t arg3, async_client_conn_t client_receiver)
     242    sysarg_t arg3, async_client_conn_t client_receiver, void *carg)
    243243{
    244244        sysarg_t task_hash;
    … …  
    251251        if (client_receiver != NULL)
    252252                async_new_connection(task_hash, phone_hash, 0, NULL,
    253                     client_receiver);
     253                    client_receiver, carg);
    254254       
    255255        return EOK;

  • uspace/lib/c/generic/devman.c

    r43ac0cc r9934f7d  
    194194       
    195195        exch = devman_exchange_begin(DEVMAN_DRIVER);
    196         async_connect_to_me(exch, 0, 0, 0, NULL);
     196        async_connect_to_me(exch, 0, 0, 0, NULL, NULL);
    197197        devman_exchange_end(exch);
    198198       

  • uspace/lib/c/generic/devmap.c

    r43ac0cc r9934f7d  
    187187       
    188188        exch = devmap_exchange_begin(DEVMAP_DRIVER);
    189         async_connect_to_me(exch, 0, 0, 0, NULL);
     189        async_connect_to_me(exch, 0, 0, 0, NULL, NULL);
    190190        devmap_exchange_end(exch);
    191191       

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

    r43ac0cc r9934f7d  
    141141        if (phone >= 0) {
    142142                /* Request the bidirectional connection */
    143                 int rc = async_obsolete_connect_to_me(phone, arg1, arg2, arg3, client_receiver);
     143                int rc = async_obsolete_connect_to_me(phone, arg1, arg2, arg3,
     144                    client_receiver, NULL);
    144145                if (rc != EOK) {
    145146                        async_obsolete_hangup(phone);

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

    r43ac0cc r9934f7d  
    203203 * @param[in] iid       The initial message identifier.
    204204 * @param[in] icall     The initial message call structure.
    205  */
    206 static void socket_connection(ipc_callid_t iid, ipc_call_t * icall)
     205 * @param[in] arg       Local argument.
     206 */
     207static void socket_connection(ipc_callid_t iid, ipc_call_t * icall, void *arg)
    207208{
    208209        ipc_callid_t callid;

  • uspace/lib/c/generic/ns.c

    r43ac0cc r9934f7d  
    4242{
    4343        async_exch_t *exch = async_exchange_begin(session_ns);
    44         int rc = async_connect_to_me(exch, service, 0, 0, NULL);
     44        int rc = async_connect_to_me(exch, service, 0, 0, NULL, NULL);
    4545        async_exchange_end(exch);
    4646       

  • uspace/lib/c/include/async.h

    r43ac0cc r9934f7d  
    5353typedef void (*async_client_data_dtor_t)(void *);
    5454
    55 typedef void (*async_client_conn_t)(ipc_callid_t, ipc_call_t *);
     55/** Client connection handler
     56 *
     57 * @param callid        ID of incoming call or 0 if connection initiated from
     58 *                      inside using async_connect_to_me()
     59 * @param call          Incoming call or 0 if connection initiated from inside
     60 * @param arg           Local argument passed from async_new_connection() or
     61 *                      async_connect_to_me()
     62 */
     63typedef void (*async_client_conn_t)(ipc_callid_t, ipc_call_t *, void *);
     64
     65/** Interrupt handler */
     66typedef void (*async_interrupt_handler_t)(ipc_callid_t, ipc_call_t *);
    5667
    5768/** Exchange management style
    … …  
    166177
    167178extern fid_t async_new_connection(sysarg_t, sysarg_t, ipc_callid_t,
    168     ipc_call_t *, async_client_conn_t);
     179    ipc_call_t *, async_client_conn_t, void *);
    169180
    170181extern void async_usleep(suseconds_t);
    … …  
    177188
    178189extern void async_set_client_connection(async_client_conn_t);
    179 extern void async_set_interrupt_received(async_client_conn_t);
     190extern void async_set_interrupt_received(async_interrupt_handler_t);
    180191
    181192/*
    … …  
    351362
    352363extern int async_connect_to_me(async_exch_t *, sysarg_t, sysarg_t, sysarg_t,
    353     async_client_conn_t);
     364    async_client_conn_t, void *);
    354365
    355366extern int async_hangup(async_sess_t *);

  • uspace/lib/c/include/async_obsolete.h

    r43ac0cc r9934f7d  
    198198
    199199extern int async_obsolete_connect_to_me(int, sysarg_t, sysarg_t, sysarg_t,
    200     async_client_conn_t);
     200    async_client_conn_t, void *);
    201201extern int async_obsolete_connect_me_to(int, sysarg_t, sysarg_t, sysarg_t);
    202202extern int async_obsolete_connect_me_to_blocking(int, sysarg_t, sysarg_t, sysarg_t);

  • uspace/lib/drv/generic/driver.c

    r43ac0cc r9934f7d  
    427427
    428428/** Function for handling connections to device driver. */
    429 static void driver_connection(ipc_callid_t iid, ipc_call_t *icall)
     429static void driver_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
    430430{
    431431        /* Select interface */

  • uspace/lib/fs/libfs.c

    r43ac0cc r9934f7d  
    106106         * Ask VFS for callback connection.
    107107         */
    108         async_connect_to_me(exch, 0, 0, 0, conn);
     108        async_connect_to_me(exch, 0, 0, 0, conn, NULL);
    109109       
    110110        /*

  • uspace/lib/net/il/il_skel.c

    r43ac0cc r9934f7d  
    5151 *
    5252 */
    53 static void il_client_connection(ipc_callid_t iid, ipc_call_t *icall)
     53static void il_client_connection(ipc_callid_t iid, ipc_call_t *icall,
     54    void *arg)
    5455{
    5556        /*
    … …  
    117118                goto out;
    118119       
    119         rc = async_connect_to_me(PHONE_NS, service, 0, 0, NULL);
     120        rc = async_connect_to_me(PHONE_NS, service, 0, 0, NULL, NULL);
    120121        if (rc != EOK)
    121122                goto out;

  • uspace/lib/net/netif/netif_skel.c

    r43ac0cc r9934f7d  
    365365 *
    366366 */
    367 static void netif_client_connection(ipc_callid_t iid, ipc_call_t *icall)
     367static void netif_client_connection(ipc_callid_t iid, ipc_call_t *icall,
     368    void *arg)
    368369{
    369370        /*

  • uspace/lib/net/nil/nil_skel.c

    r43ac0cc r9934f7d  
    5151 *
    5252 */
    53 static void nil_client_connection(ipc_callid_t iid, ipc_call_t *icall)
     53static void nil_client_connection(ipc_callid_t iid, ipc_call_t *icall,
     54    void *arg)
    5455{
    5556        /*
    … …  
    117118                goto out;
    118119       
    119         rc = async_connect_to_me(PHONE_NS, service, 0, 0, NULL);
     120        rc = async_connect_to_me(PHONE_NS, service, 0, 0, NULL, NULL);
    120121        if (rc != EOK)
    121122                goto out;

  • uspace/lib/net/tl/tl_skel.c

    r43ac0cc r9934f7d  
    4747/** Default thread for new connections.
    4848 *
    49  * @param[in] iid   The initial message identifier.
    50  * @param[in] icall The initial message call structure.
     49 * @param[in] iid       The initial message identifier.
     50 * @param[in] icall     The initial message call structure.
     51 * @param[in] arg       Local argument.
    5152 *
    5253 */
    53 static void tl_client_connection(ipc_callid_t iid, ipc_call_t *icall)
     54static void tl_client_connection(ipc_callid_t iid, ipc_call_t *icall,
     55    void *arg)
    5456{
    5557        /*
    … …  
    119121                goto out;
    120122       
    121         rc = async_connect_to_me(PHONE_NS, service, 0, 0, NULL);
     123        rc = async_connect_to_me(PHONE_NS, service, 0, 0, NULL, NULL);
    122124        if (rc != EOK)
    123125                goto out;

  • uspace/lib/usbvirt/src/device.c

    r43ac0cc r9934f7d  
    4949/** Main IPC call handling from virtual host controller.
    5050 *
    51  * @param iid Caller identification.
    52  * @param icall Initial incoming call.
     51 * @param iid           Caller identification
     52 * @param icall         Initial incoming call
     53 * @param arg           Local argument
    5354 */
    54 static void callback_connection(ipc_callid_t iid, ipc_call_t *icall)
     55static void callback_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
    5556{
    5657        assert(DEV != NULL);
    … …  
    99100       
    100101        async_exch_t *exch = async_exchange_begin(hcd_sess);
    101         rc = async_connect_to_me(exch, 0, 0, 0, callback_connection);
     102        rc = async_connect_to_me(exch, 0, 0, 0, callback_connection, NULL);
    102103        async_exchange_end(exch);
    103104       
Note: See TracChangeset for help on using the changeset viewer.