summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove unused variable BOOTCHART_DEFAULT_TIME_SEC.Elliott Hughes2015-02-131-3/+0
| | | | Change-Id: Id43c73dd32d2f9f1eee9592b55aa3fd3c02094b2
* Merge "Further refactoring of the bootchart code."Elliott Hughes2015-02-135-368/+187
|\
| * Further refactoring of the bootchart code.Elliott Hughes2015-02-135-368/+187
|/ | | | Change-Id: Ifed6ae8d481b605139fd27799574de4c2d0f5908
* Merge "bootchart: fix bootchart can not be triggered problem"Elliott Hughes2015-02-128-111/+107
|\
| * bootchart: fix bootchart can not be triggered problemYongqin Liu2015-02-128-111/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bootchart uses a file on the data partition to decide if it should collect data for bootchart, but the data partition will be mounted by the mount_all command in the "on fs" section, and it will be only added into the action queue when command "trigger fs" is executed, but that's after the bootchart_init action (late_init). This change makes bootchart_init a builtin command of init, and make it executed as the first command of "on post-fs" section which will be triggered after the "on fs" section. This change also refactors the bootchart code to all be in bootchart.cpp. Change-Id: Ia74aa34ca5b785f51fcffdd383075a549b2a99d9 Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
* | Merge "Do not dump maps/memory/code of sibling threads."Christopher Ferris2015-02-111-43/+39
|\ \
| * | Do not dump maps/memory/code of sibling threads.Christopher Ferris2015-02-091-43/+39
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modifies the code so that if the unwind fails, the code still prints as much data as possible. Also, for sibling threads, skip printing the maps and memory/code since it's not likely to be very relevant. Fix a few cases where extra space is at the end of lines. Fix an inverted if statement that was checking the wrong condition. Bug: 18816322 Change-Id: Ic659e0c34489bf2c65c5a23e2b83e31653b927e4
* | Merge "liblog: test: ARM64: Enable 32 and 64-bit liblog_benchmark"Mark Salyzyn2015-02-102-5/+5
|\ \
| * | liblog: test: ARM64: Enable 32 and 64-bit liblog_benchmarkMark Salyzyn2015-02-102-5/+5
|/ / | | | | | | | | | | | | - Enable build for 32 and 64 bit benchmark executables - Fix some cosmetics issues in logd_write.c Change-Id: I544446e5116607d7fec89171135f6e1eff6aebd8
* | Merge "Track renaming of initUnchangeableSystemProperty."Narayan Kamath2015-02-101-2/+2
|\ \ | |/ |/|
| * Track renaming of initUnchangeableSystemProperty.Narayan Kamath2015-02-101-2/+2
|/ | | | | | It's now setUnchangeableSystemProperty. Change-Id: Ib42f8ac9f074230dfb7af2eb633e0a536ab7d4b7
* Merge "log.h: Fix typo"Andreas Gampe2015-02-101-1/+1
|\
| * log.h: Fix typoAndreas Gampe2015-02-091-1/+1
|/ | | | Change-Id: I6b5e9bc9d40e5e5ecf9f50f7392675391e6f18e6
* Merge changes I420b5b8a,Ica23fe41Mark Salyzyn2015-02-091-32/+55
|\ | | | | | | | | | | * changes: log.h: wrap android_testLog around __android_log_is_loggable log.h: deprecate CONDITION
| * log.h: wrap android_testLog around __android_log_is_loggableMark Salyzyn2015-02-091-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - take android_testLog from the bonepile and resurrect - android_testLog is used, and makes sense in its current context as a holder for Android Logging policy. - Default level when not specified is ANDROID_LOG_VERBOSE for eng and userdebug, and ANDROID_LOG_DEBUG for user. NB: Properties, which are associated with __android_log_is_loggable are not to be adjusted in user release; it would be useful at that juncture to return a constant of (0) for VERBOSE, and a (1) for others on user builds. Or default level to drop to ANDROID_LOG_DEBUG for all in future. Bug: 17760225 Change-Id: I420b5b8a94d53d664c6a8b13546ebc424a147923
| * log.h: deprecate CONDITIONMark Salyzyn2015-02-091-31/+39
|/ | | | | | - replace CONDITION with __predict_false to match with bionic Change-Id: Ica23fe41cf9a7ea5eaf1b8552780af9ec7827808
* Merge "Lose touch to toybox."Elliott Hughes2015-02-092-116/+0
|\
| * Lose touch to toybox.Elliott Hughes2015-02-092-116/+0
| | | | | | | | Change-Id: Id9646ff10870425fc4013aab6621a5f6a0c6e98e
* | Merge "liblog: add __android_log_is_loggable()"Mark Salyzyn2015-02-095-1/+86
|\ \ | |/ |/|
| * liblog: add __android_log_is_loggable()Mark Salyzyn2015-02-095-1/+86
|/ | | | | | | | | - Add new liblog API __android_log_is_loggable(prio, tag, def) - future plan to integrate this into the runtime checks and into the logd daemon for filtration. Inert for now. Bug: 17760225 Change-Id: I16395b4d42acc08f0209f55a1cbf87b0b2112898
* Merge "Use mkstemp for host ashmem."Elliott Hughes2015-02-091-43/+7
|\
| * Use mkstemp for host ashmem.Elliott Hughes2015-02-091-43/+7
| | | | | | | | | | Bug: 19310167 Change-Id: Ic4e32b3924a9aa0b0d095d445108cbcf2231cd91
* | Merge "fix bug that passing invalid fd to fstats on win32 builds"Elliott Hughes2015-02-091-1/+1
|\ \
| * | fix bug that passing invalid fd to fstats on win32 buildseric.yan2015-02-091-1/+1
|/ / | | | | | | | | | | | | | | | | | | lfd returned by adb_open is not the actual file desc. on win32 builds. calling through fstat with invalid fd will lead to crash, using stat instead. Change-Id: I7fdc8b825162eaa42efe8755265842c300b00e39 Signed-off-by: eric.yan <eric.yan@yulong.com> Signed-off-by: severecold <severecold@gmail.com>
* | Merge "Bump do_write buffer size"Elliott Hughes2015-02-071-1/+1
|\ \
| * | Bump do_write buffer sizeJohan Redestig2015-02-071-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of do_write (write to generic file) there is really no relation to the PROP_VALUE_MAX limitation of system properties. The current value, 92, is not so much for writing to files so bump it a bit. Ideally there should not be any low hard limit in this case. Either expand_props should allocate the output buffer or take the output fd and to streaming write. Such a change is rather invasive though and at this point in time it seems reasonable that one dont want more than 256 character strings in the init files. Change-Id: I846a282ae4e747e6171eef38b302b46287951451
* | Merge "Move map data into backtrace data proper."Christopher Ferris2015-02-0611-43/+65
|\ \ | |/ |/|
| * Move map data into backtrace data proper.Christopher Ferris2015-02-0611-43/+65
| | | | | | | | | | | | | | | | | | | | | | The backtrace structure used to include a pointer to a backtrace_map_t that represented the map data for a particular pc. This introduced a race condition where the pointer could be discarded, but the backtrace structure still contained a pointer to garbage memory. Now all of the map information is right in the structure. Bug: 19028453 Change-Id: If7088a73f3c6bf1f3bc8cdd2bb4b62e7cab831c0
* | Merge "Clean up reading and writing in init."Elliott Hughes2015-02-0614-173/+259
|\ \
| * | Clean up reading and writing in init.Elliott Hughes2015-02-0614-173/+259
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This isn't particularly useful in and of itself, but it does introduce the first (trivial) unit test, improves the documentation (including details about how to debug init crashes), and made me aware of how unpleasant the existing parser is. I also fixed a bug in passing --- unless you thought the "peboot" and "pm" commands were features... Bug: 19217569 Change-Id: I6ab76129a543ce3ed3dab52ef2c638009874c3de
* | | Merge "fs_mgr: error check umount calls / add retry logic"Nick Kralevich2015-02-062-3/+14
|\ \ \ | |_|/ |/| |
| * | fs_mgr: error check umount calls / add retry logicNick Kralevich2015-02-052-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't silently ignore umount errors. At a minimum, log them. Add strerror(errno) to another umount call, to make sure we get some actionable data. check_fs: try 5 times umounting the filesystem. It appears that the umount is failing, perhaps because some service is opening the file on the device or other error. Try unmounting it multiple times in case it's a transient problem and we can recover. Bug: 19199624 Bug: 19156134 Change-Id: I7213eb52d55116fb2419a36494d26d5e159981a7
* | | Merge "Remove link to gccdemangle."Christopher Ferris2015-02-061-1/+0
|\ \ \ | |/ / |/| |
| * | Remove link to gccdemangle.Christopher Ferris2015-02-051-1/+0
| |/ | | | | | | | | Bug: 18930951 Change-Id: Ib7fd332b6e02241c0676ef33d2fa210a72efe1b1
* | Merge "rootdir: enable armv8_deprecated swp hook"Greg Hackmann2015-02-051-0/+3
|\ \ | |/ |/|
| * rootdir: enable armv8_deprecated swp hookGreg Hackmann2015-02-051-0/+3
|/ | | | | | | | | | | | The upstream kernel now includes support for emulating legacy AArch32 instructions on ARMv8 devices. By default this framework emulates deprecated instructions but not obsolete instructions. Android requires support for the obsolete SWP and SWPB instructions on all ARM devices, so override this default for the swp emulation hook. Change-Id: I82b9bdb564413ec7c1a101da75a9928aebe1606b Signed-off-by: Greg Hackmann <ghackmann@google.com>
* Merge "Fix Windows build."Elliott Hughes2015-02-051-0/+3
|\
| * Fix Windows build.Elliott Hughes2015-02-051-0/+3
|/ | | | | | | Take 2. Probably should have done this in the beginning, but thought I was being clever. Change-Id: I85c6e487eece9bcc75f8f62c850c2d4d1ee9e908
* Merge "Fix Windows build."Elliott Hughes2015-02-051-0/+2
|\
| * Fix Windows build.Elliott Hughes2015-02-041-0/+2
|/ | | | | | | Only two days in, and I'm already really regretting putting this code somewhere that builds for Mac OS and Windows... Change-Id: I576ee4a9e647e10dc2d47c7e1e38aedee2bf404c
* Merge "Build BSD grep separately from toolbox."Elliott Hughes2015-02-052-24/+23
|\
| * Build BSD grep separately from toolbox.Elliott Hughes2015-02-042-24/+23
|/ | | | | | | | Also move the dd-only library code into the dd section (so a future maintainer will know to keep/remove them as a block) and fix the one build warning remaining. Change-Id: Ibf6b28ef05e4cbb70b9308b0f4387f5af5b7fa94
* Merge "Stop using #if for conditional compilation."Elliott Hughes2015-02-0511-185/+162
|\
| * Stop using #if for conditional compilation.Elliott Hughes2015-02-0411-185/+162
|/ | | | | | | | Use regular 'if' to prevent bitrot. Also remove remaining typedefs. Change-Id: I2e6ca928e2db29b88b643cf990ff05cfb0be94a6
* Merge "Add a WriteStringToFile overload that cares about permissions."Elliott Hughes2015-02-042-8/+38
|\
| * Add a WriteStringToFile overload that cares about permissions.Elliott Hughes2015-02-042-8/+38
|/ | | | Change-Id: I857a80b61768d4e9610bdd149eff2d9d8e48d2c0
* Merge "Use TEMP_FAILURE_RETRY, always build bootchart.cpp."Elliott Hughes2015-02-046-70/+25
|\
| * Use TEMP_FAILURE_RETRY, always build bootchart.cpp.Elliott Hughes2015-02-046-70/+25
|/ | | | | | | | Also switch the revision parsing over to sscanf as promised. I haven't done the hardware parsing because I don't yet know whether we actually need to keep the space-stripping code. Change-Id: Ic33378345cd515cb08d00c543acf44eb72673396
* Merge "Fix clang "ueventd.cpp:111:1: error: no return statement in function ↵Elliott Hughes2015-02-041-0/+2
|\ | | | | | | returning non-void"."
| * Fix clang "ueventd.cpp:111:1: error: no return statement in function ↵Elliott Hughes2015-02-041-0/+2
|/ | | | | | returning non-void". Change-Id: I69c9e5534975bffa0fbf98ca4af50400f6b94aa0