From c8c44a4c2e6deaf57a4d7badfcbb9ba525d3dfa2 Mon Sep 17 00:00:00 2001 From: Damien George Date: Wed, 30 Jul 2014 14:04:16 +0100 Subject: [PATCH] py: Add ioctl method to stream protocol; add initial modselect. --- extmod/modselect.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++ py/mpconfig.h | 4 +++ py/obj.h | 4 ++- 3 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 extmod/modselect.c diff --git a/extmod/modselect.c b/extmod/modselect.c new file mode 100644 index 0000000000..90f861e9c6 --- /dev/null +++ b/extmod/modselect.c @@ -0,0 +1,73 @@ +/* + * This file is part of the Micro Python project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2014 Damien P. George + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include +#include +#include +#include "mpconfig.h" +#include "misc.h" +#include "nlr.h" +#include "qstr.h" +#include "obj.h" +#include "runtime.h" +#include "objtuple.h" +#include "binary.h" + +#if MICROPY_PY_SELECT + +/// \module select - Provides select function to wait for events on a stream +/// +/// This module provides the select function. + +/// \function select(rlist, wlist, xlist[, timeout]) +mp_obj_t select_select(uint n_args, const mp_obj_t *args) { + return mp_obj_new_bytes((void*)mp_obj_int_get(ptr), mp_obj_int_get(size)); +} +MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(select_select_obj, 3, 4, select_select); + +STATIC const mp_map_elem_t mp_module_select_globals_table[] = { + { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_select) }, + { MP_OBJ_NEW_QSTR(MP_QSTR_select), (mp_obj_t)&select_select_obj }, +}; + +STATIC const mp_obj_dict_t mp_module_select_globals = { + .base = {&mp_type_dict}, + .map = { + .all_keys_are_qstrs = 1, + .table_is_fixed_array = 1, + .used = MP_ARRAY_SIZE(mp_module_select_globals_table), + .alloc = MP_ARRAY_SIZE(mp_module_select_globals_table), + .table = (mp_map_elem_t*)mp_module_select_globals_table, + }, +}; + +const mp_obj_module_t mp_module_select = { + .base = { &mp_type_module }, + .name = MP_QSTR_select, + .globals = (mp_obj_dict_t*)&mp_module_select_globals, +}; + +#endif // MICROPY_PY_SELECT diff --git a/py/mpconfig.h b/py/mpconfig.h index adbcb0eb71..fc5d6ce2e1 100644 --- a/py/mpconfig.h +++ b/py/mpconfig.h @@ -390,6 +390,10 @@ typedef double mp_float_t; #define MICROPY_PY_ZLIBD (0) #endif +#ifndef MICROPY_PY_SELECT +#define MICROPY_PY_SELECT (0) +#endif + /*****************************************************************************/ /* Hooks for a port to add builtins */ diff --git a/py/obj.h b/py/obj.h index a14a031c87..79f3041500 100644 --- a/py/obj.h +++ b/py/obj.h @@ -230,12 +230,14 @@ void mp_get_buffer_raise(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flag // Stream protocol #define MP_STREAM_ERROR (-1) +#define MP_STREAM_FLUSH (1) +#define MP_STREAM_POLL (2) typedef struct _mp_stream_p_t { // On error, functions should return MP_STREAM_ERROR and fill in *errcode (values // are implementation-dependent, but will be exposed to user, e.g. via exception). mp_uint_t (*read)(mp_obj_t obj, void *buf, mp_uint_t size, int *errcode); mp_uint_t (*write)(mp_obj_t obj, const void *buf, mp_uint_t size, int *errcode); - // add seek() ? + mp_uint_t (*ioctl(mp_obj_t obj, mp_uint_t request, int *errcode, ...); mp_uint_t is_text : 1; // default is bytes, set this for text stream } mp_stream_p_t;