djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stream: Use standard name of DEFAULT_BUFFER_SIZE.

Browse Source
This commit is contained in:
Paul Sokolovsky 2014-05-07 01:51:07 +03:00
parent 6e73143de8
commit b9be45e421
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
py/stream.c
View File

@ -37,6 +37,9 @@
// This file defines generic Python stream read/write methods which // This file defines generic Python stream read/write methods which
// dispatch to the underlying stream interface of an object. // dispatch to the underlying stream interface of an object.
// TODO: should be in mpconfig.h
#define DEFAULT_BUFFER_SIZE 256
STATIC mp_obj_t stream_readall(mp_obj_t self_in); STATIC mp_obj_t stream_readall(mp_obj_t self_in);
// TODO: This is POSIX-specific (but then POSIX is the only real thing, // TODO: This is POSIX-specific (but then POSIX is the only real thing,
@ -101,8 +104,6 @@ STATIC mp_obj_t stream_write(mp_obj_t self_in, mp_obj_t arg) {
} }
} }
// TODO: should be in mpconfig.h
#define READ_SIZE 256
STATIC mp_obj_t stream_readall(mp_obj_t self_in) { STATIC mp_obj_t stream_readall(mp_obj_t self_in) {
struct _mp_obj_base_t *o = (struct _mp_obj_base_t *)self_in; struct _mp_obj_base_t *o = (struct _mp_obj_base_t *)self_in;
if (o->type->stream_p == NULL || o->type->stream_p->read == NULL) { if (o->type->stream_p == NULL || o->type->stream_p->read == NULL) {
@ -111,11 +112,11 @@ STATIC mp_obj_t stream_readall(mp_obj_t self_in) {
} }
int total_size = 0; int total_size = 0;
vstr_t *vstr = vstr_new_size(READ_SIZE); vstr_t *vstr = vstr_new_size(DEFAULT_BUFFER_SIZE);
char *buf = vstr_str(vstr); char *buf = vstr_str(vstr);
char *p = buf; char *p = buf;
int error; int error;
int current_read = READ_SIZE; int current_read = DEFAULT_BUFFER_SIZE;
while (true) { while (true) {
machine_int_t out_sz = o->type->stream_p->read(self_in, p, current_read, &error); machine_int_t out_sz = o->type->stream_p->read(self_in, p, current_read, &error);
if (out_sz == -1) { if (out_sz == -1) {
@ -138,7 +139,7 @@ STATIC mp_obj_t stream_readall(mp_obj_t self_in) {
current_read -= out_sz; current_read -= out_sz;
p += out_sz; p += out_sz;
} else { } else {
current_read = READ_SIZE; current_read = DEFAULT_BUFFER_SIZE;
p = vstr_extend(vstr, current_read); p = vstr_extend(vstr, current_read);
if (p == NULL) { if (p == NULL) {
// TODO // TODO