From ce8bbfaf547c7b96a52e5da34e5022461ff80556 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Fri, 1 Jan 2021 08:37:32 -0800 Subject: [PATCH 1/6] Windows: Fix some type conversion warnings. --- Windows/DinputDevice.cpp | 31 +++++++++++++++++-------------- Windows/DinputDevice.h | 12 ++++++------ 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/Windows/DinputDevice.cpp b/Windows/DinputDevice.cpp index d59874d680..4d415b7c8a 100644 --- a/Windows/DinputDevice.cpp +++ b/Windows/DinputDevice.cpp @@ -203,7 +203,7 @@ DinputDevice::~DinputDevice() { } } -void SendNativeAxis(int deviceId, short value, short &lastValue, int axisId) { +void SendNativeAxis(int deviceId, int value, int &lastValue, int axisId) { if (value == lastValue) return; @@ -216,11 +216,14 @@ void SendNativeAxis(int deviceId, short value, short &lastValue, int axisId) { lastValue = value; } -inline float Signs(short val) { +inline int Signs(int val) { return (0 < val) - (val < 0); } -inline float LinearMaps(short val, short a0, short a1, short b0, short b1) { +inline int LinearMaps(int val, int a0, int a1, int b0, int b1) { + return b0 + (((val - a0) * (b1 - b0)) / (a1 - a0)); +} +inline float LinearMaps(float val, float a0, float a1, float b0, float b1) { return b0 + (((val - a0) * (b1 - b0)) / (a1 - a0)); } @@ -244,11 +247,11 @@ int DinputDevice::UpdateState() { axis.deviceId = DEVICE_ID_PAD_0 + pDevNum; // Circle to Square mapping, cribbed from XInputDevice - float sx = js.lX; - float sy = js.lY; + float sx = (float)js.lX; + float sy = (float)js.lY; float scaleFactor = sqrtf((sx * sx + sy * sy) / std::max(sx * sx, sy * sy)); - js.lX = (short)(sx * scaleFactor); - js.lY = (short)(sy * scaleFactor); + js.lX = (int)(sx * scaleFactor); + js.lY = (int)(sy * scaleFactor); // Linear range mapping (used to invert deadzones) float dz = g_Config.fDInputAnalogDeadzone; @@ -257,20 +260,20 @@ int DinputDevice::UpdateState() { float md = std::max(dz, idz); float st = g_Config.fDInputAnalogSensitivity; - float magnitude = sqrtf(js.lX * js.lX + js.lY * js.lY); + float magnitude = sqrtf((float)(js.lX * js.lX + js.lY * js.lY)); if (magnitude > dz * 10000.0f) { if (idzm == 1) { - short xSign = Signs(js.lX); - if (xSign != 0.0f) { - js.lX = LinearMaps(js.lX, xSign * (short)(dz * 10000), xSign * 10000, xSign * (short)(md * 10000), xSign * 10000 * st); + int xSign = Signs(js.lX); + if (xSign != 0) { + js.lX = LinearMaps(js.lX, xSign * (int)(dz * 10000), xSign * 10000, xSign * (int)(md * 10000), xSign * (int)(st * 10000)); } } else if (idzm == 2) { - short ySign = Signs(js.lY); - if (ySign != 0.0f) { - js.lY = LinearMaps(js.lY, ySign * (short)(dz * 10000.0f), ySign * 10000, ySign * (short)(md * 10000.0f), ySign * 10000 * st); + int ySign = Signs(js.lY); + if (ySign != 0) { + js.lY = LinearMaps(js.lY, ySign * (int)(dz * 10000.0f), ySign * 10000, ySign * (int)(md * 10000.0f), ySign * (int)(st * 10000)); } } else if (idzm == 3) diff --git a/Windows/DinputDevice.h b/Windows/DinputDevice.h index 796b5e265c..d8ecc8762f 100644 --- a/Windows/DinputDevice.h +++ b/Windows/DinputDevice.h @@ -62,10 +62,10 @@ private: bool analog; BYTE lastButtons_[128]; WORD lastPOV_[4]; - short last_lX_; - short last_lY_; - short last_lZ_; - short last_lRx_; - short last_lRy_; - short last_lRz_; + int last_lX_; + int last_lY_; + int last_lZ_; + int last_lRx_; + int last_lRy_; + int last_lRz_; }; From 84aa33970b21fa463d3bfa3f94ed15bb0d77b635 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Fri, 1 Jan 2021 08:37:54 -0800 Subject: [PATCH 2/6] Debugger: Fix some type conversion warnings. --- Common/Math/expression_parser.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Common/Math/expression_parser.cpp b/Common/Math/expression_parser.cpp index 9499cce7e0..e24c056a07 100644 --- a/Common/Math/expression_parser.cpp +++ b/Common/Math/expression_parser.cpp @@ -462,7 +462,7 @@ bool parsePostfixExpression(PostfixExpression& exp, IExpressionFunctions* funcs, break; case EXOP_SIGNMINUS: // -0 if (useFloat) - valueStack.push_back(0.0 - fArg[0]); + valueStack.push_back((uint32_t)(0.0f - fArg[0])); else valueStack.push_back(0-arg[0]); break; @@ -474,7 +474,7 @@ bool parsePostfixExpression(PostfixExpression& exp, IExpressionFunctions* funcs, break; case EXOP_MUL: // a*b if (useFloat) - valueStack.push_back(fArg[1]*fArg[0]); + valueStack.push_back((uint32_t)(fArg[1] * fArg[0])); else valueStack.push_back(arg[1]*arg[0]); break; @@ -485,7 +485,7 @@ bool parsePostfixExpression(PostfixExpression& exp, IExpressionFunctions* funcs, return false; } if (useFloat) - valueStack.push_back(fArg[1]/fArg[0]); + valueStack.push_back((uint32_t)(fArg[1] / fArg[0])); else valueStack.push_back(arg[1]/arg[0]); break; @@ -499,13 +499,13 @@ bool parsePostfixExpression(PostfixExpression& exp, IExpressionFunctions* funcs, break; case EXOP_ADD: // a+b if (useFloat) - valueStack.push_back(fArg[1]+fArg[0]); + valueStack.push_back((uint32_t)(fArg[1] + fArg[0])); else valueStack.push_back(arg[1]+arg[0]); break; case EXOP_SUB: // a-b if (useFloat) - valueStack.push_back(fArg[1]-fArg[0]); + valueStack.push_back((uint32_t)(fArg[1] - fArg[0])); else valueStack.push_back(arg[1]-arg[0]); break; From f57c642f0b5d8cf81d5cfc31646d59bf9aa1bb97 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Fri, 1 Jan 2021 08:38:27 -0800 Subject: [PATCH 3/6] Common: Fix logging shutdown race condition. Got a crash during logging on another thread during shutdown. --- Common/LogManager.cpp | 4 ++++ UI/NativeApp.cpp | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Common/LogManager.cpp b/Common/LogManager.cpp index 1a7c6cffaa..113dc8200a 100644 --- a/Common/LogManager.cpp +++ b/Common/LogManager.cpp @@ -156,6 +156,9 @@ LogManager::~LogManager() { #endif } + // Make sure we don't shutdown while logging. RemoveListener locks too, but there are gaps. + std::lock_guard listeners_lock(listeners_lock_); + if (fileLog_) delete fileLog_; #if !defined(MOBILE_DEVICE) || defined(_DEBUG) @@ -262,6 +265,7 @@ bool LogManager::IsEnabled(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type) } void LogManager::Init(bool *enabledSetting) { + _assert_(logManager_ == nullptr); logManager_ = new LogManager(enabledSetting); } diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index d51adad672..7fdf56e5e9 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -1402,14 +1402,6 @@ void NativeShutdown() { #endif g_Config.Save("NativeShutdown"); - // Avoid shutting this down when restarting core. - if (!restarting) - LogManager::Shutdown(); - -#ifdef ANDROID_NDK_PROFILER - moncleanup(); -#endif - INFO_LOG(SYSTEM, "NativeShutdown called"); ShutdownWebServer(); @@ -1420,6 +1412,14 @@ void NativeShutdown() { g_Discord.Shutdown(); + // Avoid shutting this down when restarting core. + if (!restarting) + LogManager::Shutdown(); + +#ifdef ANDROID_NDK_PROFILER + moncleanup(); +#endif + if (logger) { delete logger; logger = nullptr; From 83644ec1b81377299a76095804192dd6cf12736e Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Fri, 1 Jan 2021 08:42:23 -0800 Subject: [PATCH 4/6] Android: Remove old NDK profiler. Pretty sure this no longer works. --- UI/MainScreen.cpp | 11 - UI/NativeApp.cpp | 10 - android/android-ndk-profiler/Android.mk | 15 - android/android-ndk-profiler/COPYING | 674 ------------------ android/android-ndk-profiler/README.mkd | 5 - .../armeabi-v7a/libandroid-ndk-profiler.a | Bin 38806 -> 0 bytes .../armeabi/libandroid-ndk-profiler.a | Bin 38106 -> 0 bytes android/android-ndk-profiler/prof.h | 22 - android/jni/Android.mk | 4 - android/jni/Locals.mk | 6 - headless/Headless.cpp | 16 - 11 files changed, 763 deletions(-) delete mode 100644 android/android-ndk-profiler/Android.mk delete mode 100644 android/android-ndk-profiler/COPYING delete mode 100644 android/android-ndk-profiler/README.mkd delete mode 100644 android/android-ndk-profiler/armeabi-v7a/libandroid-ndk-profiler.a delete mode 100644 android/android-ndk-profiler/armeabi/libandroid-ndk-profiler.a delete mode 100644 android/android-ndk-profiler/prof.h diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp index 7880268327..9e3a30adb0 100644 --- a/UI/MainScreen.cpp +++ b/UI/MainScreen.cpp @@ -68,11 +68,6 @@ #include "Common/CommonWindows.h" #endif -#ifdef ANDROID_NDK_PROFILER -#include -#include "android/android-ndk-profiler/prof.h" -#endif - #include bool MainScreen::showHomebrewTab = false; @@ -1372,12 +1367,6 @@ UI::EventReturn MainScreen::OnExit(UI::EventParams &e) { // Request the framework to exit cleanly. System_SendMessage("finish", ""); -#ifdef __ANDROID__ -#ifdef ANDROID_NDK_PROFILER - moncleanup(); -#endif -#endif - UpdateUIState(UISTATE_EXIT); return UI::EVENT_DONE; } diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index 7fdf56e5e9..39665dc9ff 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -137,12 +137,6 @@ Atlas g_ui_atlas; #include #endif -// https://github.com/richq/android-ndk-profiler -#ifdef ANDROID_NDK_PROFILER -#include -#include "android/android-ndk-profiler/prof.h" -#endif - ScreenManager *screenManager; std::string config_filename; @@ -1416,10 +1410,6 @@ void NativeShutdown() { if (!restarting) LogManager::Shutdown(); -#ifdef ANDROID_NDK_PROFILER - moncleanup(); -#endif - if (logger) { delete logger; logger = nullptr; diff --git a/android/android-ndk-profiler/Android.mk b/android/android-ndk-profiler/Android.mk deleted file mode 100644 index 6637e64853..0000000000 --- a/android/android-ndk-profiler/Android.mk +++ /dev/null @@ -1,15 +0,0 @@ -TARGET_thumb_release_CFLAGS := $(filter-out -ffunction-sections,$(TARGET_thumb_release_CFLAGS)) -TARGET_thumb_release_CFLAGS := $(filter-out -fomit-frame-pointer,$(TARGET_thumb_release_CFLAGS)) -TARGET_arm_release_CFLAGS := $(filter-out -ffunction-sections,$(TARGET_arm_release_CFLAGS)) -TARGET_arm_release_CFLAGS := $(filter-out -fomit-frame-pointer,$(TARGET_arm_release_CFLAGS)) -TARGET_CFLAGS := $(filter-out -ffunction-sections,$(TARGET_CFLAGS)) - -LOCAL_PATH := $(call my-dir) - -# include libandprof.a in the build -include $(CLEAR_VARS) -LOCAL_MODULE := android-ndk-profiler -LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libandroid-ndk-profiler.a -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) -LOCAL_EXPORT_LDLIBS := -llog -include $(PREBUILT_STATIC_LIBRARY) diff --git a/android/android-ndk-profiler/COPYING b/android/android-ndk-profiler/COPYING deleted file mode 100644 index 94a9ed024d..0000000000 --- a/android/android-ndk-profiler/COPYING +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/android/android-ndk-profiler/README.mkd b/android/android-ndk-profiler/README.mkd deleted file mode 100644 index 1897a2895b..0000000000 --- a/android/android-ndk-profiler/README.mkd +++ /dev/null @@ -1,5 +0,0 @@ -Profile Android NDK code. Further instructions here: - -http://code.google.com/p/android-ndk-profiler/wiki/Usage - -[![Build Status](https://travis-ci.org/richq/android-ndk-profiler.png)](https://travis-ci.org/richq/android-ndk-profiler) diff --git a/android/android-ndk-profiler/armeabi-v7a/libandroid-ndk-profiler.a b/android/android-ndk-profiler/armeabi-v7a/libandroid-ndk-profiler.a deleted file mode 100644 index 39479f1653759597b94232d7eacc6c17d087f580..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 38806 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 diff --git a/android/android-ndk-profiler/armeabi/libandroid-ndk-profiler.a b/android/android-ndk-profiler/armeabi/libandroid-ndk-profiler.a deleted file mode 100644 index 2ab6d9ce7a41d046e72f4a6c765e88c68028e6c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 38106 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

$(J_~x;@M0ZS%K%8 zX7Ua=tHHk}U#Z3V@p7(1_b%`jbK(O*_J+$r&rkIBDQCdB0sfx@J$Hcq2~EFGTDO!z z=S}G3EMduE#R*v(A^E9BI8!FCg&iCQQxcj*N<&>=9J!oMw#J8$e7JUHL>+(xahsA;XBOk8pGfVm4-14 zvi4OtGhFtmh9!(;J;#6y7k;W?7a1FvZ%Icz6SmPvpvS3(JPr)ahEWcNUdZhjDO0$R zYN$nioXuOnkz_EKbH>~Fl~^A}y*OJq3(IhkAJx#rShuEYXG0xN+2Fl7%^a@fV9ob{lR3tX%6ep!PH`k*iZ`80zLn*&HG}nBP0TUm|k*5q3 zE*Ry}I?8cYj$#r<7waU9Nd-kglE)5n3KMGN3a4nfaej}I@s)^x@lDN%=t7u~;Yn*a z8@VPvL z96V(i0OKF^vCSBL)s@caIkucqiKt1H6(g%n6$i@$M1-Lw z841cO6-k}s6eY%-&P^2{BbnzR;XB_W4BrKwY-BJA3%xOuv55H%qsUJ8iemJVtT9$7 zS`suhoiP$cRS$w~Kobp;05pCkPa6yw%BS|hnmHQW?4sI`hkm6TwVp6WJ2&B18~Rd< zqc#u;^BD=M-7XINkTmMO&YJlMsU*=njq_~JjF|3JzB`p zW0m4mMH{jru+E2BuIe9+$)qt17J>E1F+Q>&_quj4mnb>>YBLGHQ(;kAr0L{~T1Rar zNmCA63+o9)Hq&Hlhy@MzXd>r&uG;q;oW@YlQ(YWhJ=zb0yhF3L+yl^4Ftr6PZJxpJ zH(-6L`qO;xo&!s_@kO76gAX2`z<1x8xBi3*&Np;fLESrT_rnPM(c(o0IrUo05m7hvb zO7nQ=GVM0mvabWnBp_8KmglM?@nk(c1Hor>^k>+TLmPS<98=t9*mV8{4$d!q>hw=D z%_gCzf7*s3|1T1Z?(}e(81%qPhPAW}Z)vN;(&>7TIvYKlHZ+_zAe=T#A<`3p^^9C( zEr3NKY)qz+?T1-LPtsL%SXW)2RihgT^D7a4-#Bemcp|hZV^6S2quZv<+e54@GRk>i zQr^-wjHPXAY&c2GkV%Y{_9TV@kP+R4i0>FT2SshjD}hDlo&tE$IPt3ueK{y$aDE!_ z4dcYGHp}qKkpP43RzO@kHxYIkE+JvKR{+d_)J(YDa0!oUXL6)Z1>Z!$hm0V8wJFE% zJXnmM1a?Qn&P1GPxCa0xo=snblgdY^bJgOq#gmgYJy+KHQJDrrml|dfUUkwl%M66}JHJ_SGJ)<+48YGFGp68NeK}{S*q@1jj2_ z^#xEJ{k`1->M6LmnE0N?uFmexgc^c-Ad1(d*i!qgcE>w+#6kFw(t#*Xbq;i15L2T_ z!llaS;Ks{rEii!hz%jK9?l@l3MtcUkquV=s1{Bu?n$zCd9qSpu+h(=a!wiQx^aX;7x{W`ZN9T%%3BJJ$Di_M*`CsMEn;vbJ&Kx|NO5rgh7s zo7b*hyKc)`wKR?2xOCZ)%}vevIHXtpjHMgv*KJy=XBJ+5ott~rsXp9+aPpGe*=e2=byx_6TtN=J#_TkIfzDg z#rk_*{UW1t#A=C#9*O zA56YfOfm;M+jWZg{?LZv`#6)ROW`tU;TsrlbbLP}N#Z+HtDBp|sAOy$BcdljM5C

gduBWZ5{~Zx3d5&9jclLvi-*7O*U(K5*y`p*-2Mm-{5hGcG8b*rj>^m`H+$zLX6i+HCDk>>1E-4C^mK3k9+E%iyYW1R$rb)%s3rmZOs%FeD1--Di zq`KI>?4rujiekUdee|LTHn_j7BGpyZFU}~2aPf>{cXXxunp)+n@+9$dKF8f%SsvjJ z>}pBeA~$!dd+|kw+=8ucZv?+Z3*C3rsvX-9y?fvO%3}9N$oYNyBgIH7oP%rKWBWVY z<6s`!A8~)+Bo0=utlm=XKC!>j{ic&>EOu{ZsDE`T2j}WI7G!QjzN%4d>mqJVqGc;6k(wEaZCJ`4 zB~{TuwpQ;#jAwk6IdQA-Ac^+ZR1crD_wc(o97WYjAn5~`(cn~4hhA9yedG1;$sr@` z>{HQ!R!$jZLdcA)A57HDLGR^^OfLl+kfr|KF0&+)gR@LJ7JB^lvYovXQ#T~6yB7~v z{V8U0T^Mca?cLQ0?sg0vNP$ek%`BHObJB-2bhi%dN=?}D@H~%i&ywo1(ScW1_EJ;&~kztDrJ5h~xbhYjnP|-f*4v*`e zR#co>5b4DQzdB7Gsy4-%nqns>tXw$vwRQHi$979O@+(%ZKX}l?4pYfxKr*l1_9m5% zYQkhU-qo&~4>Q2((M8v}Bi7xQ*h7`Fz8mO_#`^nvde!nZ>()k_mn@Ig*GC)HZN~C& zASx^L9h^}o&WmzIlPYB@MKuoJU|>UO>l^6j_qXS=U9>Cx$u82AXiW?bn1xt$S7%q3 zin76am!*1LtJnTGZQhUS(dEYFxo+^)xcPi0Mg>V}f&HQOW12m1)x`boDP^b(2{+taW*L~ROIWvEUAm_kcAbH_D#|nWXjHwXwR(1k7+>cO-8)(TY;xWb zmu-jC`i<>WhCn#Y!ZfvckX-(^#ba1yvU_%NV9~oq$x#&D)f#J-UldGxcXjsq1}cC8ZUeH^>>dHqlzhnbcD3u4!6NEl;j*n@;2HjuWN>annY?0fL6M`C;Zx|CYp z&@eAjjt|*S{cE*39rI7QHK2r3(bTO01^&^_80QqX&>829_f7Iocl6f62QZHE?aj-{ zRfPy)O$3f5dHDzY2i-%ytDIqeT(*CdU!(E6*nf$8DZ}w7i8b6FS&}#Ul8j6JA9pW< zZ)4sHuRpgpI*H13Z>!E;x^WV9Nw1Tu8|IzNxOu0Lu8jpHJ||J;_3h=I5WF;^rn1I+kHcTT zo2mH4nmH-A9&Qdg z)>yf&?f# zpih>M$BkSv9}k0OcpC@x(L4%kd88lnQ87%OrN z_i2gO_K(-0&%QSB>N}98Zw2)6Oa}A8eq!t6deLW--;NzBuYtEV`pB`TJ}AfZ*ypUx z$Fa0{A8StKgJX(~mq)p&+vcMS`rgqonIEfqa3KjSh*Ex@s_tB zzsMltodRp)Ju6M$fifKUvq~Umomnw<9W7Bt0n!Xj#XWP|uNZS0~kftvekuA1LAZMM|rs+EXeaGR+{8oDO z-J7OwO@&gAc-pGf#}942?O^>*a|WOKsy+H17JcN=_-gU$E@0gJr9RrPrO7qnT_Wq% z8Y}l)TKf9E?;Ig))Ausu(A@fLc*@PNgh!6=bZr=V-vPO&=@4V9`fbR0^LqgKZGjB) zI|tU*2fK`?nX8uhO8pUGt+8R{x&+N3pQXl&>A4H~v;lcpsF}%ZRxW9KM z!|-`&@#V?+QZx6!HEjCXdaej7-LHGajdf}34Kwx&-c*naNq2qlTJ8XeNZ{Y zan;zg{Bg#RGA>%q@b*<`$}ib03-ys7&f$zH(T9DWwItFv2=|*F`a-z>(?cJGn{zf} zO4Ma=lzQk-f}Y}`kAgnULo=`IJTwoZaqeVHiTW%Y`#iMuA-c)iO$^sn6Vl3Kf>#{! z6Vu9LqLzOtDK$|&0Qcn|8DCLSk`7lz(&CGx`In^m`_zLX!Ep%tDC(;~x-HGJXPt43 zqCeBd{?8! ze(PTZnq!cqCxec7=oz5PJT&Lk>ft#pYe@50 zwKb&AO`|VLqi;x~?*dI0*DwVbzrL8}&-uDF)c;f({cIZTT?unAFf09Q3 zGL8N{XtEAtj443N`5?_dGdcE{ay})Eo|H!OvwdqA{}Rwt`3`J>50hH%;b6-aSNjd$ zsKZ5nl}!!U%4uq-)+FjX!n#naiIVtqpHZ>DKZ! zI%tg!R-?n=eI|W%$Qm8AMu)A{p>VaSiC%AYCtpydZDJ26?VDe{p>E!9$w64V*Dr4% zl5gBRFO1BKEBl&=r)twSm815QDh?!Yvz)IDqk2a;I@ohQ_Vw{Xt`8nHs>8gvN&0rS zcb<20+3F-)%XoGGJ9_(KJ*k5d3NOuKJ?CLlyB|qZysHWOX?XdgU#{BMEb@vGFL=zm zAMc6c?pU{e!LYVOOcFWXxtJhw zoO5NeH7x@KO}iQUreSJBxnN9l)wGboq(9EzaU2YG;7C2t#bk3akpm~pH2bLDVfHqH znD=tr4er7>P(-9-6|qa{Bm2Q_d;%kU9=i*IxPyo(+xv9C@@`60eh5TEHpzkCi9P>qdhKTrnLPR3oAwur=;vevVMtF{il&>XX zvbX@)vK#FQ=wgw{uZGKjM(^e{$yC6;!EEk+9xJYoNV6!0S(+tObK;ngh9~V3#$o@$G&j~&x_@p5F8~wTGM*KHH z9_1xnBFMWMNiPy)dnDZ|c!4122;_6Gh4_HrKM6i7_yfV82>x1->wkvxqm2>s1xp2M z1Xl?1MjXnu3-${h5WGk5VZmnvUlDvu@DGA)%hWeguw0P0l<9Z`dj&5LyhiX=!FvRs z5&W*;%Yr`>j|uJ++%5QV!6ya(S@3zmjQxziKyaeqe8IB>_X}Prc%$Img2x1(6ntLrM}lt) z{z0%P+r+z8ut#u^h_S-y=f5gRklsKAQ*{_c~~LywF8LpDJ{v&~-vD z6neSPO+ud`bd-pA+XQg!APY|6C&I0-+}gT_W@hp=*U+D0IEh8w8_*JH@|O=)*!EAtD{u6Oq2p2;MLL zkBI+Q1ivTv1Hsn>|Cive1%FF~zV`(4(6$**0TKKXBJx)uI9vSZivI@TpC$aLV6X6Z z3mz1_Qv9zbLjR|Qf3M&};{T}NH--N_!B>R;1`*+ZA^hJ7{-+@CM$zq%h=u3sZ zLg*Wai0@XRKPUc}4(jm~UK%khXhd=~Mg+?Q(bP1*N^p^2z2Hj0HG<88dR~liJ5CyP z-X)k2+%0%m@DqaE| zjx_fqiKhzk<}=cIehgeA^ajB*1wSU(Ey%q&hU0pd^{`iHuItFZTJWeK*LNH@?-AtQ z9BDm|20kt{_vFauJ8mNP+=#CV{#cOj%E|w&;Cq7a3ubfv3;&QH_tHr7-88X6kb7vP zPZOLkSTDFtkT<7MZkwQ>Mt%5PZENog3r(vEa{%s0Uu;M!sIJ0C^cUX>Q&V`M#Z)BRE>HP%t7`Cdg~wD9?L1iM)=D zxLQzOHw`)}H1A)de?ss=!HWbxE_j6?Z)BtVZGxW_X_=Z-xGY;QPXNxDG=248a^C^o$dFqF|XIZiLeERf01G_4*8Ya1WC9 z=M8eyyFsu;P_Ns-=hboa-y?WX@KQnEC`bRB1@92NTkrwFFA4IVIm$mH_-(-#1$l2H z{a+RQrQp8_{(*>m|4Hb-2xf4-2Y!%<@Ogq`gkK``6u}vSHG*}53j}$~9iQv#1h)vD zCCD4^=-(@No*=JsC7(Co5kDz-o#0J^yb+K74+uUa_^9BMf?pSWPVfc69|-=7;Ex4= zBKQkI-p0##c;g-suh%t>5X=_j4Se*UBsf`+*SnKnEjUYXzToMC%LG>mB0A;UEc<01 zwDW;N`r~;VA>z4JPQ>_IO+@|G5t&{h{Lu|GVmYf(&o98&dJry5J}@F!CTR6xD>0=P z`l*`nEEa4OTra5S8}Q#M^x1+fg6)ERf_nY|`Q1YA71Z+(@bx?dc#ZI{6TCz4Zozv6 zKQH*0;1hyR3w}fJxZq2IFAKgdI3)Np!FL6JFZiC|`-0pz=DIjXFrSEe8ZB5zM7f6r zBSe&YnV{bPLq4aI238XnVBb^l^M26Kug6E|9U={VdF;o~bFuX2n6%f?OjnE4GyJNB zo<&6XCZX38p(ieM7ZLh&`M0FXUzaavUA{H}H*?-Kv!|4Xc^tD6_$`)P$Tla`R{B+zMdRG7cqjLPGp+BC8=>POn_avpv|C+k`*obQa;fy2vA2h{l zR9WUVQ^NZitB1<9q$*u9X;*XRtyk7h{r>agI}0;zqTGl{krTlO#;#OHa~^PxWhv*(^`4*_0TT5HAZ*6PIz4fk^1I6Xxm1@K- z^i}2GJP|rp9p?XHx&UcoS<@VQAn!n6s3CrHz5fS?;z#P8m!BW+8+tmf%71?%5bj&9 zWsV&?p#MKhWb&*w{HK=4PXqNmgq>&@A7y+_<_h@voB)sY`Ft7tHyb|R z2u`+L^FKm-{t;iMNFal6R(ydG`2_!nw=`t1Ir#lha4$ll`M~d`X8dOGJ%?M+2WO^# z4;gph$KP-zelyrMGS+?yzaut7EReC~HMj$3lD(BqU#SXwfeN?ja@O6n+nHki#B z=ew8;W<~o{#%__$!v6`#*dxMO_&)&|7Z@TCI7F=%@=XJ7R}cJ=)Luj7W%2(6WbAuL z`{f6w(r>>BR~Tp^b?|)c7Y+=OIy8!t(9%fY9#R+2)Kpo3OMr|^HfgFnP(td`{hFE{ z_%f-(CWh)P{-1!1D@>Z}Kq1jrn)nt3bg5m%*DJo##Q`n{GOoT(Qw>@CKLHun8ZC{1 z%NhIiCR|hCCQ>(i4!^$A^(yF)&va%p=_ogrmEkhInwxzCe6lGB|8d%%;h6*DPs;kw zO@<#x`fHbj-ve$AYdF)t4bEKF6Vsi?4EYRwx22KPcINEHH{r=gB>v%N?(g6mr~^CG zgeg^7xGX<2q!pC}ceV#r+3U#&i5W(tHZXWoPO%O>G^E@^Q*_3pmnu3X9HCiLodxOYBCNOg{@hmledo zx`c(EXK9=nbIzsy`3{SjCJgJ_r!I!b7~b0L%%_tFNyhMvr8A#`FT*v8g}0EN{|*Y# zT@GgsYemO-J18CJ2kI0q&7IIy;Be6f^VcraP2G&^rY_I*n`?G6ym#nk+KX~W48I3A zF#I0etkh+;yazX!y2UozT)3NKF0;+Gm*D2v3vWZoYgBQkZR#4;d|X>77uWjmEFI~& zwiIN6y#{uaT%gM9Ou--RRpz~ab_~?X)wh%z>j{SBp5oCCvhXBYg1miI8DVgT+Qyo7l5YM;Lx zSyZMgLKEjy_d%+qYVYA1K|mug2kniEdXukZPafdi1$|GX`*3{^tF({?XbB1 zkIj~EwE`bU>Nu~M^hi^^`&zTR(jIh^)Cm5}^`{-jGrf}C2B&BD=sZ9jGWw3~x zP^q08@S8MDizjL1=WEu60zjd0;x}m|HcPL9gE}yqKuNy`Cy&^e&z3nfCg){}!@!6B z&o%ok?%w0qXf#vNbyM1E!0~=`%OOAceXafsmk-#~XW7e=R8op(j@E!pWT6f7I17y7 zU(;_N#u+BuX}yMV`z)6caPZT~Isk{ z1m>Ws9USR!yvuy$3<3S2n<*+3p_s5BW1z9Lp;Gk8{PhNzKGyNyai`V)xVxtQhu;0< z>9BGwlD!Iv?QhtXN9f%4$|H7Sxy=Z3^JJGdw-MnntlOzO(!qs0CB-u^t#>BPTiAJ&1Bm(cXZ`n#3BsU{`KPVF6l%!l!E#fDthlDrGzLt~r0 zeZ^kH&}HslLD%Q8LNfxGn`dMU7?v>p%lf}|S%TaiqN5)c(A?v3lG_M)2|=oEa1((! zbScAc+h9Nc!KKpoha?s1;Vd=6%GC=1Jt*m)zw`ElE~*2)uSB_4r5| zHd%U{!Rk9w&HV}HHk<*~(Yg!IkN<{S2{6UP*!fZS5^#9M9RMf2Uw}jGu=@j+=^7x!Ym&e!KNRYg<;6uGYe}el$~IIlUbwXFb8UPR`-z=CquK z@#^-eDLW%GQ;sa*5k3zgP8LsvKAYb4aC?o7_hVqf-FHYlDaY`3LSykv z@VxOp;fa@PdmAse8@&18g#A;n)>wVJ!SL#P0s2;e$9#})^?d?vZ$5qx+G}h+?g!JG z56UqgHVzx_JsuvMYBcsWZTWF*u<^bKw>KZ}gGLgQ#+K_h!11Q9&?ZPEE%^&0mn>(> zF?~2PqK!@8&q3KV)1%CjKBm*AFNpBeT}vUD2nhOHLqA%cB_&$JZ3?autg(LM;PA#f z3-R8BOr8osE;envdSPz^1BWo#*kqM}w$Ax*SU1IaMlj13nn#Y`ih1LGp$KhP;^l(V z#=9y_-vR_$OT}VrT+7n*<&>CmW~@C9q^`av_~J8VOC#1 zNRtoi@KC;kIKq!|{yL+cq-L)=Bgft129aeu;q7z~{4o`Vdsd>D7m~7wQoB)>wU( zw&>;mSA3t$y_J-)rD8bzzSwK{Ju%asG939+#zn4%>&w#e*Cj==lJ{d67WX$&hTj)^ z4ZkNI9-nvi#`?%hi_eaxMvJS4HzIyNJY3&!%GF=ANeWQV{C+ZBVtD%OHk^%bjMp2X zIfA7Ozt{De4}ah4eZnw*?7=DHsz{1}%T;Ks9^+!4iRn$H+1t}7pH7#0Leqb;!tkrx zGE-83LniF^)=+PyC4i)t!m>?%3bw$PrPcwhq5m0{0Fpi@jc!k)ccszif~J0x9@KAg z+G{=vG@k+D@<+3Qm6~AFmHbX^*r#sQDINSWjq4de8#cEGaJODh2Ua)cJ2gy^@gF48 zKRq*BrNMHuAxfl4em{l+!%(e)6(-F@KBI%v<@+QIR-8)(QIH*imk_J)Dh24G3*JPO zjx>$RXrv;haUh}r&EDz5Lx{b?SB!mWLAFBD_)|Vq=wxEVsPLg6kp%rdcNP&s^9Ab# zR|?{Yr}pO@k#aG?F2Mo8y@Ce?KOuOV;Jt!h7W|svcLjeUIL0yYlnU}&TgI!;^8wEi zny)#@KVOi~O459G5%u>h!0!nCmf#-*^*J^8AM+XcCj@^c_$NVq?hNxAzQW*p_ADY6 z2>hSw#3CZ}oGP?FZw9$q(m;LA400<)u9=AX+$wlB5&k`b14QWCC-fnqKOyuHp>GxX z4x#TC`b$LU|FYmS!vB`g-w}MBh9+CZGx?WF+trv5l^4c z7YSZ0cr6j-#I*|XcELLZ?-%@{pl+{_`)8rQE%>6~j|G1s_zS^b3;tOU8)iDbEWuns zeI5k*xh7zGiUdmqrwLXH>KFKsTO#yILETTl*WZN!w+cTh*e1ABkaJPSHz>GAkZ&x> z|Ae6KSD-nEB%g0Ci4O?s^RJ*E6`HROeP}<=3%)G)y5LU*b-#oh-zHN2Pl9?}!@MaS zZTsOZ(LW=U$;A;4hOl>@Z>ukz>nP~mdD7Ak0S5qFe9w#BU KUg&1g^M3#ZG1A=t diff --git a/android/android-ndk-profiler/prof.h b/android/android-ndk-profiler/prof.h deleted file mode 100644 index 2448612761..0000000000 --- a/android/android-ndk-profiler/prof.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Part of the android-ndk-profiler library. - * Copyright (C) Richard Quirk - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - */ -#ifndef prof_h_seen -#define prof_h_seen -#ifdef __cplusplus -extern "C" { -#endif - -void monstartup(const char *libname); -void moncleanup(void); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/android/jni/Android.mk b/android/jni/Android.mk index a6cdedb5bd..1b7bde5a44 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -696,10 +696,6 @@ $(call import-module,libzip) $(call import-module,glslang-build) $(call import-module,miniupnp-build) -ifeq ($(ANDROID_NDK_PROFILER),1) - $(call import-module,android-ndk-profiler) -endif - jni/$(SRC)/git-version.cpp: -./git-version-gen.sh -..\Windows\git-version-gen.cmd diff --git a/android/jni/Locals.mk b/android/jni/Locals.mk index d18d5d6e85..532693d05b 100644 --- a/android/jni/Locals.mk +++ b/android/jni/Locals.mk @@ -80,9 +80,3 @@ ifeq ($(TARGET_ARCH_ABI),arm64-v8a) LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/arm64/lib/libavutil.a LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../ffmpeg/android/arm64/include endif - -# Compile with profiling. -ifeq ($(ANDROID_NDK_PROFILER),1) - LOCAL_CFLAGS += -pg -DANDROID_NDK_PROFILER - LOCAL_STATIC_LIBRARIES += android-ndk-profiler -endif diff --git a/headless/Headless.cpp b/headless/Headless.cpp index 1dc70e488d..51e912442d 100644 --- a/headless/Headless.cpp +++ b/headless/Headless.cpp @@ -38,12 +38,6 @@ #include "SDLHeadlessHost.h" #endif -// https://github.com/richq/android-ndk-profiler -#ifdef ANDROID_NDK_PROFILER -#include -#include "android/android-ndk-profiler/prof.h" -#endif - #if defined(ANDROID) JNIEnv *getEnv() { return nullptr; @@ -230,12 +224,6 @@ int main(int argc, const char* argv[]) _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF); #endif -#ifdef ANDROID_NDK_PROFILER - setenv("CPUPROFILE_FREQUENCY", "500", 1); - setenv("CPUPROFILE", "/sdcard/gmon.out", 1); - monstartup("ppsspp_headless"); -#endif - bool fullLog = false; bool autoCompare = false; bool verbose = false; @@ -478,9 +466,5 @@ int main(int argc, const char* argv[]) LogManager::Shutdown(); delete printfLogger; -#ifdef ANDROID_NDK_PROFILER - moncleanup(); -#endif - return 0; } From c3ddb279f949c688ea62fd0231a6ff9ceea20410 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Fri, 1 Jan 2021 08:51:46 -0800 Subject: [PATCH 5/6] http: Cleanup excessive logging. --- Common/Net/HTTPClient.cpp | 2 ++ Common/Net/HTTPHeaders.cpp | 10 +++++----- Common/Net/HTTPServer.cpp | 16 +++++++++++++--- Common/Net/Sinks.cpp | 8 ++++++++ 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/Common/Net/HTTPClient.cpp b/Common/Net/HTTPClient.cpp index b8be625400..7193582fa5 100644 --- a/Common/Net/HTTPClient.cpp +++ b/Common/Net/HTTPClient.cpp @@ -366,6 +366,7 @@ int Client::ReadResponseHeaders(Buffer *readbuf, std::vector &respo if (code_pos != line.npos) { code = atoi(&line[code_pos]); } else { + ERROR_LOG(IO, "Code not parse HTTP status code"); return -1; } @@ -377,6 +378,7 @@ int Client::ReadResponseHeaders(Buffer *readbuf, std::vector &respo } if (responseHeaders.size() == 0) { + ERROR_LOG(IO, "No HTTP response headers"); return -1; } diff --git a/Common/Net/HTTPHeaders.cpp b/Common/Net/HTTPHeaders.cpp index acb554ee70..ef19d3bc9d 100644 --- a/Common/Net/HTTPHeaders.cpp +++ b/Common/Net/HTTPHeaders.cpp @@ -33,7 +33,7 @@ bool RequestHeader::GetParamValue(const char *param_name, std::string *value) co for (size_t i = 0; i < v.size(); i++) { std::vector parts; SplitString(v[i], '=', parts); - INFO_LOG(IO, "Param: %s Value: %s", parts[0].c_str(), parts[1].c_str()); + DEBUG_LOG(IO, "Param: %s Value: %s", parts[0].c_str(), parts[1].c_str()); if (parts[0] == param_name) { *value = parts[1]; return true; @@ -121,13 +121,13 @@ int RequestHeader::ParseHttpHeader(const char *buffer) { if (!strncasecmp(key, "User-Agent", key_len)) { user_agent = new char[value_len + 1]; memcpy(user_agent, buffer, value_len + 1); - INFO_LOG(IO, "user-agent: %s", user_agent); + VERBOSE_LOG(IO, "user-agent: %s", user_agent); } else if (!strncasecmp(key, "Referer", key_len)) { referer = new char[value_len + 1]; memcpy(referer, buffer, value_len + 1); } else if (!strncasecmp(key, "Content-Length", key_len)) { content_length = atoi(buffer); - INFO_LOG(IO, "Content-Length: %i", (int)content_length); + VERBOSE_LOG(IO, "Content-Length: %i", (int)content_length); } else { std::string key_str(key, key_len); std::transform(key_str.begin(), key_str.end(), key_str.begin(), tolower); @@ -150,12 +150,12 @@ void RequestHeader::ParseHeaders(net::InputSink *sink) { line_count++; if (type == SIMPLE) { // Done! - INFO_LOG(IO, "Simple: Done parsing http request."); + VERBOSE_LOG(IO, "Simple: Done parsing http request."); break; } } - INFO_LOG(IO, "finished parsing request."); + VERBOSE_LOG(IO, "finished parsing request."); ok = line_count > 1; } diff --git a/Common/Net/HTTPServer.cpp b/Common/Net/HTTPServer.cpp index da114da85a..1deb45f72c 100644 --- a/Common/Net/HTTPServer.cpp +++ b/Common/Net/HTTPServer.cpp @@ -54,7 +54,7 @@ Request::Request(int fd) header_.ParseHeaders(in_); if (header_.ok) { - INFO_LOG(IO, "The request carried with it %i bytes", (int)header_.content_length); + VERBOSE_LOG(IO, "The request carried with it %i bytes", (int)header_.content_length); } else { Close(); } @@ -171,8 +171,13 @@ bool Server::Listen4(int port) { setsockopt(listener_, SOL_SOCKET, SO_REUSEADDR, (const char *)&opt, sizeof(opt)); if (bind(listener_, (struct sockaddr *)&server_addr, sizeof(server_addr)) < 0) { +#if PPSSPP_PLATFORM(WINDOWS) + int err = WSAGetLastError(); +#else + int err = errno; +#endif + ERROR_LOG(IO, "Failed to bind to port %d, error=%d - Bailing (ipv4)", port, err); closesocket(listener_); - ERROR_LOG(IO, "Failed to bind to port %d. Bailing.", port); return false; } @@ -216,8 +221,13 @@ bool Server::Listen6(int port, bool ipv6_only) { setsockopt(listener_, IPPROTO_IPV6, IPV6_V6ONLY, (const char *)&opt, sizeof(opt)); if (bind(listener_, (struct sockaddr *)&server_addr, sizeof(server_addr)) < 0) { +#if PPSSPP_PLATFORM(WINDOWS) + int err = WSAGetLastError(); +#else + int err = errno; +#endif + ERROR_LOG(IO, "Failed to bind to port %d, error=%d - Bailing (ipv6)", port, err); closesocket(listener_); - ERROR_LOG(IO, "Failed to bind to port %d. Bailing.", port); return false; } diff --git a/Common/Net/Sinks.cpp b/Common/Net/Sinks.cpp index 2d15de15cf..2eadf3fe62 100644 --- a/Common/Net/Sinks.cpp +++ b/Common/Net/Sinks.cpp @@ -385,6 +385,14 @@ void OutputSink::AccountPush(size_t bytes) { void OutputSink::AccountDrain(int bytes) { if (bytes < 0) { +#if PPSSPP_PLATFORM(WINDOWS) + int err = WSAGetLastError(); + if (err == WSAEWOULDBLOCK) + return; +#else + if (errno == EWOULDBLOCK || errno == EAGAIN) + return; +#endif ERROR_LOG(IO, "Error writing to socket"); return; } From 8bf93bb757aaf216561e44c9cf65332d595a1c93 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Fri, 1 Jan 2021 08:58:35 -0800 Subject: [PATCH 6/6] http: Ignore signals on recv() too. --- Common/Buffer.cpp | 6 +++--- Common/Net/Sinks.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Common/Buffer.cpp b/Common/Buffer.cpp index 423c2cfb3c..68c7e7682e 100644 --- a/Common/Buffer.cpp +++ b/Common/Buffer.cpp @@ -196,7 +196,7 @@ bool Buffer::ReadAll(int fd, int hintSize) { } while (true) { - int retval = recv(fd, &buf[0], (int)buf.size(), 0); + int retval = recv(fd, &buf[0], (int)buf.size(), MSG_NOSIGNAL); if (retval == 0) { break; } else if (retval < 0) { @@ -228,7 +228,7 @@ bool Buffer::ReadAllWithProgress(int fd, int knownSize, float *progress, bool *c return false; ready = fd_util::WaitUntilReady(fd, CANCEL_INTERVAL, false); } - int retval = recv(fd, &buf[0], (int)buf.size(), 0); + int retval = recv(fd, &buf[0], (int)buf.size(), MSG_NOSIGNAL); if (retval == 0) { return true; } else if (retval < 0) { @@ -248,7 +248,7 @@ int Buffer::Read(int fd, size_t sz) { char buf[1024]; int retval; size_t received = 0; - while ((retval = recv(fd, buf, (int)std::min(sz, sizeof(buf)), 0)) > 0) { + while ((retval = recv(fd, buf, (int)std::min(sz, sizeof(buf)), MSG_NOSIGNAL)) > 0) { if (retval < 0) { return retval; } diff --git a/Common/Net/Sinks.cpp b/Common/Net/Sinks.cpp index 2eadf3fe62..0272465b08 100644 --- a/Common/Net/Sinks.cpp +++ b/Common/Net/Sinks.cpp @@ -170,7 +170,7 @@ void InputSink::Fill() { // Whatever isn't valid and follows write_ is what's available. size_t avail = BUFFER_SIZE - std::max(write_, valid_); - int bytes = recv(fd_, buf_ + write_, (int)avail, 0); + int bytes = recv(fd_, buf_ + write_, (int)avail, MSG_NOSIGNAL); AccountFill(bytes); } }