2c96639eb2
From a logcat profile:
```
|--95.06%-- convertPrintable(char*, char const*, unsigned long)
| |--13.95%-- [hit in function]
| |
| |--35.96%-- mbrtoc32
| | |--82.72%-- [hit in function]
| | |
| | |--11.07%-- mbsinit
| | |
| | |--5.96%-- @plt
```
I think we'd assumed that mbsinit() would be inlined, but since these
functions aren't all in wchar.cpp it wasn't being. This change moves the
implementation into a (more clearly named) inline function so we can
trivially reclaim that 11%+6%.
Benchmarks before:
```
-------------------------------------------------------------------
Benchmark Time CPU Iterations
-------------------------------------------------------------------
BM_stdlib_mbrtowc_1 8.03 ns 7.95 ns 87144997
BM_stdlib_mbrtowc_2 22.0 ns 21.8 ns 32002437
BM_stdlib_mbrtowc_3 30.0 ns 29.7 ns 23517699
BM_stdlib_mbrtowc_4 37.4 ns 37.1 ns 18895204
BM_stdlib_mbstowcs_ascii 792373 ns 782484 ns 890 bytes_per_second=609.389M/s
BM_stdlib_mbstowcs_wide 15836785 ns 15678316 ns 44 bytes_per_second=30.4138M/s
```
Benchmarks after:
```
-------------------------------------------------------------------
Benchmark Time CPU Iterations
-------------------------------------------------------------------
BM_stdlib_mbrtowc_1 5.76 ns 5.72 ns 121863813
BM_stdlib_mbrtowc_2 17.1 ns 16.9 ns 41487260
BM_stdlib_mbrtowc_3 24.2 ns 24.0 ns 29141629
BM_stdlib_mbrtowc_4 30.3 ns 30.1 ns 23229291
BM_stdlib_mbstowcs_ascii 783506 ns 775389 ns 903 bytes_per_second=614.965M/s
BM_stdlib_mbstowcs_wide 12787003 ns 12672642 ns 55 bytes_per_second=37.6273M/s
```
Bug: http://b/206523398
Test: treehugger
Change-Id: If8c6c39880096ddd2cbd323c68dca82e9849ace6
79 lines
2.7 KiB
C
79 lines
2.7 KiB
C
/*
|
|
* Copyright (C) 2014 The Android Open Source Project
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* * Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* * 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.
|
|
*
|
|
* 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 OWNER 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.
|
|
*/
|
|
|
|
#ifndef _BIONIC_MBSTATE_H
|
|
#define _BIONIC_MBSTATE_H
|
|
|
|
#include <errno.h>
|
|
#include <wchar.h>
|
|
|
|
__BEGIN_DECLS
|
|
|
|
/*
|
|
* These return values are specified by POSIX for multibyte conversion
|
|
* functions.
|
|
*/
|
|
#define __MB_ERR_ILLEGAL_SEQUENCE static_cast<size_t>(-1)
|
|
#define __MB_ERR_INCOMPLETE_SEQUENCE static_cast<size_t>(-2)
|
|
|
|
#define __MB_IS_ERR(rv) (rv == __MB_ERR_ILLEGAL_SEQUENCE || \
|
|
rv == __MB_ERR_INCOMPLETE_SEQUENCE)
|
|
|
|
static inline __wur bool mbstate_is_initial(const mbstate_t* ps) {
|
|
return *(reinterpret_cast<const uint32_t*>(ps->__seq)) == 0;
|
|
}
|
|
|
|
static inline __wur size_t mbstate_bytes_so_far(const mbstate_t* ps) {
|
|
return
|
|
(ps->__seq[2] != 0) ? 3 :
|
|
(ps->__seq[1] != 0) ? 2 :
|
|
(ps->__seq[0] != 0) ? 1 : 0;
|
|
}
|
|
|
|
static inline void mbstate_set_byte(mbstate_t* ps, int i, char byte) {
|
|
ps->__seq[i] = static_cast<uint8_t>(byte);
|
|
}
|
|
|
|
static inline __wur uint8_t mbstate_get_byte(const mbstate_t* ps, int n) {
|
|
return ps->__seq[n];
|
|
}
|
|
|
|
static inline __wur size_t mbstate_reset_and_return_illegal(int _errno, mbstate_t* ps) {
|
|
errno = _errno;
|
|
*(reinterpret_cast<uint32_t*>(ps->__seq)) = 0;
|
|
return __MB_ERR_ILLEGAL_SEQUENCE;
|
|
}
|
|
|
|
static inline __wur size_t mbstate_reset_and_return(int _return, mbstate_t* ps) {
|
|
*(reinterpret_cast<uint32_t*>(ps->__seq)) = 0;
|
|
return _return;
|
|
}
|
|
|
|
__END_DECLS
|
|
|
|
#endif // _BIONIC_MBSTATE_H
|