diff options
| author | Dmitry Kolesnikov <dmitry.kolesnikov> | 2014-02-11 00:27:11 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2014-03-21 13:23:03 +0100 |
| commit | f43a1dc55d42de3097f75ca65baead9a2ff05c78 (patch) | |
| tree | f5b0705515e4c571db694f8d8dea3562bae265e4 /lib/os_mon/c_src | |
| parent | 3c06b5b3cdde72453d97910889e38e91c1dd4870 (diff) | |
| download | otp-f43a1dc55d42de3097f75ca65baead9a2ff05c78.tar.gz otp-f43a1dc55d42de3097f75ca65baead9a2ff05c78.tar.bz2 otp-f43a1dc55d42de3097f75ca65baead9a2ff05c78.zip | |
Raspberry PI / Android a minimal cross-compile configuration
Enable a cross compile Erlang/OTP platform to Android or Raspberry PI
using Android NDK. Port emulator and core application to support target
HW platform. Exclude any add-on services required for OTP platform deployment
into target hardware due to device fragmentation and jail-break requirements.
* fix erts/emulator/beam/sys.h
Disable redefinition of __noreturn macro
* port erts/emulator/sys/unix/erl_child_setup.c
Use techniques proposed by https://code.google.com/p/erlang4android to
access system properties
* fix erts/emulator/sys/unix/erl_unix_sys_ddll.c
The static linking of emulator cannot find dlerror(), dlopen() symbols
* port erts/emulator/sys/unix/sys.c
make path to shell configurable at build time
* port erts/etc/common/Makefile.in
disable librt for *-linux-androideabi
* port erts/lib_src/pthread/ethread.c
Use techniques proposed by https://code.google.com/p/erlang4android to
disable emulator crash if kernel threads are on. Replace unreliable
pthread_sigmask() by sigprocmask()
* port lib/erl_interface/src/connect/ei_connect.c
Disable call to undefined gethostid()
* port lib/erl_interface/src/connect/ei_resolve.c
Use gethostbyname_r() on Android platform
Diffstat (limited to 'lib/os_mon/c_src')
| -rw-r--r-- | lib/os_mon/c_src/memsup.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/os_mon/c_src/memsup.c b/lib/os_mon/c_src/memsup.c index b5114d10ed..409db84aa7 100644 --- a/lib/os_mon/c_src/memsup.c +++ b/lib/os_mon/c_src/memsup.c @@ -324,7 +324,7 @@ get_mem_procfs(memory_ext *me){ /* arch specific functions */ -#if defined(__linux__) /* ifdef SYSINFO */ +#if defined(__linux__) && !defined(__ANDROID__)/* ifdef SYSINFO */ /* sysinfo does not include cached memory which is a problem. */ static int get_extended_mem_sysinfo(memory_ext *me) { @@ -395,8 +395,12 @@ get_extended_mem_sgi(memory_ext *me) { static void get_extended_mem(memory_ext *me) { +/* android */ +#if defined(__ANDROID__) + if (get_mem_procfs(me)) return; + /* linux */ -#if defined(__linux__) +#elif defined(__linux__) if (get_mem_procfs(me)) return; if (get_extended_mem_sysinfo(me)) return; |