kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

dbm: typed data

Browse source 
* ext/dbm/dbm.c (dbm_type): turn into typed data.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47794 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-10-04 23:33:01 +00:00
parent ba0655ebdd
commit ad48d99876
2 changed files with 42 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
ext/dbm/dbm.c
View file

@ -46,7 +46,7 @@ closed_dbm(void)
} }
#define GetDBM(obj, dbmp) do {\ #define GetDBM(obj, dbmp) do {\
Data_Get_Struct((obj), struct dbmdata, (dbmp));\ TypedData_Get_Struct((obj), struct dbmdata, &dbm_type, (dbmp));\
if ((dbmp) == 0) closed_dbm();\ if ((dbmp) == 0) closed_dbm();\
if ((dbmp)->di_dbm == 0) closed_dbm();\ if ((dbmp)->di_dbm == 0) closed_dbm();\
} while (0) } while (0)
@ -57,14 +57,34 @@ closed_dbm(void)
} while (0) } while (0)
static void static void
free_dbm(struct dbmdata *dbmp) free_dbm(void *ptr)
{ {
struct dbmdata *dbmp = ptr;
if (dbmp) { if (dbmp) {
if (dbmp->di_dbm) dbm_close(dbmp->di_dbm); if (dbmp->di_dbm) dbm_close(dbmp->di_dbm);
xfree(dbmp); xfree(dbmp);
} }
} }
static size_t
memsize_dbm(const void *ptr)
{
size_t size = 0;
const struct dbmdata *dbmp = ptr;
if (dbmp) {
size += sizeof(*dbmp);
if (dbmp->di_dbm) size += DBM_SIZEOF_DBM;
}
return size;
}
static const rb_data_type_t dbm_type = {
"dbm",
{0, free_dbm, memsize_dbm,},
NULL, NULL,
RUBY_TYPED_FREE_IMMEDIATELY,
};
/* /*
* call-seq: * call-seq:
* dbm.close * dbm.close
@ -94,7 +114,7 @@ fdbm_closed(VALUE obj)
{ {
struct dbmdata *dbmp; struct dbmdata *dbmp;
Data_Get_Struct(obj, struct dbmdata, dbmp); TypedData_Get_Struct(obj, struct dbmdata, &dbm_type, dbmp);
if (dbmp == 0) if (dbmp == 0)
return Qtrue; return Qtrue;
if (dbmp->di_dbm == 0) if (dbmp->di_dbm == 0)
@ -106,7 +126,7 @@ fdbm_closed(VALUE obj)
static VALUE static VALUE
fdbm_alloc(VALUE klass) fdbm_alloc(VALUE klass)
{ {
return Data_Wrap_Struct(klass, 0, free_dbm, 0); return TypedData_Wrap_Struct(klass, &dbm_type, 0);
} }
/* /*
@ -228,7 +248,7 @@ fdbm_initialize(int argc, VALUE *argv, VALUE obj)
static VALUE static VALUE
fdbm_s_open(int argc, VALUE *argv, VALUE klass) fdbm_s_open(int argc, VALUE *argv, VALUE klass)
{ {
VALUE obj = Data_Wrap_Struct(klass, 0, free_dbm, 0); VALUE obj = fdbm_alloc(klass);
if (NIL_P(fdbm_initialize(argc, argv, obj))) { if (NIL_P(fdbm_initialize(argc, argv, obj))) {
return Qnil; return Qnil;

17
ext/dbm/extconf.rb
View file

@ -267,6 +267,23 @@ if dblib.any? {|db| headers.fetch(db, ["ndbm.h"]).any? {|hdr| headers.db_check(d
have_func("dbm_pagfno((DBM *)0)", headers.found, headers.defs) have_func("dbm_pagfno((DBM *)0)", headers.found, headers.defs)
have_func("dbm_dirfno((DBM *)0)", headers.found, headers.defs) have_func("dbm_dirfno((DBM *)0)", headers.found, headers.defs)
convertible_int("datum.dsize", headers.found, headers.defs) convertible_int("datum.dsize", headers.found, headers.defs)
checking_for("sizeof(DBM) is available") {
if try_compile(<<SRC)
#ifdef HAVE_CDEFS_H
# include <cdefs.h>
#endif
#ifdef HAVE_SYS_CDEFS_H
# include <sys/cdefs.h>
#endif
#include DBM_HDR
const int sizeof_DBM = (int)sizeof(DBM);
SRC
$defs << '-DDBM_SIZEOF_DBM=sizeof(DBM)'
else
$defs << '-DDBM_SIZEOF_DBM=0'
end
}
create_makefile("dbm") create_makefile("dbm")
end end
# :startdoc: # :startdoc: