Changeset 694ca93f in mainline for uspace/lib/c/include/rtld/module.h

Timestamp:

2011-05-01T19:34:26Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

0e26444

Parents:

1ff896e (diff), 042fbe0 (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 changes

File:

• uspace/lib/c/include/rtld/module.h (moved) (moved from kernel/generic/include/proc/tasklet.h ) (2 diffs)

uspace/lib/c/include/rtld/module.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2007 Jan Hudecek
- * Copyright (c) 2008 Martin Decky
+ * Copyright (c) 2008 Jiri Svoboda
  * All rights reserved.
  *
@@ -28 +27 @@
  */
 
-/** @addtogroup genericproc
+/** @addtogroup libc
  * @{
  */
-/** @file tasklet.h
- * @brief Tasklets declarations
+/** @file
  */
 
-#ifndef KERN_TASKLET_H_
-#define KERN_TASKLET_H_
+#ifndef LIBC_RTLD_MODULE_H_
+#define LIBC_RTLD_MODULE_H_
 
+#include <sys/types.h>
+#include <rtld/dynamic.h>
 #include <adt/list.h>
 
-/** Tasklet callback type */
-typedef void (* tasklet_callback_t)(void *arg);
+typedef struct module {
+        dyn_info_t dyn;
+        size_t bias;
 
-/** Tasklet state */
-typedef enum {
-        NotActive,
-        Scheduled,
-        InProgress,
-        Disabled
-} tasklet_state_t;
+        /** Array of pointers to directly dependent modules */
+        struct module **deps;
+        /** Number of fields in deps */
+        size_t n_deps;
 
-/** Structure describing a tasklet */
-typedef struct tasklet_descriptor {
-        link_t link;
-        
-        /** Callback to call */
-        tasklet_callback_t callback;
-        
-        /** Argument passed to the callback */
-        void *arg;
-        
-        /** State of the tasklet */
-        tasklet_state_t state;
-} tasklet_descriptor_t;
+        /** True iff relocations have already been processed in this module. */
+        bool relocated;
 
+        /** Link to list of all modules in runtime environment */
+        link_t modules_link;
 
-extern void tasklet_init(void);
+        /** Link to BFS queue. Only used when doing a BFS of the module graph */
+        link_t queue_link;
+        /** Tag for modules already processed during a BFS */
+        bool bfs_tag;
+} module_t;
+
+void module_process_relocs(module_t *m);
+module_t *module_find(const char *name);
+module_t *module_load(const char *name);
+void module_load_deps(module_t *m);
+
+void modules_process_relocs(module_t *start);
+void modules_untag(void);
 
 #endif