Changeset e2a6b72 in mainline for uspace/lib/c/include/ipc/logger.h

Timestamp:

2012-10-15T16:28:58Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b3ab8f7

Parents:

7eb49f4 (diff), c4c2406 (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:

Merge mainline and io improvements.

File:

• uspace/lib/c/include/ipc/logger.h (moved) (moved from uspace/lib/c/include/adt/hash_set.h ) (2 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Jakub Jermar
- * Copyright (c) 2011 Radim Vansa
+ * Copyright (c) 2012 Vojtech Horky
  * All rights reserved.
  *
@@ -31 +30 @@
  * @{
  */
-/** @file
- */
 
-#ifndef LIBC_HASH_SET_H_
-#define LIBC_HASH_SET_H_
+#ifndef LIBC_IPC_LOGGER_H_
+#define LIBC_IPC_LOGGER_H_
 
-#include <adt/list.h>
-#include <unistd.h>
+#include <ipc/common.h>
 
-#define HASH_SET_MIN_SIZE  8
+typedef enum {
+        /** Set (global) default displayed logging level.
+         *
+         * Arguments: new log level.
+         * Returns: error code
+         */
+        LOGGER_CONTROL_SET_DEFAULT_LEVEL = IPC_FIRST_USER_METHOD,
+        /** Set displayed level for given log.
+         *
+         * Arguments: new log level.
+         * Returns: error code
+         * Followed by: string with full log name.
+         */
+        LOGGER_CONTROL_SET_LOG_LEVEL
+} logger_control_request_t;
 
-typedef unsigned long (*hash_set_hash)(const link_t *);
-typedef int (*hash_set_equals)(const link_t *, const link_t *);
+typedef enum {
+        /** Create new log.
+         *
+         * Arguments: parent log id (0 for top-level log).
+         * Returns: error code, log id
+         * Followed by: string with log name.
+         */
+        LOGGER_WRITER_CREATE_LOG = IPC_FIRST_USER_METHOD,
+        /** Write a message to a given log.
+         *
+         * Arguments: log id, message severity level (log_level_t)
+         * Returns: error code
+         * Followed by: string with the message.
+         */
+        LOGGER_WRITER_MESSAGE
+} logger_writer_request_t;
 
-/** Hash table structure. */
-typedef struct {
-        list_t *table;
-        
-        /** Current table size */
-        size_t size;
-        
-        /**
-         * Current number of entries. If count > size,
-         * the table is rehashed into table with double
-         * size. If (4 * count < size) && (size > min_size),
-         * the table is rehashed into table with half the size.
-         */
-        size_t count;
-        
-        /** Hash function */
-        hash_set_hash hash;
-        
-        /** Hash table item equals function */
-        hash_set_equals equals;
-} hash_set_t;
-
-extern int hash_set_init(hash_set_t *, hash_set_hash, hash_set_equals, size_t);
-extern int hash_set_insert(hash_set_t *, link_t *);
-extern link_t *hash_set_find(hash_set_t *, const link_t *);
-extern int hash_set_contains(const hash_set_t *, const link_t *);
-extern size_t hash_set_count(const hash_set_t *);
-extern link_t *hash_set_remove(hash_set_t *, const link_t *);
-extern void hash_set_remove_selected(hash_set_t *,
-    int (*)(link_t *, void *), void *);
-extern void hash_set_destroy(hash_set_t *);
-extern void hash_set_apply(hash_set_t *, void (*)(link_t *, void *), void *);
-extern void hash_set_clear(hash_set_t *, void (*)(link_t *, void *), void *);
+typedef enum {
+        /** Interface for controlling logger behavior. */
+        LOGGER_INTERFACE_CONTROL,
+        /** Interface for servers writing to the log. */
+        LOGGER_INTERFACE_WRITER
+} logger_interface_t;
 
 #endif