Changeset 46b881c in mainline for uspace/lib/net


Ignore:
Timestamp:
2011-01-29T11:36:41Z (14 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
0b6931a, 8add9ca5
Parents:
e26a4633 (diff), ffa2c8ef (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:

IPC/async: strictly isolate the use of low-level IPC methods (ipc_*) and async framework methods (async_*) in user code, do not allow a mixture of both in a single source file

Benefits for future plans

  • The async framework could use different communication style under the hood, but keeping the same high-level API
  • The async framework can be integrated more tightly with sessions without potential problems of intermixing session-aware async methods with session-unaware low-level methods in user code
  • The async_serialize_start()/_end() can be deprecated more easily
Location:
uspace/lib/net
Files:
13 edited

Legend:

Unmodified
Added
Removed

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

    re26a4633 r46b881c  
    3636
    3737#include <generic.h>
    38 
    3938#include <async.h>
    40 #include <ipc/ipc.h>
    4139#include <ipc/services.h>
    42 
    4340#include <net/device.h>
    4441#include <adt/measured_strings.h>

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

    re26a4633 r46b881c  
    3838#include <async.h>
    3939#include <errno.h>
    40 #include <ipc/ipc.h>
    4140#include <ipc/packet.h>
    4241#include <sys/mman.h>

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

    re26a4633 r46b881c  
    4141#include <async.h>
    4242#include <errno.h>
    43 #include <ipc/ipc.h>
    4443#include <ipc/services.h>
    4544#include <ipc/arp.h>

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

    re26a4633 r46b881c  
    5454         * the initial IPC_M_CONNECT_ME_TO call.
    5555         */
    56         ipc_answer_0(iid, EOK);
     56        async_answer_0(iid, EOK);
    5757       
    5858        while (true) {
    … …  
    115115                goto out;
    116116       
    117         rc = ipc_connect_to_me(PHONE_NS, service, 0, 0, NULL, NULL);
     117        rc = async_connect_to_me(PHONE_NS, service, 0, 0, NULL);
    118118        if (rc != EOK)
    119119                goto out;

  • uspace/lib/net/include/generic.h

    re26a4633 r46b881c  
    3939
    4040#include <async.h>
    41 #include <ipc/ipc.h>
    4241#include <ipc/services.h>
    4342

  • uspace/lib/net/include/il_skel.h

    re26a4633 r46b881c  
    4141#include <async.h>
    4242#include <fibril_synch.h>
    43 #include <ipc/ipc.h>
    4443#include <ipc/services.h>
    4544

  • uspace/lib/net/include/netif_skel.h

    re26a4633 r46b881c  
    4141#include <async.h>
    4242#include <fibril_synch.h>
    43 #include <ipc/ipc.h>
    4443#include <ipc/services.h>
    4544

  • uspace/lib/net/include/nil_skel.h

    re26a4633 r46b881c  
    4141#include <async.h>
    4242#include <fibril_synch.h>
    43 #include <ipc/ipc.h>
    4443#include <ipc/services.h>
    4544

  • uspace/lib/net/include/tl_skel.h

    re26a4633 r46b881c  
    4141#include <async.h>
    4242#include <fibril_synch.h>
    43 #include <ipc/ipc.h>
    4443#include <ipc/services.h>
    4544

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

    re26a4633 r46b881c  
    4040#include <fibril_synch.h>
    4141#include <stdio.h>
    42 #include <ipc/ipc.h>
    4342#include <ipc/services.h>
    4443#include <ipc/netif.h>
    … …  
    369368         * the initial IPC_M_CONNECT_ME_TO call.
    370369         */
    371         ipc_answer_0(iid, EOK);
     370        async_answer_0(iid, EOK);
    372371       
    373372        while (true) {

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

    re26a4633 r46b881c  
    5454         * the initial IPC_M_CONNECT_ME_TO call.
    5555         */
    56         ipc_answer_0(iid, EOK);
     56        async_answer_0(iid, EOK);
    5757       
    5858        while (true) {
    … …  
    115115                goto out;
    116116       
    117         rc = ipc_connect_to_me(PHONE_NS, service, 0, 0, NULL, NULL);
     117        rc = async_connect_to_me(PHONE_NS, service, 0, 0, NULL);
    118118        if (rc != EOK)
    119119                goto out;

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

    re26a4633 r46b881c  
    4242#include <async.h>
    4343#include <errno.h>
    44 #include <ipc/ipc.h>
    4544#include <ipc/services.h>
    4645#include <ipc/icmp.h>

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

    re26a4633 r46b881c  
    5454         * the initial IPC_M_CONNECT_ME_TO call.
    5555         */
    56         ipc_answer_0(iid, EOK);
     56        async_answer_0(iid, EOK);
    5757       
    5858        /* Per-connection initialization */
    … …  
    117117                goto out;
    118118       
    119         rc = ipc_connect_to_me(PHONE_NS, service, 0, 0, NULL, NULL);
     119        rc = async_connect_to_me(PHONE_NS, service, 0, 0, NULL);
    120120        if (rc != EOK)
    121121                goto out;
Note: See TracChangeset for help on using the changeset viewer.