Re: [Minios-devel] [UNIKRAFT/NEWLIB PATCH 1/5] Introduce <uk/_types.h> header for basic types defined by Unikraft

[Felipe Huici <Felipe.Huici@xxxxxxxxx>]

Hi Costin, this looks ok, thanks for the well explained commit messages in this 
series!

Reviewed-by: Felipe Huici <felipe.huici@xxxxxxxxx>

On 13.10.19, 15:37, "Costin Lupu" <costin.lupu@xxxxxxxxx> wrote:

    Newlib defines some fundamental data types in its <sys/_types.h> header. We 
need
    to overwrite those definitions that are provided by Unikraft so we 
introduce the
    <uk/_types.h> header. In order to use both our <uk/_types.h> and Newlib's
    <sys/_types.h> we use an intermediary <sys/_types.h> header in which we can 
also
    overwrite some other type definitions (e.g. _CLOCK_T_ in this patch).
    
    Signed-off-by: Costin Lupu <costin.lupu@xxxxxxxxx>
    ---
     include/sys/_types.h | 48 +++++++++++++++++++++++++++++++++++++
     include/uk/_types.h  | 56 ++++++++++++++++++++++++++++++++++++++++++++
     2 files changed, 104 insertions(+)
     create mode 100644 include/sys/_types.h
     create mode 100644 include/uk/_types.h
    
    diff --git a/include/sys/_types.h b/include/sys/_types.h
    new file mode 100644
    index 0000000..972a7de
    --- /dev/null
    +++ b/include/sys/_types.h
    @@ -0,0 +1,48 @@
    +/* SPDX-License-Identifier: BSD-3-Clause */
    +/*
    + * Authors: Costin Lupu <costin.lupu@xxxxxxxxx>
    + *
    + * Copyright (c) 2019, University Politehnica of Bucharest. All rights 
reserved.
    + *
    + * Redistribution and use in source and binary forms, with or without
    + * modification, are permitted provided that the following conditions
    + * are met:
    + *
    + * 1. Redistributions of source code must retain the above copyright
    + *    notice, this list of conditions and the following disclaimer.
    + * 2. Redistributions in binary form must reproduce the above copyright
    + *    notice, this list of conditions and the following disclaimer in the
    + *    documentation and/or other materials provided with the distribution.
    + * 3. Neither the name of the copyright holder nor the names of its
    + *    contributors may be used to endorse or promote products derived from
    + *    this software without specific prior written permission.
    + *
    + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS 
IS"
    + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
THE
    + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
PURPOSE
    + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS 
BE
    + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
    + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
    + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
    + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
    + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
    + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
THE
    + * POSSIBILITY OF SUCH DAMAGE.
    + *
    + * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
    + */
    +
    +#ifndef __NEWLIB_GLUE_SYS__TYPES_H__
    +#define __NEWLIB_GLUE_SYS__TYPES_H__
    +
    +/* Use Unikraft type definitions */
    +#include <uk/_types.h>
    +
    +/* Provide _CLOCK_T_ */
    +#define _CLOCK_T_ long /* clock() */
    +#define __machine_clock_t_defined
    +
    +/* Use newlib type definitions */
    +#include_next <sys/_types.h>
    +
    +#endif /* __NEWLIB_GLUE_SYS__TYPES_H__ */
    diff --git a/include/uk/_types.h b/include/uk/_types.h
    new file mode 100644
    index 0000000..72e25b9
    --- /dev/null
    +++ b/include/uk/_types.h
    @@ -0,0 +1,56 @@
    +/* SPDX-License-Identifier: BSD-3-Clause */
    +/*
    + * Authors: Costin Lupu <costin.lupu@xxxxxxxxx>
    + *
    + * Copyright (c) 2019, University Politehnica of Bucharest. All rights 
reserved.
    + *
    + * Redistribution and use in source and binary forms, with or without
    + * modification, are permitted provided that the following conditions
    + * are met:
    + *
    + * 1. Redistributions of source code must retain the above copyright
    + *    notice, this list of conditions and the following disclaimer.
    + * 2. Redistributions in binary form must reproduce the above copyright
    + *    notice, this list of conditions and the following disclaimer in the
    + *    documentation and/or other materials provided with the distribution.
    + * 3. Neither the name of the copyright holder nor the names of its
    + *    contributors may be used to endorse or promote products derived from
    + *    this software without specific prior written permission.
    + *
    + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS 
IS"
    + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
THE
    + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
PURPOSE
    + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS 
BE
    + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
    + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
    + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
    + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
    + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
    + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
THE
    + * POSSIBILITY OF SUCH DAMAGE.
    + *
    + * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
    + */
    +
    +#ifndef __NEWLIB_GLUE_UK__TYPES_H__
    +#define __NEWLIB_GLUE_UK__TYPES_H__
    +
    +/* Use Unikraft time definitions */
    +#define __NEED_time_t
    +#define __NEED_suseconds_t
    +#define __NEED_struct_timeval
    +#define __NEED_struct_timespec
    +#define __NEED_timer_t
    +#define __NEED_clockid_t
    +#define __NEED_clock_t
    +#include <uk/time_types.h>
    +
    +/* newlib guards */
    +#define __time_t_defined
    +#define _SUSECONDS_T_DECLARED
    +#define _TIMEVAL_DEFINED
    +#define    __timer_t_defined
    +#define __clockid_t_defined
    +#define __clock_t_defined
    +
    +#endif /* __NEWLIB_GLUE_UK__TYPES_H__ */
    -- 
    2.20.1
    
    

_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel