Skip to content

Commit

Permalink
* load.c (rb_feature_p): returns loading path name too.
Browse files Browse the repository at this point in the history 
* load.c (search_required): returns path too if feature is being
  loaded.  [ruby-dev:32048]  [TODO: refactoring]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14586 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
@nobu
nobu committed Dec 24, 2007
1 parent 68a6635 commit efed292
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 22 deletions.
2 changes: 1 addition & 1 deletion ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Mon Dec 24 16:53:48 2007 Nobuyoshi Nakada <[email protected]>
Mon Dec 24 17:06:14 2007 Nobuyoshi Nakada <[email protected]>

* load.c (rb_feature_p): returns loading path name too.

Expand Down
1 change: 1 addition & 0 deletions include/ruby/st.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ int st_delete(st_table *, st_data_t *, st_data_t *);
int st_delete_safe(st_table *, st_data_t *, st_data_t *, st_data_t);
int st_insert(st_table *, st_data_t, st_data_t);
int st_lookup(st_table *, st_data_t, st_data_t *);
int st_get_key(st_table *, st_data_t, st_data_t *);
int st_foreach(st_table *, int (*)(ANYARGS), st_data_t);
int st_reverse_foreach(st_table *, int (*)(ANYARGS), st_data_t);
void st_add_direct(st_table *, st_data_t, st_data_t);
Expand Down
59 changes: 38 additions & 21 deletions load.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,16 @@ loaded_feature_path_i(st_data_t v, st_data_t b, st_data_t f)
}

static int
rb_feature_p(const char *feature, const char *ext, int rb, int expanded)
rb_feature_p(const char *feature, const char *ext, int rb, int expanded, const char **fn)
{
VALUE v, features, p, load_path = 0;
const char *f, *e;
long i, len, elen, n;
st_table *loading_tbl;
st_data_t data;
int type;

if (fn) *fn = 0;
if (ext) {
len = ext - feature;
elen = strlen(ext);
Expand Down Expand Up @@ -143,6 +145,7 @@ rb_feature_p(const char *feature, const char *ext, int rb, int expanded)
}
loading_tbl = get_loading_table();
if (loading_tbl) {
f = 0;
if (!expanded) {
struct loaded_feature_searching fs;
fs.name = feature;
Expand All @@ -151,9 +154,13 @@ rb_feature_p(const char *feature, const char *ext, int rb, int expanded)
fs.load_path = load_path ? load_path : get_load_path();
fs.result = 0;
st_foreach(loading_tbl, loaded_feature_path_i, (st_data_t)&fs);
if (fs.result) goto loading;
if ((f = fs.result) != 0) {
if (fn) *fn = f;
goto loading;
}
}
if (st_lookup(loading_tbl, (st_data_t)feature, 0)) {
if (st_get_key(loading_tbl, (st_data_t)feature, &data)) {
if (fn) *fn = (const char*)data;
loading:
if (!ext) return 'u';
return !IS_RBEXT(ext) ? 's' : 'r';
Expand All @@ -166,7 +173,8 @@ rb_feature_p(const char *feature, const char *ext, int rb, int expanded)
MEMCPY(buf, feature, char, len);
for (i = 0; (e = loadable_ext[i]) != 0; i++) {
strncpy(buf + len, e, DLEXT_MAXLEN + 1);
if (st_lookup(loading_tbl, (st_data_t)buf, 0)) {
if (st_get_key(loading_tbl, (st_data_t)buf, &data)) {
if (fn) *fn = (const char*)data;
return i ? 's' : 'r';
}
}
Expand All @@ -182,15 +190,15 @@ rb_provided(const char *feature)

if (ext && !strchr(ext, '/')) {
if (IS_RBEXT(ext)) {
if (rb_feature_p(feature, ext, Qtrue, Qfalse)) return Qtrue;
if (rb_feature_p(feature, ext, Qtrue, Qfalse, 0)) return Qtrue;
return Qfalse;
}
else if (IS_SOEXT(ext) || IS_DLEXT(ext)) {
if (rb_feature_p(feature, ext, Qfalse, Qfalse)) return Qtrue;
if (rb_feature_p(feature, ext, Qfalse, Qfalse, 0)) return Qtrue;
return Qfalse;
}
}
if (rb_feature_p(feature, feature + strlen(feature), Qtrue, Qfalse))
if (rb_feature_p(feature, feature + strlen(feature), Qtrue, Qfalse, 0))
return Qtrue;
return Qfalse;
}
Expand Down Expand Up @@ -337,7 +345,8 @@ load_lock(const char *ftptr)
st_insert(loading_tbl, (st_data_t)ftptr, data);
return (char *)ftptr;
}
return RTEST(rb_barrier_wait((VALUE)data)) ? (char *)ftptr : 0;
rb_barrier_wait((VALUE)data);
return 0;
}

static void
Expand Down Expand Up @@ -390,32 +399,37 @@ search_required(VALUE fname, volatile VALUE *path)
VALUE tmp;
char *ext, *ftptr;
int type, ft = 0;
const char *loading;

*path = 0;
ext = strrchr(ftptr = RSTRING_PTR(fname), '.');
if (ext && !strchr(ext, '/')) {
if (IS_RBEXT(ext)) {
if (rb_feature_p(ftptr, ext, Qtrue, Qfalse))
if (rb_feature_p(ftptr, ext, Qtrue, Qfalse, &loading)) {
if (loading) *path = rb_str_new2(loading);
return 'r';
}
if ((tmp = rb_find_file(fname)) != 0) {
tmp = rb_file_expand_path(tmp, Qnil);
ext = strrchr(ftptr = RSTRING_PTR(tmp), '.');
if (!rb_feature_p(ftptr, ext, Qtrue, Qtrue))
if (!rb_feature_p(ftptr, ext, Qtrue, Qtrue, 0))
*path = tmp;
return 'r';
}
return 0;
}
else if (IS_SOEXT(ext)) {
if (rb_feature_p(ftptr, ext, Qfalse, Qfalse))
if (rb_feature_p(ftptr, ext, Qfalse, Qfalse, &loading)) {
if (loading) *path = rb_str_new2(loading);
return 's';
}
tmp = rb_str_new(RSTRING_PTR(fname), ext - RSTRING_PTR(fname));
#ifdef DLEXT2
OBJ_FREEZE(tmp);
if (rb_find_file_ext(&tmp, loadable_ext + 1)) {
tmp = rb_file_expand_path(tmp, Qnil);
ext = strrchr(ftptr = RSTRING_PTR(tmp), '.');
if (!rb_feature_p(ftptr, ext, Qfalse, Qtrue))
if (!rb_feature_p(ftptr, ext, Qfalse, Qtrue, 0))
*path = tmp;
return 's';
}
Expand All @@ -425,43 +439,46 @@ search_required(VALUE fname, volatile VALUE *path)
if ((tmp = rb_find_file(tmp)) != 0) {
tmp = rb_file_expand_path(tmp, Qnil);
ext = strrchr(ftptr = RSTRING_PTR(tmp), '.');
if (!rb_feature_p(ftptr, ext, Qfalse, Qtrue))
if (!rb_feature_p(ftptr, ext, Qfalse, Qtrue, 0))
*path = tmp;
return 's';
}
#endif
}
else if (IS_DLEXT(ext)) {
if (rb_feature_p(ftptr, ext, Qfalse, Qfalse))
if (rb_feature_p(ftptr, ext, Qfalse, Qfalse, &loading)) {
if (loading) *path = rb_str_new2(loading);
return 's';
}
if ((tmp = rb_find_file(fname)) != 0) {
tmp = rb_file_expand_path(tmp, Qnil);
ext = strrchr(ftptr = RSTRING_PTR(tmp), '.');
if (!rb_feature_p(ftptr, ext, Qfalse, Qtrue))
if (!rb_feature_p(ftptr, ext, Qfalse, Qtrue, 0))
*path = tmp;
return 's';
}
}
}
else if ((ft = rb_feature_p(ftptr, 0, Qfalse, Qfalse)) == 'r') {
else if ((ft = rb_feature_p(ftptr, 0, Qfalse, Qfalse, &loading)) == 'r') {
if (loading) *path = rb_str_new2(loading);
return 'r';
}
tmp = fname;
type = rb_find_file_ext(&tmp, loadable_ext);
tmp = rb_file_expand_path(tmp, Qnil);
switch (type) {
case 0:
ftptr = RSTRING_PTR(tmp);
if (ft)
break;
return rb_feature_p(ftptr, 0, Qfalse, Qtrue);
ftptr = RSTRING_PTR(tmp);
return rb_feature_p(ftptr, 0, Qfalse, Qtrue, 0);

default:
if (ft)
break;
case 1:
ext = strrchr(ftptr = RSTRING_PTR(tmp), '.');
if (rb_feature_p(ftptr, ext, !--type, Qtrue))
if (rb_feature_p(ftptr, ext, !--type, Qtrue, &loading) && !loading)
break;
*path = tmp;
}
Expand Down Expand Up @@ -494,6 +511,8 @@ rb_require_safe(VALUE fname, int safe)
} volatile saved;
char *volatile ftptr = 0;

FilePathValue(fname);
RB_GC_GUARD(fname) = rb_str_new4(fname);
PUSH_TAG();
saved.safe = rb_safe_level();
if ((state = EXEC_TAG()) == 0) {
Expand All @@ -502,8 +521,6 @@ rb_require_safe(VALUE fname, int safe)
int found;

rb_set_safe_level_force(safe);
FilePathValue(fname);
RB_GC_GUARD(fname) = rb_str_new4(fname);
found = search_required(fname, &path);
if (found) {
if (!path || !(ftptr = load_lock(RSTRING_PTR(path)))) {
Expand Down
29 changes: 29 additions & 0 deletions st.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,35 @@ st_lookup(st_table *table, register st_data_t key, st_data_t *value)
}
}

int
st_get_key(st_table *table, register st_data_t key, st_data_t *result)
{
unsigned int hash_val, bin_pos;
register st_table_entry *ptr;

if (table->entries_packed) {
int i;
for (i = 0; i < table->num_entries; i++) {
if ((st_data_t)table->bins[i*2] == key) {
if (result !=0) *result = (st_data_t)table->bins[i*2];
return 1;
}
}
return 0;
}

hash_val = do_hash(key, table);
FIND_ENTRY(table, ptr, hash_val, bin_pos);

if (ptr == 0) {
return 0;
}
else {
if (result != 0) *result = ptr->key;
return 1;
}
}

#define ADD_DIRECT(table, key, value, hash_val, bin_pos)\
do {\
st_table_entry *entry, *head;\
Expand Down

0 comments on commit efed292

Please sign in to comment.