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

Timestamp:

2011-06-01T08:43:42Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8d6c1f1

Parents:

9e2e715 (diff), e51a514 (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:

Huuuuuge merge from development - all the work actually

File:

• uspace/lib/c/include/rtld/module.h (moved) (moved from uspace/srv/net/il/arp/arp_header.h ) (2 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2008 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup arp
- *  @{
+/** @addtogroup libc
+ * @{
+ */
+/** @file
  */
 
-/** @file
- * ARP protocol header.
- * Based on the RFC 826.
- */
-
-#ifndef NET_ARP_HEADER_H_
-#define NET_ARP_HEADER_H_
+#ifndef LIBC_RTLD_MODULE_H_
+#define LIBC_RTLD_MODULE_H_
 
 #include <sys/types.h>
+#include <rtld/dynamic.h>
+#include <adt/list.h>
 
-/** Type definition of an ARP protocol header.
- * @see arp_header
- */
-typedef struct arp_header arp_header_t;
+typedef struct module {
+        dyn_info_t dyn;
+        size_t bias;
 
-/** Type definition of an ARP protocol header pointer.
- * @see arp_header
- */
-typedef arp_header_t *arp_header_ref;
+        /** Array of pointers to directly dependent modules */
+        struct module **deps;
+        /** Number of fields in deps */
+        size_t n_deps;
 
-/** ARP protocol header. */
-struct arp_header {
-        /**
-         * Hardware type identifier.
-         * @see hardware.h
-         */
-        uint16_t hardware;
-        
-        /** Protocol identifier. */
-        uint16_t protocol;
-        /** Hardware address length in bytes. */
-        uint8_t hardware_length;
-        /** Protocol address length in bytes. */
-        uint8_t protocol_length;
-        
-        /**
-         * ARP packet type.
-         * @see arp_oc.h
-         */
-        uint16_t operation;
-} __attribute__ ((packed));
+        /** 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;
+
+        /** 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