Damien George | 04b9147 | 2014-05-03 23:27:38 +0100 | [diff] [blame] | 1 | /* |
| 2 | * This file is part of the Micro Python project, http://micropython.org/ |
| 3 | * |
| 4 | * The MIT License (MIT) |
| 5 | * |
| 6 | * Copyright (c) 2013, 2014 Damien P. George |
Paul Sokolovsky | da9f092 | 2014-05-13 08:44:45 +0300 | [diff] [blame] | 7 | * Copyright (c) 2014 Paul Sokolovsky |
Damien George | 04b9147 | 2014-05-03 23:27:38 +0100 | [diff] [blame] | 8 | * |
| 9 | * Permission is hereby granted, free of charge, to any person obtaining a copy |
| 10 | * of this software and associated documentation files (the "Software"), to deal |
| 11 | * in the Software without restriction, including without limitation the rights |
| 12 | * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
| 13 | * copies of the Software, and to permit persons to whom the Software is |
| 14 | * furnished to do so, subject to the following conditions: |
| 15 | * |
| 16 | * The above copyright notice and this permission notice shall be included in |
| 17 | * all copies or substantial portions of the Software. |
| 18 | * |
| 19 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
| 20 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
| 21 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
| 22 | * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
| 23 | * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
| 24 | * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
| 25 | * THE SOFTWARE. |
| 26 | */ |
| 27 | |
Ilya Dmitrichenko | 5630b01 | 2014-04-12 16:44:32 +0100 | [diff] [blame] | 28 | #include <string.h> |
Paul Sokolovsky | e98cf40 | 2014-01-08 02:43:48 +0200 | [diff] [blame] | 29 | |
Paul Sokolovsky | f54bcbf | 2014-05-02 17:47:01 +0300 | [diff] [blame] | 30 | #include "mpconfig.h" |
Paul Sokolovsky | e98cf40 | 2014-01-08 02:43:48 +0200 | [diff] [blame] | 31 | #include "nlr.h" |
| 32 | #include "misc.h" |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 33 | #include "qstr.h" |
Paul Sokolovsky | e98cf40 | 2014-01-08 02:43:48 +0200 | [diff] [blame] | 34 | #include "obj.h" |
Paul Sokolovsky | a47b64a | 2014-05-15 07:28:19 +0300 | [diff] [blame] | 35 | #include "objstr.h" |
Paul Sokolovsky | f5f6c3b | 2014-06-15 23:23:36 +0300 | [diff] [blame] | 36 | #include "runtime.h" |
Paul Sokolovsky | e98cf40 | 2014-01-08 02:43:48 +0200 | [diff] [blame] | 37 | #include "stream.h" |
Paul Sokolovsky | 0ef015b | 2014-05-07 02:23:46 +0300 | [diff] [blame] | 38 | #if MICROPY_STREAMS_NON_BLOCK |
| 39 | #include <errno.h> |
stijn | ec6fa87 | 2014-06-28 21:04:20 +0200 | [diff] [blame] | 40 | #if defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR) |
| 41 | #define EWOULDBLOCK 140 |
| 42 | #endif |
Paul Sokolovsky | 0ef015b | 2014-05-07 02:23:46 +0300 | [diff] [blame] | 43 | #endif |
Paul Sokolovsky | e98cf40 | 2014-01-08 02:43:48 +0200 | [diff] [blame] | 44 | |
| 45 | // This file defines generic Python stream read/write methods which |
| 46 | // dispatch to the underlying stream interface of an object. |
| 47 | |
Paul Sokolovsky | b9be45e | 2014-05-07 01:51:07 +0300 | [diff] [blame] | 48 | // TODO: should be in mpconfig.h |
| 49 | #define DEFAULT_BUFFER_SIZE 256 |
| 50 | |
Paul Sokolovsky | 520e2f5 | 2014-02-12 18:31:30 +0200 | [diff] [blame] | 51 | STATIC mp_obj_t stream_readall(mp_obj_t self_in); |
Paul Sokolovsky | a671f89 | 2014-01-16 12:53:46 +0200 | [diff] [blame] | 52 | |
Paul Sokolovsky | 0ef015b | 2014-05-07 02:23:46 +0300 | [diff] [blame] | 53 | #if MICROPY_STREAMS_NON_BLOCK |
Paul Sokolovsky | a592104 | 2014-05-07 01:39:38 +0300 | [diff] [blame] | 54 | // TODO: This is POSIX-specific (but then POSIX is the only real thing, |
| 55 | // and anything else just emulates it, right?) |
| 56 | #define is_nonblocking_error(errno) ((errno) == EAGAIN || (errno) == EWOULDBLOCK) |
Paul Sokolovsky | 0ef015b | 2014-05-07 02:23:46 +0300 | [diff] [blame] | 57 | #else |
| 58 | #define is_nonblocking_error(errno) (0) |
| 59 | #endif |
Paul Sokolovsky | a592104 | 2014-05-07 01:39:38 +0300 | [diff] [blame] | 60 | |
Paul Sokolovsky | a47b64a | 2014-05-15 07:28:19 +0300 | [diff] [blame] | 61 | #define STREAM_CONTENT_TYPE(stream) (((stream)->is_bytes) ? &mp_type_bytes : &mp_type_str) |
| 62 | |
Paul Sokolovsky | 520e2f5 | 2014-02-12 18:31:30 +0200 | [diff] [blame] | 63 | STATIC mp_obj_t stream_read(uint n_args, const mp_obj_t *args) { |
Paul Sokolovsky | a671f89 | 2014-01-16 12:53:46 +0200 | [diff] [blame] | 64 | struct _mp_obj_base_t *o = (struct _mp_obj_base_t *)args[0]; |
Damien George | 27e735f | 2014-04-05 23:02:23 +0100 | [diff] [blame] | 65 | if (o->type->stream_p == NULL || o->type->stream_p->read == NULL) { |
Paul Sokolovsky | e98cf40 | 2014-01-08 02:43:48 +0200 | [diff] [blame] | 66 | // CPython: io.UnsupportedOperation, OSError subclass |
Damien George | ea13f40 | 2014-04-05 18:32:08 +0100 | [diff] [blame] | 67 | nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "Operation not supported")); |
Paul Sokolovsky | e98cf40 | 2014-01-08 02:43:48 +0200 | [diff] [blame] | 68 | } |
| 69 | |
Damien George | 1694bc7 | 2014-07-16 11:45:10 +0100 | [diff] [blame^] | 70 | // What to do if sz < -1? Python docs don't specify this case. |
| 71 | // CPython does a readall, but here we silently let negatives through, |
| 72 | // and they will cause a MemoryError. |
Damien George | 40f3c02 | 2014-07-03 13:25:24 +0100 | [diff] [blame] | 73 | mp_int_t sz; |
Paul Sokolovsky | a671f89 | 2014-01-16 12:53:46 +0200 | [diff] [blame] | 74 | if (n_args == 1 || ((sz = mp_obj_get_int(args[1])) == -1)) { |
| 75 | return stream_readall(args[0]); |
| 76 | } |
Paul Sokolovsky | f5f6c3b | 2014-06-15 23:23:36 +0300 | [diff] [blame] | 77 | |
| 78 | #if MICROPY_PY_BUILTINS_STR_UNICODE |
| 79 | if (!o->type->stream_p->is_bytes) { |
Damien George | 1694bc7 | 2014-07-16 11:45:10 +0100 | [diff] [blame^] | 80 | // We need to read sz number of unicode characters. Because we don't have any |
| 81 | // buffering, and because the stream API can only read bytes, we must read here |
| 82 | // in units of bytes and must never over read. If we want sz chars, then reading |
| 83 | // sz bytes will never over-read, so we follow this approach, in a loop to keep |
| 84 | // reading until we have exactly enough chars. This will be 1 read for text |
| 85 | // with ASCII-only chars, and about 2 reads for text with a couple of non-ASCII |
| 86 | // chars. For text with lots of non-ASCII chars, it'll be pretty inefficient |
| 87 | // in time and memory. |
| 88 | |
| 89 | vstr_t vstr; |
| 90 | vstr_init(&vstr, sz); |
| 91 | mp_uint_t more_bytes = sz; |
| 92 | mp_uint_t last_buf_offset = 0; |
| 93 | while (more_bytes > 0) { |
| 94 | char *p = vstr_add_len(&vstr, more_bytes); |
| 95 | if (p == NULL) { |
| 96 | nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_MemoryError, "out of memory")); |
| 97 | } |
| 98 | int error; |
| 99 | mp_int_t out_sz = o->type->stream_p->read(o, p, more_bytes, &error); |
| 100 | if (out_sz == -1) { |
| 101 | vstr_cut_tail_bytes(&vstr, more_bytes); |
| 102 | if (is_nonblocking_error(error)) { |
| 103 | // With non-blocking streams, we read as much as we can. |
| 104 | // If we read nothing, return None, just like read(). |
| 105 | // Otherwise, return data read so far. |
| 106 | // TODO what if we have read only half a non-ASCII char? |
| 107 | if (vstr.len == 0) { |
| 108 | vstr_clear(&vstr); |
| 109 | return mp_const_none; |
| 110 | } |
| 111 | break; |
| 112 | } |
| 113 | nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "[Errno %d]", error)); |
| 114 | } |
| 115 | |
| 116 | if (out_sz == 0) { |
| 117 | // Finish reading. |
| 118 | // TODO what if we have read only half a non-ASCII char? |
| 119 | vstr_cut_tail_bytes(&vstr, more_bytes); |
| 120 | break; |
| 121 | } |
| 122 | |
| 123 | // count chars from bytes just read |
| 124 | for (mp_uint_t off = last_buf_offset;;) { |
| 125 | byte b = vstr.buf[off]; |
| 126 | int n; |
| 127 | if (!UTF8_IS_NONASCII(b)) { |
| 128 | // 1-byte ASCII char |
| 129 | n = 1; |
| 130 | } else if ((b & 0xe0) == 0xc0) { |
| 131 | // 2-byte char |
| 132 | n = 2; |
| 133 | } else if ((b & 0xf0) == 0xe0) { |
| 134 | // 3-byte char |
| 135 | n = 3; |
| 136 | } else if ((b & 0xf8) == 0xf0) { |
| 137 | // 4-byte char |
| 138 | n = 4; |
| 139 | } else { |
| 140 | // TODO |
| 141 | n = 5; |
| 142 | } |
| 143 | if (off + n <= vstr.len) { |
| 144 | // got a whole char in n bytes |
| 145 | off += n; |
| 146 | sz -= 1; |
| 147 | last_buf_offset = off; |
| 148 | if (off >= vstr.len) { |
| 149 | more_bytes = sz; |
| 150 | break; |
| 151 | } |
| 152 | } else { |
| 153 | // didn't get a whole char, so work out how many extra bytes are needed for |
| 154 | // this partial char, plus bytes for additional chars that we want |
| 155 | more_bytes = (off + n - vstr.len) + (sz - 1); |
| 156 | break; |
| 157 | } |
| 158 | } |
| 159 | } |
| 160 | |
| 161 | mp_obj_t ret = mp_obj_new_str_of_type(&mp_type_str, (byte*)vstr.buf, vstr.len); |
| 162 | vstr_clear(&vstr); |
| 163 | return ret; |
Paul Sokolovsky | f5f6c3b | 2014-06-15 23:23:36 +0300 | [diff] [blame] | 164 | } |
| 165 | #endif |
| 166 | |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 167 | byte *buf = m_new(byte, sz); |
Paul Sokolovsky | e98cf40 | 2014-01-08 02:43:48 +0200 | [diff] [blame] | 168 | int error; |
Damien George | 40f3c02 | 2014-07-03 13:25:24 +0100 | [diff] [blame] | 169 | mp_int_t out_sz = o->type->stream_p->read(o, buf, sz, &error); |
Paul Sokolovsky | e98cf40 | 2014-01-08 02:43:48 +0200 | [diff] [blame] | 170 | if (out_sz == -1) { |
Paul Sokolovsky | a592104 | 2014-05-07 01:39:38 +0300 | [diff] [blame] | 171 | if (is_nonblocking_error(error)) { |
| 172 | // https://docs.python.org/3.4/library/io.html#io.RawIOBase.read |
| 173 | // "If the object is in non-blocking mode and no bytes are available, |
| 174 | // None is returned." |
| 175 | // This is actually very weird, as naive truth check will treat |
| 176 | // this as EOF. |
| 177 | return mp_const_none; |
| 178 | } |
Damien George | ea13f40 | 2014-04-05 18:32:08 +0100 | [diff] [blame] | 179 | nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "[Errno %d]", error)); |
Paul Sokolovsky | e98cf40 | 2014-01-08 02:43:48 +0200 | [diff] [blame] | 180 | } else { |
Damien George | f600a6a | 2014-05-25 22:34:34 +0100 | [diff] [blame] | 181 | mp_obj_t s = mp_obj_new_str_of_type(STREAM_CONTENT_TYPE(o->type->stream_p), buf, out_sz); // will reallocate to use exact size |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 182 | m_free(buf, sz); |
| 183 | return s; |
Paul Sokolovsky | e98cf40 | 2014-01-08 02:43:48 +0200 | [diff] [blame] | 184 | } |
| 185 | } |
| 186 | |
Paul Sokolovsky | ac736f1 | 2014-07-13 23:04:17 +0300 | [diff] [blame] | 187 | mp_obj_t mp_stream_write(mp_obj_t self_in, const void *buf, mp_uint_t len) { |
Paul Sokolovsky | e98cf40 | 2014-01-08 02:43:48 +0200 | [diff] [blame] | 188 | struct _mp_obj_base_t *o = (struct _mp_obj_base_t *)self_in; |
Damien George | 27e735f | 2014-04-05 23:02:23 +0100 | [diff] [blame] | 189 | if (o->type->stream_p == NULL || o->type->stream_p->write == NULL) { |
Paul Sokolovsky | e98cf40 | 2014-01-08 02:43:48 +0200 | [diff] [blame] | 190 | // CPython: io.UnsupportedOperation, OSError subclass |
Damien George | ea13f40 | 2014-04-05 18:32:08 +0100 | [diff] [blame] | 191 | nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "Operation not supported")); |
Paul Sokolovsky | e98cf40 | 2014-01-08 02:43:48 +0200 | [diff] [blame] | 192 | } |
| 193 | |
Paul Sokolovsky | e98cf40 | 2014-01-08 02:43:48 +0200 | [diff] [blame] | 194 | int error; |
Paul Sokolovsky | ac736f1 | 2014-07-13 23:04:17 +0300 | [diff] [blame] | 195 | mp_int_t out_sz = o->type->stream_p->write(self_in, buf, len, &error); |
Paul Sokolovsky | e98cf40 | 2014-01-08 02:43:48 +0200 | [diff] [blame] | 196 | if (out_sz == -1) { |
Paul Sokolovsky | a592104 | 2014-05-07 01:39:38 +0300 | [diff] [blame] | 197 | if (is_nonblocking_error(error)) { |
| 198 | // http://docs.python.org/3/library/io.html#io.RawIOBase.write |
| 199 | // "None is returned if the raw stream is set not to block and |
| 200 | // no single byte could be readily written to it." |
| 201 | // This is for consistency with read() behavior, still weird, |
| 202 | // see abobe. |
| 203 | return mp_const_none; |
| 204 | } |
Damien George | ea13f40 | 2014-04-05 18:32:08 +0100 | [diff] [blame] | 205 | nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "[Errno %d]", error)); |
Paul Sokolovsky | e98cf40 | 2014-01-08 02:43:48 +0200 | [diff] [blame] | 206 | } else { |
Paul Sokolovsky | e98cf40 | 2014-01-08 02:43:48 +0200 | [diff] [blame] | 207 | return MP_OBJ_NEW_SMALL_INT(out_sz); |
| 208 | } |
| 209 | } |
| 210 | |
Paul Sokolovsky | ac736f1 | 2014-07-13 23:04:17 +0300 | [diff] [blame] | 211 | STATIC mp_obj_t stream_write_method(mp_obj_t self_in, mp_obj_t arg) { |
| 212 | mp_buffer_info_t bufinfo; |
| 213 | mp_get_buffer_raise(arg, &bufinfo, MP_BUFFER_READ); |
| 214 | return mp_stream_write(self_in, bufinfo.buf, bufinfo.len); |
| 215 | } |
| 216 | |
Paul Sokolovsky | 520e2f5 | 2014-02-12 18:31:30 +0200 | [diff] [blame] | 217 | STATIC mp_obj_t stream_readall(mp_obj_t self_in) { |
Paul Sokolovsky | 5225450 | 2014-01-13 23:25:33 +0200 | [diff] [blame] | 218 | struct _mp_obj_base_t *o = (struct _mp_obj_base_t *)self_in; |
Damien George | 27e735f | 2014-04-05 23:02:23 +0100 | [diff] [blame] | 219 | if (o->type->stream_p == NULL || o->type->stream_p->read == NULL) { |
Paul Sokolovsky | 5225450 | 2014-01-13 23:25:33 +0200 | [diff] [blame] | 220 | // CPython: io.UnsupportedOperation, OSError subclass |
Damien George | ea13f40 | 2014-04-05 18:32:08 +0100 | [diff] [blame] | 221 | nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "Operation not supported")); |
Paul Sokolovsky | 5225450 | 2014-01-13 23:25:33 +0200 | [diff] [blame] | 222 | } |
| 223 | |
| 224 | int total_size = 0; |
Paul Sokolovsky | b9be45e | 2014-05-07 01:51:07 +0300 | [diff] [blame] | 225 | vstr_t *vstr = vstr_new_size(DEFAULT_BUFFER_SIZE); |
Paul Sokolovsky | 5225450 | 2014-01-13 23:25:33 +0200 | [diff] [blame] | 226 | char *buf = vstr_str(vstr); |
| 227 | char *p = buf; |
| 228 | int error; |
Paul Sokolovsky | b9be45e | 2014-05-07 01:51:07 +0300 | [diff] [blame] | 229 | int current_read = DEFAULT_BUFFER_SIZE; |
Paul Sokolovsky | 5225450 | 2014-01-13 23:25:33 +0200 | [diff] [blame] | 230 | while (true) { |
Damien George | 40f3c02 | 2014-07-03 13:25:24 +0100 | [diff] [blame] | 231 | mp_int_t out_sz = o->type->stream_p->read(self_in, p, current_read, &error); |
Paul Sokolovsky | 5225450 | 2014-01-13 23:25:33 +0200 | [diff] [blame] | 232 | if (out_sz == -1) { |
Paul Sokolovsky | 6e73143 | 2014-05-07 01:48:12 +0300 | [diff] [blame] | 233 | if (is_nonblocking_error(error)) { |
| 234 | // With non-blocking streams, we read as much as we can. |
| 235 | // If we read nothing, return None, just like read(). |
| 236 | // Otherwise, return data read so far. |
| 237 | if (total_size == 0) { |
| 238 | return mp_const_none; |
| 239 | } |
| 240 | break; |
| 241 | } |
Damien George | ea13f40 | 2014-04-05 18:32:08 +0100 | [diff] [blame] | 242 | nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "[Errno %d]", error)); |
Paul Sokolovsky | 5225450 | 2014-01-13 23:25:33 +0200 | [diff] [blame] | 243 | } |
| 244 | if (out_sz == 0) { |
| 245 | break; |
| 246 | } |
| 247 | total_size += out_sz; |
| 248 | if (out_sz < current_read) { |
| 249 | current_read -= out_sz; |
| 250 | p += out_sz; |
| 251 | } else { |
Paul Sokolovsky | b9be45e | 2014-05-07 01:51:07 +0300 | [diff] [blame] | 252 | current_read = DEFAULT_BUFFER_SIZE; |
Paul Sokolovsky | 5225450 | 2014-01-13 23:25:33 +0200 | [diff] [blame] | 253 | p = vstr_extend(vstr, current_read); |
| 254 | if (p == NULL) { |
| 255 | // TODO |
Damien George | ea13f40 | 2014-04-05 18:32:08 +0100 | [diff] [blame] | 256 | nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError/*&mp_type_RuntimeError*/, "Out of memory")); |
Paul Sokolovsky | 5225450 | 2014-01-13 23:25:33 +0200 | [diff] [blame] | 257 | } |
| 258 | } |
| 259 | } |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 260 | |
Damien George | f600a6a | 2014-05-25 22:34:34 +0100 | [diff] [blame] | 261 | mp_obj_t s = mp_obj_new_str_of_type(STREAM_CONTENT_TYPE(o->type->stream_p), (byte*)vstr->buf, total_size); |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 262 | vstr_free(vstr); |
| 263 | return s; |
Paul Sokolovsky | 5225450 | 2014-01-13 23:25:33 +0200 | [diff] [blame] | 264 | } |
| 265 | |
Paul Sokolovsky | 9953ca4 | 2014-01-15 23:39:44 +0200 | [diff] [blame] | 266 | // Unbuffered, inefficient implementation of readline() for raw I/O files. |
Paul Sokolovsky | 520e2f5 | 2014-02-12 18:31:30 +0200 | [diff] [blame] | 267 | STATIC mp_obj_t stream_unbuffered_readline(uint n_args, const mp_obj_t *args) { |
Paul Sokolovsky | 9953ca4 | 2014-01-15 23:39:44 +0200 | [diff] [blame] | 268 | struct _mp_obj_base_t *o = (struct _mp_obj_base_t *)args[0]; |
Damien George | 27e735f | 2014-04-05 23:02:23 +0100 | [diff] [blame] | 269 | if (o->type->stream_p == NULL || o->type->stream_p->read == NULL) { |
Paul Sokolovsky | 9953ca4 | 2014-01-15 23:39:44 +0200 | [diff] [blame] | 270 | // CPython: io.UnsupportedOperation, OSError subclass |
Damien George | ea13f40 | 2014-04-05 18:32:08 +0100 | [diff] [blame] | 271 | nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "Operation not supported")); |
Paul Sokolovsky | 9953ca4 | 2014-01-15 23:39:44 +0200 | [diff] [blame] | 272 | } |
| 273 | |
Damien George | 40f3c02 | 2014-07-03 13:25:24 +0100 | [diff] [blame] | 274 | mp_int_t max_size = -1; |
Paul Sokolovsky | 9953ca4 | 2014-01-15 23:39:44 +0200 | [diff] [blame] | 275 | if (n_args > 1) { |
| 276 | max_size = MP_OBJ_SMALL_INT_VALUE(args[1]); |
| 277 | } |
| 278 | |
| 279 | vstr_t *vstr; |
| 280 | if (max_size != -1) { |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 281 | vstr = vstr_new_size(max_size); |
Paul Sokolovsky | 9953ca4 | 2014-01-15 23:39:44 +0200 | [diff] [blame] | 282 | } else { |
| 283 | vstr = vstr_new(); |
| 284 | } |
| 285 | |
| 286 | int error; |
| 287 | while (max_size == -1 || max_size-- != 0) { |
| 288 | char *p = vstr_add_len(vstr, 1); |
| 289 | if (p == NULL) { |
Damien George | d5f5b2f | 2014-05-03 22:01:32 +0100 | [diff] [blame] | 290 | nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_MemoryError, "out of memory")); |
Paul Sokolovsky | 9953ca4 | 2014-01-15 23:39:44 +0200 | [diff] [blame] | 291 | } |
| 292 | |
Damien George | 40f3c02 | 2014-07-03 13:25:24 +0100 | [diff] [blame] | 293 | mp_int_t out_sz = o->type->stream_p->read(o, p, 1, &error); |
Paul Sokolovsky | 9953ca4 | 2014-01-15 23:39:44 +0200 | [diff] [blame] | 294 | if (out_sz == -1) { |
Damien George | ea13f40 | 2014-04-05 18:32:08 +0100 | [diff] [blame] | 295 | nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "[Errno %d]", error)); |
Paul Sokolovsky | 9953ca4 | 2014-01-15 23:39:44 +0200 | [diff] [blame] | 296 | } |
Paul Sokolovsky | 0914371 | 2014-01-22 10:34:45 +0200 | [diff] [blame] | 297 | if (out_sz == 0) { |
| 298 | // Back out previously added byte |
| 299 | // TODO: This is a bit hacky, does it supported by vstr API contract? |
| 300 | // Consider, what's better - read a char and get OutOfMemory (so read |
| 301 | // char is lost), or allocate first as we do. |
| 302 | vstr_add_len(vstr, -1); |
| 303 | break; |
| 304 | } |
| 305 | if (*p == '\n') { |
Paul Sokolovsky | 9953ca4 | 2014-01-15 23:39:44 +0200 | [diff] [blame] | 306 | break; |
| 307 | } |
| 308 | } |
Damien George | d5f5b2f | 2014-05-03 22:01:32 +0100 | [diff] [blame] | 309 | // TODO need a string creation API that doesn't copy the given data |
Damien George | f600a6a | 2014-05-25 22:34:34 +0100 | [diff] [blame] | 310 | mp_obj_t ret = mp_obj_new_str_of_type(STREAM_CONTENT_TYPE(o->type->stream_p), (byte*)vstr->buf, vstr->len); |
Damien George | d5f5b2f | 2014-05-03 22:01:32 +0100 | [diff] [blame] | 311 | vstr_free(vstr); |
| 312 | return ret; |
Paul Sokolovsky | 9953ca4 | 2014-01-15 23:39:44 +0200 | [diff] [blame] | 313 | } |
| 314 | |
Damien George | d5f5b2f | 2014-05-03 22:01:32 +0100 | [diff] [blame] | 315 | // TODO take an optional extra argument (what does it do exactly?) |
| 316 | STATIC mp_obj_t stream_unbuffered_readlines(mp_obj_t self) { |
| 317 | mp_obj_t lines = mp_obj_new_list(0, NULL); |
| 318 | for (;;) { |
| 319 | mp_obj_t line = stream_unbuffered_readline(1, &self); |
Paul Sokolovsky | e22cddb | 2014-06-13 23:46:21 +0300 | [diff] [blame] | 320 | if (!mp_obj_is_true(line)) { |
Damien George | d5f5b2f | 2014-05-03 22:01:32 +0100 | [diff] [blame] | 321 | break; |
| 322 | } |
| 323 | mp_obj_list_append(lines, line); |
| 324 | } |
| 325 | return lines; |
| 326 | } |
| 327 | MP_DEFINE_CONST_FUN_OBJ_1(mp_stream_unbuffered_readlines_obj, stream_unbuffered_readlines); |
| 328 | |
Paul Sokolovsky | d54bef7 | 2014-01-20 18:35:32 +0200 | [diff] [blame] | 329 | mp_obj_t mp_stream_unbuffered_iter(mp_obj_t self) { |
| 330 | mp_obj_t l_in = stream_unbuffered_readline(1, &self); |
Paul Sokolovsky | e22cddb | 2014-06-13 23:46:21 +0300 | [diff] [blame] | 331 | if (mp_obj_is_true(l_in)) { |
Paul Sokolovsky | d54bef7 | 2014-01-20 18:35:32 +0200 | [diff] [blame] | 332 | return l_in; |
| 333 | } |
Damien George | ea8d06c | 2014-04-17 23:19:36 +0100 | [diff] [blame] | 334 | return MP_OBJ_STOP_ITERATION; |
Paul Sokolovsky | d54bef7 | 2014-01-20 18:35:32 +0200 | [diff] [blame] | 335 | } |
Paul Sokolovsky | 9953ca4 | 2014-01-15 23:39:44 +0200 | [diff] [blame] | 336 | |
Paul Sokolovsky | a671f89 | 2014-01-16 12:53:46 +0200 | [diff] [blame] | 337 | MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_read_obj, 1, 2, stream_read); |
Paul Sokolovsky | 5225450 | 2014-01-13 23:25:33 +0200 | [diff] [blame] | 338 | MP_DEFINE_CONST_FUN_OBJ_1(mp_stream_readall_obj, stream_readall); |
Paul Sokolovsky | 9953ca4 | 2014-01-15 23:39:44 +0200 | [diff] [blame] | 339 | MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_unbuffered_readline_obj, 1, 2, stream_unbuffered_readline); |
Paul Sokolovsky | ac736f1 | 2014-07-13 23:04:17 +0300 | [diff] [blame] | 340 | MP_DEFINE_CONST_FUN_OBJ_2(mp_stream_write_obj, stream_write_method); |