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

* io.c (IO_[CRW]BUF_CAPA_MIN): replaced magic numbers.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26994 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-03-21 00:43:07 +00:00
parent 9a83683190
commit f623979f65
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Sun Mar 21 09:43:01 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (IO_[CRW]BUF_CAPA_MIN): replaced magic numbers.
Sun Mar 21 09:22:10 2010 Tanaka Akira <akr@fsij.org>
* object.c (rb_obj_hash): use LONG2FIX to avoid Bignum allocation.

17
io.c
View file

@ -109,6 +109,10 @@ extern void Init_File(void);
#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
#define IO_RBUF_CAPA_MIN 16384
#define IO_CBUF_CAPA_MIN 16384
#define IO_WBUF_CAPA_MIN 8192
VALUE rb_cIO;
VALUE rb_eEOFError;
VALUE rb_eIOError;
@ -338,10 +342,10 @@ io_ungetbyte(VALUE str, rb_io_t *fptr)
if (len > INT_MAX)
rb_raise(rb_eIOError, "ungetbyte failed");
#endif
if (len > 8192)
if (len > IO_RBUF_CAPA_MIN)
fptr->rbuf_capa = (int)len;
else
fptr->rbuf_capa = 8192;
fptr->rbuf_capa = IO_RBUF_CAPA_MIN;
fptr->rbuf = ALLOC_N(char, fptr->rbuf_capa);
}
if (fptr->rbuf_capa < len + fptr->rbuf_len) {
@ -799,7 +803,7 @@ io_binwrite(VALUE str, rb_io_t *fptr, int nosync)
if (fptr->wbuf == NULL && !(!nosync && (fptr->mode & FMODE_SYNC))) {
fptr->wbuf_off = 0;
fptr->wbuf_len = 0;
fptr->wbuf_capa = 8192;
fptr->wbuf_capa = IO_WBUF_CAPA_MIN;
fptr->wbuf = ALLOC_N(char, fptr->wbuf_capa);
fptr->write_lock = rb_mutex_new();
}
@ -1171,7 +1175,7 @@ io_fillbuf(rb_io_t *fptr)
if (fptr->rbuf == NULL) {
fptr->rbuf_off = 0;
fptr->rbuf_len = 0;
fptr->rbuf_capa = 8192;
fptr->rbuf_capa = IO_RBUF_CAPA_MIN;
fptr->rbuf = ALLOC_N(char, fptr->rbuf_capa);
}
if (fptr->rbuf_len == 0) {
@ -1426,7 +1430,7 @@ rb_io_inspect(VALUE obj)
{
rb_io_t *fptr;
const char *cname;
char fd_desc[256];
char fd_desc[4+sizeof(int)*3];
const char *path;
const char *st = "";
@ -1587,7 +1591,8 @@ make_readconv(rb_io_t *fptr, int size)
rb_exc_raise(rb_econv_open_exc(sname, dname, ecflags));
fptr->cbuf_off = 0;
fptr->cbuf_len = 0;
fptr->cbuf_capa = size < 1024 ? 1024 : size;
if (size < IO_CBUF_CAPA_MIN) size = IO_CBUF_CAPA_MIN;
fptr->cbuf_capa = size;
fptr->cbuf = ALLOC_N(char, fptr->cbuf_capa);
}
}