Subversion Repositories HelenOS

Rev

Rev 2999 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 2999 Rev 3000
Line 67... Line 67...
67 
            rela_table_process(m, m->dyn.rela, m->dyn.rela_sz);
 67 
            rela_table_process(m, m->dyn.rela, m->dyn.rela_sz);
68 
        }
 68 
        }
69 
    }
 69 
    }
70 
}
 70 
}
71 
 
 71 
 
72 
/** Find module structure by soname.
 72 
/** Find module structure by soname/pathname.
73 
 *
 73 
 *
74 
 * Used primarily to see if a module has already been loaded.
 74 
 * Used primarily to see if a module has already been loaded.
- 
 
 75 
 * Modules are compared according to their soname, i.e. possible
- 
 
 76 
 * path components are ignored.
75 
 */
 77 
 */
76 
module_t *module_find(char *soname)
 78 
module_t *module_find(char *name)
77 
{
 79 
{
78 
    link_t *head = &runtime_env.modules_head;
 80 
    link_t *head = &runtime_env.modules_head;
79 
 
 81 
 
80 
    link_t *cur;
 82 
    link_t *cur;
81 
    module_t *m;
 83 
    module_t *m;
- 
 
 84 
    char *p, *soname;
82 
 
 85 
 
- 
 
 86 
    /*
- 
 
 87 
     * If name contains slashes, treat it as a pathname and
- 
 
 88 
     * construct soname by chopping off the path. Otherwise
- 
 
 89 
     * treat it as soname.
83 
    /* FIXME!! */
 90 
     */
- 
 
 91 
    p = strrchr(name, '/');
84 
    if (soname[0] == '.') return &runtime_env.rtld;
 92 
    soname = p ? (p + 1) : name;
85 
 
 93 
   
- 
 
 94 
    /* Traverse list of all modules. Not extremely fast, but simple */
86 
    for (cur = head->next; cur != head; cur = cur->next) {
 95 
    for (cur = head->next; cur != head; cur = cur->next) {
87 
        m = list_get_instance(cur, module_t, modules_link);
 96 
        m = list_get_instance(cur, module_t, modules_link);
88 
        if (strcmp(m->dyn.soname, soname) == 0) {
 97 
        if (strcmp(m->dyn.soname, soname) == 0) {
89 
            return m; /* Found */
 98 
            return m; /* Found */
90 
        }
 99 
        }
Line 95... Line 104...
95 
 
 104 
 
96 
#define NAME_BUF_SIZE 64
 105 
#define NAME_BUF_SIZE 64
97 
 
 106 
 
98 
/** Load a module.
 107 
/** Load a module.
99 
 *
 108 
 *
100 
 * Currently this trivially tries to load '/<soname>'.
 109 
 * Currently this trivially tries to load '/<name>'.
101 
 */
 110 
 */
102 
module_t *module_load(char *soname)
 111 
module_t *module_load(char *name)
103 
{
 112 
{
104 
    elf_info_t info;
 113 
    elf_info_t info;
105 
    char name_buf[NAME_BUF_SIZE];
 114 
    char name_buf[NAME_BUF_SIZE];
106 
    module_t *m;
 115 
    module_t *m;
107 
    int rc;
 116 
    int rc;
Line 110... Line 119...
110 
    if (!m) {
 119 
    if (!m) {
111 
        printf("malloc failed\n");
 120 
        printf("malloc failed\n");
112 
        exit(1);
 121 
        exit(1);
113 
    }
 122 
    }
114 
 
 123 
 
115 
    printf("Requested load of module '%s'\n", soname);
 - 
 
116 
 
 - 
 
117 
    if (strlen(soname) > NAME_BUF_SIZE - 2) {
 124 
    if (strlen(name) > NAME_BUF_SIZE - 2) {
118 
        printf("soname too long. increase NAME_BUF_SIZE\n");
 125 
        printf("soname too long. increase NAME_BUF_SIZE\n");
119 
        exit(1);
 126 
        exit(1);
120 
    }
 127 
    }
121 
 
 128 
 
122 
    /* Prepend soname with slash */
 129 
    /* Prepend soname with slash */
123 
    name_buf[0] = '/';
 130 
    name_buf[0] = '/';
124 
    strcpy(name_buf + 1, soname);
 131 
    strcpy(name_buf + 1, name);
125 
 
 132 
 
126 
    /* FIXME: need to vary bias / allocate address space */
 133 
    /* FIXME: need to vary bias / allocate address space */
127 
    m->bias = 0x20000;
 134 
    m->bias = 0x20000;
128 
    printf("filename:'%s'\n", name_buf);
 135 
    printf("filename:'%s'\n", name_buf);
129 
 
 136 
 
Line 134... Line 141...
134 
    }
 141 
    }
135 
 
 142 
 
136 
    printf("parse dynamic section\n");
 143 
    printf("parse dynamic section\n");
137 
    /* Parse ELF .dynamic section. Store info to m->dyn. */
 144 
    /* Parse ELF .dynamic section. Store info to m->dyn. */
138 
    dynamic_parse(info.dynamic, m->bias, &m->dyn);
 145 
    dynamic_parse(info.dynamic, m->bias, &m->dyn);
139 
    printf("...\n");
 - 
 
140 
 
 146 
 
141 
    /* Insert into the list of loaded modules */
 147 
    /* Insert into the list of loaded modules */
142 
    list_append(&m->modules_link, &runtime_env.modules_head);
 148 
    list_append(&m->modules_link, &runtime_env.modules_head);
143 
 
 149 
 
144 
    return m;
 150 
    return m;
Line 147... Line 153...
147 
/** Load all modules on which m (transitively) depends.
 153 
/** Load all modules on which m (transitively) depends.
148 
 */
 154 
 */
149 
void module_load_deps(module_t *m)
 155 
void module_load_deps(module_t *m)
150 
{
 156 
{
151 
    elf_dyn_t *dp;
 157 
    elf_dyn_t *dp;
152 
    char *dep_soname;
 158 
    char *dep_name;
153 
    module_t *dm;
 159 
    module_t *dm;
154 
    size_t n, i;
 160 
    size_t n, i;
155 
 
 161 
 
156 
    /* Count direct dependencies */
 162 
    /* Count direct dependencies */
157 
   
 163 
   
Line 179... Line 185...
179 
    i = 0; /* Current dependency index */
 185 
    i = 0; /* Current dependency index */
180 
    dp = m->dyn.dynamic;
 186 
    dp = m->dyn.dynamic;
181 
 
 187 
 
182 
    while (dp->d_tag != DT_NULL) {
 188 
    while (dp->d_tag != DT_NULL) {
183 
        if (dp->d_tag == DT_NEEDED) {
 189 
        if (dp->d_tag == DT_NEEDED) {
184 
            dep_soname = m->dyn.str_tab + dp->d_un.d_val;
 190 
            dep_name = m->dyn.str_tab + dp->d_un.d_val;
185 
            printf("needed:'%s'\n", dep_soname);
 - 
 
186 
 
 191 
 
- 
 
 192 
            printf("%s needs %s\n", m->dyn.soname, dep_name);
187 
            dm = module_find(dep_soname);
 193 
            dm = module_find(dep_name);
188 
            if (!dm) {
 194 
            if (!dm) {
189 
                dm = module_load(dep_soname);
 195 
                dm = module_load(dep_name);
190 
                module_load_deps(dm);
 196 
                module_load_deps(dm);
191 
            }
 197 
            }
192 
 
 198 
 
193 
            /* Save into deps table */
 199 
            /* Save into deps table */
194 
            m->deps[i++] = dm;
 200 
            m->deps[i++] = dm;
Line 212... Line 218...
212 
            module_process_relocs(m);
 218 
            module_process_relocs(m);
213 
        }
 219 
        }
214 
    }
 220 
    }
215 
}
 221 
}
216 
 
 222 
 
- 
 
 223 
/** Clear BFS tags of all modules.
- 
 
 224 
 */
- 
 
 225 
void modules_untag(void)
- 
 
 226 
{
- 
 
 227 
    link_t *head = &runtime_env.modules_head;
- 
 
 228 
 
- 
 
 229 
    link_t *cur;
- 
 
 230 
    module_t *m;
- 
 
 231 
 
- 
 
 232 
    for (cur = head->next; cur != head; cur = cur->next) {
- 
 
 233 
        m = list_get_instance(cur, module_t, modules_link);
- 
 
 234 
        m->bfs_tag = false;
- 
 
 235 
    }
- 
 
 236 
}
- 
 
 237 
 
217 
/** @}
 238 
/** @}
218 
 */
 239 
 */