Changeset 79ae36dd in mainline for uspace/srv/net


Ignore:
Timestamp:
2011-06-08T19:01:55Z (14 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
0eff68e
Parents:
764d71e
Message:

new async framework with integrated exchange tracking

  • strict isolation between low-level IPC and high-level async framework with integrated exchange tracking
    • each IPC connection is represented by an async_sess_t structure
    • each IPC exchange is represented by an async_exch_t structure
    • exchange management is either based on atomic messages (EXCHANGE_ATOMIC), locking (EXCHANGE_SERIALIZE) or connection cloning (EXCHANGE_CLONE)
  • async_obsolete: temporary compatibility layer to keep old async clients working (several pieces of code are currently broken, but only non-essential functionality)
  • IPC_M_PHONE_HANGUP is now method no. 0 (for elegant boolean evaluation)
  • IPC_M_DEBUG_ALL has been renamed to IPC_M_DEBUG
  • IPC_M_PING has been removed (VFS protocol now has VFS_IN_PING)
  • console routines in libc have been rewritten for better abstraction
  • additional use for libc-private header files (FILE structure opaque to the client)
  • various cstyle changes (typos, indentation, missing externs in header files, improved comments, etc.)
Location:
uspace/srv/net
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/net/il/arp/arp.c

    r764d71e r79ae36dd  
    845845       
    846846        *count = 0;
     847       
     848        if (!IPC_GET_IMETHOD(*call))
     849                return EOK;
     850       
    847851        switch (IPC_GET_IMETHOD(*call)) {
    848         case IPC_M_PHONE_HUNGUP:
    849                 return EOK;
    850        
    851852        case NET_ARP_DEVICE:
    852853                rc = measured_strings_receive(&address, &data, 1);

  • uspace/srv/net/il/ip/ip.c

    r764d71e r79ae36dd  
    7676#include <il_remote.h>
    7777#include <il_skel.h>
     78
     79// FIXME: remove this header
     80#include <kernel/ipc/ipc_methods.h>
    7881
    7982/** IP module name. */
    … …  
    19131916       
    19141917        *answer_count = 0;
     1918       
     1919        if (!IPC_GET_IMETHOD(*call))
     1920                return EOK;
     1921       
    19151922        switch (IPC_GET_IMETHOD(*call)) {
    1916         case IPC_M_PHONE_HUNGUP:
    1917                 return EOK;
    1918        
    19191923        case IPC_M_CONNECT_TO_ME:
    19201924                return ip_register(IL_GET_PROTO(*call), IL_GET_SERVICE(*call),

  • uspace/srv/net/net/net.c

    r764d71e r79ae36dd  
    4141#include <ctype.h>
    4242#include <ddi.h>
     43#include <ns.h>
    4344#include <errno.h>
    4445#include <malloc.h>
    … …  
    339340                goto out;
    340341       
    341         rc = async_connect_to_me(PHONE_NS, SERVICE_NETWORKING, 0, 0, NULL);
     342        rc = service_register(SERVICE_NETWORKING);
    342343        if (rc != EOK)
    343344                goto out;
    … …  
    638639       
    639640        *answer_count = 0;
     641       
     642        if (!IPC_GET_IMETHOD(*call))
     643                return EOK;
     644       
    640645        switch (IPC_GET_IMETHOD(*call)) {
    641         case IPC_M_PHONE_HUNGUP:
    642                 return EOK;
    643646        case NET_NET_GET_DEVICE_CONF:
    644647                rc = measured_strings_receive(&strings, &data,
    … …  
    703706               
    704707                /* End if told to either by the message or the processing result */
    705                 if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) || (res == EHANGUP))
     708                if ((!IPC_GET_IMETHOD(call)) || (res == EHANGUP))
    706709                        return;
    707710               

  • uspace/srv/net/netif/lo/lo.c

    r764d71e r79ae36dd  
    3939#include <stdio.h>
    4040#include <str.h>
     41#include <ns.h>
    4142#include <ipc/services.h>
    4243#include <ipc/nil.h>
    … …  
    164165int netif_initialize(void)
    165166{
    166         return async_connect_to_me(PHONE_NS, SERVICE_LO, 0, 0, NULL);
     167        return service_register(SERVICE_LO);
    167168}
    168169

  • uspace/srv/net/nil/eth/eth.c

    r764d71e r79ae36dd  
    5959#include <packet_remote.h>
    6060#include <nil_skel.h>
     61
     62// FIXME: remove this header
     63#include <kernel/ipc/ipc_methods.h>
    6164
    6265#include "eth.h"
    … …  
    846849       
    847850        *answer_count = 0;
     851       
     852        if (!IPC_GET_IMETHOD(*call))
     853                return EOK;
     854       
    848855        switch (IPC_GET_IMETHOD(*call)) {
    849         case IPC_M_PHONE_HUNGUP:
    850                 return EOK;
    851        
    852856        case NET_NIL_DEVICE:
    853857                return eth_device_message(IPC_GET_DEVICE(*call),

  • uspace/srv/net/nil/nildummy/nildummy.c

    r764d71e r79ae36dd  
    5454#include <nil_skel.h>
    5555
     56// FIXME: remove this header
     57#include <kernel/ipc/ipc_methods.h>
     58
    5659#include "nildummy.h"
    5760
    … …  
    393396       
    394397        *answer_count = 0;
     398       
     399        if (!IPC_GET_IMETHOD(*call))
     400                return EOK;
     401       
    395402        switch (IPC_GET_IMETHOD(*call)) {
    396         case IPC_M_PHONE_HUNGUP:
    397                 return EOK;
    398        
    399403        case NET_NIL_DEVICE:
    400404                return nildummy_device_message(IPC_GET_DEVICE(*call),

  • uspace/srv/net/tl/icmp/icmp.c

    r764d71e r79ae36dd  
    612612static void icmp_receiver(ipc_callid_t iid, ipc_call_t *icall)
    613613{
    614         bool loop = true;
    615614        packet_t *packet;
    616615        int rc;
    617616       
    618         while (loop) {
     617        while (true) {
     618                if (!IPC_GET_IMETHOD(*icall))
     619                        break;
     620               
    619621                switch (IPC_GET_IMETHOD(*icall)) {
    620622                case NET_TL_RECEIVED:
    … …  
    629631                        async_answer_0(iid, (sysarg_t) rc);
    630632                        break;
    631                 case IPC_M_PHONE_HUNGUP:
    632                         loop = false;
    633                         continue;
    634633                default:
    635634                        async_answer_0(iid, (sysarg_t) ENOTSUP);

  • uspace/srv/net/tl/tcp/tcp.c

    r764d71e r79ae36dd  
    3838#include <assert.h>
    3939#include <async.h>
     40#include <async_obsolete.h>
    4041#include <fibril_synch.h>
    4142#include <malloc.h>
    … …  
    7273#include "tcp.h"
    7374#include "tcp_header.h"
     75
     76// FIXME: remove this header
     77#include <kernel/ipc/ipc_methods.h>
    7478
    7579/** TCP module name. */
    … …  
    799803
    800804        /* Notify the destination socket */
    801         async_msg_5(socket->phone, NET_SOCKET_RECEIVED,
     805        async_obsolete_msg_5(socket->phone, NET_SOCKET_RECEIVED,
    802806            (sysarg_t) socket->socket_id,
    803807            ((packet_dimension->content < socket_data->data_fragment_size) ?
    … …  
    820824
    821825        /* Notify the destination socket */
    822         async_msg_5(socket->phone, NET_SOCKET_RECEIVED,
     826        async_obsolete_msg_5(socket->phone, NET_SOCKET_RECEIVED,
    823827            (sysarg_t) socket->socket_id,
    824828            0, 0, 0,
    … …  
    10781082                if (rc == EOK) {
    10791083                        /* Notify the destination socket */
    1080                         async_msg_5(socket->phone, NET_SOCKET_ACCEPTED,
     1084                        async_obsolete_msg_5(socket->phone, NET_SOCKET_ACCEPTED,
    10811085                            (sysarg_t) listening_socket->socket_id,
    10821086                            socket_data->data_fragment_size, TCP_HEADER_SIZE,
    … …  
    12691273{
    12701274        int res;
    1271         bool keep_on_going = true;
    12721275        socket_cores_t local_sockets;
    12731276        int app_phone = IPC_GET_PHONE(call);
    … …  
    12931296        fibril_rwlock_initialize(&lock);
    12941297
    1295         while (keep_on_going) {
     1298        while (true) {
    12961299
    12971300                /* Answer the call */
    … …  
    13011304                /* Get the next call */
    13021305                callid = async_get_call(&call);
     1306               
     1307                if (!IPC_GET_IMETHOD(call)) {
     1308                        res = EHANGUP;
     1309                        break;
     1310                }
    13031311
    13041312                /* Process the call */
    13051313                switch (IPC_GET_IMETHOD(call)) {
    1306                 case IPC_M_PHONE_HUNGUP:
    1307                         keep_on_going = false;
    1308                         res = EHANGUP;
    1309                         break;
    1310 
    13111314                case NET_SOCKET:
    13121315                        socket_data =
    … …  
    15061509
    15071510        /* Release the application phone */
    1508         async_hangup(app_phone);
     1511        async_obsolete_hangup(app_phone);
    15091512
    15101513        printf("release\n");

  • uspace/srv/net/tl/udp/udp.c

    r764d71e r79ae36dd  
    3737
    3838#include <async.h>
     39#include <async_obsolete.h>
    3940#include <fibril_synch.h>
    4041#include <malloc.h>
    … …  
    6970#include "udp.h"
    7071#include "udp_header.h"
     72
     73// FIXME: remove this header
     74#include <kernel/ipc/ipc_methods.h>
    7175
    7276/** UDP module name. */
    … …  
    299303        /* Notify the destination socket */
    300304        fibril_rwlock_write_unlock(&udp_globals.lock);
    301         async_msg_5(socket->phone, NET_SOCKET_RECEIVED,
     305        async_obsolete_msg_5(socket->phone, NET_SOCKET_RECEIVED,
    302306            (sysarg_t) socket->socket_id, packet_dimension->content, 0, 0,
    303307            (sysarg_t) fragments);
    … …  
    748752{
    749753        int res;
    750         bool keep_on_going = true;
    751754        socket_cores_t local_sockets;
    752755        int app_phone = IPC_GET_PHONE(call);
    … …  
    773776        socket_cores_initialize(&local_sockets);
    774777
    775         while (keep_on_going) {
     778        while (true) {
    776779
    777780                /* Answer the call */
    … …  
    783786                /* Get the next call */
    784787                callid = async_get_call(&call);
     788               
     789                if (!IPC_GET_IMETHOD(call)) {
     790                        res = EHANGUP;
     791                        break;
     792                }
    785793
    786794                /* Process the call */
    787795                switch (IPC_GET_IMETHOD(call)) {
    788                 case IPC_M_PHONE_HUNGUP:
    789                         keep_on_going = false;
    790                         res = EHANGUP;
    791                         break;
    792 
    793796                case NET_SOCKET:
    794797                        socket_id = SOCKET_GET_SOCKET_ID(call);
    … …  
    880883
    881884        /* Release the application phone */
    882         async_hangup(app_phone);
     885        async_obsolete_hangup(app_phone);
    883886
    884887        /* Release all local sockets */
Note: See TracChangeset for help on using the changeset viewer.