Changeset cba45af in mainline for uspace/lib/c


Ignore:
Timestamp:
2012-08-16T21:01:55Z (13 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
2bf781a
Parents:
e005f92
Message:

Rewrite logger (work in progress)

Major issues

  • no locking
  • no clean-up (at all)
Location:
uspace/lib/c
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/generic/io/log.c

    re005f92 rcba45af  
    6262#define MESSAGE_BUFFER_SIZE 4096
    6363
     64static sysarg_t toplog_id;
     65
    6466static int logger_register(async_sess_t *session, const char *prog_name)
    6567{
    … …  
    6971        }
    7072
    71         aid_t reg_msg = async_send_0(exchange, LOGGER_REGISTER, NULL);
     73        ipc_call_t answer;
     74        aid_t reg_msg = async_send_0(exchange, LOGGER_WRITER_CREATE_TOPLEVEL_LOG, &answer);
    7275        int rc = async_data_write_start(exchange, prog_name, str_size(prog_name));
    7376        sysarg_t reg_msg_rc;
    … …  
    8083        }
    8184
    82         return reg_msg_rc;
     85        if (reg_msg_rc != EOK)
     86                return reg_msg_rc;
     87
     88        toplog_id = IPC_GET_ARG1(answer);
     89
     90        return EOK;
    8391}
    8492
    … …  
    9098        }
    9199
    92         aid_t reg_msg = async_send_2(exchange, LOGGER_MESSAGE,
    93             ctx, level, NULL);
     100        aid_t reg_msg = async_send_3(exchange, LOGGER_WRITER_MESSAGE,
     101            toplog_id, ctx, level, NULL);
    94102        int rc = async_data_write_start(exchange, message, str_size(message));
    95103        sysarg_t reg_msg_rc;
    … …  
    183191
    184192        ipc_call_t answer;
    185         aid_t reg_msg = async_send_0(exchange, LOGGER_CREATE_CONTEXT, &answer);
     193        aid_t reg_msg = async_send_1(exchange, LOGGER_WRITER_CREATE_SUB_LOG, toplog_id, &answer);
    186194        int rc = async_data_write_start(exchange, name, str_size(name));
    187195        sysarg_t reg_msg_rc;

  • uspace/lib/c/generic/io/logctl.c

    re005f92 rcba45af  
    9090                return rc;
    9191
    92         aid_t reg_msg = async_send_1(exchange, LOGGER_CTL_SET_NAMESPACE_LEVEL,
     92        aid_t reg_msg = async_send_1(exchange, LOGGER_CTL_SET_TOP_LOG_LEVEL,
    9393            new_level, NULL);
    9494        rc = async_data_write_start(exchange, namespace, str_size(namespace));
    … …  
    112112                return rc;
    113113
    114         aid_t reg_msg = async_send_1(exchange, LOGGER_CTL_SET_CONTEXT_LEVEL,
     114        aid_t reg_msg = async_send_1(exchange, LOGGER_CTL_SET_LOG_LEVEL,
    115115            new_level, NULL);
    116116        rc = async_data_write_start(exchange, namespace, str_size(namespace));

  • uspace/lib/c/include/ipc/logger.h

    re005f92 rcba45af  
    3737
    3838typedef enum {
    39         LOGGER_CTL_GET_DEFAULT_LEVEL = IPC_FIRST_USER_METHOD,
    40         LOGGER_CTL_SET_DEFAULT_LEVEL,
    41         LOGGER_CTL_SET_NAMESPACE_LEVEL,
    42         LOGGER_CTL_SET_CONTEXT_LEVEL
     39        LOGGER_CTL_SET_DEFAULT_LEVEL = IPC_FIRST_USER_METHOD,
     40        LOGGER_CTL_SET_TOP_LOG_LEVEL,
     41        LOGGER_CTL_SET_LOG_LEVEL
    4342} logger_control_request_t;
    4443
    4544typedef enum {
    46         LOGGER_REGISTER = IPC_FIRST_USER_METHOD,
    47         LOGGER_CREATE_CONTEXT,
    48         LOGGER_MESSAGE
    49 } logger_sink_request_t;
     45        /** Followed by STRING, returns ID to be used for CREATE_SUB_LOG */
     46        LOGGER_WRITER_CREATE_TOPLEVEL_LOG = IPC_FIRST_USER_METHOD,
     47        LOGGER_WRITER_CREATE_SUB_LOG,
     48        LOGGER_WRITER_MESSAGE
     49} logger_writer_request_t;
    5050
    5151typedef enum {
Note: See TracChangeset for help on using the changeset viewer.