Import Cobalt 21.master.0.300525
diff --git a/src/.pre-commit-config.yaml b/src/.pre-commit-config.yaml
index 7d2b389..a541f14 100644
--- a/src/.pre-commit-config.yaml
+++ b/src/.pre-commit-config.yaml
@@ -16,6 +16,12 @@
- id: trailing-whitespace
- id: mixed-line-ending
+- repo: https://cobalt.googlesource.com/codespell
+ rev: 67c489d36dd4c52cbb9e4755d90c35c6231842ef # v2.0.0
+ hooks:
+ - id: codespell
+ name: Spell Check
+
- repo: local
hooks:
- id: sync-keyboxes
@@ -44,7 +50,7 @@
entry: yapf
language: system
types: [python]
- args: [--style=yapf, -i]
+ args: [-i]
exclude: '\.gypi?$'
- id: pylint
name: pylint
@@ -73,13 +79,13 @@
verbose: true
- id: check-copyright-year
name: check copyright year
- entry: python ./precommit_hooks/custom_hooks/check_copyright_year.py
+ entry: python ./precommit_hooks/check_copyright_year.py
language: python
types: [file, text]
stages: [push]
- id: check-if-starboard-interface-changed
name: check if starboard interface changed
- entry: python ./precommit_hooks/custom_hooks/warn_that_starboard_interface_changed_wrapper.py
+ entry: python ./precommit_hooks/warn_that_starboard_interface_changed_wrapper.py
language: python
files: '^starboard/*.h$'
stages: [push]
@@ -114,7 +120,17 @@
- id: run-py2-tests
name: Run Python 2 Tests
description: Run Python 2 unittests
- entry: python precommit_hooks/custom_hooks/run_python2_unittests.py
+ entry: python precommit_hooks/run_python2_unittests.py
language: python
language_version: python2
types: [python]
+ - id: osslint
+ name: osslint
+ entry: python precommit_hooks/osslint_wrapper.py
+ language: python
+ types: [text]
+ - id: internal-file-check
+ name: Internal File Check
+ entry: python precommit_hooks/internal_file_check_wrapper.py
+ language: python
+ types: [text]
diff --git a/src/.style.yapf b/src/.style.yapf
new file mode 100644
index 0000000..fdd0723
--- /dev/null
+++ b/src/.style.yapf
@@ -0,0 +1,2 @@
+[style]
+based_on_style = yapf
diff --git a/src/cobalt/audio/audio_buffer_source_node.cc b/src/cobalt/audio/audio_buffer_source_node.cc
index df8ca6b..79e4bdc 100644
--- a/src/cobalt/audio/audio_buffer_source_node.cc
+++ b/src/cobalt/audio/audio_buffer_source_node.cc
@@ -18,6 +18,7 @@
#include <algorithm>
#include <memory>
+#include <utility>
#include "cobalt/audio/audio_context.h"
#include "cobalt/audio/audio_helpers.h"
@@ -246,6 +247,7 @@
void AudioBufferSourceNode::RemoveBufferSource() {
context()->RemoveBufferSource(base::WrapRefCounted(this));
+ DispatchEvent(new dom::Event(base::Tokens::ended()));
}
} // namespace audio
diff --git a/src/cobalt/browser/browser_bindings_gen.gyp b/src/cobalt/browser/browser_bindings_gen.gyp
index 11d207d..00699e2 100644
--- a/src/cobalt/browser/browser_bindings_gen.gyp
+++ b/src/cobalt/browser/browser_bindings_gen.gyp
@@ -133,6 +133,7 @@
'../dom/on_screen_keyboard.idl',
'../dom/performance.idl',
'../dom/performance_entry.idl',
+ '../dom/performance_observer_entry_list.idl',
'../dom/performance_timing.idl',
'../dom/plugin_array.idl',
'../dom/pointer_event.idl',
@@ -273,6 +274,7 @@
'../dom/media_source_ready_state.idl',
'../dom/mouse_event_init.idl',
'../dom/mutation_observer_init.idl',
+ '../dom/performance_observer_init.idl',
'../dom/pointer_event_init.idl',
'../dom/source_buffer_append_mode.idl',
'../dom/track_default_type.idl',
@@ -339,6 +341,7 @@
'../dom/non_document_type_child_node.idl',
'../dom/non_element_parent_node.idl',
'../dom/parent_node.idl',
+ '../dom/performance_entry_list.idl',
'../dom/performance_high_resolution_time.idl',
'../dom/speech_synthesis_getter.idl',
'../dom/url_mse.idl',
diff --git a/src/cobalt/browser/user_agent_string_test.cc b/src/cobalt/browser/user_agent_string_test.cc
index 739e92f..194513b 100644
--- a/src/cobalt/browser/user_agent_string_test.cc
+++ b/src/cobalt/browser/user_agent_string_test.cc
@@ -133,13 +133,10 @@
TEST(UserAgentStringFactoryTest, WithJavaScriptVersion) {
UserAgentPlatformInfo platform_info;
- platform_info.starboard_version = "Starboard/6";
platform_info.javascript_engine_version = "V8/6.5.254.28";
- platform_info.device_type = kSbSystemDeviceTypeOverTheTopBox;
std::string user_agent_string = CreateUserAgentString(platform_info);
- const char* tv_info_str = "V8/6.5.254.28 Starboard/6, _OTT__/ (, , )";
- EXPECT_NE(std::string::npos, user_agent_string.find(tv_info_str));
+ EXPECT_NE(std::string::npos, user_agent_string.find("V8/6.5.254.28"));
}
} // namespace
diff --git a/src/cobalt/build/build.id b/src/cobalt/build/build.id
index a1d19cb..595a107 100644
--- a/src/cobalt/build/build.id
+++ b/src/cobalt/build/build.id
@@ -1 +1 @@
-299983
\ No newline at end of file
+300525
\ No newline at end of file
diff --git a/src/cobalt/content/fonts/config/android/fonts.xml b/src/cobalt/content/fonts/config/android/fonts.xml
index 3305769..d26ab07 100644
--- a/src/cobalt/content/fonts/config/android/fonts.xml
+++ b/src/cobalt/content/fonts/config/android/fonts.xml
@@ -541,4 +541,24 @@
<family>
<font weight="400" style="normal">RobotoCondensed-MediumItalic.ttf</font>
</family>
+
+ <!--
+ Include font files on android version S under /system/fonts directory.
+ -->
+ <family lang="zh-Hans">
+ <font weight="400" style="normal" index="2">NotoSansCJKjp-Regular.otc</font>
+ <font weight="400" style="normal" index="2" fallbackFor="serif">NotoSerifCJKjp-Regular.otc</font>
+ </family>
+ <family lang="zh-Hant,zh-Bopo">
+ <font weight="400" style="normal" index="3">NotoSansCJKjp-Regular.otc</font>
+ <font weight="400" style="normal" index="3" fallbackFor="serif">NotoSerifCJKjp-Regular.otc</font>
+ </family>
+ <family lang="ja">
+ <font weight="400" style="normal" index="0">NotoSansCJKjp-Regular.otc</font>
+ <font weight="400" style="normal" index="0" fallbackFor="serif">NotoSerifCJKjp-Regular.otc</font>
+ </family>
+ <family lang="ko">
+ <font weight="400" style="normal" index="1">NotoSansCJKjp-Regular.otc</font>
+ <font weight="400" style="normal" index="1" fallbackFor="serif">NotoSerifCJKjp-Regular.otc</font>
+ </family>
</familyset>
diff --git a/src/cobalt/content/licenses/platform/android/licenses_cobalt.txt b/src/cobalt/content/licenses/platform/android/licenses_cobalt.txt
index ef96d48..3dee052 100644
--- a/src/cobalt/content/licenses/platform/android/licenses_cobalt.txt
+++ b/src/cobalt/content/licenses/platform/android/licenses_cobalt.txt
@@ -346,7 +346,7 @@
* are met:
*
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
+ * 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
@@ -401,21 +401,21 @@
* This package is an SSL implementation written
* by Eric Young (eay@cryptsoft.com).
* The implementation was written so as to conform with Netscapes SSL.
- *
+ *
* This library is free for commercial and non-commercial use as long as
* the following conditions are aheared to. The following conditions
* apply to all code found in this distribution, be it the RC4, RSA,
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
* included with this distribution is covered by the same copyright terms
* except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
+ *
* Copyright remains Eric Young's, and as such any Copyright notices in
* the code are not to be removed.
* If this package is used in a product, Eric Young should be given attribution
* as the author of the parts of the library used.
* This can be in the form of a textual message at program startup or
* in documentation (online or textual) provided with the package.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -430,10 +430,10 @@
* Eric Young (eay@cryptsoft.com)"
* The word 'cryptographic' can be left out if the rouines from the library
* being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
+ * 4. If you include any Windows specific code (or a derivative thereof) from
* the apps directory (application code) you must include an acknowledgement:
* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
+ *
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -445,7 +445,7 @@
* 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.
- *
+ *
* The licence and distribution terms for any publically available version or
* derivative of this code cannot be changed. i.e. this code cannot simply be
* copied and put under another distribution licence
@@ -825,16 +825,16 @@
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
- 2. The origin of this software must not be misrepresented; you must
- not claim that you wrote the original software. If you use this
- software in a product, an acknowledgment in the product
+ 2. The origin of this software must not be misrepresented; you must
+ not claim that you wrote the original software. If you use this
+ software in a product, an acknowledgment in the product
documentation would be appreciated but is not required.
3. Altered source versions must be plainly marked as such, and must
not be misrepresented as being the original software.
- 4. The name of the author may not be used to endorse or promote
- products derived from this software without specific prior written
+ 4. The name of the author may not be used to endorse or promote
+ products derived from this software without specific prior written
permission.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
@@ -1127,7 +1127,7 @@
means any form of the work other than Source Code Form.
1.7. "Larger Work"
- means a work that combines Covered Software with other material, in
+ means a work that combines Covered Software with other material, in
a separate file or files, that is not Covered Software.
1.8. "License"
@@ -1600,15 +1600,6 @@
- dlmalloc
-
- This is a version (aka dlmalloc) of malloc/free/realloc written by
- Doug Lea and released to the public domain, as explained at
- http://creativecommons.org/publicdomain/zero/1.0/ Send questions,
- comments, complaints, performance data, etc to dl@cs.oswego.edu
-
-
-
FreeType
@@ -3242,13 +3233,13 @@
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.
+ * 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.
+ and/or other materials provided with the distribution.
* Neither the name of the David Beazley or Dabeaz LLC may be used to
endorse or promote products derived from this software without
- specific prior written permission.
+ 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
@@ -3302,7 +3293,7 @@
The above copyright notice including the dates of first publication and either
this permission notice or a reference to http://oss.sgi.com/projects/FreeB/
- shall be included in all copies or substantial portions of the Software.
+ shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
diff --git a/src/cobalt/content/licenses/platform/default/licenses_cobalt.txt b/src/cobalt/content/licenses/platform/default/licenses_cobalt.txt
index 5b4bc55..63e3019 100644
--- a/src/cobalt/content/licenses/platform/default/licenses_cobalt.txt
+++ b/src/cobalt/content/licenses/platform/default/licenses_cobalt.txt
@@ -346,7 +346,7 @@
* are met:
*
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
+ * 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
@@ -401,21 +401,21 @@
* This package is an SSL implementation written
* by Eric Young (eay@cryptsoft.com).
* The implementation was written so as to conform with Netscapes SSL.
- *
+ *
* This library is free for commercial and non-commercial use as long as
* the following conditions are aheared to. The following conditions
* apply to all code found in this distribution, be it the RC4, RSA,
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
* included with this distribution is covered by the same copyright terms
* except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
+ *
* Copyright remains Eric Young's, and as such any Copyright notices in
* the code are not to be removed.
* If this package is used in a product, Eric Young should be given attribution
* as the author of the parts of the library used.
* This can be in the form of a textual message at program startup or
* in documentation (online or textual) provided with the package.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -430,10 +430,10 @@
* Eric Young (eay@cryptsoft.com)"
* The word 'cryptographic' can be left out if the rouines from the library
* being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
+ * 4. If you include any Windows specific code (or a derivative thereof) from
* the apps directory (application code) you must include an acknowledgement:
* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
+ *
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -445,7 +445,7 @@
* 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.
- *
+ *
* The licence and distribution terms for any publically available version or
* derivative of this code cannot be changed. i.e. this code cannot simply be
* copied and put under another distribution licence
@@ -825,16 +825,16 @@
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
- 2. The origin of this software must not be misrepresented; you must
- not claim that you wrote the original software. If you use this
- software in a product, an acknowledgment in the product
+ 2. The origin of this software must not be misrepresented; you must
+ not claim that you wrote the original software. If you use this
+ software in a product, an acknowledgment in the product
documentation would be appreciated but is not required.
3. Altered source versions must be plainly marked as such, and must
not be misrepresented as being the original software.
- 4. The name of the author may not be used to endorse or promote
- products derived from this software without specific prior written
+ 4. The name of the author may not be used to endorse or promote
+ products derived from this software without specific prior written
permission.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
@@ -1015,10 +1015,10 @@
including without limitation the rights to use, copy, modify, merge,
publish, distribute, sublicense, and/or sell copies of the Software,
and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
+ subject to the following conditions:
The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
+ included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
@@ -1307,7 +1307,7 @@
means any form of the work other than Source Code Form.
1.7. "Larger Work"
- means a work that combines Covered Software with other material, in
+ means a work that combines Covered Software with other material, in
a separate file or files, that is not Covered Software.
1.8. "License"
@@ -1780,15 +1780,6 @@
- dlmalloc
-
- This is a version (aka dlmalloc) of malloc/free/realloc written by
- Doug Lea and released to the public domain, as explained at
- http://creativecommons.org/publicdomain/zero/1.0/ Send questions,
- comments, complaints, performance data, etc to dl@cs.oswego.edu
-
-
-
FreeType
@@ -3988,7 +3979,7 @@
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.
-
+
Finally, software patents pose a constant threat to the existence of
any free program. We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
@@ -4044,7 +4035,7 @@
"work based on the library" and a "work that uses the library". The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.
-
+
GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@@ -4091,7 +4082,7 @@
You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.
-
+
2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
@@ -4149,7 +4140,7 @@
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.) Do not make any other change in
these notices.
-
+
Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.
@@ -4200,7 +4191,7 @@
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.
-
+
6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
@@ -4262,7 +4253,7 @@
accompany the operating system. Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.
-
+
7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
@@ -4303,7 +4294,7 @@
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.
-
+
11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
@@ -4355,7 +4346,7 @@
the Free Software Foundation. If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.
-
+
14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission. For software which is
@@ -4389,7 +4380,7 @@
DAMAGES.
END OF TERMS AND CONDITIONS
-
+
How to Apply These Terms to Your New Libraries
If you develop a new library, and you want it to be of the greatest
@@ -4878,13 +4869,13 @@
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.
+ * 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.
+ and/or other materials provided with the distribution.
* Neither the name of the David Beazley or Dabeaz LLC may be used to
endorse or promote products derived from this software without
- specific prior written permission.
+ 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
@@ -4938,7 +4929,7 @@
The above copyright notice including the dates of first publication and either
this permission notice or a reference to http://oss.sgi.com/projects/FreeB/
- shall be included in all copies or substantial portions of the Software.
+ shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
diff --git a/src/cobalt/content/ssl/certs/080911ac.0 b/src/cobalt/content/ssl/certs/080911ac.0
deleted file mode 100644
index ffa4dbe..0000000
--- a/src/cobalt/content/ssl/certs/080911ac.0
+++ /dev/null
@@ -1,34 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJC
-TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0
-aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0
-aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAzMTkxODMzMzNaFw0yMTAzMTcxODMz
-MzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUw
-IwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQDEyVR
-dW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Yp
-li4kVEAkOPcahdxYTMukJ0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2D
-rOpm2RgbaIr1VxqYuvXtdj182d6UajtLF8HVj71lODqV0D1VNk7feVcxKh7YWWVJ
-WCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeLYzcS19Dsw3sgQUSj7cug
-F+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWenAScOospU
-xbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCC
-Ak4wPQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVv
-dmFkaXNvZmZzaG9yZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREw
-ggENMIIBCQYJKwYBBAG+WAABMIH7MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNl
-IG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmljYXRlIGJ5IGFueSBwYXJ0eSBh
-c3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFy
-ZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
-Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYI
-KwYBBQUHAgEWFmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3T
-KbkGGew5Oanwl4Rqy+/fMIGuBgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rq
-y+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1p
-dGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYD
-VQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6tlCL
-MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSk
-fnIYj9lofFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf8
-7C9TqnN7Az10buYWnuulLsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1R
-cHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2xgI4JVrmcGmD+XcHXetwReNDWXcG31a0y
-mQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi5upZIof4l/UO/erMkqQW
-xFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi5nrQNiOK
-SnQ2+Q==
------END CERTIFICATE-----
diff --git a/src/cobalt/demos/content/web-audio-demo/web-audio-demo.html b/src/cobalt/demos/content/web-audio-demo/web-audio-demo.html
new file mode 100644
index 0000000..52abc07
--- /dev/null
+++ b/src/cobalt/demos/content/web-audio-demo/web-audio-demo.html
@@ -0,0 +1,108 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+body {
+ background-color: rgb(255, 255, 255);
+}
+
+.row {
+ position: absolute;
+}
+
+.tile {
+ background-color: rgb(190, 195, 255);
+ display: contents;
+ font-size: x-large;
+ font-weight: bold;
+ height: max-content;
+ width: max-content;
+ margin: 8px;
+ padding: 8px;
+ text-align: center;
+ align-content: center;
+}
+</style>
+</head>
+<body>
+
+<div class="row">
+ <div class="tile">
+ <p>
+ WebAudio API Test
+ </p>
+ </div>
+</div>
+
+<script>
+ function testWebAudioApi() {
+ // Settings for the test.
+ var source_count = 3;
+ var buffer_duration_seconds = 3.0;
+ var source_start_delay_seconds = 5.0;
+ var sample_rate = 44100.0;
+
+ console.log("WebAudio API Test:");
+ console.log(" source_count=" + source_count.toString());
+ console.log(" buffer_duration_seconds=" + buffer_duration_seconds.toString());
+ console.log(" source_start_delay_seconds=" + source_start_delay_seconds.toString());
+ console.log(" sample_rate=" + source_count.toString());
+
+ // Create Float32Array of samples containing sin wave.
+ var audio_sample_count = sample_rate * buffer_duration_seconds;
+ var audio_array = new Float32Array(audio_sample_count);
+ for (var i = 0; i < audio_sample_count; ++i) {
+ audio_array[i] = Math.sin(440.0 * 2.0 * Math.PI * i / sample_rate);
+ }
+ console.log("Created Float32Array of samples containing sin wave");
+
+ // Create audio context.
+ var context = new AudioContext();
+ console.log("Created AudioContext");
+
+ // Create and initialize contents of audio buffer.
+ var audio_buffer =
+ context.createBuffer(1, audio_sample_count, sample_rate);
+ console.log("Created AudioBuffer");
+ audio_buffer.copyToChannel(audio_array, 0);
+ console.log("Initialized AudioBuffer contents with Float32Array");
+
+ // Create and initialize |source_count| audio buffer source nodes.
+ var source_nodes = new Array(source_count);
+ for (var i = 0; i < source_count; ++i)
+ {
+ source_nodes[i] = context.createBufferSource();
+ console.log(
+ "source_nodes["+ i.toString() +"]: Created AudioBufferSourceNode");
+ source_nodes[i].buffer = audio_buffer;
+ source_nodes[i].connect(context.destination);
+ console.log(
+ "source_nodes["+ i.toString() +"]: Initialized AudioBufferSourceNode");
+
+ // Capture a copy of |i| for delayed calls.
+ (function (i) {
+ // Delay a call by |i| * |source_start_delay_seconds| seconds.
+ setTimeout(
+ // The call to delay: A lambda that adds an event listener for the
+ // "ended" event and starts |source_nodes[i]|.
+ function() {
+ source_nodes[i].addEventListener(
+ "ended",
+ function () {
+ console.log(
+ "source_nodes["+ i.toString() +"]: ended event handled");
+ });
+ source_nodes[i].start(0);
+ console.log("source_nodes["+ i.toString() +"]: start called");
+ },
+ i * source_start_delay_seconds * 1000);
+ }) (i);
+ }
+ };
+
+ // Delay the entire test for a short time to allow |console| to initialize.
+ setTimeout(testWebAudioApi, 500);
+</script>
+
+</body>
+</html>
diff --git a/src/cobalt/doc/clients_performance_guide.md b/src/cobalt/doc/clients_performance_guide.md
index 482be74..1de5a4e 100644
--- a/src/cobalt/doc/clients_performance_guide.md
+++ b/src/cobalt/doc/clients_performance_guide.md
@@ -142,3 +142,27 @@
guarantees a full screen draw, the most optimal way of specifying a
background is to modify `<body>`'s background properties instead of adding
a layer on top of it.
+
+## Blitter optimizations
+
+If the platform's user agent string contains "blitter", then the platform uses
+the Blitter API for rendering. This device is much more limited in what it can
+render natively, and many complex geometry will require software rendering.
+This means the CPU creates a texture and calculates the color of each pixel in
+that texture. The following things trigger the software rendering path (i.e.
+uses extra memory and is slow) on platforms using the Blitter API:
+
+ - Text.
+ - Rounded corners.
+ - Borders of different sizes. If borders are to be used, then all borders
+ should have the same properties. (And avoid rounded corners.)
+ - Linear gradients which are not exactly vertical or horizontal (i.e. gradients
+ at an angle).
+ - Radial gradients.
+ - Shadows.
+ - Multi-plane images. JPEG images tend to decode into multi-plane images.
+ Prefer using PNG images instead -- these tend to be decoded into RGBA which
+ blitter can handle natively.
+ - Using part of a background image. For example, using background-position may
+ result in extra memory usage, or using a background image inside an
+ `overflow: hidden` element that is shifted or has rounded corners.
diff --git a/src/cobalt/dom/dom.gyp b/src/cobalt/dom/dom.gyp
index 22e1fb3..8688973 100644
--- a/src/cobalt/dom/dom.gyp
+++ b/src/cobalt/dom/dom.gyp
@@ -258,6 +258,10 @@
'performance.h',
'performance_entry.cc',
'performance_entry.h',
+ 'performance_entry_buffer_impl.cc',
+ 'performance_entry_buffer_impl.h',
+ 'performance_observer_entry_list.cc',
+ 'performance_observer_entry_list.h',
'performance_timing.cc',
'performance_timing.h',
'performance_high_resolution_time.h',
diff --git a/src/cobalt/dom/mutation_observer.cc b/src/cobalt/dom/mutation_observer.cc
index 83f819d..82740b2 100644
--- a/src/cobalt/dom/mutation_observer.cc
+++ b/src/cobalt/dom/mutation_observer.cc
@@ -33,7 +33,7 @@
}
void SetSimpleExceptionVA(script::SimpleExceptionType, const char*,
- va_list) override {
+ va_list &) override {
NOTREACHED();
}
};
diff --git a/src/cobalt/dom/performance.cc b/src/cobalt/dom/performance.cc
index 2e77bf7..27040be 100644
--- a/src/cobalt/dom/performance.cc
+++ b/src/cobalt/dom/performance.cc
@@ -16,25 +16,66 @@
#include "base/time/time.h"
#include "cobalt/dom/memory_info.h"
+#include "cobalt/dom/performance_entry.h"
namespace cobalt {
namespace dom {
Performance::Performance(const scoped_refptr<base::BasicClock>& clock)
- : timing_(new PerformanceTiming(clock)), memory_(new MemoryInfo()) {}
+ : timing_(new PerformanceTiming(clock)),
+ memory_(new MemoryInfo()),
+ time_origin_(base::Time::Now() - base::Time::UnixEpoch()) {}
-double Performance::Now() const {
- return timing_->GetNavigationStartClock()->Now().InMillisecondsF();
+DOMHighResTimeStamp Performance::Now() const {
+ base::TimeDelta now = base::Time::Now() - base::Time::UnixEpoch();
+ return ConvertTimeDeltaToDOMHighResTimeStamp(now - time_origin_,
+ Performance::kPerformanceTimerMinResolutionInMicroseconds);
}
scoped_refptr<PerformanceTiming> Performance::timing() const { return timing_; }
scoped_refptr<MemoryInfo> Performance::memory() const { return memory_; }
+DOMHighResTimeStamp Performance::time_origin() const {
+ // The algorithm for calculating time origin timestamp.
+ // https://www.w3.org/TR/2019/REC-hr-time-2-20191121/#dfn-time-origin-timestamp
+ // Assert that global's time origin is not undefined.
+ DCHECK(!time_origin_.is_zero());
+
+ // Let t1 be the DOMHighResTimeStamp representing the high resolution
+ // time at which the global monotonic clock is zero.
+ base::TimeDelta t1 =
+ base::Time::UnixEpoch().ToDeltaSinceWindowsEpoch();
+
+ // Let t2 be the DOMHighResTimeStamp representing the high resolution
+ // time value of the global monotonic clock at global's time origin.
+ base::TimeDelta t2 = time_origin_;
+
+ // Return the sum of t1 and t2.
+ return ConvertTimeDeltaToDOMHighResTimeStamp(t1 + t2,
+ Performance::kPerformanceTimerMinResolutionInMicroseconds);
+}
+
void Performance::TraceMembers(script::Tracer* tracer) {
tracer->Trace(timing_);
tracer->Trace(memory_);
}
+PerformanceEntryList Performance::GetEntries() {
+ return PerformanceEntryBufferImpl::GetEntries(performance_entry_buffer_);
+}
+
+PerformanceEntryList Performance::GetEntriesByType(
+ const std::string& entry_type) {
+ return PerformanceEntryBufferImpl::GetEntriesByType(
+ performance_entry_buffer_, entry_type);
+}
+
+PerformanceEntryList Performance::GetEntriesByName(
+ const std::string& name, const base::StringPiece& type) {
+ return PerformanceEntryBufferImpl::GetEntriesByName(
+ performance_entry_buffer_, name, type);
+}
+
} // namespace dom
} // namespace cobalt
diff --git a/src/cobalt/dom/performance.h b/src/cobalt/dom/performance.h
index b717a94..027a8ed 100644
--- a/src/cobalt/dom/performance.h
+++ b/src/cobalt/dom/performance.h
@@ -15,7 +15,12 @@
#ifndef COBALT_DOM_PERFORMANCE_H_
#define COBALT_DOM_PERFORMANCE_H_
+#include <string>
+
#include "cobalt/base/clock.h"
+#include "cobalt/dom/performance_entry_buffer_impl.h"
+#include "cobalt/dom/performance_high_resolution_time.h"
+#include "cobalt/dom/performance_observer_entry_list.h"
#include "cobalt/dom/performance_timing.h"
#include "cobalt/script/wrappable.h"
@@ -41,17 +46,36 @@
scoped_refptr<PerformanceTiming> timing() const;
scoped_refptr<MemoryInfo> memory() const;
- // Custom, not in any spec.
- // Returns the time since timing()->navigation_start(), in milliseconds.
- double Now() const;
+ // https://www.w3.org/TR/hr-time-2/#now-method
+ DOMHighResTimeStamp Now() const;
+
+ // High Resolution Time Level 3 timeOrigin.
+ // https://www.w3.org/TR/hr-time-3/#dom-performance-timeorigin
+ DOMHighResTimeStamp time_origin() const;
+
+ // Internal getter method for the time origin value.
+ base::TimeDelta get_time_origin() const {
+ return time_origin_;
+ }
DEFINE_WRAPPABLE_TYPE(Performance);
void TraceMembers(script::Tracer* tracer) override;
+ // Performance Timeline extensions to the Performance interface.
+ PerformanceEntryList GetEntries();
+ PerformanceEntryList GetEntriesByType(const std::string& entry_type);
+ PerformanceEntryList GetEntriesByName(
+ const std::string& name, const base::StringPiece& type);
+
private:
scoped_refptr<PerformanceTiming> timing_;
scoped_refptr<MemoryInfo> memory_;
+ // https://www.w3.org/TR/hr-time-3/#dfn-time-origin
+ base::TimeDelta time_origin_;
+
+ PerformanceEntryBuffer performance_entry_buffer_;
+
DISALLOW_COPY_AND_ASSIGN(Performance);
};
diff --git a/src/cobalt/dom/performance_entry_buffer_impl.cc b/src/cobalt/dom/performance_entry_buffer_impl.cc
new file mode 100644
index 0000000..cda4fe2
--- /dev/null
+++ b/src/cobalt/dom/performance_entry_buffer_impl.cc
@@ -0,0 +1,100 @@
+// Copyright 2021 The Cobalt Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "cobalt/dom/performance_entry_buffer_impl.h"
+
+#include <algorithm>
+
+#include "cobalt/dom/performance_entry.h"
+
+namespace cobalt {
+namespace dom {
+
+namespace {
+
+PerformanceEntryList FilterBufferByNameAndType(
+ PerformanceEntryBuffer performance_entry_buffer,
+ const std::string& name,
+ const base::StringPiece& entry_type) {
+ // Algorithm for filtering buffers.
+ // https://www.w3.org/TR/2019/WD-performance-timeline-2-20191024/#filter-buffer-by-name-and-type
+ // 1. Let the list of entry objects be the empty PerformanceEntryList.
+ PerformanceEntryList buffer;
+
+ // 2. For each PerformanceEntry object (entryObject) in the buffer,
+ // in chronological order with respect to startTime:
+ for (const auto& entry : performance_entry_buffer) {
+ // 2.1 If name is not null and entryObject's name attribute does not
+ // match name in a case-sensitive manner, go to next entryObject.
+ bool is_name_not_valid = !entry->name().empty() && name != entry->name();
+ if (is_name_not_valid) {
+ continue;
+ }
+
+ // 2.2 If type is not null and entryObject's type attribute does not
+ // match type in a case-sensitive manner, go to next entryObject.
+ const PerformanceEntry::EntryType type =
+ PerformanceEntry::ToEntryTypeEnum(entry_type.as_string());
+ bool is_entry_type_not_valid = entry_type.data() != nullptr &&
+ type != entry->EntryTypeEnum();
+ if (is_entry_type_not_valid) {
+ continue;
+ }
+
+ // 2.3 Add entryObject to the list of entry objects.
+ buffer.push_back(entry);
+ }
+
+ // Sort entry with respect to startTime.
+ std::sort(buffer.begin(), buffer.end(),
+ PerformanceEntry::StartTimeCompareLessThan);
+
+ // 3. Return the list of entry objects.
+ return buffer;
+}
+
+}
+
+// static
+PerformanceEntryList PerformanceEntryBufferImpl::GetEntries(
+ PerformanceEntryBuffer performance_entry_buffer) {
+ std::string empty_name_type;
+ return FilterBufferByNameAndType(
+ performance_entry_buffer, empty_name_type, empty_name_type);
+}
+
+// static
+PerformanceEntryList PerformanceEntryBufferImpl::GetEntriesByType(
+ PerformanceEntryBuffer performance_entry_buffer,
+ const std::string& entry_type) {
+ std::string empty_name;
+ return FilterBufferByNameAndType(
+ performance_entry_buffer, empty_name, entry_type);
+}
+
+// static
+PerformanceEntryList PerformanceEntryBufferImpl::GetEntriesByName(
+ PerformanceEntryBuffer performance_entry_buffer,
+ const std::string& name,
+ const base::StringPiece& type) {
+ if (!type.data()) {
+ std::string empty_type;
+ return FilterBufferByNameAndType(
+ performance_entry_buffer, name, empty_type);
+ }
+ return FilterBufferByNameAndType(performance_entry_buffer, name, type);
+}
+
+} // namespace dom
+} // namespace cobalt
diff --git a/src/cobalt/dom/performance_entry_buffer_impl.h b/src/cobalt/dom/performance_entry_buffer_impl.h
new file mode 100644
index 0000000..31ca21f
--- /dev/null
+++ b/src/cobalt/dom/performance_entry_buffer_impl.h
@@ -0,0 +1,47 @@
+// Copyright 2021 The Cobalt Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef COBALT_DOM_PERFORMANCE_ENTRY_BUFFER_IMPL_H_
+#define COBALT_DOM_PERFORMANCE_ENTRY_BUFFER_IMPL_H_
+
+#include <string>
+
+#include "base/strings/string_piece.h"
+#include "cobalt/dom/performance_high_resolution_time.h"
+#include "cobalt/dom/performance_observer_entry_list.h"
+#include "cobalt/script/sequence.h"
+#include "cobalt/script/wrappable.h"
+
+namespace cobalt {
+namespace dom {
+
+typedef PerformanceEntryList PerformanceEntryBuffer;
+
+class PerformanceEntryBufferImpl {
+ public:
+ static PerformanceEntryBuffer GetEntries(
+ PerformanceEntryBuffer performance_entry_buffer);
+ static PerformanceEntryBuffer GetEntriesByType(
+ PerformanceEntryBuffer performance_entry_buffer,
+ const std::string& entry_type);
+ static PerformanceEntryBuffer GetEntriesByName(
+ PerformanceEntryBuffer performance_entry_buffer,
+ const std::string& name,
+ const base::StringPiece& type);
+};
+
+} // namespace dom
+} // namespace cobalt
+
+#endif // COBALT_DOM_PERFORMANCE_ENTRY_LIST_IMPL_H_
diff --git a/src/cobalt/dom/performance_entry_list.idl b/src/cobalt/dom/performance_entry_list.idl
index f8e6671..16c5045 100644
--- a/src/cobalt/dom/performance_entry_list.idl
+++ b/src/cobalt/dom/performance_entry_list.idl
@@ -17,6 +17,6 @@
partial interface Performance {
PerformanceEntryList getEntries();
PerformanceEntryList getEntriesByType(DOMString type);
- PerformanceEntryList getEntriesByName(DOMString name, optional DOMString type);
-}
+ PerformanceEntryList getEntriesByName(DOMString name, optional DOMString type = "");
+};
typedef sequence<PerformanceEntry> PerformanceEntryList;
diff --git a/src/cobalt/dom/performance_high_resolution_time.idl b/src/cobalt/dom/performance_high_resolution_time.idl
index 84d6b8f..8d43a0b 100644
--- a/src/cobalt/dom/performance_high_resolution_time.idl
+++ b/src/cobalt/dom/performance_high_resolution_time.idl
@@ -12,10 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-// https://www.w3.org/TR/2016/WD-hr-time-2-20160225/#the-performance-interface
+// https://w3c.github.io/hr-time/#sec-performance
partial interface Performance {
DOMHighResTimeStamp now();
+ readonly attribute DOMHighResTimeStamp timeOrigin;
};
typedef double DOMHighResTimeStamp;
diff --git a/src/cobalt/dom/performance_observer_entry_list.cc b/src/cobalt/dom/performance_observer_entry_list.cc
new file mode 100644
index 0000000..b51bf76
--- /dev/null
+++ b/src/cobalt/dom/performance_observer_entry_list.cc
@@ -0,0 +1,46 @@
+// Copyright 2021 The Cobalt Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "cobalt/dom/performance_observer_entry_list.h"
+
+#include <algorithm>
+
+#include "cobalt/dom/performance_entry.h"
+#include "cobalt/dom/performance_entry_buffer_impl.h"
+
+namespace cobalt {
+namespace dom {
+
+PerformanceObserverEntryList::PerformanceObserverEntryList(
+ const PerformanceEntryList& entry_list)
+ : observer_buffer_(entry_list) {}
+
+PerformanceEntryList PerformanceObserverEntryList::GetEntries() {
+ return PerformanceEntryBufferImpl::GetEntries(observer_buffer_);
+}
+
+PerformanceEntryList PerformanceObserverEntryList::GetEntriesByType(
+ const std::string& entry_type) {
+ return PerformanceEntryBufferImpl::GetEntriesByType(
+ observer_buffer_, entry_type);
+}
+
+PerformanceEntryList PerformanceObserverEntryList::GetEntriesByName(
+ const std::string& name, const base::StringPiece& type) {
+ return PerformanceEntryBufferImpl::GetEntriesByName(
+ observer_buffer_, name, type);
+}
+
+} // namespace dom
+} // namespace cobalt
diff --git a/src/cobalt/dom/performance_observer_entry_list.h b/src/cobalt/dom/performance_observer_entry_list.h
new file mode 100644
index 0000000..e9dd07f
--- /dev/null
+++ b/src/cobalt/dom/performance_observer_entry_list.h
@@ -0,0 +1,52 @@
+// Copyright 2021 The Cobalt Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef COBALT_DOM_PERFORMANCE_OBSERVER_ENTRY_LIST_H_
+#define COBALT_DOM_PERFORMANCE_OBSERVER_ENTRY_LIST_H_
+
+#include <string>
+
+#include "base/strings/string_piece.h"
+#include "cobalt/dom/performance_high_resolution_time.h"
+#include "cobalt/script/sequence.h"
+#include "cobalt/script/wrappable.h"
+
+namespace cobalt {
+namespace dom {
+
+class PerformanceEntry;
+typedef script::Sequence<PerformanceEntry*> PerformanceEntryList;
+
+// Implements the PerformanceObserverEntryList IDL interface, as described here:
+// https://www.w3.org/TR/performance-timeline-2/#performanceobserverentrylist-interface
+class PerformanceObserverEntryList : public script::Wrappable {
+ public:
+ explicit PerformanceObserverEntryList(
+ const PerformanceEntryList& observer_buffer);
+
+ PerformanceEntryList GetEntries();
+ PerformanceEntryList GetEntriesByType(const std::string& entry_type);
+ PerformanceEntryList GetEntriesByName(const std::string& name,
+ const base::StringPiece& type);
+
+ DEFINE_WRAPPABLE_TYPE(PerformanceObserverEntryList);
+
+ protected:
+ PerformanceEntryList observer_buffer_;
+};
+
+} // namespace dom
+} // namespace cobalt
+
+#endif // COBALT_DOM_PERFORMANCE_OBSERVER_ENTRY_LIST_H_
diff --git a/src/cobalt/dom/performance_observer_entry_list.idl b/src/cobalt/dom/performance_observer_entry_list.idl
new file mode 100644
index 0000000..f925556
--- /dev/null
+++ b/src/cobalt/dom/performance_observer_entry_list.idl
@@ -0,0 +1,22 @@
+// Copyright 2021 The Cobalt Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// https://w3c.github.io/performance-timeline/#performanceobserverentrylist-interface
+
+[Exposed=Window]
+interface PerformanceObserverEntryList {
+ PerformanceEntryList getEntries();
+ PerformanceEntryList getEntriesByType (DOMString type);
+ PerformanceEntryList getEntriesByName (DOMString name, optional DOMString type = "");
+};
diff --git a/src/cobalt/dom/performance_test.cc b/src/cobalt/dom/performance_test.cc
index 2025ba6..29f8627 100644
--- a/src/cobalt/dom/performance_test.cc
+++ b/src/cobalt/dom/performance_test.cc
@@ -13,6 +13,7 @@
// limitations under the License.
#include "cobalt/dom/performance.h"
+#include "cobalt/dom/performance_high_resolution_time.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace cobalt {
@@ -26,19 +27,47 @@
// Test that now returns a result that is within a correct range for the
// current time.
- base::TimeDelta lower_limit = clock->Now();
+ base::TimeDelta lower_limit = base::Time::Now() - base::Time::UnixEpoch();
- double current_time_in_milliseconds = performance->Now();
+ DOMHighResTimeStamp current_time_in_milliseconds = performance->Now();
- base::TimeDelta upper_limit = clock->Now();
+ base::TimeDelta upper_limit = base::Time::Now() - base::Time::UnixEpoch();
- scoped_refptr<base::OffsetClock> navigation_start_clock =
- performance->timing()->GetNavigationStartClock();
+ DCHECK_GE(current_time_in_milliseconds, ConvertTimeDeltaToDOMHighResTimeStamp(
+ lower_limit - performance->get_time_origin(),
+ Performance::kPerformanceTimerMinResolutionInMicroseconds));
+ DCHECK_LE(current_time_in_milliseconds, ConvertTimeDeltaToDOMHighResTimeStamp(
+ upper_limit - performance->get_time_origin(),
+ Performance::kPerformanceTimerMinResolutionInMicroseconds));
+}
- DCHECK_GE(current_time_in_milliseconds,
- (lower_limit - navigation_start_clock->origin()).InMillisecondsF());
- DCHECK_LE(current_time_in_milliseconds,
- (upper_limit - navigation_start_clock->origin()).InMillisecondsF());
+TEST(PerformanceTest, TimeOrigin) {
+ scoped_refptr<base::SystemMonotonicClock> clock(
+ new base::SystemMonotonicClock());
+ // Test that time_origin returns a result that is within a correct range for
+ // the current time.
+ base::Time lower_limit = base::Time::Now();
+
+ scoped_refptr<Performance> performance(new Performance(clock));
+
+ base::Time upper_limit = base::Time::Now();
+
+ base::TimeDelta lower_limit_delta = lower_limit - base::Time::UnixEpoch();
+ base::TimeDelta upper_limit_delta = upper_limit - base::Time::UnixEpoch();
+
+ base::TimeDelta time_zero =
+ base::Time::UnixEpoch().ToDeltaSinceWindowsEpoch();
+
+ DOMHighResTimeStamp lower_limit_milliseconds =
+ ConvertTimeDeltaToDOMHighResTimeStamp(lower_limit_delta + time_zero,
+ Performance::kPerformanceTimerMinResolutionInMicroseconds);
+
+ DOMHighResTimeStamp upper_limit_milliseconds =
+ ConvertTimeDeltaToDOMHighResTimeStamp(upper_limit_delta + time_zero,
+ Performance::kPerformanceTimerMinResolutionInMicroseconds);
+
+ DCHECK_GE(performance->time_origin(), lower_limit_milliseconds);
+ DCHECK_LE(performance->time_origin(), upper_limit_milliseconds);
}
TEST(PerformanceTest, NavigationStart) {
diff --git a/src/cobalt/dom/testing/fake_exception_state.h b/src/cobalt/dom/testing/fake_exception_state.h
index c995d05..9c88bc9 100644
--- a/src/cobalt/dom/testing/fake_exception_state.h
+++ b/src/cobalt/dom/testing/fake_exception_state.h
@@ -32,7 +32,7 @@
base::polymorphic_downcast<dom::DOMException*>(exception.get()));
}
void SetSimpleExceptionVA(script::SimpleExceptionType type,
- const char* format, va_list args) override {
+ const char* format, va_list & args) override {
// no-op
}
dom::DOMException::ExceptionCode GetExceptionCode() {
diff --git a/src/cobalt/extension/extension_test.cc b/src/cobalt/extension/extension_test.cc
index 3d1c30e..8e844f1 100644
--- a/src/cobalt/extension/extension_test.cc
+++ b/src/cobalt/extension/extension_test.cc
@@ -17,6 +17,7 @@
#include "cobalt/extension/configuration.h"
#include "cobalt/extension/crash_handler.h"
#include "cobalt/extension/cwrappers.h"
+#include "cobalt/extension/font.h"
#include "cobalt/extension/graphics.h"
#include "cobalt/extension/installation_manager.h"
#include "cobalt/extension/media_session.h"
@@ -235,6 +236,25 @@
EXPECT_EQ(second_extension_api, extension_api)
<< "Extension struct should be a singleton";
}
+TEST(ExtensionTest, Font) {
+ typedef CobaltExtensionFontApi ExtensionApi;
+ const char* kExtensionName = kCobaltExtensionFontName;
+
+ const ExtensionApi* extension_api =
+ static_cast<const ExtensionApi*>(SbSystemGetExtension(kExtensionName));
+ if (!extension_api) {
+ return;
+ }
+
+ EXPECT_STREQ(extension_api->name, kExtensionName);
+ EXPECT_EQ(extension_api->version, 1u);
+ EXPECT_NE(extension_api->GetPathFallbackFontDirectory, nullptr);
+
+ const ExtensionApi* second_extension_api =
+ static_cast<const ExtensionApi*>(SbSystemGetExtension(kExtensionName));
+ EXPECT_EQ(second_extension_api, extension_api)
+ << "Extension struct should be a singleton";
+}
} // namespace extension
} // namespace cobalt
#endif // SB_API_VERSION >= 11
diff --git a/src/cobalt/extension/font.h b/src/cobalt/extension/font.h
new file mode 100644
index 0000000..b6c0e5f
--- /dev/null
+++ b/src/cobalt/extension/font.h
@@ -0,0 +1,45 @@
+// Copyright 2021 The Cobalt Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef COBALT_EXTENSION_FONT_H_
+#define COBALT_EXTENSION_FONT_H_
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define kCobaltExtensionFontName "dev.cobalt.extension.Font"
+
+typedef struct CobaltExtensionFontApi {
+ // Name should be the string |kCobaltExtensionFontName|.
+ // This helps to validate that the extension API is correct.
+ const char* name;
+
+ // This specifies the version of the API that is implemented.
+ uint32_t version;
+
+ // The fields below this point were added in version 1 or later.
+
+ // Provide additional font directory for fonts not available
+ // as system or Cobalt fonts. This is useful for adding local fallback fonts.
+ bool (*GetPathFallbackFontDirectory)(char* path, int path_size);
+} CobaltExtensionFontApi;
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif // COBALT_EXTENSION_FONT_H_
diff --git a/src/cobalt/layout/replaced_box.cc b/src/cobalt/layout/replaced_box.cc
index c420851..21eba9a 100644
--- a/src/cobalt/layout/replaced_box.cc
+++ b/src/cobalt/layout/replaced_box.cc
@@ -344,11 +344,14 @@
cssom::MapToMeshFunction::ExtractFromFilterList(
computed_style()->filter());
- if (mtm_filter_function && mtm_filter_function->mesh_spec().mesh_type() !=
- cssom::MapToMeshFunction::kRectangular) {
- DCHECK(*replaced_box_mode_ == ReplacedBox::ReplacedBoxMode::kVideo)
- << "We currently do not support punched out video with map-to-mesh "
- "filters.";
+ // Map-to-mesh is only supported with decode-to-texture videos.
+ const bool supports_mtm =
+ replaced_box_mode_ &&
+ *replaced_box_mode_ == ReplacedBox::ReplacedBoxMode::kVideo;
+
+ if (supports_mtm && mtm_filter_function &&
+ mtm_filter_function->mesh_spec().mesh_type() !=
+ cssom::MapToMeshFunction::kRectangular) {
RenderAndAnimateContentWithMapToMesh(border_node_builder,
mtm_filter_function);
} else {
diff --git a/src/cobalt/media/base/sbplayer_pipeline.cc b/src/cobalt/media/base/sbplayer_pipeline.cc
index 5ca7e82..a8f57c9 100644
--- a/src/cobalt/media/base/sbplayer_pipeline.cc
+++ b/src/cobalt/media/base/sbplayer_pipeline.cc
@@ -299,7 +299,7 @@
// Timestamp for the last written audio.
SbTime timestamp_of_last_written_audio_ = 0;
// Last media time reported by GetMediaTime().
- SbTime last_media_time_;
+ SbTime last_media_time_ = 0;
// Time when we last checked the media time.
SbTime last_time_media_time_retrieved_ = 0;
// The maximum video playback capabilities required for the playback.
diff --git a/src/cobalt/media/player/web_media_player_impl.cc b/src/cobalt/media/player/web_media_player_impl.cc
index a6d9b41..480d7e8 100644
--- a/src/cobalt/media/player/web_media_player_impl.cc
+++ b/src/cobalt/media/player/web_media_player_impl.cc
@@ -129,7 +129,8 @@
is_local_source_(false),
supports_save_(true),
suppress_destruction_errors_(false),
- drm_system_(NULL) {
+ drm_system_(NULL),
+ window_(window) {
TRACE_EVENT0("cobalt::media", "WebMediaPlayerImpl::WebMediaPlayerImpl");
ON_INSTANCE_CREATED(WebMediaPlayerImpl);
@@ -532,6 +533,10 @@
void WebMediaPlayerImpl::Suspend() { pipeline_->Suspend(); }
void WebMediaPlayerImpl::Resume(PipelineWindow window) {
+ if (!window_ && window) {
+ is_resuming_from_background_mode_ = true;
+ }
+ window_ = window;
pipeline_->Resume(window);
}
@@ -758,6 +763,13 @@
Pipeline::BufferingState buffering_state) {
DVLOG(1) << "OnPipelineBufferingState(" << buffering_state << ")";
+ // If |is_resuming_from_background_mode_| is true, we are exiting background
+ // mode and must seek.
+ if (is_resuming_from_background_mode_) {
+ Seek(pipeline_->GetMediaTime().InSecondsF());
+ is_resuming_from_background_mode_ = false;
+ }
+
switch (buffering_state) {
case Pipeline::kHaveMetadata:
SetReadyState(WebMediaPlayer::kReadyStateHaveMetadata);
diff --git a/src/cobalt/media/player/web_media_player_impl.h b/src/cobalt/media/player/web_media_player_impl.h
index 6b0843f..9056524 100644
--- a/src/cobalt/media/player/web_media_player_impl.h
+++ b/src/cobalt/media/player/web_media_player_impl.h
@@ -331,6 +331,11 @@
DrmSystemReadyCB drm_system_ready_cb_;
scoped_refptr<DrmSystem> drm_system_;
+ // Used to determine when the player enters and exits background mode.
+ PipelineWindow window_;
+
+ bool is_resuming_from_background_mode_ = false;
+
DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
};
diff --git a/src/cobalt/renderer/egl_and_gles.h b/src/cobalt/renderer/egl_and_gles.h
index 9f808b8..3dac4b2 100644
--- a/src/cobalt/renderer/egl_and_gles.h
+++ b/src/cobalt/renderer/egl_and_gles.h
@@ -43,30 +43,27 @@
#endif // SB_API_VERSION >= 11
#if defined(COBALT_EGL_AND_GLES_LOGGING)
+#define EGL_DCHECK_MAYBE_LOG(x) SB_LOG(INFO) << #x;
+#define GL_DCHECK_MAYBE_LOG(x) SB_LOG(INFO) << #x;
+#else // !defined(COBALT_EGL_AND_GLES_LOGGING)
+#define EGL_DCHECK_MAYBE_LOG(x)
+#define GL_DCHECK_MAYBE_LOG(x)
+#endif // defined(COBALT_EGL_AND_GLES_LOGGING)
+
#define EGL_DCHECK(x) \
do { \
- SB_LOG(INFO) << #x; \
+ EGL_DCHECK_MAYBE_LOG(x); \
const int32_t COBALT_EGL_ERRNO = (EGL_CALL_PREFIX eglGetError()); \
SB_DCHECK(COBALT_EGL_ERRNO == EGL_SUCCESS) \
<< #x << " exited with code: " << COBALT_EGL_ERRNO; \
} while (false)
#define GL_DCHECK(x) \
do { \
- SB_LOG(INFO) << #x; \
+ GL_DCHECK_MAYBE_LOG(x); \
const int32_t COBALT_GL_ERRNO = (GL_CALL_PREFIX glGetError()); \
SB_DCHECK(COBALT_GL_ERRNO == GL_NO_ERROR) \
<< #x << " exited with code: " << COBALT_GL_ERRNO; \
} while (false)
-#else // !defined(COBALT_EGL_AND_GLES_LOGGING)
-#define EGL_DCHECK(x) \
- do { \
- SB_DCHECK((EGL_CALL_PREFIX eglGetError()) == EGL_SUCCESS); \
- } while (false)
-#define GL_DCHECK(x) \
- do { \
- SB_DCHECK((GL_CALL_PREFIX glGetError()) == GL_NO_ERROR); \
- } while (false)
-#endif // defined(COBALT_EGL_AND_GLES_LOGGING)
#if SB_API_VERSION >= 11
namespace cobalt {
diff --git a/src/cobalt/renderer/rasterizer/skia/render_tree_node_visitor.cc b/src/cobalt/renderer/rasterizer/skia/render_tree_node_visitor.cc
index 537a25f..f5adeca 100644
--- a/src/cobalt/renderer/rasterizer/skia/render_tree_node_visitor.cc
+++ b/src/cobalt/renderer/rasterizer/skia/render_tree_node_visitor.cc
@@ -18,6 +18,7 @@
#include <cmath>
#include <memory>
#include <string>
+#include <utility>
#include <vector>
#include "base/trace_event/trace_event.h"
@@ -439,17 +440,19 @@
TRACE_EVENT0("cobalt::renderer", "Visit(FilterNode)");
if (filter_node->data().opacity_filter) {
- TRACE_EVENT_INSTANT1("cobalt::renderer", "opacity", "opacity",
+ TRACE_EVENT_INSTANT1("cobalt::renderer", "opacity",
+ TRACE_EVENT_SCOPE_THREAD, "opacity",
filter_node->data().opacity_filter->opacity());
}
if (filter_node->data().viewport_filter) {
TRACE_EVENT_INSTANT2(
- "cobalt::renderer", "viewport", "width",
+ "cobalt::renderer", "viewport", TRACE_EVENT_SCOPE_THREAD, "width",
filter_node->data().viewport_filter->viewport().width(), "height",
filter_node->data().viewport_filter->viewport().height());
}
if (filter_node->data().blur_filter) {
- TRACE_EVENT_INSTANT1("cobalt::renderer", "blur", "blur_sigma",
+ TRACE_EVENT_INSTANT1("cobalt::renderer", "blur", TRACE_EVENT_SCOPE_THREAD,
+ "blur_sigma",
filter_node->data().blur_filter->blur_sigma());
}
#endif // ENABLE_RENDER_TREE_VISITOR_TRACING
@@ -532,8 +535,7 @@
// operating in a normalized coordinate system, we must perform some
// transformations.
void ConvertLocalTransformMatrixToSkiaShaderFormat(
- const math::Size& input_size,
- const math::RectF& output_rect,
+ const math::Size& input_size, const math::RectF& output_rect,
SkMatrix* local_transform_matrix) {
// First transform to normalized coordinates, where the input transform
// specified by local_transform_matrix is expecting to take place.
@@ -1089,10 +1091,10 @@
// Top
SkPoint top_points[4] = {
- {rect.x(), rect.y()}, // A
- {rect.x() + border.left.width, rect.y() + border.top.width}, // E
- {rect.right() - border.right.width, rect.y() + border.top.width}, // F
- {rect.right(), rect.y()}}; // B
+ {rect.x(), rect.y()}, // A
+ {rect.x() + border.left.width, rect.y() + border.top.width}, // E
+ {rect.right() - border.right.width, rect.y() + border.top.width}, // F
+ {rect.right(), rect.y()}}; // B
DrawQuadWithColorIfBorderIsSolid(
border.top.style, draw_state, border.top.color, top_points,
border.top.width < kAntiAliasWidthThreshold ? true
@@ -1115,7 +1117,7 @@
{rect.x(), rect.bottom()}, // C
{rect.right(), rect.bottom()}, // D
{rect.right() - border.right.width,
- rect.bottom() - border.bottom.width}}; // H
+ rect.bottom() - border.bottom.width}}; // H
DrawQuadWithColorIfBorderIsSolid(
border.bottom.style, draw_state, border.bottom.color, bottom_points,
border.bottom.width < kAntiAliasWidthThreshold ? true
@@ -1123,11 +1125,11 @@
// Right
SkPoint right_points[4] = {
- {rect.right() - border.right.width, rect.y() + border.top.width}, // F
+ {rect.right() - border.right.width, rect.y() + border.top.width}, // F
{rect.right() - border.right.width,
- rect.bottom() - border.bottom.width}, // H
- {rect.right(), rect.bottom()}, // D
- {rect.right(), rect.y()}}; // B
+ rect.bottom() - border.bottom.width}, // H
+ {rect.right(), rect.bottom()}, // D
+ {rect.right(), rect.y()}}; // B
DrawQuadWithColorIfBorderIsSolid(
border.right.style, draw_state, border.right.color, right_points,
border.right.width < kAntiAliasWidthThreshold ? true
@@ -1763,8 +1765,9 @@
RenderText(
draw_state_.render_target, text_node->data().glyph_buffer,
- shadow.color, math::PointAtOffsetFromOrigin(text_node->data().offset +
- shadow.offset),
+ shadow.color,
+ math::PointAtOffsetFromOrigin(text_node->data().offset +
+ shadow.offset),
shadow.blur_sigma == 0.0f ? blur_zero_sigma : shadow.blur_sigma);
}
}
diff --git a/src/cobalt/renderer/rasterizer/skia/skia/src/ports/SkFontConfigParser_cobalt.cc b/src/cobalt/renderer/rasterizer/skia/skia/src/ports/SkFontConfigParser_cobalt.cc
index 3c7aeed..4890e72 100644
--- a/src/cobalt/renderer/rasterizer/skia/skia/src/ports/SkFontConfigParser_cobalt.cc
+++ b/src/cobalt/renderer/rasterizer/skia/skia/src/ports/SkFontConfigParser_cobalt.cc
@@ -398,9 +398,6 @@
default:
break;
}
-
- LOG(ERROR) << "---- Unsupported font attribute [" << name << "]";
- NOTREACHED();
}
}
diff --git a/src/cobalt/renderer/rasterizer/skia/skia/src/ports/SkFontMgr_cobalt.cc b/src/cobalt/renderer/rasterizer/skia/skia/src/ports/SkFontMgr_cobalt.cc
index 8d31ad3..2590ffc 100644
--- a/src/cobalt/renderer/rasterizer/skia/skia/src/ports/SkFontMgr_cobalt.cc
+++ b/src/cobalt/renderer/rasterizer/skia/skia/src/ports/SkFontMgr_cobalt.cc
@@ -13,6 +13,7 @@
// limitations under the License.
#include <memory>
+#include <utility>
#include "cobalt/renderer/rasterizer/skia/skia/src/ports/SkFontMgr_cobalt.h"
@@ -26,6 +27,7 @@
#include "base/memory/ptr_util.h"
#include "base/trace_event/trace_event.h"
#include "cobalt/configuration/configuration.h"
+#include "cobalt/extension/font.h"
#include "cobalt/renderer/rasterizer/skia/skia/src/ports/SkFontConfigParser_cobalt.h"
#include "cobalt/renderer/rasterizer/skia/skia/src/ports/SkFreeType_cobalt.h"
#include "cobalt/renderer/rasterizer/skia/skia/src/ports/SkTypeface_cobalt.h"
@@ -68,6 +70,29 @@
&priority_fallback_families);
}
+// Load local fallback fonts if available.
+// The fonts are added in addition to the Cobalt and System fonts.
+#if SB_API_VERSION >= 11
+ const CobaltExtensionFontApi* font_extension =
+ static_cast<const CobaltExtensionFontApi*>(
+ SbSystemGetExtension(kCobaltExtensionFontName));
+ if (font_extension &&
+ SbStringCompareAll(font_extension->name, kCobaltExtensionFontName) == 0 &&
+ font_extension->version >= 1) {
+ std::vector<char> fallback_directory(kSbFileMaxPath);
+ if (font_extension->GetPathFallbackFontDirectory(fallback_directory.data(),
+ kSbFileMaxPath)) {
+ LOG(INFO) << "Fallback font directory :" << fallback_directory.data();
+ TRACE_EVENT0("cobalt::renderer", "LoadCobaltFallbackFontFamilies");
+
+ ParseConfigAndBuildFamilies(fallback_directory.data(),
+ fallback_directory.data(),
+ &priority_fallback_families);
+ }
+ }
+#endif
+
+
GeneratePriorityOrderedFallbackFamilies(priority_fallback_families);
FindDefaultFamily(default_families);
}
diff --git a/src/cobalt/script/exception_state.h b/src/cobalt/script/exception_state.h
index a899b84..2dda69e 100644
--- a/src/cobalt/script/exception_state.h
+++ b/src/cobalt/script/exception_state.h
@@ -48,7 +48,7 @@
protected:
virtual void SetSimpleExceptionVA(SimpleExceptionType, const char* format,
- va_list args) = 0;
+ va_list & args) = 0;
};
} // namespace script
diff --git a/src/cobalt/script/logging_exception_state.h b/src/cobalt/script/logging_exception_state.h
index 6bb56c1..c96be38 100644
--- a/src/cobalt/script/logging_exception_state.h
+++ b/src/cobalt/script/logging_exception_state.h
@@ -31,7 +31,7 @@
LogException(exception->name(), exception->message());
}
void SetSimpleExceptionVA(SimpleExceptionType type, const char* format,
- va_list arguments) override {
+ va_list & arguments) override {
LogException(SimpleExceptionToString(type),
base::StringPrintV(format, arguments));
}
diff --git a/src/cobalt/script/mozjs-45/mozjs_exception_state.cc b/src/cobalt/script/mozjs-45/mozjs_exception_state.cc
index c67a5fc..fdb1066 100644
--- a/src/cobalt/script/mozjs-45/mozjs_exception_state.cc
+++ b/src/cobalt/script/mozjs-45/mozjs_exception_state.cc
@@ -76,7 +76,7 @@
void MozjsExceptionState::SetSimpleExceptionVA(SimpleExceptionType type,
const char* format,
- va_list arguments) {
+ va_list & arguments) {
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
DCHECK(!is_exception_set_);
diff --git a/src/cobalt/script/mozjs-45/mozjs_exception_state.h b/src/cobalt/script/mozjs-45/mozjs_exception_state.h
index 2bf9ab1..6e5bd7c 100644
--- a/src/cobalt/script/mozjs-45/mozjs_exception_state.h
+++ b/src/cobalt/script/mozjs-45/mozjs_exception_state.h
@@ -32,7 +32,7 @@
// ExceptionState interface
void SetException(const scoped_refptr<ScriptException>& exception) override;
void SetSimpleExceptionVA(SimpleExceptionType type, const char* format,
- va_list arguments) override;
+ va_list & arguments) override;
bool is_exception_set() const { return is_exception_set_; }
diff --git a/src/cobalt/script/testing/mock_exception_state.h b/src/cobalt/script/testing/mock_exception_state.h
index ec12d38..d19c27b 100644
--- a/src/cobalt/script/testing/mock_exception_state.h
+++ b/src/cobalt/script/testing/mock_exception_state.h
@@ -28,7 +28,7 @@
public:
MOCK_METHOD1(SetException, void(const scoped_refptr<ScriptException>&));
MOCK_METHOD3(SetSimpleExceptionVA,
- void(SimpleExceptionType, const char*, va_list));
+ void(SimpleExceptionType, const char*, va_list &));
};
} // namespace testing
diff --git a/src/cobalt/script/v8c/v8c_exception_state.cc b/src/cobalt/script/v8c/v8c_exception_state.cc
index 9a65973..dc2c309 100644
--- a/src/cobalt/script/v8c/v8c_exception_state.cc
+++ b/src/cobalt/script/v8c/v8c_exception_state.cc
@@ -79,7 +79,7 @@
void V8cExceptionState::SetSimpleExceptionVA(SimpleExceptionType type,
const char* format,
- va_list arguments) {
+ va_list & arguments) {
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
DCHECK(!is_exception_set_);
diff --git a/src/cobalt/script/v8c/v8c_exception_state.h b/src/cobalt/script/v8c/v8c_exception_state.h
index f42093b..c00785f 100644
--- a/src/cobalt/script/v8c/v8c_exception_state.h
+++ b/src/cobalt/script/v8c/v8c_exception_state.h
@@ -38,7 +38,7 @@
// ExceptionState interface:
void SetException(const scoped_refptr<ScriptException>& exception) override;
void SetSimpleExceptionVA(SimpleExceptionType type, const char* format,
- va_list arguments) override;
+ va_list & arguments) override;
bool is_exception_set() const { return is_exception_set_; }
diff --git a/src/cobalt/site/deploy/app.yaml b/src/cobalt/site/deploy/app.yaml
index 4099777..d91cbd5 100644
--- a/src/cobalt/site/deploy/app.yaml
+++ b/src/cobalt/site/deploy/app.yaml
@@ -1,3 +1,4 @@
+service: staging
runtime: python27
api_version: 1
threadsafe: true
diff --git a/src/cobalt/site/docs/reference/starboard/configuration-public.md b/src/cobalt/site/docs/reference/starboard/configuration-public.md
index 3b30513..c40b059 100644
--- a/src/cobalt/site/docs/reference/starboard/configuration-public.md
+++ b/src/cobalt/site/docs/reference/starboard/configuration-public.md
@@ -71,8 +71,6 @@
| :--- |
| **`SB_HAS_QUIRK_SEEK_TO_KEYFRAME`**<br><br>After a seek is triggerred, the default behavior is to append video frames from the last key frame before the seek time and append audio frames from the seek time because usually all audio frames are key frames. On platforms that cannot decode video frames without displaying them, this will cause the video being played without audio for several seconds after seeking. When the following macro is defined, the app will append audio frames start from the timestamp that is before the timestamp of the video key frame being appended. This quirk has been deprecated in Starboard version 12 or later. Please see `configuration_public.md` for more details.<br><br>By default, this property is undefined. |
| **`SB_HAS_QUIRK_SUPPORT_INT16_AUDIO_SAMPLES`**<br><br>The implementation is allowed to support kSbMediaAudioSampleTypeInt16 only when this macro is defined.<br><br>By default, this property is undefined. |
-| **`SB_HAS_QUIRK_NO_FFS`**<br><br>dlmalloc will use the ffs intrinsic if available. Platforms on which this is not available should define the following quirk.<br><br>By default, this property is undefined. |
-
## Memory Configuration
@@ -110,5 +108,3 @@
| Properties |
| :--- |
| **`SB_HAS_TIME_THREAD_NOW`**<br><br>Whether this platform has an API to retrieve how long the current thread has spent in the executing state.<br><br>The default value in the Stub implementation is `1` |
-
-
diff --git a/src/cobalt/site/docs/reference/starboard/gyp-configuration.md b/src/cobalt/site/docs/reference/starboard/gyp-configuration.md
index 2793b5b..9c911a9 100644
--- a/src/cobalt/site/docs/reference/starboard/gyp-configuration.md
+++ b/src/cobalt/site/docs/reference/starboard/gyp-configuration.md
@@ -86,7 +86,6 @@
| **`render_dirty_region_only`**<br><br> Deprecated. Implement the CobaltExtensionConfigurationApi function CobaltRenderDirtyRegionOnly instead. If set to 1, will enable support for rendering only the regions of the display that are modified due to animations, instead of re-rendering the entire scene each frame. This feature can reduce startup time where usually there is a small loading spinner animating on the screen. On GLES renderers, Cobalt will attempt to implement this support by using eglSurfaceAttrib(..., EGL_SWAP_BEHAVIOR, EGL_BUFFER_PRESERVED), otherwise the dirty region will be silently disabled. On Blitter API platforms, if this is enabled, we explicitly create an extra offscreen full-size intermediate surface to render into. Note that some GLES driver implementations may internally allocate an extra full screen surface to support this feature, and many have been noticed to not properly support this functionality (but they report that they do), and for these reasons this value is defaulted to 0.<br><br>The default value is `-1`. |
| **`sb_api_version`**<br><br> The Starboard API version of the current build configuration. The default value is meant to be overridden by a Starboard ABI file.<br><br>The default value is `0`. |
| **`sb_deploy_output_dir`**<br><br> Top-level directory for staging deploy build output. Platform deploy actions should use <(target_deploy_dir) defined in deploy.gypi to place artifacts for each deploy target in its own subdirectoy.<br><br>The default value is `'<(sb_deploy_output_dir)'`. |
-| **`sb_disable_cpp14_audit`**<br><br> Disables an NPLB audit of C++14 support.<br><br>The default value is `0`. |
| **`sb_disable_microphone_idl`**<br><br> When this is set to true, the web bindings for the microphone are disabled<br><br>The default value is `0`. |
| **`sb_enable_benchmark`**<br><br> Used to enable benchmarks.<br><br>The default value is `0`. |
| **`sb_enable_lib`**<br><br> Enables embedding Cobalt as a shared library within another app. This requires a 'lib' starboard implementation for the corresponding platform.<br><br>The default value is `'<(sb_enable_lib)'`. |
diff --git a/src/cobalt/updater/configurator.cc b/src/cobalt/updater/configurator.cc
index c673065..925c06e 100644
--- a/src/cobalt/updater/configurator.cc
+++ b/src/cobalt/updater/configurator.cc
@@ -96,6 +96,9 @@
} else {
SetChannel(persisted_channel);
}
+ if (network_module != nullptr) {
+ user_agent_string_ = network_module->GetUserAgent();
+ }
}
Configurator::~Configurator() = default;
@@ -164,6 +167,11 @@
params.insert(
std::make_pair("model", GetDeviceProperty(kSbSystemPropertyModelName)));
+ // Original Design manufacturer name
+ params.insert(
+ std::make_pair("manufacturer",
+ GetDeviceProperty(kSbSystemPropertySystemIntegratorName)));
+
// Chipset model number
params.insert(std::make_pair(
"chipset", GetDeviceProperty(kSbSystemPropertyChipsetModelNumber)));
@@ -176,6 +184,9 @@
params.insert(
std::make_pair("year", GetDeviceProperty(kSbSystemPropertyModelYear)));
+ // User Agent String
+ params.insert(std::make_pair("uastring", user_agent_string_));
+
return params;
}
diff --git a/src/cobalt/updater/configurator.h b/src/cobalt/updater/configurator.h
index a4499bd..c6fa12a 100644
--- a/src/cobalt/updater/configurator.h
+++ b/src/cobalt/updater/configurator.h
@@ -103,6 +103,7 @@
base::Lock updater_status_lock_;
std::string previous_updater_status_;
base::Lock previous_updater_status_lock_;
+ std::string user_agent_string_;
DISALLOW_COPY_AND_ASSIGN(Configurator);
};
diff --git a/src/cobalt/updater/utils.cc b/src/cobalt/updater/utils.cc
index 9c23c0b..5baad0a 100644
--- a/src/cobalt/updater/utils.cc
+++ b/src/cobalt/updater/utils.cc
@@ -1,4 +1,4 @@
-// Copyright 2019 The Chromium Authors. All rights reserved.
+// Copyright 2021 The Cobalt Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -16,6 +16,7 @@
#include "cobalt/extension/installation_manager.h"
#include "components/update_client/utils.h"
#include "starboard/configuration_constants.h"
+#include "starboard/string.h"
#include "starboard/system.h"
#define PRODUCT_FULLNAME_STRING "cobalt_updater"
@@ -26,7 +27,7 @@
// The default manifest version to assume when the actual manifest cannot be
// parsed for any reason. This should not be used for installation manager
// errors, or any other error unrelated to parsing the manifest.
-const std::string kDefaultManifestVersion = "1.0.0";
+const char kDefaultManifestVersion[] = "1.0.0";
} // namespace
bool CreateProductDirectory(base::FilePath* path) {
@@ -92,40 +93,60 @@
return base::Version();
}
+const std::string GetLoadedInstallationEvergreenVersion() {
+ std::vector<char> system_path_content_dir(kSbFileMaxPath);
+ if (!SbSystemGetPath(kSbSystemPathContentDirectory,
+ system_path_content_dir.data(), kSbFileMaxPath)) {
+ SB_LOG(ERROR) << "Failed to get system path content directory";
+ return "";
+ }
+ // Get the parent directory of the system_path_content_dir, and read the
+ // manifest.json there
+ base::Version version = ReadEvergreenVersion(
+ base::FilePath(std::string(system_path_content_dir.begin(),
+ system_path_content_dir.end()))
+ .DirName());
+
+ if (!version.IsValid()) {
+ SB_LOG(ERROR) << "Failed to get the Evergreen version. Defaulting to "
+ << kDefaultManifestVersion << ".";
+ return std::string(kDefaultManifestVersion);
+ }
+ return version.GetString();
+}
+
const std::string GetCurrentEvergreenVersion() {
auto installation_manager =
static_cast<const CobaltExtensionInstallationManagerApi*>(
SbSystemGetExtension(kCobaltExtensionInstallationManagerName));
if (!installation_manager) {
- SB_LOG(ERROR) << "Failed to get installation manager extension.";
- return "";
+ SB_LOG(ERROR) << "Failed to get installation manager extension, getting "
+ "the Evergreen version of the loaded installation.";
+ return GetLoadedInstallationEvergreenVersion();
}
-
// Get the update version from the manifest file under the current
// installation path.
int index = installation_manager->GetCurrentInstallationIndex();
if (index == IM_EXT_ERROR) {
- SB_LOG(ERROR) << "Failed to get current installation index.";
- return "";
+ SB_LOG(ERROR) << "Failed to get current installation index, getting the "
+ "Evergreen version of the currently loaded installation.";
+ return GetLoadedInstallationEvergreenVersion();
}
std::vector<char> installation_path(kSbFileMaxPath);
if (installation_manager->GetInstallationPath(
index, installation_path.data(), kSbFileMaxPath) == IM_EXT_ERROR) {
- SB_LOG(ERROR) << "Failed to get installation path.";
- return "";
+ SB_LOG(ERROR) << "Failed to get installation path, getting the Evergreen "
+ "version of the currently loaded installation.";
+ return GetLoadedInstallationEvergreenVersion();
}
+
base::Version version = ReadEvergreenVersion(base::FilePath(
std::string(installation_path.begin(), installation_path.end())));
if (!version.IsValid()) {
- if (!index) {
- SB_LOG(ERROR) << "Failed to get the Evergreen version. Defaulting to "
- << kDefaultManifestVersion << ".";
- return kDefaultManifestVersion;
- }
-
- SB_LOG(ERROR) << "Failed to get the Evergreen version.";
- return "";
+ SB_LOG(ERROR) << "Failed to get the Evergreen version. Defaulting to "
+ << kDefaultManifestVersion << ".";
+ return std::string(kDefaultManifestVersion);
}
return version.GetString();
}
diff --git a/src/docker-compose.yml b/src/docker-compose.yml
index a0b8c66..492361a 100644
--- a/src/docker-compose.yml
+++ b/src/docker-compose.yml
@@ -108,7 +108,7 @@
linux-x64x11-clang-3-6-prebuilt:
<<: *common-definitions
<<: *build-volumes
- image: gcr.io/cobalt-buildbot-gcr/build-cobalt-linux-x64x11-clang-3-6:1.2
+ image: gcr.io/cobalt-tools/build-cobalt-linux-x64x11-clang-3-6:1.2
environment:
- PLATFORM=linux-x64x11-clang-3-6
- CONFIG=${CONFIG:-debug}
diff --git a/src/docker/docsite/Dockerfile b/src/docker/docsite/Dockerfile
index 7dbadc1..252515b 100644
--- a/src/docker/docsite/Dockerfile
+++ b/src/docker/docsite/Dockerfile
@@ -25,4 +25,4 @@
USER defaultuser
-CMD /code/third_party/repo-publishing-toolkit-local/preview-site.sh
+CMD /cobalt/third_party/repo-publishing-toolkit-local/preview-site.sh
diff --git a/src/docker/docsite/Gemfile b/src/docker/docsite/Gemfile
index 00b5556..f26eb4c 100644
--- a/src/docker/docsite/Gemfile
+++ b/src/docker/docsite/Gemfile
@@ -17,4 +17,5 @@
gem 'jekyll-feed', '0.3.1'
gem 'bourbon'
+gem 'i18n'
gem 'neat'
diff --git a/src/docker/docsite/README.md b/src/docker/docsite/README.md
index 506176c..06ea6fc 100644
--- a/src/docker/docsite/README.md
+++ b/src/docker/docsite/README.md
@@ -1,7 +1,22 @@
-# How It Works
-A Docker container will be launched that will update the cobalt.dev source files
-in the Cobalt repository specified by `$COBALT_SRC`, which must be set, and it
-will locally host the updated cobalt.dev on port `4000`.
+# How To Use
+A docker container will be launched that will update the cobalt.dev source files
+in the Cobalt repository specified by the environment variable `COBALT_SRC` or
+the current working directory, which should be the root of the Cobalt
+repository, if that environment variable is not set.
+
+When the `docsite` service is run, the container will then host the updated
+cobalt.dev site locally on port `4000`.
+
+When the `docsite-build-only` service is run, the container will build and
+output the site content in the directory `out/deploy/www` at the root of the
+Cobalt directory, and copy the app.yaml deployable into `out/deploy`.
+
+# How To Run
+docker-compose build --build-arg UID=$(id -u) --build-arg GID=$(id -g) SERVICE
+
+docker-compose up SERVICE
+
+# Notes
A separate docker-compose.yml was created due to the root docker-compose.yml
being unable to locate the Gemfile in the Docker build context.
@@ -11,7 +26,3 @@
`preview-site.sh`, which normally installs gems, run with elevated permissions
the resulting files added or modified would not be accessible to the user who
ran the Docker container.
-
-# How To Run
-docker-compose build --build-arg UID=$(id -u) --build-arg GID=$(id -g) docsite
-docker-compose up docsite
diff --git a/src/docker/docsite/docker-compose.yml b/src/docker/docsite/docker-compose.yml
index 381ee36..b8f4bba 100644
--- a/src/docker/docsite/docker-compose.yml
+++ b/src/docker/docsite/docker-compose.yml
@@ -5,7 +5,18 @@
build:
context: .
dockerfile: Dockerfile
+ container_name: docsite
ports:
- "4000:4000"
volumes:
- - ${COBALT_SRC:-.}:/code/
+ # We use ../../ when the environment variable COBALT_SRC is not set since
+ # this file is located two directories under the root of the repository.
+ - ${COBALT_SRC:-../../}:/cobalt/
+ docsite-build-only:
+ container_name: docsite-build-only
+ environment:
+ # SITE_DST specifies where the files required to deploy the site should be
+ # placed, and by default this is under the "out" directory.
+ - SITE_DST=${SITE_DST:-/cobalt/out/deploy/www}
+ extends:
+ service: docsite
diff --git a/src/docker/linux/android/Dockerfile b/src/docker/linux/android/Dockerfile
index fe82cef..5967e8a 100644
--- a/src/docker/linux/android/Dockerfile
+++ b/src/docker/linux/android/Dockerfile
@@ -18,17 +18,15 @@
RUN mkdir -p /root/.android
-CMD (test -f /root/.android/debug.keystore \
- && echo "Android debug keystore exists." \
- || (keytool -genkey -v \
- -keystore /root/.android/debug.keystore \
- -dname "cn=Android Docker, ou=YouTube, o=Google, c=US" \
- -storepass android \
- -alias androiddebugkey \
- -keypass android \
- -keyalg RSA \
- -keysize 2048 \
- -validity 10000 \
- && echo "Generated Android Debug keystore.")) \
- && /code/cobalt/build/gyp_cobalt -v -C ${CONFIG} ${PLATFORM} \
+RUN keytool -genkey -v \
+ -keystore /root/.android/debug.keystore \
+ -dname "cn=Android Docker, ou=YouTube, o=Google, c=US" \
+ -storepass android \
+ -alias androiddebugkey \
+ -keypass android \
+ -keyalg RSA \
+ -keysize 2048 \
+ -validity 10000
+
+CMD /code/cobalt/build/gyp_cobalt -v -C ${CONFIG} ${PLATFORM} \
&& ninja -v -j ${NINJA_PARALLEL} -C ${OUTDIR}/${PLATFORM}_${CONFIG} ${TARGET:-cobalt_deploy}
diff --git a/src/net/socket/tcp_socket_starboard.cc b/src/net/socket/tcp_socket_starboard.cc
index 3870684..76795d2 100644
--- a/src/net/socket/tcp_socket_starboard.cc
+++ b/src/net/socket/tcp_socket_starboard.cc
@@ -14,6 +14,9 @@
#include "net/socket/tcp_socket_starboard.h"
+#include <memory>
+#include <utility>
+
#include "base/callback_helpers.h"
#include "net/base/net_errors.h"
#include "net/base/network_activity_monitor.h"
@@ -326,8 +329,8 @@
peer_address_.reset(new IPEndPoint(address));
- bool success = SbSocketConnect(socket_, &storage);
- DCHECK_EQ(true, success);
+ SbSocketError result = SbSocketConnect(socket_, &storage);
+ DCHECK_NE(kSbSocketErrorFailed, result);
int rv = MapLastSocketError(socket_);
if (rv != ERR_IO_PENDING) {
diff --git a/src/precommit_hooks/check_bug_in_description_wrapper.py b/src/precommit_hooks/check_bug_in_description_wrapper.py
index 770c4f7..706a127 100644
--- a/src/precommit_hooks/check_bug_in_description_wrapper.py
+++ b/src/precommit_hooks/check_bug_in_description_wrapper.py
@@ -17,7 +17,7 @@
import os
import sys
try:
- from custom_hooks.check_bug_in_description import CheckForBugInCommitDescription
+ from internal.check_bug_in_description import CheckForBugInCommitDescription
except ImportError as e:
print(e)
sys.exit(0)
diff --git a/src/precommit_hooks/custom_hooks/check_copyright_year.py b/src/precommit_hooks/check_copyright_year.py
similarity index 100%
rename from src/precommit_hooks/custom_hooks/check_copyright_year.py
rename to src/precommit_hooks/check_copyright_year.py
diff --git a/src/precommit_hooks/gcheckstyle_wrapper.py b/src/precommit_hooks/gcheckstyle_wrapper.py
index def89b3..3d25352 100755
--- a/src/precommit_hooks/gcheckstyle_wrapper.py
+++ b/src/precommit_hooks/gcheckstyle_wrapper.py
@@ -18,7 +18,7 @@
import sys
try:
- from internal_tools_paths import checkstyle_path
+ from internal.internal_tools_paths import checkstyle_path
except ImportError:
checkstyle_path = None
diff --git a/src/precommit_hooks/custom_hooks/warn_that_starboard_interface_changed_wrapper.py b/src/precommit_hooks/internal_file_check_wrapper.py
similarity index 64%
copy from src/precommit_hooks/custom_hooks/warn_that_starboard_interface_changed_wrapper.py
copy to src/precommit_hooks/internal_file_check_wrapper.py
index 3334728..2ad2951 100644
--- a/src/precommit_hooks/custom_hooks/warn_that_starboard_interface_changed_wrapper.py
+++ b/src/precommit_hooks/internal_file_check_wrapper.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
-# Copyright 2020 The Cobalt Authors. All Rights Reserved.
+# Copyright 2021 The Cobalt Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,14 +12,14 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-"""Gives information on what to do when users change a starboard interface."""
+"""Wrapper for internal_file_check.py."""
import sys
try:
- from warn_that_starboard_interface_changed import WarnThatStarboardInterfaceChanged
+ from internal.internal_file_check import CheckFiles
except ImportError:
- print('warn_that_starboard_interface_changed.py not found, skipping.')
+ print('internal_file_check.py not found, skipping')
sys.exit(0)
if __name__ == '__main__':
- sys.exit(WarnThatStarboardInterfaceChanged())
+ sys.exit(CheckFiles(sys.argv[1:]))
diff --git a/src/starboard/linux/x64x11/gczeal/starboard_platform_tests.gyp b/src/precommit_hooks/osslint_wrapper.py
similarity index 63%
rename from src/starboard/linux/x64x11/gczeal/starboard_platform_tests.gyp
rename to src/precommit_hooks/osslint_wrapper.py
index 0ea8622..bd8b6f1 100644
--- a/src/starboard/linux/x64x11/gczeal/starboard_platform_tests.gyp
+++ b/src/precommit_hooks/osslint_wrapper.py
@@ -1,4 +1,5 @@
-# Copyright 2018 The Cobalt Authors. All Rights Reserved.
+#!/usr/bin/env python3
+# Copyright 2021 The Cobalt Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -11,8 +12,14 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-{
- 'includes': [
- '<(DEPTH)/starboard/linux/shared/starboard_platform_tests.gypi',
- ],
-}
+"""Wrapper to run osslint.py."""
+
+import sys
+try:
+ from internal.osslint import RunPrecommitCheck
+except ImportError as e:
+ print(e)
+ sys.exit(0)
+
+if __name__ == '__main__':
+ sys.exit(RunPrecommitCheck(sys.argv[1:]))
diff --git a/src/precommit_hooks/custom_hooks/run_python2_unittests.py b/src/precommit_hooks/run_python2_unittests.py
similarity index 100%
rename from src/precommit_hooks/custom_hooks/run_python2_unittests.py
rename to src/precommit_hooks/run_python2_unittests.py
diff --git a/src/precommit_hooks/sync_keyboxes_wrapper.py b/src/precommit_hooks/sync_keyboxes_wrapper.py
index 0e21be1..002c012 100755
--- a/src/precommit_hooks/sync_keyboxes_wrapper.py
+++ b/src/precommit_hooks/sync_keyboxes_wrapper.py
@@ -18,7 +18,7 @@
import sys
try:
- import sync_keyboxes
+ import internal.sync_keyboxes as sync_keyboxes
except ImportError:
print('sync_keyboxes.py not found, skipping.')
sys.exit(0)
diff --git a/src/precommit_hooks/custom_hooks/warn_that_starboard_interface_changed_wrapper.py b/src/precommit_hooks/warn_that_starboard_interface_changed_wrapper.py
similarity index 90%
rename from src/precommit_hooks/custom_hooks/warn_that_starboard_interface_changed_wrapper.py
rename to src/precommit_hooks/warn_that_starboard_interface_changed_wrapper.py
index 3334728..0e39fd7 100644
--- a/src/precommit_hooks/custom_hooks/warn_that_starboard_interface_changed_wrapper.py
+++ b/src/precommit_hooks/warn_that_starboard_interface_changed_wrapper.py
@@ -16,7 +16,7 @@
import sys
try:
- from warn_that_starboard_interface_changed import WarnThatStarboardInterfaceChanged
+ from internal.warn_that_starboard_interface_changed import WarnThatStarboardInterfaceChanged
except ImportError:
print('warn_that_starboard_interface_changed.py not found, skipping.')
sys.exit(0)
diff --git a/src/starboard/android/apk/app/src/main/java/dev/cobalt/coat/CobaltActivity.java b/src/starboard/android/apk/app/src/main/java/dev/cobalt/coat/CobaltActivity.java
index a72b743..22f7e05 100644
--- a/src/starboard/android/apk/app/src/main/java/dev/cobalt/coat/CobaltActivity.java
+++ b/src/starboard/android/apk/app/src/main/java/dev/cobalt/coat/CobaltActivity.java
@@ -17,12 +17,10 @@
import static dev.cobalt.util.Log.TAG;
import android.app.NativeActivity;
-import android.content.ComponentCallbacks;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.res.Configuration;
import android.media.AudioManager;
import android.net.Uri;
import android.os.Bundle;
@@ -40,7 +38,7 @@
import java.util.List;
/** Native activity that has the required JNI methods called by the Starboard implementation. */
-public abstract class CobaltActivity extends NativeActivity implements ComponentCallbacks {
+public abstract class CobaltActivity extends NativeActivity {
// A place to put args while debugging so they're used even when starting from the launcher.
// This should always be empty in submitted code.
@@ -340,9 +338,7 @@
@Override
public void onLowMemory() {
+ super.onLowMemory();
nativeLowMemoryEvent();
}
-
- @Override
- public void onConfigurationChanged(Configuration newConfig) {}
}
diff --git a/src/starboard/android/apk/app/src/main/java/dev/cobalt/media/MediaCodecBridge.java b/src/starboard/android/apk/app/src/main/java/dev/cobalt/media/MediaCodecBridge.java
index 4de534c..3bc2c7a 100644
--- a/src/starboard/android/apk/app/src/main/java/dev/cobalt/media/MediaCodecBridge.java
+++ b/src/starboard/android/apk/app/src/main/java/dev/cobalt/media/MediaCodecBridge.java
@@ -33,7 +33,6 @@
import dev.cobalt.util.Log;
import dev.cobalt.util.UsedByNative;
import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
/** A wrapper of the MediaCodec class. */
@SuppressWarnings("unused")
@@ -366,8 +365,8 @@
// This logic is inspired by
// https://github.com/google/ExoPlayer/blob/deb9b301b2c7ef66fdd7d8a3e58298a79ba9c619/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java#L1803.
byte[] hdrStaticInfoData = new byte[25];
- ByteBuffer hdrStaticInfo = ByteBuffer.wrap(hdrStaticInfoData).order(ByteOrder.LITTLE_ENDIAN);
- ;
+ ByteBuffer hdrStaticInfo = ByteBuffer.wrap(hdrStaticInfoData);
+
hdrStaticInfo.put((byte) 0);
hdrStaticInfo.putShort((short) ((primaryRChromaticityX * MAX_CHROMATICITY) + 0.5f));
hdrStaticInfo.putShort((short) ((primaryRChromaticityY * MAX_CHROMATICITY) + 0.5f));
diff --git a/src/starboard/evergreen/shared/gyp_configuration.gypi b/src/starboard/evergreen/shared/gyp_configuration.gypi
index 40f4071..3074756 100644
--- a/src/starboard/evergreen/shared/gyp_configuration.gypi
+++ b/src/starboard/evergreen/shared/gyp_configuration.gypi
@@ -33,13 +33,6 @@
'final_executable_type': 'shared_library',
'gtest_target_type': 'shared_library',
-
- # Using an inner scope for 'variables' so that it can be made a default
- # (and so overridden elsewhere), but yet still used immediately in this
- # file.
- 'variables': {
- 'use_dlmalloc_allocator%': 0,
- },
},
'target_defaults': {
'defines' : [
diff --git a/src/starboard/linux/shared/gyp_configuration.gypi b/src/starboard/linux/shared/gyp_configuration.gypi
index cafbc99..9a886c7 100644
--- a/src/starboard/linux/shared/gyp_configuration.gypi
+++ b/src/starboard/linux/shared/gyp_configuration.gypi
@@ -34,12 +34,6 @@
'-lrt',
],
- # Using an inner scope for 'variables' so that it can be made a default
- # (and so overridden elsewhere), but yet still used immediately in this
- # file.
- 'variables': {
- 'use_dlmalloc_allocator%': 0,
- },
'conditions': [
['sb_evergreen != 1', {
# TODO: allow starboard_platform to use system libc/libc++ in the
diff --git a/src/starboard/linux/shared/starboard_platform.gypi b/src/starboard/linux/shared/starboard_platform.gypi
index d15ec8e..85eac8e 100644
--- a/src/starboard/linux/shared/starboard_platform.gypi
+++ b/src/starboard/linux/shared/starboard_platform.gypi
@@ -25,10 +25,10 @@
'<@(filter_based_player_sources)',
'<(DEPTH)/starboard/linux/shared/atomic_public.h',
'<(DEPTH)/starboard/linux/shared/audio_sink_type_dispatcher.cc',
+ '<(DEPTH)/starboard/linux/shared/configuration_constants.cc',
+ '<(DEPTH)/starboard/linux/shared/configuration_public.h',
'<(DEPTH)/starboard/linux/shared/configuration.cc',
'<(DEPTH)/starboard/linux/shared/configuration.h',
- '<(DEPTH)/starboard/linux/shared/configuration_public.h',
- '<(DEPTH)/starboard/linux/shared/configuration_constants.cc',
'<(DEPTH)/starboard/linux/shared/decode_target_get_info.cc',
'<(DEPTH)/starboard/linux/shared/decode_target_internal.cc',
'<(DEPTH)/starboard/linux/shared/decode_target_internal.h',
@@ -66,18 +66,21 @@
'<(DEPTH)/starboard/shared/iso/double_floor.cc',
'<(DEPTH)/starboard/shared/iso/double_is_finite.cc',
'<(DEPTH)/starboard/shared/iso/double_is_nan.cc',
+ '<(DEPTH)/starboard/shared/iso/memory_allocate_unchecked.cc',
'<(DEPTH)/starboard/shared/iso/memory_compare.cc',
'<(DEPTH)/starboard/shared/iso/memory_copy.cc',
'<(DEPTH)/starboard/shared/iso/memory_find_byte.cc',
+ '<(DEPTH)/starboard/shared/iso/memory_free.cc',
'<(DEPTH)/starboard/shared/iso/memory_move.cc',
+ '<(DEPTH)/starboard/shared/iso/memory_reallocate_unchecked.cc',
'<(DEPTH)/starboard/shared/iso/memory_set.cc',
- '<(DEPTH)/starboard/shared/iso/string_compare.cc',
'<(DEPTH)/starboard/shared/iso/string_compare_all.cc',
+ '<(DEPTH)/starboard/shared/iso/string_compare.cc',
'<(DEPTH)/starboard/shared/iso/string_find_character.cc',
'<(DEPTH)/starboard/shared/iso/string_find_last_character.cc',
'<(DEPTH)/starboard/shared/iso/string_find_string.cc',
- '<(DEPTH)/starboard/shared/iso/string_get_length.cc',
'<(DEPTH)/starboard/shared/iso/string_get_length_wide.cc',
+ '<(DEPTH)/starboard/shared/iso/string_get_length.cc',
'<(DEPTH)/starboard/shared/iso/string_parse_double.cc',
'<(DEPTH)/starboard/shared/iso/string_parse_signed_integer.cc',
'<(DEPTH)/starboard/shared/iso/string_parse_uint64.cc',
@@ -96,12 +99,13 @@
'<(DEPTH)/starboard/shared/libevent/socket_waiter_destroy.cc',
'<(DEPTH)/starboard/shared/libevent/socket_waiter_internal.cc',
'<(DEPTH)/starboard/shared/libevent/socket_waiter_remove.cc',
- '<(DEPTH)/starboard/shared/libevent/socket_waiter_wait.cc',
'<(DEPTH)/starboard/shared/libevent/socket_waiter_wait_timed.cc',
+ '<(DEPTH)/starboard/shared/libevent/socket_waiter_wait.cc',
'<(DEPTH)/starboard/shared/libevent/socket_waiter_wake_up.cc',
'<(DEPTH)/starboard/shared/libvpx/vpx_video_decoder.cc',
'<(DEPTH)/starboard/shared/libvpx/vpx_video_decoder.h',
'<(DEPTH)/starboard/shared/linux/byte_swap.cc',
+ '<(DEPTH)/starboard/shared/linux/cpu_features_get.cc',
'<(DEPTH)/starboard/shared/linux/dev_input/dev_input.cc',
'<(DEPTH)/starboard/shared/linux/dev_input/dev_input.h',
'<(DEPTH)/starboard/shared/linux/get_home_directory.cc',
@@ -111,6 +115,7 @@
'<(DEPTH)/starboard/shared/linux/system_get_random_data.cc',
'<(DEPTH)/starboard/shared/linux/system_get_stack.cc',
'<(DEPTH)/starboard/shared/linux/system_get_total_cpu_memory.cc',
+ '<(DEPTH)/starboard/shared/linux/system_get_used_cpu_memory.cc',
'<(DEPTH)/starboard/shared/linux/system_is_debugger_attached.cc',
'<(DEPTH)/starboard/shared/linux/system_symbolize.cc',
'<(DEPTH)/starboard/shared/linux/thread_get_id.cc',
@@ -136,12 +141,14 @@
'<(DEPTH)/starboard/shared/posix/file_seek.cc',
'<(DEPTH)/starboard/shared/posix/file_truncate.cc',
'<(DEPTH)/starboard/shared/posix/file_write.cc',
- '<(DEPTH)/starboard/shared/posix/log.cc',
'<(DEPTH)/starboard/shared/posix/log_flush.cc',
'<(DEPTH)/starboard/shared/posix/log_format.cc',
'<(DEPTH)/starboard/shared/posix/log_is_tty.cc',
'<(DEPTH)/starboard/shared/posix/log_raw.cc',
+ '<(DEPTH)/starboard/shared/posix/log.cc',
+ '<(DEPTH)/starboard/shared/posix/memory_allocate_aligned_unchecked.cc',
'<(DEPTH)/starboard/shared/posix/memory_flush.cc',
+ '<(DEPTH)/starboard/shared/posix/memory_free_aligned.cc',
'<(DEPTH)/starboard/shared/posix/set_non_blocking_internal.cc',
'<(DEPTH)/starboard/shared/posix/socket_accept.cc',
'<(DEPTH)/starboard/shared/posix/socket_bind.cc',
@@ -153,8 +160,8 @@
'<(DEPTH)/starboard/shared/posix/socket_get_last_error.cc',
'<(DEPTH)/starboard/shared/posix/socket_get_local_address.cc',
'<(DEPTH)/starboard/shared/posix/socket_internal.cc',
- '<(DEPTH)/starboard/shared/posix/socket_is_connected.cc',
'<(DEPTH)/starboard/shared/posix/socket_is_connected_and_idle.cc',
+ '<(DEPTH)/starboard/shared/posix/socket_is_connected.cc',
'<(DEPTH)/starboard/shared/posix/socket_is_ipv6_supported.cc',
'<(DEPTH)/starboard/shared/posix/socket_join_multicast_group.cc',
'<(DEPTH)/starboard/shared/posix/socket_listen.cc',
@@ -169,11 +176,11 @@
'<(DEPTH)/starboard/shared/posix/socket_set_tcp_no_delay.cc',
'<(DEPTH)/starboard/shared/posix/socket_set_tcp_window_scaling.cc',
'<(DEPTH)/starboard/shared/posix/storage_write_record.cc',
- '<(DEPTH)/starboard/shared/posix/string_compare_no_case.cc',
'<(DEPTH)/starboard/shared/posix/string_compare_no_case_n.cc',
+ '<(DEPTH)/starboard/shared/posix/string_compare_no_case.cc',
'<(DEPTH)/starboard/shared/posix/string_compare_wide.cc',
- '<(DEPTH)/starboard/shared/posix/string_format.cc',
'<(DEPTH)/starboard/shared/posix/string_format_wide.cc',
+ '<(DEPTH)/starboard/shared/posix/string_format.cc',
'<(DEPTH)/starboard/shared/posix/system_break_into_debugger.cc',
'<(DEPTH)/starboard/shared/posix/system_clear_last_error.cc',
'<(DEPTH)/starboard/shared/posix/system_get_error_string.cc',
@@ -191,10 +198,10 @@
'<(DEPTH)/starboard/shared/pthread/condition_variable_create.cc',
'<(DEPTH)/starboard/shared/pthread/condition_variable_destroy.cc',
'<(DEPTH)/starboard/shared/pthread/condition_variable_signal.cc',
- '<(DEPTH)/starboard/shared/pthread/condition_variable_wait.cc',
'<(DEPTH)/starboard/shared/pthread/condition_variable_wait_timed.cc',
- '<(DEPTH)/starboard/shared/pthread/mutex_acquire.cc',
+ '<(DEPTH)/starboard/shared/pthread/condition_variable_wait.cc',
'<(DEPTH)/starboard/shared/pthread/mutex_acquire_try.cc',
+ '<(DEPTH)/starboard/shared/pthread/mutex_acquire.cc',
'<(DEPTH)/starboard/shared/pthread/mutex_create.cc',
'<(DEPTH)/starboard/shared/pthread/mutex_destroy.cc',
'<(DEPTH)/starboard/shared/pthread/mutex_release.cc',
@@ -202,9 +209,9 @@
'<(DEPTH)/starboard/shared/pthread/thread_context_get_pointer.cc',
'<(DEPTH)/starboard/shared/pthread/thread_context_internal.cc',
'<(DEPTH)/starboard/shared/pthread/thread_context_internal.h',
- '<(DEPTH)/starboard/shared/pthread/thread_create.cc',
'<(DEPTH)/starboard/shared/pthread/thread_create_local_key.cc',
'<(DEPTH)/starboard/shared/pthread/thread_create_priority.h',
+ '<(DEPTH)/starboard/shared/pthread/thread_create.cc',
'<(DEPTH)/starboard/shared/pthread/thread_destroy_local_key.cc',
'<(DEPTH)/starboard/shared/pthread/thread_detach.cc',
'<(DEPTH)/starboard/shared/pthread/thread_get_current.cc',
@@ -224,8 +231,8 @@
'<(DEPTH)/starboard/shared/pulse/pulse_audio_sink_type.h',
'<(DEPTH)/starboard/shared/pulse/pulse_dynamic_load_dispatcher.cc',
'<(DEPTH)/starboard/shared/pulse/pulse_dynamic_load_dispatcher.h',
- '<(DEPTH)/starboard/shared/signal/crash_signals.h',
'<(DEPTH)/starboard/shared/signal/crash_signals_sigaction.cc',
+ '<(DEPTH)/starboard/shared/signal/crash_signals.h',
'<(DEPTH)/starboard/shared/signal/suspend_signals.cc',
'<(DEPTH)/starboard/shared/signal/suspend_signals.h',
'<(DEPTH)/starboard/shared/signal/system_request_conceal.cc',
@@ -285,10 +292,10 @@
'<(DEPTH)/starboard/shared/starboard/new.cc',
'<(DEPTH)/starboard/shared/starboard/player/player_output_mode_supported.cc',
'<(DEPTH)/starboard/shared/starboard/queue_application.cc',
- '<(DEPTH)/starboard/shared/starboard/string_concat.cc',
'<(DEPTH)/starboard/shared/starboard/string_concat_wide.cc',
- '<(DEPTH)/starboard/shared/starboard/string_copy.cc',
+ '<(DEPTH)/starboard/shared/starboard/string_concat.cc',
'<(DEPTH)/starboard/shared/starboard/string_copy_wide.cc',
+ '<(DEPTH)/starboard/shared/starboard/string_copy.cc',
'<(DEPTH)/starboard/shared/starboard/string_duplicate.cc',
'<(DEPTH)/starboard/shared/starboard/system_get_random_uint64.cc',
'<(DEPTH)/starboard/shared/starboard/system_request_blur.cc',
@@ -303,7 +310,6 @@
'<(DEPTH)/starboard/shared/stub/accessibility_get_display_settings.cc',
'<(DEPTH)/starboard/shared/stub/accessibility_get_text_to_speech_settings.cc',
'<(DEPTH)/starboard/shared/stub/accessibility_set_captions_enabled.cc',
- '<(DEPTH)/starboard/shared/linux/cpu_features_get.cc',
'<(DEPTH)/starboard/shared/stub/cryptography_create_transformer.cc',
'<(DEPTH)/starboard/shared/stub/cryptography_destroy_transformer.cc',
'<(DEPTH)/starboard/shared/stub/cryptography_get_tag.cc',
@@ -349,6 +355,7 @@
'<(DEPTH)/starboard/shared/stub/window_set_on_screen_keyboard_keep_focus.cc',
'<(DEPTH)/starboard/shared/stub/window_show_on_screen_keyboard.cc',
'<(DEPTH)/starboard/shared/stub/window_update_on_screen_keyboard_suggestions.cc',
+
],
'starboard_platform_dependencies': [
'<(DEPTH)/starboard/common/common.gyp:common',
@@ -358,31 +365,11 @@
'<(DEPTH)/starboard/shared/starboard/player/player.gyp:player',
'<(DEPTH)/third_party/boringssl/boringssl.gyp:crypto',
'<(DEPTH)/third_party/de265_includes/de265_includes.gyp:de265',
- '<(DEPTH)/third_party/dlmalloc/dlmalloc.gyp:dlmalloc',
'<(DEPTH)/third_party/libevent/libevent.gyp:libevent',
'<(DEPTH)/third_party/opus/opus.gyp:opus',
'<(DEPTH)/third_party/pulseaudio_includes/pulseaudio_includes.gyp:pulseaudio',
],
'conditions': [
- ['use_dlmalloc_allocator==1', {
- 'starboard_platform_sources': [
- '<(DEPTH)/starboard/shared/dlmalloc/memory_allocate_aligned_unchecked.cc',
- '<(DEPTH)/starboard/shared/dlmalloc/memory_allocate_unchecked.cc',
- '<(DEPTH)/starboard/shared/dlmalloc/memory_free.cc',
- '<(DEPTH)/starboard/shared/dlmalloc/memory_free_aligned.cc',
- '<(DEPTH)/starboard/shared/dlmalloc/memory_reallocate_unchecked.cc',
- '<(DEPTH)/starboard/shared/linux/system_get_used_cpu_memory.cc',
- ],
- }, {
- 'starboard_platform_sources': [
- '<(DEPTH)/starboard/shared/iso/memory_allocate_unchecked.cc',
- '<(DEPTH)/starboard/shared/iso/memory_free.cc',
- '<(DEPTH)/starboard/shared/iso/memory_reallocate_unchecked.cc',
- '<(DEPTH)/starboard/shared/linux/system_get_used_cpu_memory.cc',
- '<(DEPTH)/starboard/shared/posix/memory_allocate_aligned_unchecked.cc',
- '<(DEPTH)/starboard/shared/posix/memory_free_aligned.cc',
- ],
- }],
['has_cdm==1', {
'starboard_platform_dependencies': [
'<(DEPTH)/starboard/shared/widevine/widevine3.gyp:oemcrypto',
diff --git a/src/starboard/linux/x64x11/clang/3.6/gyp_configuration.gypi b/src/starboard/linux/x64x11/clang/3.6/gyp_configuration.gypi
index 03c533b..bf3d7f0 100644
--- a/src/starboard/linux/x64x11/clang/3.6/gyp_configuration.gypi
+++ b/src/starboard/linux/x64x11/clang/3.6/gyp_configuration.gypi
@@ -15,10 +15,6 @@
{
'variables': {
'sb_target_platform': 'linux-x64x11-clang-3-6',
- 'linker_flags!': [
- '-Wl,--wrap=malloc',
- '-Wl,--wrap=free',
- ],
'cobalt_v8_emit_builtins_as_inline_asm': 0,
},
diff --git a/src/starboard/linux/x64x11/dlmalloc/atomic_public.h b/src/starboard/linux/x64x11/dlmalloc/atomic_public.h
deleted file mode 100644
index 0d5b249..0000000
--- a/src/starboard/linux/x64x11/dlmalloc/atomic_public.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2019 The Cobalt Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef STARBOARD_LINUX_X64X11_DLMALLOC_ATOMIC_PUBLIC_H_
-#define STARBOARD_LINUX_X64X11_DLMALLOC_ATOMIC_PUBLIC_H_
-
-#include "starboard/linux/shared/atomic_public.h"
-
-#endif // STARBOARD_LINUX_X64X11_DLMALLOC_ATOMIC_PUBLIC_H_
diff --git a/src/starboard/linux/x64x11/dlmalloc/configuration_public.h b/src/starboard/linux/x64x11/dlmalloc/configuration_public.h
deleted file mode 100644
index 0b81e15..0000000
--- a/src/starboard/linux/x64x11/dlmalloc/configuration_public.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2019 The Cobalt Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef STARBOARD_LINUX_X64X11_DLMALLOC_CONFIGURATION_PUBLIC_H_
-#define STARBOARD_LINUX_X64X11_DLMALLOC_CONFIGURATION_PUBLIC_H_
-
-// Include the X64X11 Linux configuration.
-#include "starboard/linux/x64x11/configuration_public.h"
-
-#endif // STARBOARD_LINUX_X64X11_DLMALLOC_CONFIGURATION_PUBLIC_H_
diff --git a/src/starboard/linux/x64x11/dlmalloc/gyp_configuration.gypi b/src/starboard/linux/x64x11/dlmalloc/gyp_configuration.gypi
deleted file mode 100644
index bd7aa50..0000000
--- a/src/starboard/linux/x64x11/dlmalloc/gyp_configuration.gypi
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2019 The Cobalt Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-{
- 'target_defaults': {
- 'default_configuration': 'linux-x64x11-dlmalloc_debug',
- 'configurations': {
- 'linux-x64x11-dlmalloc_debug': {
- 'inherit_from': ['debug_base'],
- },
- 'linux-x64x11-dlmalloc_devel': {
- 'inherit_from': ['devel_base'],
- },
- 'linux-x64x11-dlmalloc_qa': {
- 'inherit_from': ['qa_base'],
- },
- 'linux-x64x11-dlmalloc_gold': {
- 'inherit_from': ['gold_base'],
- },
- }, # end of configurations
- },
-
- 'includes': [
- '../gyp_configuration.gypi',
- ],
-
- 'variables': {
- 'use_dlmalloc_allocator': 1,
-
- 'linker_flags': [
- # We want to see all the places using malloc(), free(), etc.
- '-Wl,-error-limit=0',
- ],
- },
-}
diff --git a/src/starboard/linux/x64x11/dlmalloc/gyp_configuration.py b/src/starboard/linux/x64x11/dlmalloc/gyp_configuration.py
deleted file mode 100644
index 488666a..0000000
--- a/src/starboard/linux/x64x11/dlmalloc/gyp_configuration.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2019 The Cobalt Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-"""Starboard Linux X64 X11 dlmalloc platform configuration."""
-
-from starboard.linux.x64x11 import gyp_configuration as linux_configuration
-
-
-class LinuxX64X11DlmallocConfiguration(
- linux_configuration.LinuxX64X11Configuration):
- """Starboard Linux X64 X11 dlmalloc platform configuration."""
-
- def GetVariables(self, config_name):
- variables = super(LinuxX64X11DlmallocConfiguration,
- self).GetVariables(config_name)
- variables.update({
- 'use_asan': 0,
- })
- return variables
-
-
-def CreatePlatformConfig():
- return LinuxX64X11DlmallocConfiguration(
- 'linux-x64x11-dlmalloc',
- sabi_json_path='starboard/sabi/x64/sysv/sabi-v{sb_api_version}.json')
diff --git a/src/starboard/linux/x64x11/dlmalloc/starboard_platform.gyp b/src/starboard/linux/x64x11/dlmalloc/starboard_platform.gyp
deleted file mode 100644
index 760e06b..0000000
--- a/src/starboard/linux/x64x11/dlmalloc/starboard_platform.gyp
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2019 The Cobalt Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-{
- 'includes': [
- '../shared/starboard_platform_target.gypi',
- ],
-}
diff --git a/src/starboard/linux/x64x11/dlmalloc/starboard_platform_tests.gyp b/src/starboard/linux/x64x11/dlmalloc/starboard_platform_tests.gyp
deleted file mode 100644
index 74835fe..0000000
--- a/src/starboard/linux/x64x11/dlmalloc/starboard_platform_tests.gyp
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2019 The Cobalt Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-{
- 'includes': [
- '<(DEPTH)/starboard/linux/shared/starboard_platform_tests.gypi',
- ],
-}
diff --git a/src/starboard/linux/x64x11/dlmalloc/thread_types_public.h b/src/starboard/linux/x64x11/dlmalloc/thread_types_public.h
deleted file mode 100644
index a780cfd..0000000
--- a/src/starboard/linux/x64x11/dlmalloc/thread_types_public.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2019 The Cobalt Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef STARBOARD_LINUX_X64X11_DLMALLOC_THREAD_TYPES_PUBLIC_H_
-#define STARBOARD_LINUX_X64X11_DLMALLOC_THREAD_TYPES_PUBLIC_H_
-
-#include "starboard/linux/shared/thread_types_public.h"
-
-#endif // STARBOARD_LINUX_X64X11_DLMALLOC_THREAD_TYPES_PUBLIC_H_
diff --git a/src/starboard/linux/x64x11/gczeal/atomic_public.h b/src/starboard/linux/x64x11/gczeal/atomic_public.h
deleted file mode 100644
index 69fc779..0000000
--- a/src/starboard/linux/x64x11/gczeal/atomic_public.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2017 The Cobalt Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef STARBOARD_LINUX_X64X11_GCZEAL_ATOMIC_PUBLIC_H_
-#define STARBOARD_LINUX_X64X11_GCZEAL_ATOMIC_PUBLIC_H_
-
-#include "starboard/linux/shared/atomic_public.h"
-
-#endif // STARBOARD_LINUX_X64X11_GCZEAL_ATOMIC_PUBLIC_H_
diff --git a/src/starboard/linux/x64x11/gczeal/configuration.cc b/src/starboard/linux/x64x11/gczeal/configuration.cc
deleted file mode 100644
index 5a88df1..0000000
--- a/src/starboard/linux/x64x11/gczeal/configuration.cc
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2020 The Cobalt Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "starboard/linux/x64x11/gczeal/configuration.h"
-
-#include "cobalt/extension/configuration.h"
-#include "starboard/common/configuration_defaults.h"
-
-// Omit namespace linux due to symbol name conflict.
-namespace starboard {
-namespace x64x11 {
-namespace gczeal {
-
-namespace {
-
-int CobaltEglSwapInterval() {
- // This platform uses a compositor to present the rendering output, so
- // set the swap interval to update the buffer immediately. That buffer
- // will then be presented by the compositor on its own time.
- return 0;
-}
-
-bool CobaltGcZeal() {
- // Enable zealous garbage collection.
- return true;
-}
-
-const CobaltExtensionConfigurationApi kConfigurationApi = {
- kCobaltExtensionConfigurationName,
- 2,
- &common::CobaltUserOnExitStrategyDefault,
- &common::CobaltRenderDirtyRegionOnlyDefault,
- &CobaltEglSwapInterval,
- &common::CobaltFallbackSplashScreenUrlDefault,
- &common::CobaltEnableQuicDefault,
- &common::CobaltSkiaCacheSizeInBytesDefault,
- &common::CobaltOffscreenTargetCacheSizeInBytesDefault,
- &common::CobaltEncodedImageCacheSizeInBytesDefault,
- &common::CobaltImageCacheSizeInBytesDefault,
- &common::CobaltLocalTypefaceCacheSizeInBytesDefault,
- &common::CobaltRemoteTypefaceCacheSizeInBytesDefault,
- &common::CobaltMeshCacheSizeInBytesDefault,
- &common::CobaltSoftwareSurfaceCacheSizeInBytesDefault,
- &common::CobaltImageCacheCapacityMultiplierWhenPlayingVideoDefault,
- &common::CobaltSkiaGlyphAtlasWidthDefault,
- &common::CobaltSkiaGlyphAtlasHeightDefault,
- &common::CobaltJsGarbageCollectionThresholdInBytesDefault,
- &common::CobaltReduceCpuMemoryByDefault,
- &common::CobaltReduceGpuMemoryByDefault,
- &CobaltGcZeal,
- &common::CobaltRasterizerTypeDefault,
- &common::CobaltEnableJitDefault,
- &common::CobaltFallbackSplashScreenTopicsDefault,
-};
-
-} // namespace
-
-const void* GetConfigurationApi() {
- return &kConfigurationApi;
-}
-
-} // namespace gczeal
-} // namespace x64x11
-} // namespace starboard
diff --git a/src/starboard/linux/x64x11/gczeal/configuration.h b/src/starboard/linux/x64x11/gczeal/configuration.h
deleted file mode 100644
index 5248102..0000000
--- a/src/starboard/linux/x64x11/gczeal/configuration.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2020 The Cobalt Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef STARBOARD_LINUX_X64X11_GCZEAL_CONFIGURATION_H_
-#define STARBOARD_LINUX_X64X11_GCZEAL_CONFIGURATION_H_
-
-// Omit namespace linux due to symbol name conflict.
-namespace starboard {
-namespace x64x11 {
-namespace gczeal {
-
-const void* GetConfigurationApi();
-
-} // namespace gczeal
-} // namespace x64x11
-} // namespace starboard
-
-#endif // STARBOARD_LINUX_X64X11_GCZEAL_CONFIGURATION_H_
diff --git a/src/starboard/linux/x64x11/gczeal/configuration_public.h b/src/starboard/linux/x64x11/gczeal/configuration_public.h
deleted file mode 100644
index d152b96..0000000
--- a/src/starboard/linux/x64x11/gczeal/configuration_public.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2017 The Cobalt Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// The Starboard configuration for Desktop X86 Linux configured for the future
-// starboard API.
-
-#ifndef STARBOARD_LINUX_X64X11_GCZEAL_CONFIGURATION_PUBLIC_H_
-#define STARBOARD_LINUX_X64X11_GCZEAL_CONFIGURATION_PUBLIC_H_
-
-// Include the X64X11 Linux configuration.
-#include "starboard/linux/x64x11/configuration_public.h"
-
-#endif // STARBOARD_LINUX_X64X11_GCZEAL_CONFIGURATION_PUBLIC_H_
diff --git a/src/starboard/linux/x64x11/gczeal/gyp_configuration.gypi b/src/starboard/linux/x64x11/gczeal/gyp_configuration.gypi
deleted file mode 100644
index 909c6e8..0000000
--- a/src/starboard/linux/x64x11/gczeal/gyp_configuration.gypi
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2017 The Cobalt Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-{
- 'target_defaults': {
- 'default_configuration': 'linux-x64x11-gczeal_debug',
- 'configurations': {
- 'linux-x64x11-gczeal_debug': {
- 'inherit_from': ['debug_base'],
- },
- 'linux-x64x11-gczeal_devel': {
- 'inherit_from': ['devel_base'],
- },
- 'linux-x64x11-gczeal_qa': {
- 'inherit_from': ['qa_base'],
- },
- 'linux-x64x11-gczeal_gold': {
- 'inherit_from': ['gold_base'],
- },
- }, # end of configurations
- },
-
- 'includes': [
- '../gyp_configuration.gypi',
- ],
-}
diff --git a/src/starboard/linux/x64x11/gczeal/gyp_configuration.py b/src/starboard/linux/x64x11/gczeal/gyp_configuration.py
deleted file mode 100644
index 128b202..0000000
--- a/src/starboard/linux/x64x11/gczeal/gyp_configuration.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2016 The Cobalt Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-"""Starboard Linux X64 X11 future platform configuration."""
-
-from starboard.linux.x64x11 import gyp_configuration as linux_configuration
-
-
-def CreatePlatformConfig():
- return linux_configuration.LinuxX64X11Configuration(
- 'linux-x64x11-gczeal',
- sabi_json_path='starboard/sabi/x64/sysv/sabi-v{sb_api_version}.json')
diff --git a/src/starboard/linux/x64x11/gczeal/starboard_platform.gyp b/src/starboard/linux/x64x11/gczeal/starboard_platform.gyp
deleted file mode 100644
index 029148d..0000000
--- a/src/starboard/linux/x64x11/gczeal/starboard_platform.gyp
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2017 The Cobalt Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-{
- 'variables': {
- 'sources': [
- '<(DEPTH)/starboard/linux/x64x11/gczeal/configuration.cc',
- '<(DEPTH)/starboard/linux/x64x11/gczeal/configuration.h'
- '<(DEPTH)/starboard/linux/x64x11/gczeal/system_get_extensions.cc',
- ],
- 'sources!': [
- '<(DEPTH)/starboard/linux/shared/system_get_extensions.cc',
- ],
- },
- 'includes': [
- '../shared/starboard_platform_target.gypi',
- ],
-}
diff --git a/src/starboard/linux/x64x11/gczeal/system_get_extensions.cc b/src/starboard/linux/x64x11/gczeal/system_get_extensions.cc
deleted file mode 100644
index 9d6382a..0000000
--- a/src/starboard/linux/x64x11/gczeal/system_get_extensions.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2020 The Cobalt Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "starboard/system.h"
-
-#include "cobalt/extension/configuration.h"
-#include "starboard/common/string.h"
-#include "starboard/linux/x64x11/gczeal/configuration.h"
-
-const void* SbSystemGetExtension(const char* name) {
- if (SbStringCompareAll(name, kCobaltExtensionConfigurationName) == 0) {
- return starboard::shared::GetConfigurationApi();
- }
- return NULL;
-}
diff --git a/src/starboard/linux/x64x11/gczeal/thread_types_public.h b/src/starboard/linux/x64x11/gczeal/thread_types_public.h
deleted file mode 100644
index 0e50d29..0000000
--- a/src/starboard/linux/x64x11/gczeal/thread_types_public.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2017 The Cobalt Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef STARBOARD_LINUX_X64X11_GCZEAL_THREAD_TYPES_PUBLIC_H_
-#define STARBOARD_LINUX_X64X11_GCZEAL_THREAD_TYPES_PUBLIC_H_
-
-#include "starboard/linux/shared/thread_types_public.h"
-
-#endif // STARBOARD_LINUX_X64X11_GCZEAL_THREAD_TYPES_PUBLIC_H_
diff --git a/src/starboard/linux/x64x11/skia/cobalt/configuration.py b/src/starboard/linux/x64x11/skia/cobalt/configuration.py
new file mode 100644
index 0000000..feee8a0
--- /dev/null
+++ b/src/starboard/linux/x64x11/skia/cobalt/configuration.py
@@ -0,0 +1,36 @@
+# Copyright 2021 The Cobalt Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Starboard Linux x64x11 Skia Cobalt configuration."""
+
+import os
+
+from starboard.linux.shared.cobalt import configuration as shared_configuration
+from starboard.tools.testing import test_filter
+
+
+class CobaltLinuxX64X11SkiaConfiguration(
+ shared_configuration.CobaltLinuxConfiguration):
+ """Starboard Linux x64x11 Skia Cobalt configuration."""
+
+ def GetTestFilters(self):
+ filters = super(CobaltLinuxX64X11SkiaConfiguration, self).GetTestFilters()
+ for target, tests in self.__FILTERED_TESTS.iteritems():
+ filters.extend(test_filter.TestFilter(target, test) for test in tests)
+ return filters
+
+ # A map of failing or crashing tests per target.
+ __FILTERED_TESTS = {
+ # Tracked by b/181270083
+ 'renderer_test': ['PixelTest.RectWithRoundedCornersOnSolidColor',],
+ }
diff --git a/src/starboard/loader_app/installation_manager.cc b/src/starboard/loader_app/installation_manager.cc
index 85d543c..6f7286e 100644
--- a/src/starboard/loader_app/installation_manager.cc
+++ b/src/starboard/loader_app/installation_manager.cc
@@ -26,7 +26,9 @@
#include "starboard/directory.h"
#include "starboard/file.h"
#include "starboard/loader_app/installation_store.pb.h"
+#if !SB_IS(EVERGREEN_COMPATIBLE_LITE)
#include "starboard/loader_app/pending_restart.h"
+#endif // !SB_IS(EVERGREEN_COMPATIBLE_LITE)
#include "starboard/once.h"
#include "starboard/string.h"
@@ -583,8 +585,11 @@
const size_t buf_size = installation_store_.ByteSize();
std::vector<char> buf(buf_size, 0);
- loader_app::SetPendingRestart(
- installation_store_.roll_forward_to_installation() != -1);
+
+ int result = installation_store_.roll_forward_to_installation();
+#if !SB_IS(EVERGREEN_COMPATIBLE_LITE)
+ loader_app::SetPendingRestart(result != -1);
+#endif
installation_store_.SerializeToArray(buf.data(),
installation_store_.ByteSize());
diff --git a/src/starboard/loader_app/installation_manager.gyp b/src/starboard/loader_app/installation_manager.gyp
index 93dba9b..fb547c5 100644
--- a/src/starboard/loader_app/installation_manager.gyp
+++ b/src/starboard/loader_app/installation_manager.gyp
@@ -35,7 +35,13 @@
'dependencies': [
':installation_store_proto',
'<(DEPTH)/starboard/starboard.gyp:starboard',
- '<(DEPTH)/starboard/loader_app/pending_restart.gyp:pending_restart',
+ ],
+ 'conditions': [
+ ['sb_evergreen_compatible_lite != 1', {
+ 'dependencies': [
+ '<(DEPTH)/starboard/loader_app/pending_restart.gyp:pending_restart',
+ ],},
+ ],
],
'include_dirs': [
# Get protobuf headers from the chromium tree.
@@ -47,9 +53,15 @@
'type': '<(gtest_target_type)',
'sources': [
'installation_manager_test.cc',
- 'pending_restart_test.cc',
'<(DEPTH)/starboard/common/test_main.cc',
],
+ 'conditions': [
+ ['sb_evergreen_compatible_lite != 1', {
+ 'sources': [
+ 'pending_restart_test.cc',
+ ],},
+ ],
+ ],
'dependencies': [
':installation_manager',
'<(DEPTH)/testing/gmock.gyp:gmock',
diff --git a/src/starboard/nplb/nplb.gyp b/src/starboard/nplb/nplb.gyp
index c280c78..9fbb3c3 100644
--- a/src/starboard/nplb/nplb.gyp
+++ b/src/starboard/nplb/nplb.gyp
@@ -319,6 +319,7 @@
'dependencies': [
'<@(cobalt_platform_dependencies)',
'<(DEPTH)/starboard/common/common.gyp:common',
+ '<(DEPTH)/starboard/nplb/compiler_compliance/compiler_compliance.gyp:cpp14_supported',
'<(DEPTH)/starboard/shared/starboard/media/media.gyp:media_util',
'<(DEPTH)/starboard/shared/starboard/player/player.gyp:player_copy_test_data',
'<(DEPTH)/starboard/shared/starboard/player/player.gyp:video_dmp',
@@ -328,11 +329,6 @@
'copy_nplb_file_tests_data',
],
'conditions': [
- ['sb_disable_cpp14_audit != 1', {
- 'dependencies': [
- '<(DEPTH)/starboard/nplb/compiler_compliance/compiler_compliance.gyp:cpp14_supported',
- ],
- }],
['sb_evergreen != 1', {
'sources': [
# Segfaults or causes unresolved symbols for Cobalt Evergreen.
diff --git a/src/starboard/raspi/directfb/README.md b/src/starboard/raspi/directfb/README.md
deleted file mode 100644
index 28452a6..0000000
--- a/src/starboard/raspi/directfb/README.md
+++ /dev/null
@@ -1,85 +0,0 @@
-# Setting up Starboard to use DirectFB on a Raspberry Pi
-
-Starboard's Blitter API contains a DirectFB implementation. There does not
-currently exist a supported Starboard configuration for DirectFB on the
-Raspberry Pi, but it can be created easily by copying the raspi-0 configuration
-and modifying the setup to use the Blitter API with DirectFB instead of Dispmanx
-and EGL/GLES2.
-
-You will also need to do some configuration of your Raspberry Pi's enviornment,
-and for that you should consult with the following steps.
-
-## Modifications to /boot/config.txt
-
-Open '/boot/config.txt' (as root) and uncomment/add the lines:
-
- framebuffer_width=1920
- framebuffer_height=1080
- framebuffer_depth=32
- framebuffer_ignore_alpha=1
-
-## Modifications to /etc/fb.modes
-
-Open '/etc/fb.modes' (as root) and add the lines:
-
- mode "1920x1080-24p"
- geometry 1920 1080 1920 1080 32
- timings 13468 148 638 36 4 44 5
- hsync high
- vsync high
- endmode
-
-## Modifications to /etc/directfbrc
-
-Open or create '/etc/directfbrc' (as root) and add the lines:
-
- graphics-vt
- hardware
- mode=1920x1080
- depth=32
- pixelformat=ARGB
-
-## Run fbset
-
-At a terminal, execute the command:
-
- $ fbset -depth 32
-
-Now, when you type
-
- $ fbset -i
-
-You should see the output:
-
- mode "1920x1080"
- geometry 1920 1080 1920 1080 32
- timings 0 0 0 0 0 0 0
- rgba 8/16,8/8,8/0,8/24
- endmode
-
- Frame buffer device information:
- Name : BCM2708 FB
- Address : 0x3d402000
- Size : 8294400
- Type : PACKED PIXELS
- Visual : TRUECOLOR
- XPanStep : 1
- YPanStep : 1
- YWrapStep : 0
- LineLength : 7680
- Accelerator : No
-
-## Running your executable
-
-At this point, you should be able to run your executable. You will need to run
-it as root. You should be able to run as a normal user instead if you modify
-/etc/udev/rules.d/99-input.rules by adding the following contents:
-
- SUBSYSTEM=="input", GROUP="input", MODE="0660"
- KERNEL=="tty[0-9]*", GROUP="root", MODE="0666"
- KERNEL=="mice", MODE="0666"
- KERNEL=="fb0", OWNER="root", MODE="0660"
-
-## Sources
-
-For more information, see https://taoofmac.com/space/blog/2013/01/09/2339.
diff --git a/src/starboard/raspi/shared/gyp_configuration.gypi b/src/starboard/raspi/shared/gyp_configuration.gypi
index d2dd46b..c73f317 100644
--- a/src/starboard/raspi/shared/gyp_configuration.gypi
+++ b/src/starboard/raspi/shared/gyp_configuration.gypi
@@ -18,9 +18,6 @@
# TODO: Remove when omitted for all platforms in base_configuration.gypi.
'sb_static_contents_output_data_dir': '<(PRODUCT_DIR)/content',
- # The Raspberry Pi compiler does not have support for C++14.
- 'sb_disable_cpp14_audit': 1,
-
'target_os': 'linux',
'sysroot%': '/',
@@ -69,6 +66,7 @@
'-I<(sysroot)/opt/vc/include',
'-I<(sysroot)/opt/vc/include/interface/vcos/pthreads',
'-I<(sysroot)/opt/vc/include/interface/vmcs_host/linux',
+ '-I<(sysroot)/usr/include/arm-linux-gnueabihf',
],
'linker_flags': [
'--sysroot=<(sysroot)',
@@ -76,20 +74,13 @@
# libraries.
'-L<(sysroot)/opt/vc/lib',
'-Wl,-rpath=<(sysroot)/opt/vc/lib',
+ '-L<(sysroot)/usr/lib/arm-linux-gnueabihf',
+ '-Wl,-rpath=<(sysroot)/usr/lib/arm-linux-gnueabihf',
+ '-L<(sysroot)/lib/arm-linux-gnueabihf',
+ '-Wl,-rpath=<(sysroot)/lib/arm-linux-gnueabihf',
# Cleanup unused sections
'-Wl,-gc-sections',
- # We don't wrap these symbols, but this ensures that they aren't
- # linked in.
- '-Wl,--wrap=malloc',
- '-Wl,--wrap=calloc',
- '-Wl,--wrap=realloc',
- '-Wl,--wrap=memalign',
- '-Wl,--wrap=reallocalign',
- '-Wl,--wrap=free',
- '-Wl,--wrap=strdup',
- '-Wl,--wrap=malloc_usable_size',
- '-Wl,--wrap=malloc_stats_fast',
- '-Wl,--wrap=__cxa_demangle',
+ '-Wl,--unresolved-symbols=ignore-in-shared-libs',
],
'compiler_flags_debug': [
'-O0',
@@ -144,14 +135,18 @@
'-lavcodec',
'-lavformat',
'-lavutil',
- '-lEGL',
- '-lGLESv2',
+ '-l:libpthread.so.0',
'-lpthread',
'-lrt',
'-lopenmaxil',
'-lbcm_host',
'-lvcos',
'-lvchiq_arm',
+ '-lbrcmGLESv2',
+ '-lbrcmEGL',
+ # Static libs must be last, to avoid __dlopen linker errors
+ '-lEGL_static',
+ '-lGLESv2_static',
],
'conditions': [
['cobalt_fastbuild==0', {
@@ -181,7 +176,7 @@
'-std=c11',
],
'cflags_cc': [
- '-std=gnu++11',
+ '-std=gnu++14',
'-Wno-literal-suffix',
],
'target_conditions': [
@@ -196,6 +191,8 @@
'-Wno-maybe-uninitialized',
# Turn warnings into errors.
'-Werror',
+ '-Wno-expansion-to-defined',
+ '-Wno-implicit-fallthrough',
],
},{
'cflags': [
diff --git a/src/starboard/raspi/shared/gyp_configuration.py b/src/starboard/raspi/shared/gyp_configuration.py
index faacb40..5e073fa 100644
--- a/src/starboard/raspi/shared/gyp_configuration.py
+++ b/src/starboard/raspi/shared/gyp_configuration.py
@@ -43,7 +43,7 @@
self.sabi_json_path = sabi_json_path
self.AppendApplicationConfigurationPath(os.path.dirname(__file__))
self.raspi_home = os.environ.get('RASPI_HOME', _UNDEFINED_RASPI_HOME)
- self.sysroot = os.path.realpath(os.path.join(self.raspi_home, 'sysroot'))
+ self.sysroot = os.path.realpath(os.path.join(self.raspi_home, 'busterroot'))
def GetBuildFormat(self):
"""Returns the desired build format."""
@@ -75,7 +75,8 @@
toolchain = os.path.realpath(
os.path.join(
self.raspi_home,
- 'tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64'))
+ 'tools/arm-bcm2708/gcc-linaro-7.5.0-2019.12-x86_64_arm-linux-gnueabihf'
+ ))
toolchain_bin_dir = os.path.join(toolchain, 'bin')
env_variables = self.host_compiler_environment
@@ -159,6 +160,7 @@
'SbMediaCanPlayMimeAndKeySystem.AnySupportedKeySystems',
'SbMediaCanPlayMimeAndKeySystem.KeySystemWithAttributes',
'SbMediaCanPlayMimeAndKeySystem.MinimumSupport',
+ 'SbUndefinedBehaviorTest.CallThisPointerIsNullRainyDay'
],
'player_filter_tests': [
# The implementations for the raspberry pi (0 and 2) are incomplete
diff --git a/src/starboard/raspi/shared/starboard_platform.gypi b/src/starboard/raspi/shared/starboard_platform.gypi
index 05a0159..69508a2 100644
--- a/src/starboard/raspi/shared/starboard_platform.gypi
+++ b/src/starboard/raspi/shared/starboard_platform.gypi
@@ -64,10 +64,10 @@
'<(DEPTH)/starboard/raspi/shared/open_max/dispmanx_resource_pool.h',
'<(DEPTH)/starboard/raspi/shared/open_max/image_decode.cc',
'<(DEPTH)/starboard/raspi/shared/open_max/image_is_decode_supported.cc',
- '<(DEPTH)/starboard/raspi/shared/open_max/open_max_component.cc',
- '<(DEPTH)/starboard/raspi/shared/open_max/open_max_component.h',
'<(DEPTH)/starboard/raspi/shared/open_max/open_max_component_base.cc',
'<(DEPTH)/starboard/raspi/shared/open_max/open_max_component_base.h',
+ '<(DEPTH)/starboard/raspi/shared/open_max/open_max_component.cc',
+ '<(DEPTH)/starboard/raspi/shared/open_max/open_max_component.h',
'<(DEPTH)/starboard/raspi/shared/open_max/open_max_egl_render_component.cc',
'<(DEPTH)/starboard/raspi/shared/open_max/open_max_egl_render_component.h',
'<(DEPTH)/starboard/raspi/shared/open_max/open_max_image_decode_component.cc',
@@ -93,13 +93,8 @@
'<(DEPTH)/starboard/shared/alsa/alsa_audio_sink_type.h',
'<(DEPTH)/starboard/shared/alsa/alsa_util.cc',
'<(DEPTH)/starboard/shared/alsa/alsa_util.h',
- '<(DEPTH)/starboard/shared/dlmalloc/memory_allocate_aligned_unchecked.cc',
- '<(DEPTH)/starboard/shared/dlmalloc/memory_allocate_unchecked.cc',
- '<(DEPTH)/starboard/shared/dlmalloc/memory_free.cc',
- '<(DEPTH)/starboard/shared/dlmalloc/memory_free_aligned.cc',
'<(DEPTH)/starboard/shared/dlmalloc/memory_map.cc',
'<(DEPTH)/starboard/shared/dlmalloc/memory_protect.cc',
- '<(DEPTH)/starboard/shared/dlmalloc/memory_reallocate_unchecked.cc',
'<(DEPTH)/starboard/shared/dlmalloc/memory_unmap.cc',
'<(DEPTH)/starboard/shared/egl/system_egl.cc',
'<(DEPTH)/starboard/shared/gcc/atomic_gcc.h',
@@ -118,18 +113,21 @@
'<(DEPTH)/starboard/shared/iso/double_floor.cc',
'<(DEPTH)/starboard/shared/iso/double_is_finite.cc',
'<(DEPTH)/starboard/shared/iso/double_is_nan.cc',
+ '<(DEPTH)/starboard/shared/iso/memory_allocate_unchecked.cc',
'<(DEPTH)/starboard/shared/iso/memory_compare.cc',
'<(DEPTH)/starboard/shared/iso/memory_copy.cc',
'<(DEPTH)/starboard/shared/iso/memory_find_byte.cc',
+ '<(DEPTH)/starboard/shared/iso/memory_free.cc',
'<(DEPTH)/starboard/shared/iso/memory_move.cc',
+ '<(DEPTH)/starboard/shared/iso/memory_reallocate_unchecked.cc',
'<(DEPTH)/starboard/shared/iso/memory_set.cc',
- '<(DEPTH)/starboard/shared/iso/string_compare.cc',
'<(DEPTH)/starboard/shared/iso/string_compare_all.cc',
+ '<(DEPTH)/starboard/shared/iso/string_compare.cc',
'<(DEPTH)/starboard/shared/iso/string_find_character.cc',
'<(DEPTH)/starboard/shared/iso/string_find_last_character.cc',
'<(DEPTH)/starboard/shared/iso/string_find_string.cc',
- '<(DEPTH)/starboard/shared/iso/string_get_length.cc',
'<(DEPTH)/starboard/shared/iso/string_get_length_wide.cc',
+ '<(DEPTH)/starboard/shared/iso/string_get_length.cc',
'<(DEPTH)/starboard/shared/iso/string_parse_double.cc',
'<(DEPTH)/starboard/shared/iso/string_parse_signed_integer.cc',
'<(DEPTH)/starboard/shared/iso/string_parse_uint64.cc',
@@ -142,8 +140,8 @@
'<(DEPTH)/starboard/shared/libevent/socket_waiter_destroy.cc',
'<(DEPTH)/starboard/shared/libevent/socket_waiter_internal.cc',
'<(DEPTH)/starboard/shared/libevent/socket_waiter_remove.cc',
- '<(DEPTH)/starboard/shared/libevent/socket_waiter_wait.cc',
'<(DEPTH)/starboard/shared/libevent/socket_waiter_wait_timed.cc',
+ '<(DEPTH)/starboard/shared/libevent/socket_waiter_wait.cc',
'<(DEPTH)/starboard/shared/libevent/socket_waiter_wake_up.cc',
'<(DEPTH)/starboard/shared/linux/byte_swap.cc',
'<(DEPTH)/starboard/shared/linux/cpu_features_get.cc',
@@ -156,6 +154,7 @@
'<(DEPTH)/starboard/shared/linux/system_get_stack.cc',
'<(DEPTH)/starboard/shared/linux/system_get_total_cpu_memory.cc',
'<(DEPTH)/starboard/shared/linux/system_get_used_cpu_memory.cc',
+ '<(DEPTH)/starboard/shared/linux/system_get_used_cpu_memory.cc',
'<(DEPTH)/starboard/shared/linux/system_is_debugger_attached.cc',
'<(DEPTH)/starboard/shared/linux/system_symbolize.cc',
'<(DEPTH)/starboard/shared/linux/thread_get_id.cc',
@@ -165,8 +164,8 @@
'<(DEPTH)/starboard/shared/nouser/user_get_property.cc',
'<(DEPTH)/starboard/shared/nouser/user_get_signed_in.cc',
'<(DEPTH)/starboard/shared/nouser/user_internal.cc',
- '<(DEPTH)/starboard/shared/opus/opus_audio_decoder.h',
'<(DEPTH)/starboard/shared/opus/opus_audio_decoder.cc',
+ '<(DEPTH)/starboard/shared/opus/opus_audio_decoder.h',
'<(DEPTH)/starboard/shared/posix/directory_create.cc',
'<(DEPTH)/starboard/shared/posix/file_atomic_replace.cc',
'<(DEPTH)/starboard/shared/posix/file_can_open.cc',
@@ -181,12 +180,14 @@
'<(DEPTH)/starboard/shared/posix/file_seek.cc',
'<(DEPTH)/starboard/shared/posix/file_truncate.cc',
'<(DEPTH)/starboard/shared/posix/file_write.cc',
- '<(DEPTH)/starboard/shared/posix/log.cc',
'<(DEPTH)/starboard/shared/posix/log_flush.cc',
'<(DEPTH)/starboard/shared/posix/log_format.cc',
'<(DEPTH)/starboard/shared/posix/log_is_tty.cc',
'<(DEPTH)/starboard/shared/posix/log_raw.cc',
+ '<(DEPTH)/starboard/shared/posix/log.cc',
+ '<(DEPTH)/starboard/shared/posix/memory_allocate_aligned_unchecked.cc',
'<(DEPTH)/starboard/shared/posix/memory_flush.cc',
+ '<(DEPTH)/starboard/shared/posix/memory_free_aligned.cc',
'<(DEPTH)/starboard/shared/posix/set_non_blocking_internal.cc',
'<(DEPTH)/starboard/shared/posix/socket_accept.cc',
'<(DEPTH)/starboard/shared/posix/socket_bind.cc',
@@ -198,8 +199,8 @@
'<(DEPTH)/starboard/shared/posix/socket_get_last_error.cc',
'<(DEPTH)/starboard/shared/posix/socket_get_local_address.cc',
'<(DEPTH)/starboard/shared/posix/socket_internal.cc',
- '<(DEPTH)/starboard/shared/posix/socket_is_connected.cc',
'<(DEPTH)/starboard/shared/posix/socket_is_connected_and_idle.cc',
+ '<(DEPTH)/starboard/shared/posix/socket_is_connected.cc',
'<(DEPTH)/starboard/shared/posix/socket_is_ipv6_supported.cc',
'<(DEPTH)/starboard/shared/posix/socket_join_multicast_group.cc',
'<(DEPTH)/starboard/shared/posix/socket_listen.cc',
@@ -214,11 +215,11 @@
'<(DEPTH)/starboard/shared/posix/socket_set_tcp_no_delay.cc',
'<(DEPTH)/starboard/shared/posix/socket_set_tcp_window_scaling.cc',
'<(DEPTH)/starboard/shared/posix/storage_write_record.cc',
- '<(DEPTH)/starboard/shared/posix/string_compare_no_case.cc',
'<(DEPTH)/starboard/shared/posix/string_compare_no_case_n.cc',
+ '<(DEPTH)/starboard/shared/posix/string_compare_no_case.cc',
'<(DEPTH)/starboard/shared/posix/string_compare_wide.cc',
- '<(DEPTH)/starboard/shared/posix/string_format.cc',
'<(DEPTH)/starboard/shared/posix/string_format_wide.cc',
+ '<(DEPTH)/starboard/shared/posix/string_format.cc',
'<(DEPTH)/starboard/shared/posix/system_break_into_debugger.cc',
'<(DEPTH)/starboard/shared/posix/system_clear_last_error.cc',
'<(DEPTH)/starboard/shared/posix/system_get_error_string.cc',
@@ -236,10 +237,10 @@
'<(DEPTH)/starboard/shared/pthread/condition_variable_create.cc',
'<(DEPTH)/starboard/shared/pthread/condition_variable_destroy.cc',
'<(DEPTH)/starboard/shared/pthread/condition_variable_signal.cc',
- '<(DEPTH)/starboard/shared/pthread/condition_variable_wait.cc',
'<(DEPTH)/starboard/shared/pthread/condition_variable_wait_timed.cc',
- '<(DEPTH)/starboard/shared/pthread/mutex_acquire.cc',
+ '<(DEPTH)/starboard/shared/pthread/condition_variable_wait.cc',
'<(DEPTH)/starboard/shared/pthread/mutex_acquire_try.cc',
+ '<(DEPTH)/starboard/shared/pthread/mutex_acquire.cc',
'<(DEPTH)/starboard/shared/pthread/mutex_create.cc',
'<(DEPTH)/starboard/shared/pthread/mutex_destroy.cc',
'<(DEPTH)/starboard/shared/pthread/mutex_release.cc',
@@ -247,9 +248,9 @@
'<(DEPTH)/starboard/shared/pthread/thread_context_get_pointer.cc',
'<(DEPTH)/starboard/shared/pthread/thread_context_internal.cc',
'<(DEPTH)/starboard/shared/pthread/thread_context_internal.h',
- '<(DEPTH)/starboard/shared/pthread/thread_create.cc',
'<(DEPTH)/starboard/shared/pthread/thread_create_local_key.cc',
'<(DEPTH)/starboard/shared/pthread/thread_create_priority.h',
+ '<(DEPTH)/starboard/shared/pthread/thread_create.cc',
'<(DEPTH)/starboard/shared/pthread/thread_destroy_local_key.cc',
'<(DEPTH)/starboard/shared/pthread/thread_detach.cc',
'<(DEPTH)/starboard/shared/pthread/thread_get_current.cc',
@@ -326,10 +327,10 @@
'<(DEPTH)/starboard/shared/starboard/memory.cc',
'<(DEPTH)/starboard/shared/starboard/new.cc',
'<(DEPTH)/starboard/shared/starboard/queue_application.cc',
- '<(DEPTH)/starboard/shared/starboard/string_concat.cc',
'<(DEPTH)/starboard/shared/starboard/string_concat_wide.cc',
- '<(DEPTH)/starboard/shared/starboard/string_copy.cc',
+ '<(DEPTH)/starboard/shared/starboard/string_concat.cc',
'<(DEPTH)/starboard/shared/starboard/string_copy_wide.cc',
+ '<(DEPTH)/starboard/shared/starboard/string_copy.cc',
'<(DEPTH)/starboard/shared/starboard/string_duplicate.cc',
'<(DEPTH)/starboard/shared/starboard/system_get_random_uint64.cc',
'<(DEPTH)/starboard/shared/starboard/system_request_blur.cc',
@@ -402,7 +403,6 @@
],
'dependencies': [
'<(DEPTH)/starboard/common/common.gyp:common',
- '<(DEPTH)/third_party/dlmalloc/dlmalloc.gyp:dlmalloc',
'<(DEPTH)/third_party/libevent/libevent.gyp:libevent',
'<(DEPTH)/third_party/opus/opus.gyp:opus',
'<(DEPTH)/starboard/shared/ffmpeg/ffmpeg.gyp:ffmpeg_linked',
diff --git a/src/starboard/shared/dlmalloc/memory_allocate_aligned_unchecked.cc b/src/starboard/shared/dlmalloc/memory_allocate_aligned_unchecked.cc
deleted file mode 100644
index 12d1223..0000000
--- a/src/starboard/shared/dlmalloc/memory_allocate_aligned_unchecked.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2016 The Cobalt Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "starboard/memory.h"
-
-#include "starboard/shared/dlmalloc/page_internal.h"
-
-void* SbMemoryAllocateAlignedUnchecked(size_t alignment, size_t size) {
- return SB_ALLOCATOR(memalign)(alignment, size);
-}
diff --git a/src/starboard/shared/dlmalloc/memory_allocate_unchecked.cc b/src/starboard/shared/dlmalloc/memory_allocate_unchecked.cc
deleted file mode 100644
index bb83883..0000000
--- a/src/starboard/shared/dlmalloc/memory_allocate_unchecked.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2016 The Cobalt Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "starboard/memory.h"
-
-#include "starboard/shared/dlmalloc/page_internal.h"
-
-void* SbMemoryAllocateUnchecked(size_t size) {
- return SB_ALLOCATOR(malloc)(size);
-}
diff --git a/src/starboard/shared/dlmalloc/memory_free.cc b/src/starboard/shared/dlmalloc/memory_free.cc
deleted file mode 100644
index f58fa02..0000000
--- a/src/starboard/shared/dlmalloc/memory_free.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2016 The Cobalt Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "starboard/memory.h"
-
-#include "starboard/shared/dlmalloc/page_internal.h"
-
-void SbMemoryFree(void* memory) {
- SB_ALLOCATOR(free)(memory);
-}
diff --git a/src/starboard/shared/dlmalloc/memory_free_aligned.cc b/src/starboard/shared/dlmalloc/memory_free_aligned.cc
deleted file mode 100644
index 07ee824..0000000
--- a/src/starboard/shared/dlmalloc/memory_free_aligned.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2016 The Cobalt Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "starboard/memory.h"
-
-#include "starboard/shared/dlmalloc/page_internal.h"
-
-void SbMemoryFreeAligned(void* memory) {
- SB_ALLOCATOR(free)(memory);
-}
diff --git a/src/starboard/shared/signal/suspend_signals.cc b/src/starboard/shared/signal/suspend_signals.cc
index 6e89b38..0220389 100644
--- a/src/starboard/shared/signal/suspend_signals.cc
+++ b/src/starboard/shared/signal/suspend_signals.cc
@@ -25,9 +25,9 @@
#include "starboard/shared/starboard/application.h"
#include "starboard/system.h"
-#if SB_IS(EVERGREEN_COMPATIBLE)
+#if SB_IS(EVERGREEN_COMPATIBLE) && !SB_IS(EVERGREEN_COMPATIBLE_LITE)
#include "starboard/loader_app/pending_restart.h"
-#endif
+#endif // SB_IS(EVERGREEN_COMPATIBLE) && !SB_IS(EVERGREEN_COMPATIBLE_LITE)
namespace starboard {
namespace shared {
diff --git a/src/starboard/shared/signal/system_request_freeze.cc b/src/starboard/shared/signal/system_request_freeze.cc
index e55e9ac..b2cbc47 100644
--- a/src/starboard/shared/signal/system_request_freeze.cc
+++ b/src/starboard/shared/signal/system_request_freeze.cc
@@ -17,9 +17,9 @@
#include "starboard/shared/signal/signal_internal.h"
#include "starboard/shared/starboard/application.h"
-#if SB_IS(EVERGREEN_COMPATIBLE)
+#if SB_IS(EVERGREEN_COMPATIBLE) && !SB_IS(EVERGREEN_COMPATIBLE_LITE)
#include "starboard/loader_app/pending_restart.h"
-#endif
+#endif // SB_IS(EVERGREEN_COMPATIBLE) && !SB_IS(EVERGREEN_COMPATIBLE_LITE)
#if SB_API_VERSION >= SB_ADD_CONCEALED_STATE_SUPPORT_VERSION || \
SB_HAS(CONCEALED_STATE)
@@ -33,7 +33,7 @@
}
void SbSystemRequestFreeze() {
-#if SB_IS(EVERGREEN_COMPATIBLE)
+#if SB_IS(EVERGREEN_COMPATIBLE) && !SB_IS(EVERGREEN_COMPATIBLE_LITE)
if (starboard::loader_app::IsPendingRestart()) {
SbLogRawFormatF("\nPending update restart . Stopping.\n");
SbLogFlush();
@@ -45,7 +45,7 @@
#else
// Let the platform decide if directly transit into Frozen.
starboard::shared::starboard::Application::Get()->Freeze(NULL, &FreezeDone);
-#endif
+#endif // SB_IS(EVERGREEN_COMPATIBLE) && !SB_IS(EVERGREEN_COMPATIBLE_LITE)
}
#endif // SB_API_VERSION >= SB_ADD_CONCEALED_STATE_SUPPORT_VERSION ||
// SB_HAS(CONCEALED_STATE)
diff --git a/src/starboard/shared/signal/system_request_freeze_no_freezedone_callback.cc b/src/starboard/shared/signal/system_request_freeze_no_freezedone_callback.cc
index 8d9bd2d..5264446 100644
--- a/src/starboard/shared/signal/system_request_freeze_no_freezedone_callback.cc
+++ b/src/starboard/shared/signal/system_request_freeze_no_freezedone_callback.cc
@@ -17,15 +17,15 @@
#include "starboard/shared/signal/signal_internal.h"
#include "starboard/shared/starboard/application.h"
-#if SB_IS(EVERGREEN_COMPATIBLE)
+#if SB_IS(EVERGREEN_COMPATIBLE) && !SB_IS(EVERGREEN_COMPATIBLE_LITE)
#include "starboard/loader_app/pending_restart.h"
-#endif
+#endif // SB_IS(EVERGREEN_COMPATIBLE) && !SB_IS(EVERGREEN_COMPATIBLE_LITE)
#if SB_API_VERSION >= SB_ADD_CONCEALED_STATE_SUPPORT_VERSION || \
SB_HAS(CONCEALED_STATE)
void SbSystemRequestFreeze() {
-#if SB_IS(EVERGREEN_COMPATIBLE)
+#if SB_IS(EVERGREEN_COMPATIBLE) && !SB_IS(EVERGREEN_COMPATIBLE_LITE)
if (starboard::loader_app::IsPendingRestart()) {
SbLogRawFormatF("\nPending update restart . Stopping.\n");
SbLogFlush();
@@ -41,7 +41,7 @@
// is no FreezeDone callback for stopping all thread execution
// after fully transitioning into Frozen.
starboard::shared::starboard::Application::Get()->Freeze(NULL, NULL);
-#endif
+#endif // SB_IS(EVERGREEN_COMPATIBLE) && !SB_IS(EVERGREEN_COMPATIBLE_LITE)
}
#endif // SB_API_VERSION >= SB_ADD_CONCEALED_STATE_SUPPORT_VERSION ||
// SB_HAS(CONCEALED_STATE)
diff --git a/src/starboard/shared/signal/system_request_suspend.cc b/src/starboard/shared/signal/system_request_suspend.cc
index 950d487..fbbe42a 100644
--- a/src/starboard/shared/signal/system_request_suspend.cc
+++ b/src/starboard/shared/signal/system_request_suspend.cc
@@ -17,9 +17,9 @@
#include "starboard/shared/signal/signal_internal.h"
#include "starboard/shared/starboard/application.h"
-#if SB_IS(EVERGREEN_COMPATIBLE)
+#if SB_IS(EVERGREEN_COMPATIBLE) && !SB_IS(EVERGREEN_COMPATIBLE_LITE)
#include "starboard/loader_app/pending_restart.h"
-#endif
+#endif // SB_IS(EVERGREEN_COMPATIBLE) && !SB_IS(EVERGREEN_COMPATIBLE_LITE)
#if SB_API_VERSION < SB_ADD_CONCEALED_STATE_SUPPORT_VERSION && \
!SB_HAS(CONCEALED_STATE)
@@ -29,7 +29,7 @@
}
void SbSystemRequestSuspend() {
-#if SB_IS(EVERGREEN_COMPATIBLE)
+#if SB_IS(EVERGREEN_COMPATIBLE) && !SB_IS(EVERGREEN_COMPATIBLE_LITE)
if (starboard::loader_app::IsPendingRestart()) {
SbLogRawFormatF("\nPending update restart . Stopping.\n");
SbLogFlush();
@@ -40,7 +40,7 @@
}
#else
starboard::shared::starboard::Application::Get()->Suspend(NULL, &SuspendDone);
-#endif
+#endif // SB_IS(EVERGREEN_COMPATIBLE) && !SB_IS(EVERGREEN_COMPATIBLE_LITE)
}
#endif // SB_API_VERSION < SB_ADD_CONCEALED_STATE_SUPPORT_VERSION &&
// !SB_HAS(CONCEALED_STATE)
diff --git a/src/starboard/shared/starboard/crash_handler.cc b/src/starboard/shared/starboard/crash_handler.cc
index 38a6884..c866384 100644
--- a/src/starboard/shared/starboard/crash_handler.cc
+++ b/src/starboard/shared/starboard/crash_handler.cc
@@ -26,7 +26,7 @@
bool OverrideCrashpadAnnotations(CrashpadAnnotations* crashpad_annotations) {
CrashpadAnnotations annotations;
- SbMemorySet(&annotations, sizeof(CrashpadAnnotations), 0);
+ SbMemorySet(&annotations, 0, sizeof(CrashpadAnnotations));
SbMemoryCopy(&annotations, crashpad_annotations, sizeof(CrashpadAnnotations));
return third_party::crashpad::wrapper::AddAnnotationsToCrashpad(annotations);
}
diff --git a/src/starboard/stub/configuration_public.h b/src/starboard/stub/configuration_public.h
index 77cf75d..3e56803 100644
--- a/src/starboard/stub/configuration_public.h
+++ b/src/starboard/stub/configuration_public.h
@@ -188,10 +188,6 @@
// when this macro is defined.
#undef SB_HAS_QUIRK_SUPPORT_INT16_AUDIO_SAMPLES
-// dlmalloc will use the ffs intrinsic if available. Platforms on which this is
-// not available should define the following quirk.
-#undef SB_HAS_QUIRK_NO_FFS
-
// --- Decoder-only Params ---
// --- Memory Configuration --------------------------------------------------
diff --git a/src/starboard/stub/font.cc b/src/starboard/stub/font.cc
new file mode 100644
index 0000000..a93fed7
--- /dev/null
+++ b/src/starboard/stub/font.cc
@@ -0,0 +1,41 @@
+// Copyright 2021 The Cobalt Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "starboard/stub/font.h"
+
+#include "cobalt/extension/font.h"
+
+namespace starboard {
+namespace stub {
+
+namespace {
+
+bool GetPathFallbackFontDirectory(char* path, int path_size) {
+ return false;
+}
+
+const CobaltExtensionFontApi kFontApi = {
+ kCobaltExtensionFontName,
+ 1, // API version that's implemented.
+ &GetPathFallbackFontDirectory,
+};
+
+} // namespace
+
+const void* GetFontApi() {
+ return &kFontApi;
+}
+
+} // namespace stub
+} // namespace starboard
diff --git a/src/starboard/shared/dlmalloc/memory_reallocate_unchecked.cc b/src/starboard/stub/font.h
similarity index 67%
rename from src/starboard/shared/dlmalloc/memory_reallocate_unchecked.cc
rename to src/starboard/stub/font.h
index de2a87e..73ccf0c 100644
--- a/src/starboard/shared/dlmalloc/memory_reallocate_unchecked.cc
+++ b/src/starboard/stub/font.h
@@ -1,4 +1,4 @@
-// Copyright 2016 The Cobalt Authors. All Rights Reserved.
+// Copyright 2021 The Cobalt Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -12,10 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "starboard/memory.h"
+#ifndef STARBOARD_STUB_FONT_H_
+#define STARBOARD_STUB_FONT_H_
-#include "starboard/shared/dlmalloc/page_internal.h"
+namespace starboard {
+namespace stub {
-void* SbMemoryReallocateUnchecked(void* memory, size_t size) {
- return SB_ALLOCATOR(realloc)(memory, size);
-}
+const void* GetFontApi();
+
+} // namespace stub
+} // namespace starboard
+
+#endif // STARBOARD_STUB_FONT_H_
diff --git a/src/starboard/stub/starboard_platform.gyp b/src/starboard/stub/starboard_platform.gyp
index 5444083..717849d 100644
--- a/src/starboard/stub/starboard_platform.gyp
+++ b/src/starboard/stub/starboard_platform.gyp
@@ -27,6 +27,8 @@
'configuration.cc',
'configuration.h',
'configuration_constants.cc',
+ 'font.cc',
+ 'font.h',
'main.cc',
'system_get_extensions.cc',
'thread_types_public.h',
diff --git a/src/starboard/stub/system_get_extensions.cc b/src/starboard/stub/system_get_extensions.cc
index 31f44f7..22e8777 100644
--- a/src/starboard/stub/system_get_extensions.cc
+++ b/src/starboard/stub/system_get_extensions.cc
@@ -15,12 +15,17 @@
#include "starboard/system.h"
#include "cobalt/extension/configuration.h"
+#include "cobalt/extension/font.h"
#include "starboard/common/string.h"
#include "starboard/stub/configuration.h"
+#include "starboard/stub/font.h"
const void* SbSystemGetExtension(const char* name) {
if (SbStringCompareAll(name, kCobaltExtensionConfigurationName) == 0) {
return starboard::stub::GetConfigurationApi();
}
+ if (SbStringCompareAll(name, kCobaltExtensionFontName) == 0) {
+ return starboard::stub::GetFontApi();
+ }
return NULL;
}
diff --git a/src/starboard/tools/toolchain/msvc.py b/src/starboard/tools/toolchain/msvc.py
index 601da6d..3d43367 100644
--- a/src/starboard/tools/toolchain/msvc.py
+++ b/src/starboard/tools/toolchain/msvc.py
@@ -58,8 +58,8 @@
def GetCommand(self, path, extra_flags, flags, shell):
del extra_flags # Not used.
del shell # Not used.
- return ('{path} /nologo /showIncludes {flags} /c $in /Fo$out'.format(
- path=path, flags=flags))
+ return ('{path} /nologo /showIncludes {flags} /c $in /Fo$out /Fd$out.pdb'
+ .format(path=path, flags=flags))
def GetFlags(self, defines, include_dirs, cflags):
defines = defines + self._gyp_defines
diff --git a/src/starboard/ui_navigation.h b/src/starboard/ui_navigation.h
index 827401e..101a6bf 100644
--- a/src/starboard/ui_navigation.h
+++ b/src/starboard/ui_navigation.h
@@ -64,7 +64,7 @@
// Navigation items of type kSbUiNavItemTypeContainer have directionality. If
// directionality is not specified for a container, it should default to
// left-to-right and top-to-bottom.
-//
+// @verbatim
// For left-to-right, content offset x = 0 shows the leftmost content.
// |<--Container Size-->|
// +--------------------+--------------------+--------------------+
@@ -83,7 +83,7 @@
// | Negative position. | Positive position. | Positive position. |
// +--------------------+--------------------+--------------------+
// ^
-// Content Offset X = 0.
+// Content Offset X = 0. @endverbatim
//
// Top-to-bottom is similar to left-to-right, but for the Y position.
// Bottom-to-top is similar to right-to-left, but for the Y position.
@@ -93,8 +93,9 @@
} SbUiNavItemDir;
// This represents a 2x3 transform matrix in row-major order.
+// @verbatim
// | a b tx |
-// | c d ty |
+// | c d ty | @endverbatim
typedef struct SbUiNavMatrix2x3 { float m[6]; } SbUiNavMatrix2x3;
// This represents a 4x4 transform matrix in row-major order.
@@ -240,8 +241,10 @@
//
// For example, consider item A with position (5,5) and content offset (0,0).
// Given item B with position (10,10) is registered as a content of item A.
-// 1. Item B should be drawn at position (15,15).
-// 2. If item A's content offset is changed to (10,0), then item B should be
+//
+// 1) Item B should be drawn at position (15,15).
+//
+// 2) If item A's content offset is changed to (10,0), then item B should be
// drawn at position (5,15).
//
// Essentially, content items should be drawn at:
diff --git a/src/testing/gtest/include/gtest/gtest.h b/src/testing/gtest/include/gtest/gtest.h
index 4f611e1..2c448e2 100644
--- a/src/testing/gtest/include/gtest/gtest.h
+++ b/src/testing/gtest/include/gtest/gtest.h
@@ -1403,6 +1403,9 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wsign-compare"
#pragma clang diagnostic ignored "-Wshorten-64-to-32"
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wsign-compare"
#endif
if (expected == actual) {
return AssertionSuccess();
@@ -1411,6 +1414,8 @@
GTEST_DISABLE_MSC_WARNINGS_POP_()
#elif defined(__clang__)
#pragma clang diagnostic pop
+#else
+#pragma GCC diagnostic pop
#endif
return CmpHelperEQFailure(expected_expression, actual_expression, expected,
diff --git a/src/third_party/dlmalloc/BUILD.gn b/src/third_party/dlmalloc/BUILD.gn
deleted file mode 100644
index 3811508..0000000
--- a/src/third_party/dlmalloc/BUILD.gn
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2013 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# Modifications Copyright 2017 Google Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-static_library("dlmalloc") {
- sources = [
- "dlmalloc.c",
- ]
-
- if (target_os == "win") {
- # Compile dlmalloc.c as C++ on MSVC.
- cflags += [ "/TP" ]
- } else if (target_cpu == "android") {
- cflags += [ "-std=c99" ]
- }
-}
diff --git a/src/third_party/dlmalloc/dlmalloc.c b/src/third_party/dlmalloc/dlmalloc.c
deleted file mode 100644
index 88a0c01..0000000
--- a/src/third_party/dlmalloc/dlmalloc.c
+++ /dev/null
@@ -1,6748 +0,0 @@
-/*
- This is a version (aka dlmalloc) of malloc/free/realloc written by
- Doug Lea and released to the public domain, as explained at
- http://creativecommons.org/publicdomain/zero/1.0/ Send questions,
- comments, complaints, performance data, etc to dl@cs.oswego.edu
-
-* Version 2.8.6 Wed Aug 29 06:57:58 2012 Doug Lea
- Note: There may be an updated version of this malloc obtainable at
- ftp://gee.cs.oswego.edu/pub/misc/malloc.c
- Check before installing!
-
-* Quickstart
-
- This library is all in one file to simplify the most common usage:
- ftp it, compile it (-O3), and link it into another program. All of
- the compile-time options default to reasonable values for use on
- most platforms. You might later want to step through various
- compile-time and dynamic tuning options.
-
- For convenience, an include file for code using this malloc is at:
- ftp://gee.cs.oswego.edu/pub/misc/malloc-2.8.6.h
- You don't really need this .h file unless you call functions not
- defined in your system include files. The .h file contains only the
- excerpts from this file needed for using this malloc on ANSI C/C++
- systems, so long as you haven't changed compile-time options about
- naming and tuning parameters. If you do, then you can create your
- own malloc.h that does include all settings by cutting at the point
- indicated below. Note that you may already by default be using a C
- library containing a malloc that is based on some version of this
- malloc (for example in linux). You might still want to use the one
- in this file to customize settings or to avoid overheads associated
- with library versions.
-
-* Vital statistics:
-
- Supported pointer/size_t representation: 4 or 8 bytes
- size_t MUST be an unsigned type of the same width as
- pointers. (If you are using an ancient system that declares
- size_t as a signed type, or need it to be a different width
- than pointers, you can use a previous release of this malloc
- (e.g. 2.7.2) supporting these.)
-
- Alignment: 8 bytes (minimum)
- This suffices for nearly all current machines and C compilers.
- However, you can define MALLOC_ALIGNMENT to be wider than this
- if necessary (up to 128bytes), at the expense of using more space.
-
- Minimum overhead per allocated chunk: 4 or 8 bytes (if 4byte sizes)
- 8 or 16 bytes (if 8byte sizes)
- Each malloced chunk has a hidden word of overhead holding size
- and status information, and additional cross-check word
- if FOOTERS is defined.
-
- Minimum allocated size: 4-byte ptrs: 16 bytes (including overhead)
- 8-byte ptrs: 32 bytes (including overhead)
-
- Even a request for zero bytes (i.e., malloc(0)) returns a
- pointer to something of the minimum allocatable size.
- The maximum overhead wastage (i.e., number of extra bytes
- allocated than were requested in malloc) is less than or equal
- to the minimum size, except for requests >= mmap_threshold that
- are serviced via mmap(), where the worst case wastage is about
- 32 bytes plus the remainder from a system page (the minimal
- mmap unit); typically 4096 or 8192 bytes.
-
- Security: static-safe; optionally more or less
- The "security" of malloc refers to the ability of malicious
- code to accentuate the effects of errors (for example, freeing
- space that is not currently malloc'ed or overwriting past the
- ends of chunks) in code that calls malloc. This malloc
- guarantees not to modify any memory locations below the base of
- heap, i.e., static variables, even in the presence of usage
- errors. The routines additionally detect most improper frees
- and reallocs. All this holds as long as the static bookkeeping
- for malloc itself is not corrupted by some other means. This
- is only one aspect of security -- these checks do not, and
- cannot, detect all possible programming errors.
-
- If FOOTERS is defined nonzero, then each allocated chunk
- carries an additional check word to verify that it was malloced
- from its space. These check words are the same within each
- execution of a program using malloc, but differ across
- executions, so externally crafted fake chunks cannot be
- freed. This improves security by rejecting frees/reallocs that
- could corrupt heap memory, in addition to the checks preventing
- writes to statics that are always on. This may further improve
- security at the expense of time and space overhead. (Note that
- FOOTERS may also be worth using with MSPACES.)
-
- By default detected errors cause the program to abort (calling
- "abort()"). You can override this to instead proceed past
- errors by defining PROCEED_ON_ERROR. In this case, a bad free
- has no effect, and a malloc that encounters a bad address
- caused by user overwrites will ignore the bad address by
- dropping pointers and indices to all known memory. This may
- be appropriate for programs that should continue if at all
- possible in the face of programming errors, although they may
- run out of memory because dropped memory is never reclaimed.
-
- If you don't like either of these options, you can define
- CORRUPTION_ERROR_ACTION and USAGE_ERROR_ACTION to do anything
- else. And if if you are sure that your program using malloc has
- no errors or vulnerabilities, you can define INSECURE to 1,
- which might (or might not) provide a small performance improvement.
-
- It is also possible to limit the maximum total allocatable
- space, using malloc_set_footprint_limit. This is not
- designed as a security feature in itself (calls to set limits
- are not screened or privileged), but may be useful as one
- aspect of a secure implementation.
-
- Thread-safety: NOT thread-safe unless USE_LOCKS defined non-zero
- When USE_LOCKS is defined, each public call to malloc, free,
- etc is surrounded with a lock. By default, this uses a plain
- pthread mutex, win32 critical section, or a spin-lock if if
- available for the platform and not disabled by setting
- USE_SPIN_LOCKS=0. However, if USE_RECURSIVE_LOCKS is defined,
- recursive versions are used instead (which are not required for
- base functionality but may be needed in layered extensions).
- Using a global lock is not especially fast, and can be a major
- bottleneck. It is designed only to provide minimal protection
- in concurrent environments, and to provide a basis for
- extensions. If you are using malloc in a concurrent program,
- consider instead using nedmalloc
- (http://www.nedprod.com/programs/portable/nedmalloc/) or
- ptmalloc (See http://www.malloc.de), which are derived from
- versions of this malloc.
-
- System requirements: Any combination of MORECORE and/or MMAP/MUNMAP
- This malloc can use unix sbrk or any emulation (invoked using
- the CALL_MORECORE macro) and/or mmap/munmap or any emulation
- (invoked using CALL_MMAP/CALL_MUNMAP) to get and release system
- memory. On most unix systems, it tends to work best if both
- MORECORE and MMAP are enabled. On Win32, it uses emulations
- based on VirtualAlloc. It also uses common C library functions
- like memset.
-
- Compliance: I believe it is compliant with the Single Unix Specification
- (See http://www.unix.org). Also SVID/XPG, ANSI C, and probably
- others as well.
-
-* Overview of algorithms
-
- This is not the fastest, most space-conserving, most portable, or
- most tunable malloc ever written. However it is among the fastest
- while also being among the most space-conserving, portable and
- tunable. Consistent balance across these factors results in a good
- general-purpose allocator for malloc-intensive programs.
-
- In most ways, this malloc is a best-fit allocator. Generally, it
- chooses the best-fitting existing chunk for a request, with ties
- broken in approximately least-recently-used order. (This strategy
- normally maintains low fragmentation.) However, for requests less
- than 256bytes, it deviates from best-fit when there is not an
- exactly fitting available chunk by preferring to use space adjacent
- to that used for the previous small request, as well as by breaking
- ties in approximately most-recently-used order. (These enhance
- locality of series of small allocations.) And for very large requests
- (>= 256Kb by default), it relies on system memory mapping
- facilities, if supported. (This helps avoid carrying around and
- possibly fragmenting memory used only for large chunks.)
-
- All operations (except malloc_stats and mallinfo) have execution
- times that are bounded by a constant factor of the number of bits in
- a size_t, not counting any clearing in calloc or copying in realloc,
- or actions surrounding MORECORE and MMAP that have times
- proportional to the number of non-contiguous regions returned by
- system allocation routines, which is often just 1. In real-time
- applications, you can optionally suppress segment traversals using
- NO_SEGMENT_TRAVERSAL, which assures bounded execution even when
- system allocators return non-contiguous spaces, at the typical
- expense of carrying around more memory and increased fragmentation.
-
- The implementation is not very modular and seriously overuses
- macros. Perhaps someday all C compilers will do as good a job
- inlining modular code as can now be done by brute-force expansion,
- but now, enough of them seem not to.
-
- Some compilers issue a lot of warnings about code that is
- dead/unreachable only on some platforms, and also about intentional
- uses of negation on unsigned types. All known cases of each can be
- ignored.
-
- For a longer but out of date high-level description, see
- http://gee.cs.oswego.edu/dl/html/malloc.html
-
-* MSPACES
- If MSPACES is defined, then in addition to malloc, free, etc.,
- this file also defines mspace_malloc, mspace_free, etc. These
- are versions of malloc routines that take an "mspace" argument
- obtained using create_mspace, to control all internal bookkeeping.
- If ONLY_MSPACES is defined, only these versions are compiled.
- So if you would like to use this allocator for only some allocations,
- and your system malloc for others, you can compile with
- ONLY_MSPACES and then do something like...
- static mspace mymspace = create_mspace(0,0); // for example
- #define mymalloc(bytes) mspace_malloc(mymspace, bytes)
-
- (Note: If you only need one instance of an mspace, you can instead
- use "USE_DL_PREFIX" to relabel the global malloc.)
-
- You can similarly create thread-local allocators by storing
- mspaces as thread-locals. For example:
- static __thread mspace tlms = 0;
- void* tlmalloc(size_t bytes) {
- if (tlms == 0) tlms = create_mspace(0, 0);
- return mspace_malloc(tlms, bytes);
- }
- void tlfree(void* mem) { mspace_free(tlms, mem); }
-
- Unless FOOTERS is defined, each mspace is completely independent.
- You cannot allocate from one and free to another (although
- conformance is only weakly checked, so usage errors are not always
- caught). If FOOTERS is defined, then each chunk carries around a tag
- indicating its originating mspace, and frees are directed to their
- originating spaces. Normally, this requires use of locks.
-
- ------------------------- Compile-time options ---------------------------
-
-Be careful in setting #define values for numerical constants of type
-size_t. On some systems, literal values are not automatically extended
-to size_t precision unless they are explicitly casted. You can also
-use the symbolic values MAX_SIZE_T, SIZE_T_ONE, etc below.
-
-WIN32 default: defined if _WIN32 defined
- Defining WIN32 sets up defaults for MS environment and compilers.
- Otherwise defaults are for unix. Beware that there seem to be some
- cases where this malloc might not be a pure drop-in replacement for
- Win32 malloc: Random-looking failures from Win32 GDI API's (eg;
- SetDIBits()) may be due to bugs in some video driver implementations
- when pixel buffers are malloc()ed, and the region spans more than
- one VirtualAlloc()ed region. Because dlmalloc uses a small (64Kb)
- default granularity, pixel buffers may straddle virtual allocation
- regions more often than when using the Microsoft allocator. You can
- avoid this by using VirtualAlloc() and VirtualFree() for all pixel
- buffers rather than using malloc(). If this is not possible,
- recompile this malloc with a larger DEFAULT_GRANULARITY. Note:
- in cases where MSC and gcc (cygwin) are known to differ on WIN32,
- conditions use _MSC_VER to distinguish them.
-
-DLMALLOC_EXPORT default: extern
- Defines how public APIs are declared. If you want to export via a
- Windows DLL, you might define this as
- #define DLMALLOC_EXPORT extern __declspec(dllexport)
- If you want a POSIX ELF shared object, you might use
- #define DLMALLOC_EXPORT extern __attribute__((visibility("default")))
-
-MALLOC_ALIGNMENT default: (size_t)(2 * sizeof(void *))
- Controls the minimum alignment for malloc'ed chunks. It must be a
- power of two and at least 8, even on machines for which smaller
- alignments would suffice. It may be defined as larger than this
- though. Note however that code and data structures are optimized for
- the case of 8-byte alignment.
-
-MSPACES default: 0 (false)
- If true, compile in support for independent allocation spaces.
- This is only supported if HAVE_MMAP is true.
-
-ONLY_MSPACES default: 0 (false)
- If true, only compile in mspace versions, not regular versions.
-
-USE_LOCKS default: 0 (false)
- Causes each call to each public routine to be surrounded with
- pthread or WIN32 mutex lock/unlock. (If set true, this can be
- overridden on a per-mspace basis for mspace versions.) If set to a
- non-zero value other than 1, locks are used, but their
- implementation is left out, so lock functions must be supplied manually,
- as described below.
-
-USE_SPIN_LOCKS default: 1 iff USE_LOCKS and spin locks available
- If true, uses custom spin locks for locking. This is currently
- supported only gcc >= 4.1, older gccs on x86 platforms, and recent
- MS compilers. Otherwise, posix locks or win32 critical sections are
- used.
-
-USE_RECURSIVE_LOCKS default: not defined
- If defined nonzero, uses recursive (aka reentrant) locks, otherwise
- uses plain mutexes. This is not required for malloc proper, but may
- be needed for layered allocators such as nedmalloc.
-
-LOCK_AT_FORK default: not defined
- If defined nonzero, performs pthread_atfork upon initialization
- to initialize child lock while holding parent lock. The implementation
- assumes that pthread locks (not custom locks) are being used. In other
- cases, you may need to customize the implementation.
-
-FOOTERS default: 0
- If true, provide extra checking and dispatching by placing
- information in the footers of allocated chunks. This adds
- space and time overhead.
-
-INSECURE default: 0
- If true, omit checks for usage errors and heap space overwrites.
-
-USE_DL_PREFIX default: NOT defined
- Causes compiler to prefix all public routines with the string 'dl'.
- This can be useful when you only want to use this malloc in one part
- of a program, using your regular system malloc elsewhere.
-
-MALLOC_INSPECT_ALL default: NOT defined
- If defined, compiles malloc_inspect_all and mspace_inspect_all, that
- perform traversal of all heap space. Unless access to these
- functions is otherwise restricted, you probably do not want to
- include them in secure implementations.
-
-ABORT default: defined as abort()
- Defines how to abort on failed checks. On most systems, a failed
- check cannot die with an "assert" or even print an informative
- message, because the underlying print routines in turn call malloc,
- which will fail again. Generally, the best policy is to simply call
- abort(). It's not very useful to do more than this because many
- errors due to overwriting will show up as address faults (null, odd
- addresses etc) rather than malloc-triggered checks, so will also
- abort. Also, most compilers know that abort() does not return, so
- can better optimize code conditionally calling it.
-
-PROCEED_ON_ERROR default: defined as 0 (false)
- Controls whether detected bad addresses cause them to bypassed
- rather than aborting. If set, detected bad arguments to free and
- realloc are ignored. And all bookkeeping information is zeroed out
- upon a detected overwrite of freed heap space, thus losing the
- ability to ever return it from malloc again, but enabling the
- application to proceed. If PROCEED_ON_ERROR is defined, the
- static variable malloc_corruption_error_count is compiled in
- and can be examined to see if errors have occurred. This option
- generates slower code than the default abort policy.
-
-DEBUG default: NOT defined
- The DEBUG setting is mainly intended for people trying to modify
- this code or diagnose problems when porting to new platforms.
- However, it may also be able to better isolate user errors than just
- using runtime checks. The assertions in the check routines spell
- out in more detail the assumptions and invariants underlying the
- algorithms. The checking is fairly extensive, and will slow down
- execution noticeably. Calling malloc_stats or mallinfo with DEBUG
- set will attempt to check every non-mmapped allocated and free chunk
- in the course of computing the summaries.
-
-ABORT_ON_ASSERT_FAILURE default: defined as 1 (true)
- Debugging assertion failures can be nearly impossible if your
- version of the assert macro causes malloc to be called, which will
- lead to a cascade of further failures, blowing the runtime stack.
- ABORT_ON_ASSERT_FAILURE cause assertions failures to call abort(),
- which will usually make debugging easier.
-
-MALLOC_FAILURE_ACTION default: sets errno to ENOMEM, or no-op on win32
- The action to take before "return 0" when malloc fails to be able to
- return memory because there is none available.
-
-HAVE_MORECORE default: 1 (true) unless win32 or ONLY_MSPACES
- True if this system supports sbrk or an emulation of it.
-
-MORECORE default: sbrk
- The name of the sbrk-style system routine to call to obtain more
- memory. See below for guidance on writing custom MORECORE
- functions. The type of the argument to sbrk/MORECORE varies across
- systems. It cannot be size_t, because it supports negative
- arguments, so it is normally the signed type of the same width as
- size_t (sometimes declared as "intptr_t"). It doesn't much matter
- though. Internally, we only call it with arguments less than half
- the max value of a size_t, which should work across all reasonable
- possibilities, although sometimes generating compiler warnings.
-
-MORECORE_CONTIGUOUS default: 1 (true) if HAVE_MORECORE
- If true, take advantage of fact that consecutive calls to MORECORE
- with positive arguments always return contiguous increasing
- addresses. This is true of unix sbrk. It does not hurt too much to
- set it true anyway, since malloc copes with non-contiguities.
- Setting it false when definitely non-contiguous saves time
- and possibly wasted space it would take to discover this though.
-
-MORECORE_CANNOT_TRIM default: NOT defined
- True if MORECORE cannot release space back to the system when given
- negative arguments. This is generally necessary only if you are
- using a hand-crafted MORECORE function that cannot handle negative
- arguments.
-
-NO_SEGMENT_TRAVERSAL default: 0
- If non-zero, suppresses traversals of memory segments
- returned by either MORECORE or CALL_MMAP. This disables
- merging of segments that are contiguous, and selectively
- releasing them to the OS if unused, but bounds execution times.
-
-HAVE_MMAP default: 1 (true)
- True if this system supports mmap or an emulation of it. If so, and
- HAVE_MORECORE is not true, MMAP is used for all system
- allocation. If set and HAVE_MORECORE is true as well, MMAP is
- primarily used to directly allocate very large blocks. It is also
- used as a backup strategy in cases where MORECORE fails to provide
- space from system. Note: A single call to MUNMAP is assumed to be
- able to unmap memory that may have be allocated using multiple calls
- to MMAP, so long as they are adjacent.
-
-HAVE_MREMAP default: 1 on linux, else 0
- If true realloc() uses mremap() to re-allocate large blocks and
- extend or shrink allocation spaces.
-
-MMAP_CLEARS default: 1 except on WINCE.
- True if mmap clears memory so calloc doesn't need to. This is true
- for standard unix mmap using /dev/zero and on WIN32 except for WINCE.
-
-USE_BUILTIN_FFS default: 0 (i.e., not used)
- Causes malloc to use the builtin ffs() function to compute indices.
- Some compilers may recognize and intrinsify ffs to be faster than the
- supplied C version. Also, the case of x86 using gcc is special-cased
- to an asm instruction, so is already as fast as it can be, and so
- this setting has no effect. Similarly for Win32 under recent MS compilers.
- (On most x86s, the asm version is only slightly faster than the C version.)
-
-malloc_getpagesize default: derive from system includes, or 4096.
- The system page size. To the extent possible, this malloc manages
- memory from the system in page-size units. This may be (and
- usually is) a function rather than a constant. This is ignored
- if WIN32, where page size is determined using getSystemInfo during
- initialization.
-
-USE_DEV_RANDOM default: 0 (i.e., not used)
- Causes malloc to use /dev/random to initialize secure magic seed for
- stamping footers. Otherwise, the current time is used.
-
-NO_MALLINFO default: 0
- If defined, don't compile "mallinfo". This can be a simple way
- of dealing with mismatches between system declarations and
- those in this file.
-
-MALLINFO_FIELD_TYPE default: size_t
- The type of the fields in the mallinfo struct. This was originally
- defined as "int" in SVID etc, but is more usefully defined as
- size_t. The value is used only if HAVE_USR_INCLUDE_MALLOC_H is not set
-
-NO_MALLOC_STATS default: 0
- If defined, don't compile "malloc_stats". This avoids calls to
- fprintf and bringing in stdio dependencies you might not want.
-
-REALLOC_ZERO_BYTES_FREES default: not defined
- This should be set if a call to realloc with zero bytes should
- be the same as a call to free. Some people think it should. Otherwise,
- since this malloc returns a unique pointer for malloc(0), so does
- realloc(p, 0).
-
-LACKS_UNISTD_H, LACKS_FCNTL_H, LACKS_SYS_PARAM_H, LACKS_SYS_MMAN_H
-LACKS_STRINGS_H, LACKS_STRING_H, LACKS_SYS_TYPES_H, LACKS_ERRNO_H
-LACKS_STDLIB_H LACKS_SCHED_H LACKS_TIME_H default: NOT defined unless on WIN32
- Define these if your system does not have these header files.
- You might need to manually insert some of the declarations they provide.
-
-DEFAULT_GRANULARITY default: page size if MORECORE_CONTIGUOUS,
- system_info.dwAllocationGranularity in WIN32,
- otherwise 64K.
- Also settable using mallopt(M_GRANULARITY, x)
- The unit for allocating and deallocating memory from the system. On
- most systems with contiguous MORECORE, there is no reason to
- make this more than a page. However, systems with MMAP tend to
- either require or encourage larger granularities. You can increase
- this value to prevent system allocation functions to be called so
- often, especially if they are slow. The value must be at least one
- page and must be a power of two. Setting to 0 causes initialization
- to either page size or win32 region size. (Note: In previous
- versions of malloc, the equivalent of this option was called
- "TOP_PAD")
-
-DEFAULT_TRIM_THRESHOLD default: 2MB
- Also settable using mallopt(M_TRIM_THRESHOLD, x)
- The maximum amount of unused top-most memory to keep before
- releasing via malloc_trim in free(). Automatic trimming is mainly
- useful in long-lived programs using contiguous MORECORE. Because
- trimming via sbrk can be slow on some systems, and can sometimes be
- wasteful (in cases where programs immediately afterward allocate
- more large chunks) the value should be high enough so that your
- overall system performance would improve by releasing this much
- memory. As a rough guide, you might set to a value close to the
- average size of a process (program) running on your system.
- Releasing this much memory would allow such a process to run in
- memory. Generally, it is worth tuning trim thresholds when a
- program undergoes phases where several large chunks are allocated
- and released in ways that can reuse each other's storage, perhaps
- mixed with phases where there are no such chunks at all. The trim
- value must be greater than page size to have any useful effect. To
- disable trimming completely, you can set to MAX_SIZE_T. Note that the trick
- some people use of mallocing a huge space and then freeing it at
- program startup, in an attempt to reserve system memory, doesn't
- have the intended effect under automatic trimming, since that memory
- will immediately be returned to the system.
-
-DEFAULT_MMAP_THRESHOLD default: 256K
- Also settable using mallopt(M_MMAP_THRESHOLD, x)
- The request size threshold for using MMAP to directly service a
- request. Requests of at least this size that cannot be allocated
- using already-existing space will be serviced via mmap. (If enough
- normal freed space already exists it is used instead.) Using mmap
- segregates relatively large chunks of memory so that they can be
- individually obtained and released from the host system. A request
- serviced through mmap is never reused by any other request (at least
- not directly; the system may just so happen to remap successive
- requests to the same locations). Segregating space in this way has
- the benefits that: Mmapped space can always be individually released
- back to the system, which helps keep the system level memory demands
- of a long-lived program low. Also, mapped memory doesn't become
- `locked' between other chunks, as can happen with normally allocated
- chunks, which means that even trimming via malloc_trim would not
- release them. However, it has the disadvantage that the space
- cannot be reclaimed, consolidated, and then used to service later
- requests, as happens with normal chunks. The advantages of mmap
- nearly always outweigh disadvantages for "large" chunks, but the
- value of "large" may vary across systems. The default is an
- empirically derived value that works well in most systems. You can
- disable mmap by setting to MAX_SIZE_T.
-
-MAX_RELEASE_CHECK_RATE default: 4095 unless not HAVE_MMAP
- The number of consolidated frees between checks to release
- unused segments when freeing. When using non-contiguous segments,
- especially with multiple mspaces, checking only for topmost space
- doesn't always suffice to trigger trimming. To compensate for this,
- free() will, with a period of MAX_RELEASE_CHECK_RATE (or the
- current number of segments, if greater) try to release unused
- segments to the OS when freeing chunks that result in
- consolidation. The best value for this parameter is a compromise
- between slowing down frees with relatively costly checks that
- rarely trigger versus holding on to unused memory. To effectively
- disable, set to MAX_SIZE_T. This may lead to a very slight speed
- improvement at the expense of carrying around more memory.
-*/
-
-/* Version identifier to allow people to support multiple versions */
-#ifndef DLMALLOC_VERSION
-#define DLMALLOC_VERSION 20806
-#endif /* DLMALLOC_VERSION */
-
-#ifndef DLMALLOC_EXPORT
-#define DLMALLOC_EXPORT extern
-#endif
-
-#if defined(STARBOARD)
-// Just make sure we don't detect as these other platforms.
-#elif defined(__LB_SHELL__)
-#include <time.h>
-
-#if defined(__LB_XB1__) || defined(__LB_XB360__)
-// We don't want dlmalloc's WIN32, but
-// we do need some Windows types.
-#include <windows.h>
-#undef WIN32
-#endif // __LB_XB1__ || __LB_XB360__
-#else // defined(STARBOARD)
-
-#ifndef WIN32
-#if defined(_WIN32) && !defined(__LB_XB1__) && !defined(__LB_XB360__)
-#define WIN32 1
-#endif /* _WIN32 */
-#ifdef _WIN32_WCE
-#define LACKS_FCNTL_H
-#define WIN32 1
-#endif /* _WIN32_WCE */
-#endif /* WIN32 */
-#if defined(WIN32) && !defined(__LB_XB1__) && !defined(__LB_XB360__)
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <tchar.h>
-#define HAVE_MMAP 1
-#define HAVE_MORECORE 0
-#define LACKS_UNISTD_H
-#define LACKS_SYS_PARAM_H
-#define LACKS_SYS_MMAN_H
-#define LACKS_STRING_H
-#define LACKS_STRINGS_H
-#define LACKS_SYS_TYPES_H
-#define LACKS_ERRNO_H
-#define LACKS_SCHED_H
-#ifndef MALLOC_FAILURE_ACTION
-#define MALLOC_FAILURE_ACTION
-#endif /* MALLOC_FAILURE_ACTION */
-#ifndef MMAP_CLEARS
-#ifdef _WIN32_WCE /* WINCE reportedly does not clear */
-#define MMAP_CLEARS 0
-#else
-#define MMAP_CLEARS 1
-#endif /* _WIN32_WCE */
-#endif /*MMAP_CLEARS */
-#endif /* WIN32 */
-
-#if defined(DARWIN) || defined(_DARWIN)
-/* Mac OSX docs advise not to use sbrk; it seems better to use mmap */
-#ifndef HAVE_MORECORE
-#define HAVE_MORECORE 0
-#define HAVE_MMAP 1
-/* OSX allocators provide 16 byte alignment */
-#ifndef MALLOC_ALIGNMENT
-#define MALLOC_ALIGNMENT ((size_t)16U)
-#endif
-#endif /* HAVE_MORECORE */
-#endif /* DARWIN */
-
-#ifndef LACKS_SYS_TYPES_H
-#include <sys/types.h> /* For size_t */
-#endif /* LACKS_SYS_TYPES_H */
-#endif // defined(STARBOARD)
-
-#if defined(STARBOARD)
-#include "dlmalloc_config.h"
-#include "starboard/common/log.h"
-#include "starboard/configuration_constants.h"
-#include "starboard/memory.h"
-#include "starboard/string.h"
-#include "starboard/system.h"
-#ifdef MAX
-#undef MAX
-#endif
-#define MAX(a, b) (((a) > (b)) ? (a) : (b))
-#define ABORT \
- do { \
- SbLogFormatF("%s:%s:%d - ABORT\n", __FUNCTION__, __FILE__, __LINE__); \
- SbSystemBreakIntoDebugger(); \
- } while(false)
-#define CRASH() ABORT
-#define fprintf(stderr, format, ...) SbLogFormatF(format, __VA_ARGS__)
-#elif defined(__LB_SHELL__)
-#include "dlmalloc_config.h"
-#include "lb_memory_debug_platform.h"
-#ifdef MAX
-#undef MAX
-#endif
-#define MAX(a, b) (((a) > (b)) ? (a) : (b))
-
-#define CRASH() ((void(*)())0)()
-#endif // defined(STARBOARD)
-
-/* The maximum possible size_t value has all bits set */
-#define MAX_SIZE_T (~(size_t)0)
-
-#ifndef USE_LOCKS /* ensure true if spin or recursive locks set */
-#define USE_LOCKS ((defined(USE_SPIN_LOCKS) && USE_SPIN_LOCKS != 0) || \
- (defined(USE_RECURSIVE_LOCKS) && USE_RECURSIVE_LOCKS != 0))
-#endif /* USE_LOCKS */
-
-#if USE_LOCKS /* Spin locks for gcc >= 4.1, older gcc on x86, MSC >= 1310 */
-#if ((defined(__GNUC__) && \
- ((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) || \
- defined(__i386__) || defined(__x86_64__))) || \
- (defined(_MSC_VER) && _MSC_VER>=1310))
-#ifndef USE_SPIN_LOCKS
-#define USE_SPIN_LOCKS 1
-#endif /* USE_SPIN_LOCKS */
-#elif USE_SPIN_LOCKS
-#error "USE_SPIN_LOCKS defined without implementation"
-#endif /* ... locks available... */
-#elif !defined(USE_SPIN_LOCKS)
-#define USE_SPIN_LOCKS 0
-#endif /* USE_LOCKS */
-
-#ifndef ONLY_MSPACES
-#define ONLY_MSPACES 0
-#endif /* ONLY_MSPACES */
-#ifndef MSPACES
-#if ONLY_MSPACES
-#define MSPACES 1
-#else /* ONLY_MSPACES */
-#define MSPACES 0
-#endif /* ONLY_MSPACES */
-#endif /* MSPACES */
-#ifndef MALLOC_ALIGNMENT
-#define MALLOC_ALIGNMENT ((size_t)(2 * sizeof(void *)))
-#endif /* MALLOC_ALIGNMENT */
-#ifndef FOOTERS
-#define FOOTERS 0
-#endif /* FOOTERS */
-#ifndef ABORT
-#define ABORT abort()
-#endif /* ABORT */
-#ifndef ABORT_ON_ASSERT_FAILURE
-#define ABORT_ON_ASSERT_FAILURE 1
-#endif /* ABORT_ON_ASSERT_FAILURE */
-#ifndef PROCEED_ON_ERROR
-#define PROCEED_ON_ERROR 0
-#endif /* PROCEED_ON_ERROR */
-
-#ifndef INSECURE
-#define INSECURE 0
-#endif /* INSECURE */
-#ifndef MALLOC_INSPECT_ALL
-#define MALLOC_INSPECT_ALL 0
-#endif /* MALLOC_INSPECT_ALL */
-#ifndef HAVE_MMAP
-#define HAVE_MMAP 1
-#endif /* HAVE_MMAP */
-#ifndef MMAP_CLEARS
-#define MMAP_CLEARS 1
-#endif /* MMAP_CLEARS */
-#ifndef HAVE_MREMAP
-#ifdef linux
-#define HAVE_MREMAP 1
-#define _GNU_SOURCE /* Turns on mremap() definition */
-#else /* linux */
-#define HAVE_MREMAP 0
-#endif /* linux */
-#endif /* HAVE_MREMAP */
-#ifndef MALLOC_FAILURE_ACTION
-#define MALLOC_FAILURE_ACTION errno = ENOMEM;
-#endif /* MALLOC_FAILURE_ACTION */
-#ifndef HAVE_MORECORE
-#if ONLY_MSPACES
-#define HAVE_MORECORE 0
-#else /* ONLY_MSPACES */
-#define HAVE_MORECORE 1
-#endif /* ONLY_MSPACES */
-#endif /* HAVE_MORECORE */
-#if !HAVE_MORECORE
-#define MORECORE_CONTIGUOUS 0
-#else /* !HAVE_MORECORE */
-#define MORECORE_DEFAULT sbrk
-#ifndef MORECORE_CONTIGUOUS
-#define MORECORE_CONTIGUOUS 1
-#endif /* MORECORE_CONTIGUOUS */
-#endif /* HAVE_MORECORE */
-#ifndef DEFAULT_GRANULARITY
-#if (MORECORE_CONTIGUOUS || defined(WIN32) || defined(STARBOARD))
-#define DEFAULT_GRANULARITY (0) /* 0 means to compute in init_mparams */
-#else /* MORECORE_CONTIGUOUS */
-#define DEFAULT_GRANULARITY ((size_t)64U * (size_t)1024U)
-#endif /* MORECORE_CONTIGUOUS */
-#endif /* DEFAULT_GRANULARITY */
-#ifndef DEFAULT_TRIM_THRESHOLD
-#ifndef MORECORE_CANNOT_TRIM
-#define DEFAULT_TRIM_THRESHOLD ((size_t)2U * (size_t)1024U * (size_t)1024U)
-#else /* MORECORE_CANNOT_TRIM */
-#define DEFAULT_TRIM_THRESHOLD MAX_SIZE_T
-#endif /* MORECORE_CANNOT_TRIM */
-#endif /* DEFAULT_TRIM_THRESHOLD */
-#ifndef DEFAULT_MMAP_THRESHOLD
-#if HAVE_MMAP
-#define DEFAULT_MMAP_THRESHOLD ((size_t)256U * (size_t)1024U)
-#else /* HAVE_MMAP */
-#define DEFAULT_MMAP_THRESHOLD MAX_SIZE_T
-#endif /* HAVE_MMAP */
-#endif /* DEFAULT_MMAP_THRESHOLD */
-#ifndef MAX_RELEASE_CHECK_RATE
-#if HAVE_MMAP
-#define MAX_RELEASE_CHECK_RATE 4095
-#else
-#define MAX_RELEASE_CHECK_RATE MAX_SIZE_T
-#endif /* HAVE_MMAP */
-#endif /* MAX_RELEASE_CHECK_RATE */
-#ifndef USE_BUILTIN_FFS
-#define USE_BUILTIN_FFS 0
-#endif /* USE_BUILTIN_FFS */
-#ifndef USE_DEV_RANDOM
-#define USE_DEV_RANDOM 0
-#endif /* USE_DEV_RANDOM */
-#ifndef NO_MALLINFO
-#define NO_MALLINFO 0
-#endif /* NO_MALLINFO */
-#ifndef MALLINFO_FIELD_TYPE
-#define MALLINFO_FIELD_TYPE size_t
-#endif /* MALLINFO_FIELD_TYPE */
-#ifndef NO_MALLOC_STATS
-#define NO_MALLOC_STATS 0
-#endif /* NO_MALLOC_STATS */
-#ifndef NO_SEGMENT_TRAVERSAL
-#define NO_SEGMENT_TRAVERSAL 0
-#endif /* NO_SEGMENT_TRAVERSAL */
-
-/*
- mallopt tuning options. SVID/XPG defines four standard parameter
- numbers for mallopt, normally defined in malloc.h. None of these
- are used in this malloc, so setting them has no effect. But this
- malloc does support the following options.
-*/
-
-#define M_TRIM_THRESHOLD (-1)
-#define M_GRANULARITY (-2)
-#define M_MMAP_THRESHOLD (-3)
-
-/* ------------------------ Mallinfo declarations ------------------------ */
-
-#if !NO_MALLINFO
-/*
- This version of malloc supports the standard SVID/XPG mallinfo
- routine that returns a struct containing usage properties and
- statistics. It should work on any system that has a
- /usr/include/malloc.h defining struct mallinfo. The main
- declaration needed is the mallinfo struct that is returned (by-copy)
- by mallinfo(). The malloinfo struct contains a bunch of fields that
- are not even meaningful in this version of malloc. These fields are
- are instead filled by mallinfo() with other numbers that might be of
- interest.
-
- HAVE_USR_INCLUDE_MALLOC_H should be set if you have a
- /usr/include/malloc.h file that includes a declaration of struct
- mallinfo. If so, it is included; else a compliant version is
- declared below. These must be precisely the same for mallinfo() to
- work. The original SVID version of this struct, defined on most
- systems with mallinfo, declares all fields as ints. But some others
- define as unsigned long. If your system defines the fields using a
- type of different width than listed here, you MUST #include your
- system version and #define HAVE_USR_INCLUDE_MALLOC_H.
-*/
-
-/* #define HAVE_USR_INCLUDE_MALLOC_H */
-
-#ifdef HAVE_USR_INCLUDE_MALLOC_H
-#include "/usr/include/malloc.h"
-#else /* HAVE_USR_INCLUDE_MALLOC_H */
-#ifndef STRUCT_MALLINFO_DECLARED
-/* HP-UX (and others?) redefines mallinfo unless _STRUCT_MALLINFO is defined */
-#define _STRUCT_MALLINFO
-#define STRUCT_MALLINFO_DECLARED 1
-struct mallinfo {
- MALLINFO_FIELD_TYPE arena; /* non-mmapped space allocated from system */
- MALLINFO_FIELD_TYPE ordblks; /* number of free chunks */
- MALLINFO_FIELD_TYPE smblks; /* always 0 */
- MALLINFO_FIELD_TYPE hblks; /* always 0 */
- MALLINFO_FIELD_TYPE hblkhd; /* space in mmapped regions */
- MALLINFO_FIELD_TYPE usmblks; /* maximum total allocated space */
- MALLINFO_FIELD_TYPE fsmblks; /* always 0 */
- MALLINFO_FIELD_TYPE uordblks; /* total allocated space */
- MALLINFO_FIELD_TYPE fordblks; /* total free space */
- MALLINFO_FIELD_TYPE keepcost; /* releasable (via malloc_trim) space */
-};
-#endif /* STRUCT_MALLINFO_DECLARED */
-#endif /* HAVE_USR_INCLUDE_MALLOC_H */
-#endif /* NO_MALLINFO */
-
-/*
- Try to persuade compilers to inline. The most critical functions for
- inlining are defined as macros, so these aren't used for them.
-*/
-
-#ifndef FORCEINLINE
- #if defined(__GNUC__)
- #define FORCEINLINE __inline __attribute__ ((always_inline))
- #elif defined(_MSC_VER)
- #define FORCEINLINE __forceinline
- #endif
-#elif defined(__LB_XB360__)
- #undef FORCEINLINE
- #define FORCEINLINE __forceinline
-#endif
-#ifndef NOINLINE
- #if defined(__GNUC__)
- #define NOINLINE __attribute__ ((noinline))
- #elif defined(_MSC_VER)
- #define NOINLINE __declspec(noinline)
- #else
- #define NOINLINE
- #endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#ifndef FORCEINLINE
- #define FORCEINLINE inline
-#endif
-#endif /* __cplusplus */
-#ifndef FORCEINLINE
- #define FORCEINLINE
-#endif
-
-#if !ONLY_MSPACES
-
-/* ------------------- Declarations of public routines ------------------- */
-
-#ifndef USE_DL_PREFIX
-#define dlcalloc calloc
-#define dlfree free
-#define dlmalloc malloc
-#define dlmemalign memalign
-#define dlposix_memalign posix_memalign
-#define dlrealloc realloc
-#define dlrealloc_in_place realloc_in_place
-#define dlvalloc valloc
-#define dlpvalloc pvalloc
-#define dlmallinfo mallinfo
-#define dlmallopt mallopt
-#define dlmalloc_trim malloc_trim
-#define dlmalloc_stats malloc_stats
-#define dlmalloc_usable_size malloc_usable_size
-#define dlmalloc_footprint malloc_footprint
-#define dlmalloc_max_footprint malloc_max_footprint
-#define dlmalloc_footprint_limit malloc_footprint_limit
-#define dlmalloc_set_footprint_limit malloc_set_footprint_limit
-#define dlmalloc_inspect_all malloc_inspect_all
-#define dlindependent_calloc independent_calloc
-#define dlindependent_comalloc independent_comalloc
-#define dlbulk_free bulk_free
-#endif /* USE_DL_PREFIX */
-
-/*
- malloc(size_t n)
- Returns a pointer to a newly allocated chunk of at least n bytes, or
- null if no space is available, in which case errno is set to ENOMEM
- on ANSI C systems.
-
- If n is zero, malloc returns a minimum-sized chunk. (The minimum
- size is 16 bytes on most 32bit systems, and 32 bytes on 64bit
- systems.) Note that size_t is an unsigned type, so calls with
- arguments that would be negative if signed are interpreted as
- requests for huge amounts of space, which will often fail. The
- maximum supported value of n differs across systems, but is in all
- cases less than the maximum representable value of a size_t.
-*/
-DLMALLOC_EXPORT void* dlmalloc(size_t);
-
-/*
- free(void* p)
- Releases the chunk of memory pointed to by p, that had been previously
- allocated using malloc or a related routine such as realloc.
- It has no effect if p is null. If p was not malloced or already
- freed, free(p) will by default cause the current program to abort.
-*/
-DLMALLOC_EXPORT void dlfree(void*);
-
-/*
- calloc(size_t n_elements, size_t element_size);
- Returns a pointer to n_elements * element_size bytes, with all locations
- set to zero.
-*/
-DLMALLOC_EXPORT void* dlcalloc(size_t, size_t);
-
-/*
- realloc(void* p, size_t n)
- Returns a pointer to a chunk of size n that contains the same data
- as does chunk p up to the minimum of (n, p's size) bytes, or null
- if no space is available.
-
- The returned pointer may or may not be the same as p. The algorithm
- prefers extending p in most cases when possible, otherwise it
- employs the equivalent of a malloc-copy-free sequence.
-
- If p is null, realloc is equivalent to malloc.
-
- If space is not available, realloc returns null, errno is set (if on
- ANSI) and p is NOT freed.
-
- if n is for fewer bytes than already held by p, the newly unused
- space is lopped off and freed if possible. realloc with a size
- argument of zero (re)allocates a minimum-sized chunk.
-
- The old unix realloc convention of allowing the last-free'd chunk
- to be used as an argument to realloc is not supported.
-*/
-DLMALLOC_EXPORT void* dlrealloc(void*, size_t);
-
-/*
- realloc_in_place(void* p, size_t n)
- Resizes the space allocated for p to size n, only if this can be
- done without moving p (i.e., only if there is adjacent space
- available if n is greater than p's current allocated size, or n is
- less than or equal to p's size). This may be used instead of plain
- realloc if an alternative allocation strategy is needed upon failure
- to expand space; for example, reallocation of a buffer that must be
- memory-aligned or cleared. You can use realloc_in_place to trigger
- these alternatives only when needed.
-
- Returns p if successful; otherwise null.
-*/
-DLMALLOC_EXPORT void* dlrealloc_in_place(void*, size_t);
-
-/*
- memalign(size_t alignment, size_t n);
- Returns a pointer to a newly allocated chunk of n bytes, aligned
- in accord with the alignment argument.
-
- The alignment argument should be a power of two. If the argument is
- not a power of two, the nearest greater power is used.
- 8-byte alignment is guaranteed by normal malloc calls, so don't
- bother calling memalign with an argument of 8 or less.
-
- Overreliance on memalign is a sure way to fragment space.
-*/
-DLMALLOC_EXPORT void* dlmemalign(size_t, size_t);
-
-/*
- int posix_memalign(void** pp, size_t alignment, size_t n);
- Allocates a chunk of n bytes, aligned in accord with the alignment
- argument. Differs from memalign only in that it (1) assigns the
- allocated memory to *pp rather than returning it, (2) fails and
- returns EINVAL if the alignment is not a power of two (3) fails and
- returns ENOMEM if memory cannot be allocated.
-*/
-DLMALLOC_EXPORT int dlposix_memalign(void**, size_t, size_t);
-
-/*
- valloc(size_t n);
- Equivalent to memalign(pagesize, n), where pagesize is the page
- size of the system. If the pagesize is unknown, 4096 is used.
-*/
-DLMALLOC_EXPORT void* dlvalloc(size_t);
-
-/*
- mallopt(int parameter_number, int parameter_value)
- Sets tunable parameters The format is to provide a
- (parameter-number, parameter-value) pair. mallopt then sets the
- corresponding parameter to the argument value if it can (i.e., so
- long as the value is meaningful), and returns 1 if successful else
- 0. To workaround the fact that mallopt is specified to use int,
- not size_t parameters, the value -1 is specially treated as the
- maximum unsigned size_t value.
-
- SVID/XPG/ANSI defines four standard param numbers for mallopt,
- normally defined in malloc.h. None of these are use in this malloc,
- so setting them has no effect. But this malloc also supports other
- options in mallopt. See below for details. Briefly, supported
- parameters are as follows (listed defaults are for "typical"
- configurations).
-
- Symbol param # default allowed param values
- M_TRIM_THRESHOLD -1 2*1024*1024 any (-1 disables)
- M_GRANULARITY -2 page size any power of 2 >= page size
- M_MMAP_THRESHOLD -3 256*1024 any (or 0 if no MMAP support)
-*/
-DLMALLOC_EXPORT int dlmallopt(int, int);
-
-/*
- malloc_footprint();
- Returns the number of bytes obtained from the system. The total
- number of bytes allocated by malloc, realloc etc., is less than this
- value. Unlike mallinfo, this function returns only a precomputed
- result, so can be called frequently to monitor memory consumption.
- Even if locks are otherwise defined, this function does not use them,
- so results might not be up to date.
-*/
-DLMALLOC_EXPORT size_t dlmalloc_footprint(void);
-
-/*
- malloc_max_footprint();
- Returns the maximum number of bytes obtained from the system. This
- value will be greater than current footprint if deallocated space
- has been reclaimed by the system. The peak number of bytes allocated
- by malloc, realloc etc., is less than this value. Unlike mallinfo,
- this function returns only a precomputed result, so can be called
- frequently to monitor memory consumption. Even if locks are
- otherwise defined, this function does not use them, so results might
- not be up to date.
-*/
-DLMALLOC_EXPORT size_t dlmalloc_max_footprint(void);
-
-/*
- malloc_footprint_limit();
- Returns the number of bytes that the heap is allowed to obtain from
- the system, returning the last value returned by
- malloc_set_footprint_limit, or the maximum size_t value if
- never set. The returned value reflects a permission. There is no
- guarantee that this number of bytes can actually be obtained from
- the system.
-*/
-DLMALLOC_EXPORT size_t dlmalloc_footprint_limit();
-
-/*
- malloc_set_footprint_limit();
- Sets the maximum number of bytes to obtain from the system, causing
- failure returns from malloc and related functions upon attempts to
- exceed this value. The argument value may be subject to page
- rounding to an enforceable limit; this actual value is returned.
- Using an argument of the maximum possible size_t effectively
- disables checks. If the argument is less than or equal to the
- current malloc_footprint, then all future allocations that require
- additional system memory will fail. However, invocation cannot
- retroactively deallocate existing used memory.
-*/
-DLMALLOC_EXPORT size_t dlmalloc_set_footprint_limit(size_t bytes);
-
-#if MALLOC_INSPECT_ALL
-/*
- malloc_inspect_all(void(*handler)(void *start,
- void *end,
- size_t used_bytes,
- void* callback_arg),
- void* arg);
- Traverses the heap and calls the given handler for each managed
- region, skipping all bytes that are (or may be) used for bookkeeping
- purposes. Traversal does not include include chunks that have been
- directly memory mapped. Each reported region begins at the start
- address, and continues up to but not including the end address. The
- first used_bytes of the region contain allocated data. If
- used_bytes is zero, the region is unallocated. The handler is
- invoked with the given callback argument. If locks are defined, they
- are held during the entire traversal. It is a bad idea to invoke
- other malloc functions from within the handler.
-
- For example, to count the number of in-use chunks with size greater
- than 1000, you could write:
- static int count = 0;
- void count_chunks(void* start, void* end, size_t used, void* arg) {
- if (used >= 1000) ++count;
- }
- then:
- malloc_inspect_all(count_chunks, NULL);
-
- malloc_inspect_all is compiled only if MALLOC_INSPECT_ALL is defined.
-*/
-DLMALLOC_EXPORT void dlmalloc_inspect_all(void(*handler)(void*, void *, size_t, void*),
- void* arg);
-
-#endif /* MALLOC_INSPECT_ALL */
-
-#if !NO_MALLINFO
-/*
- mallinfo()
- Returns (by copy) a struct containing various summary statistics:
-
- arena: current total non-mmapped bytes allocated from system
- ordblks: the number of free chunks
- smblks: always zero.
- hblks: current number of mmapped regions
- hblkhd: total bytes held in mmapped regions
- usmblks: the maximum total allocated space. This will be greater
- than current total if trimming has occurred.
- fsmblks: always zero
- uordblks: current total allocated space (normal or mmapped)
- fordblks: total free space
- keepcost: the maximum number of bytes that could ideally be released
- back to system via malloc_trim. ("ideally" means that
- it ignores page restrictions etc.)
-
- Because these fields are ints, but internal bookkeeping may
- be kept as longs, the reported values may wrap around zero and
- thus be inaccurate.
-*/
-DLMALLOC_EXPORT struct mallinfo dlmallinfo(void);
-#endif /* NO_MALLINFO */
-
-/*
- independent_calloc(size_t n_elements, size_t element_size, void* chunks[]);
-
- independent_calloc is similar to calloc, but instead of returning a
- single cleared space, it returns an array of pointers to n_elements
- independent elements that can hold contents of size elem_size, each
- of which starts out cleared, and can be independently freed,
- realloc'ed etc. The elements are guaranteed to be adjacently
- allocated (this is not guaranteed to occur with multiple callocs or
- mallocs), which may also improve cache locality in some
- applications.
-
- The "chunks" argument is optional (i.e., may be null, which is
- probably the most typical usage). If it is null, the returned array
- is itself dynamically allocated and should also be freed when it is
- no longer needed. Otherwise, the chunks array must be of at least
- n_elements in length. It is filled in with the pointers to the
- chunks.
-
- In either case, independent_calloc returns this pointer array, or
- null if the allocation failed. If n_elements is zero and "chunks"
- is null, it returns a chunk representing an array with zero elements
- (which should be freed if not wanted).
-
- Each element must be freed when it is no longer needed. This can be
- done all at once using bulk_free.
-
- independent_calloc simplifies and speeds up implementations of many
- kinds of pools. It may also be useful when constructing large data
- structures that initially have a fixed number of fixed-sized nodes,
- but the number is not known at compile time, and some of the nodes
- may later need to be freed. For example:
-
- struct Node { int item; struct Node* next; };
-
- struct Node* build_list() {
- struct Node** pool;
- int n = read_number_of_nodes_needed();
- if (n <= 0) return 0;
- pool = (struct Node**)(independent_calloc(n, sizeof(struct Node), 0);
- if (pool == 0) die();
- // organize into a linked list...
- struct Node* first = pool[0];
- for (i = 0; i < n-1; ++i)
- pool[i]->next = pool[i+1];
- free(pool); // Can now free the array (or not, if it is needed later)
- return first;
- }
-*/
-DLMALLOC_EXPORT void** dlindependent_calloc(size_t, size_t, void**);
-
-/*
- independent_comalloc(size_t n_elements, size_t sizes[], void* chunks[]);
-
- independent_comalloc allocates, all at once, a set of n_elements
- chunks with sizes indicated in the "sizes" array. It returns
- an array of pointers to these elements, each of which can be
- independently freed, realloc'ed etc. The elements are guaranteed to
- be adjacently allocated (this is not guaranteed to occur with
- multiple callocs or mallocs), which may also improve cache locality
- in some applications.
-
- The "chunks" argument is optional (i.e., may be null). If it is null
- the returned array is itself dynamically allocated and should also
- be freed when it is no longer needed. Otherwise, the chunks array
- must be of at least n_elements in length. It is filled in with the
- pointers to the chunks.
-
- In either case, independent_comalloc returns this pointer array, or
- null if the allocation failed. If n_elements is zero and chunks is
- null, it returns a chunk representing an array with zero elements
- (which should be freed if not wanted).
-
- Each element must be freed when it is no longer needed. This can be
- done all at once using bulk_free.
-
- independent_comallac differs from independent_calloc in that each
- element may have a different size, and also that it does not
- automatically clear elements.
-
- independent_comalloc can be used to speed up allocation in cases
- where several structs or objects must always be allocated at the
- same time. For example:
-
- struct Head { ... }
- struct Foot { ... }
-
- void send_message(char* msg) {
- int msglen = strlen(msg);
- size_t sizes[3] = { sizeof(struct Head), msglen, sizeof(struct Foot) };
- void* chunks[3];
- if (independent_comalloc(3, sizes, chunks) == 0)
- die();
- struct Head* head = (struct Head*)(chunks[0]);
- char* body = (char*)(chunks[1]);
- struct Foot* foot = (struct Foot*)(chunks[2]);
- // ...
- }
-
- In general though, independent_comalloc is worth using only for
- larger values of n_elements. For small values, you probably won't
- detect enough difference from series of malloc calls to bother.
-
- Overuse of independent_comalloc can increase overall memory usage,
- since it cannot reuse existing noncontiguous small chunks that
- might be available for some of the elements.
-*/
-DLMALLOC_EXPORT void** dlindependent_comalloc(size_t, size_t*, void**);
-
-/*
- bulk_free(void* array[], size_t n_elements)
- Frees and clears (sets to null) each non-null pointer in the given
- array. This is likely to be faster than freeing them one-by-one.
- If footers are used, pointers that have been allocated in different
- mspaces are not freed or cleared, and the count of all such pointers
- is returned. For large arrays of pointers with poor locality, it
- may be worthwhile to sort this array before calling bulk_free.
-*/
-DLMALLOC_EXPORT size_t dlbulk_free(void**, size_t n_elements);
-
-/*
- pvalloc(size_t n);
- Equivalent to valloc(minimum-page-that-holds(n)), that is,
- round up n to nearest pagesize.
- */
-DLMALLOC_EXPORT void* dlpvalloc(size_t);
-
-/*
- malloc_trim(size_t pad);
-
- If possible, gives memory back to the system (via negative arguments
- to sbrk) if there is unused memory at the `high' end of the malloc
- pool or in unused MMAP segments. You can call this after freeing
- large blocks of memory to potentially reduce the system-level memory
- requirements of a program. However, it cannot guarantee to reduce
- memory. Under some allocation patterns, some large free blocks of
- memory will be locked between two used chunks, so they cannot be
- given back to the system.
-
- The `pad' argument to malloc_trim represents the amount of free
- trailing space to leave untrimmed. If this argument is zero, only
- the minimum amount of memory to maintain internal data structures
- will be left. Non-zero arguments can be supplied to maintain enough
- trailing space to service future expected allocations without having
- to re-obtain memory from the system.
-
- Malloc_trim returns 1 if it actually released any memory, else 0.
-*/
-DLMALLOC_EXPORT int dlmalloc_trim(size_t);
-
-/*
- malloc_stats();
- Prints on stderr the amount of space obtained from the system (both
- via sbrk and mmap), the maximum amount (which may be more than
- current if malloc_trim and/or munmap got called), and the current
- number of bytes allocated via malloc (or realloc, etc) but not yet
- freed. Note that this is the number of bytes allocated, not the
- number requested. It will be larger than the number requested
- because of alignment and bookkeeping overhead. Because it includes
- alignment wastage as being in use, this figure may be greater than
- zero even when no user-level chunks are allocated.
-
- The reported current and maximum system memory can be inaccurate if
- a program makes other calls to system memory allocation functions
- (normally sbrk) outside of malloc.
-
- malloc_stats prints only the most commonly interesting statistics.
- More information can be obtained by calling mallinfo.
-*/
-DLMALLOC_EXPORT void dlmalloc_stats(void);
-
-/*
- malloc_usable_size(void* p);
-
- Returns the number of bytes you can actually use in
- an allocated chunk, which may be more than you requested (although
- often not) due to alignment and minimum size constraints.
- You can use this many bytes without worrying about
- overwriting other allocated objects. This is not a particularly great
- programming practice. malloc_usable_size can be more useful in
- debugging and assertions, for example:
-
- p = malloc(n);
- assert(malloc_usable_size(p) >= 256);
-*/
-size_t dlmalloc_usable_size(void*);
-
-#endif /* ONLY_MSPACES */
-
-#if MSPACES
-
-/*
- mspace is an opaque type representing an independent
- region of space that supports mspace_malloc, etc.
-*/
-typedef void* mspace;
-
-/*
- create_mspace creates and returns a new independent space with the
- given initial capacity, or, if 0, the default granularity size. It
- returns null if there is no system memory available to create the
- space. If argument locked is non-zero, the space uses a separate
- lock to control access. The capacity of the space will grow
- dynamically as needed to service mspace_malloc requests. You can
- control the sizes of incremental increases of this space by
- compiling with a different DEFAULT_GRANULARITY or dynamically
- setting with mallopt(M_GRANULARITY, value).
-*/
-DLMALLOC_EXPORT mspace create_mspace(size_t capacity, int locked);
-
-/*
- destroy_mspace destroys the given space, and attempts to return all
- of its memory back to the system, returning the total number of
- bytes freed. After destruction, the results of access to all memory
- used by the space become undefined.
-*/
-DLMALLOC_EXPORT size_t destroy_mspace(mspace msp);
-
-/*
- create_mspace_with_base uses the memory supplied as the initial base
- of a new mspace. Part (less than 128*sizeof(size_t) bytes) of this
- space is used for bookkeeping, so the capacity must be at least this
- large. (Otherwise 0 is returned.) When this initial space is
- exhausted, additional memory will be obtained from the system.
- Destroying this space will deallocate all additionally allocated
- space (if possible) but not the initial base.
-*/
-DLMALLOC_EXPORT mspace create_mspace_with_base(void* base, size_t capacity, int locked);
-
-/*
- mspace_track_large_chunks controls whether requests for large chunks
- are allocated in their own untracked mmapped regions, separate from
- others in this mspace. By default large chunks are not tracked,
- which reduces fragmentation. However, such chunks are not
- necessarily released to the system upon destroy_mspace. Enabling
- tracking by setting to true may increase fragmentation, but avoids
- leakage when relying on destroy_mspace to release all memory
- allocated using this space. The function returns the previous
- setting.
-*/
-DLMALLOC_EXPORT int mspace_track_large_chunks(mspace msp, int enable);
-
-
-/*
- mspace_malloc behaves as malloc, but operates within
- the given space.
-*/
-DLMALLOC_EXPORT void* mspace_malloc(mspace msp, size_t bytes);
-
-/*
- mspace_free behaves as free, but operates within
- the given space.
-
- If compiled with FOOTERS==1, mspace_free is not actually needed.
- free may be called instead of mspace_free because freed chunks from
- any space are handled by their originating spaces.
-*/
-DLMALLOC_EXPORT void mspace_free(mspace msp, void* mem);
-
-/*
- mspace_realloc behaves as realloc, but operates within
- the given space.
-
- If compiled with FOOTERS==1, mspace_realloc is not actually
- needed. realloc may be called instead of mspace_realloc because
- realloced chunks from any space are handled by their originating
- spaces.
-*/
-DLMALLOC_EXPORT void* mspace_realloc(mspace msp, void* mem, size_t newsize);
-
-/*
- mspace_calloc behaves as calloc, but operates within
- the given space.
-*/
-DLMALLOC_EXPORT void* mspace_calloc(mspace msp, size_t n_elements, size_t elem_size);
-
-/*
- mspace_memalign behaves as memalign, but operates within
- the given space.
-*/
-DLMALLOC_EXPORT void* mspace_memalign(mspace msp, size_t alignment, size_t bytes);
-
-/*
- mspace_independent_calloc behaves as independent_calloc, but
- operates within the given space.
-*/
-DLMALLOC_EXPORT void** mspace_independent_calloc(mspace msp, size_t n_elements,
- size_t elem_size, void* chunks[]);
-
-/*
- mspace_independent_comalloc behaves as independent_comalloc, but
- operates within the given space.
-*/
-DLMALLOC_EXPORT void** mspace_independent_comalloc(mspace msp, size_t n_elements,
- size_t sizes[], void* chunks[]);
-
-/*
- mspace_footprint() returns the number of bytes obtained from the
- system for this space.
-*/
-DLMALLOC_EXPORT size_t mspace_footprint(mspace msp);
-
-/*
- mspace_max_footprint() returns the peak number of bytes obtained from the
- system for this space.
-*/
-DLMALLOC_EXPORT size_t mspace_max_footprint(mspace msp);
-
-
-#if !NO_MALLINFO
-/*
- mspace_mallinfo behaves as mallinfo, but reports properties of
- the given space.
-*/
-DLMALLOC_EXPORT struct mallinfo mspace_mallinfo(mspace msp);
-#endif /* NO_MALLINFO */
-
-/*
- malloc_usable_size(void* p) behaves the same as malloc_usable_size;
-*/
-DLMALLOC_EXPORT size_t mspace_usable_size(const void* mem);
-
-/*
- mspace_malloc_stats behaves as malloc_stats, but reports
- properties of the given space.
-*/
-DLMALLOC_EXPORT void mspace_malloc_stats(mspace msp);
-
-/*
- mspace_trim behaves as malloc_trim, but
- operates within the given space.
-*/
-DLMALLOC_EXPORT int mspace_trim(mspace msp, size_t pad);
-
-/*
- An alias for mallopt.
-*/
-DLMALLOC_EXPORT int mspace_mallopt(int, int);
-
-#endif /* MSPACES */
-
-#ifdef __cplusplus
-} /* end of extern "C" */
-#endif /* __cplusplus */
-
-/*
- ========================================================================
- To make a fully customizable malloc.h header file, cut everything
- above this line, put into file malloc.h, edit to suit, and #include it
- on the next line, as well as in programs that use this malloc.
- ========================================================================
-*/
-
-/* #include "malloc.h" */
-
-/*------------------------------ internal #includes ---------------------- */
-
-#ifdef _MSC_VER
-#pragma warning( disable : 4146 ) /* no "unsigned" warnings */
-#endif /* _MSC_VER */
-#if !NO_MALLOC_STATS && !defined(STARBOARD)
-#include <stdio.h> /* for printing in malloc_stats */
-#endif /* NO_MALLOC_STATS && STARBOARD */
-#ifndef LACKS_ERRNO_H
-#include <errno.h> /* for MALLOC_FAILURE_ACTION */
-#endif /* LACKS_ERRNO_H */
-#ifdef DEBUG
-#if ABORT_ON_ASSERT_FAILURE
-#undef assert
-#define assert(x) if(!(x)) ABORT
-#else /* ABORT_ON_ASSERT_FAILURE */
-#include <assert.h>
-#endif /* ABORT_ON_ASSERT_FAILURE */
-#else /* DEBUG */
-#ifndef assert
-#define assert(x)
-#endif
-#define DEBUG 0
-#endif /* DEBUG */
-#if !defined(WIN32) && !defined(LACKS_TIME_H)
-#include <time.h> /* for magic initialization */
-#endif /* WIN32 */
-#ifndef LACKS_STDLIB_H
-#include <stdlib.h> /* for abort() */
-#endif /* LACKS_STDLIB_H */
-#ifndef LACKS_STRING_H
-#include <string.h> /* for memset etc */
-#endif /* LACKS_STRING_H */
-#if USE_BUILTIN_FFS
-#ifndef LACKS_STRINGS_H
-#include <strings.h> /* for ffs */
-#endif /* LACKS_STRINGS_H */
-#endif /* USE_BUILTIN_FFS */
-#if HAVE_MMAP
-#ifndef LACKS_SYS_MMAN_H
-/* On some versions of linux, mremap decl in mman.h needs __USE_GNU set */
-#if (defined(linux) && !defined(__USE_GNU))
-#define __USE_GNU 1
-#include <sys/mman.h> /* for mmap */
-#undef __USE_GNU
-#else
-#include <sys/mman.h> /* for mmap */
-#endif /* linux */
-#endif /* LACKS_SYS_MMAN_H */
-#ifndef LACKS_FCNTL_H
-#include <fcntl.h>
-#endif /* LACKS_FCNTL_H */
-#endif /* HAVE_MMAP */
-#ifndef LACKS_UNISTD_H
-#include <unistd.h> /* for sbrk, sysconf */
-#else /* LACKS_UNISTD_H */
-#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
-extern void* sbrk(ptrdiff_t);
-#endif /* FreeBSD etc */
-#endif /* LACKS_UNISTD_H */
-
-/* Declarations for locking */
-#if USE_LOCKS
-#ifndef WIN32
-#if defined (__SVR4) && defined (__sun) /* solaris */
-#include <thread.h>
-#elif !defined(LACKS_SCHED_H)
-#include <sched.h>
-#endif /* solaris or LACKS_SCHED_H */
-#if (defined(USE_RECURSIVE_LOCKS) && USE_RECURSIVE_LOCKS != 0) || !USE_SPIN_LOCKS
-#if !defined(STARBOARD)
-#include <pthread.h>
-#endif /* !STARBOARD */
-#endif /* USE_RECURSIVE_LOCKS ... */
-#elif defined(_MSC_VER)
-#ifndef _M_AMD64
-/* These are already defined on AMD64 builds */
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-LONG __cdecl _InterlockedCompareExchange(LONG volatile *Dest, LONG Exchange, LONG Comp);
-LONG __cdecl _InterlockedExchange(LONG volatile *Target, LONG Value);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* _M_AMD64 */
-#pragma intrinsic (_InterlockedCompareExchange)
-#pragma intrinsic (_InterlockedExchange)
-#define interlockedcompareexchange _InterlockedCompareExchange
-#define interlockedexchange _InterlockedExchange
-#elif defined(WIN32) && defined(__GNUC__)
-#define interlockedcompareexchange(a, b, c) __sync_val_compare_and_swap(a, c, b)
-#define interlockedexchange __sync_lock_test_and_set
-#endif /* Win32 */
-#else /* USE_LOCKS */
-#endif /* USE_LOCKS */
-
-#ifndef LOCK_AT_FORK
-#define LOCK_AT_FORK 0
-#endif
-
-/* Declarations for bit scanning on win32 */
-#if defined(_MSC_VER) && _MSC_VER>=1300 && !defined(__LB_XB360__)
-#ifndef BitScanForward /* Try to avoid pulling in WinNT.h */
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-unsigned char _BitScanForward(unsigned long *index, unsigned long mask);
-unsigned char _BitScanReverse(unsigned long *index, unsigned long mask);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#define BitScanForward _BitScanForward
-#define BitScanReverse _BitScanReverse
-#pragma intrinsic(_BitScanForward)
-#pragma intrinsic(_BitScanReverse)
-#endif /* BitScanForward */
-#endif /* defined(_MSC_VER) && _MSC_VER>=1300 */
-
-#ifndef WIN32
-#ifndef malloc_getpagesize
-# ifdef _SC_PAGESIZE /* some SVR4 systems omit an underscore */
-# ifndef _SC_PAGE_SIZE
-# define _SC_PAGE_SIZE _SC_PAGESIZE
-# endif
-# endif
-# ifdef _SC_PAGE_SIZE
-# define malloc_getpagesize sysconf(_SC_PAGE_SIZE)
-# else
-# if defined(BSD) || defined(DGUX) || defined(HAVE_GETPAGESIZE)
- extern size_t getpagesize();
-# define malloc_getpagesize getpagesize()
-# else
-# ifdef WIN32 /* use supplied emulation of getpagesize */
-# define malloc_getpagesize getpagesize()
-# else
-# ifndef LACKS_SYS_PARAM_H
-# include <sys/param.h>
-# endif
-# ifdef EXEC_PAGESIZE
-# define malloc_getpagesize EXEC_PAGESIZE
-# else
-# ifdef NBPG
-# ifndef CLSIZE
-# define malloc_getpagesize NBPG
-# else
-# define malloc_getpagesize (NBPG * CLSIZE)
-# endif
-# else
-# ifdef NBPC
-# define malloc_getpagesize NBPC
-# else
-# ifdef PAGESIZE
-# define malloc_getpagesize PAGESIZE
-# else /* just guess */
-# define malloc_getpagesize ((size_t)4096U)
-# endif
-# endif
-# endif
-# endif
-# endif
-# endif
-# endif
-#endif
-#endif
-
-/* ------------------- size_t and alignment properties -------------------- */
-
-/* The byte and bit size of a size_t */
-#define SIZE_T_SIZE (sizeof(size_t))
-#define SIZE_T_BITSIZE (sizeof(size_t) << 3)
-
-/* Some constants coerced to size_t */
-/* Annoying but necessary to avoid errors on some platforms */
-#define SIZE_T_ZERO ((size_t)0)
-#define SIZE_T_ONE ((size_t)1)
-#define SIZE_T_TWO ((size_t)2)
-#define SIZE_T_FOUR ((size_t)4)
-#define TWO_SIZE_T_SIZES (SIZE_T_SIZE<<1)
-#define FOUR_SIZE_T_SIZES (SIZE_T_SIZE<<2)
-#define SIX_SIZE_T_SIZES (FOUR_SIZE_T_SIZES+TWO_SIZE_T_SIZES)
-#define HALF_MAX_SIZE_T (MAX_SIZE_T / 2U)
-
-/* The bit mask value corresponding to MALLOC_ALIGNMENT */
-#define CHUNK_ALIGN_MASK (MALLOC_ALIGNMENT - SIZE_T_ONE)
-
-/* True if address a has acceptable alignment */
-#define is_aligned(A) (((size_t)((A)) & (CHUNK_ALIGN_MASK)) == 0)
-
-/* the number of bytes to offset an address to align it */
-#define align_offset(A)\
- ((((size_t)(A) & CHUNK_ALIGN_MASK) == 0)? 0 :\
- ((MALLOC_ALIGNMENT - ((size_t)(A) & CHUNK_ALIGN_MASK)) & CHUNK_ALIGN_MASK))
-
-/* -------------------------- MMAP preliminaries ------------------------- */
-
-/*
- If HAVE_MORECORE or HAVE_MMAP are false, we just define calls and
- checks to fail so compiler optimizer can delete code rather than
- using so many "#if"s.
-*/
-
-
-/* MORECORE and MMAP must return MFAIL on failure */
-#define MFAIL ((void*)(MAX_SIZE_T))
-#define CMFAIL ((char*)(MFAIL)) /* defined for convenience */
-
-#if HAVE_MMAP
-
-#if defined(STARBOARD)
-#define MMAP_DEFAULT(s) SbPageMapUntracked(s, kSbMemoryMapProtectReadWrite, "dlmalloc_mmap")
-#define DIRECT_MMAP_DEFAULT(s) MMAP_DEFAULT(s)
-#define MUNMAP_DEFAULT(a, s) (SbPageUnmapUntracked((a), (s)) ? 0 : 1)
-
-#elif defined (__LB_SHELL__)
-#define MMAP_DEFAULT(s) lb_mmap_untracked(s, "dlmalloc_mmap")
-#define DIRECT_MMAP_DEFAULT(s) MMAP_DEFAULT(s)
-#define MUNMAP_DEFAULT(a, s) lb_munmap_untracked((a), (s))
-
-#elif !defined(WIN32)
-#define MUNMAP_DEFAULT(a, s) munmap((a), (s))
-#define MMAP_PROT (PROT_READ|PROT_WRITE)
-#if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
-#define MAP_ANONYMOUS MAP_ANON
-#endif /* MAP_ANON */
-#ifdef MAP_ANONYMOUS
-#define MMAP_FLAGS (MAP_PRIVATE|MAP_ANONYMOUS)
-#define MMAP_DEFAULT(s) mmap(0, (s), MMAP_PROT, MMAP_FLAGS, -1, 0)
-#else /* MAP_ANONYMOUS */
-/*
- Nearly all versions of mmap support MAP_ANONYMOUS, so the following
- is unlikely to be needed, but is supplied just in case.
-*/
-#define MMAP_FLAGS (MAP_PRIVATE)
-static int dev_zero_fd = -1; /* Cached file descriptor for /dev/zero. */
-#define MMAP_DEFAULT(s) ((dev_zero_fd < 0) ? \
- (dev_zero_fd = open("/dev/zero", O_RDWR), \
- mmap(0, (s), MMAP_PROT, MMAP_FLAGS, dev_zero_fd, 0)) : \
- mmap(0, (s), MMAP_PROT, MMAP_FLAGS, dev_zero_fd, 0))
-#endif /* MAP_ANONYMOUS */
-
-#define DIRECT_MMAP_DEFAULT(s) MMAP_DEFAULT(s)
-
-#else /* WIN32 */
-
-/* Win32 MMAP via VirtualAlloc */
-static FORCEINLINE void* win32mmap(size_t size) {
- void* ptr = VirtualAlloc(0, size, MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE);
- return (ptr != 0)? ptr: MFAIL;
-}
-
-/* For direct MMAP, use MEM_TOP_DOWN to minimize interference */
-static FORCEINLINE void* win32direct_mmap(size_t size) {
- void* ptr = VirtualAlloc(0, size, MEM_RESERVE|MEM_COMMIT|MEM_TOP_DOWN,
- PAGE_READWRITE);
- return (ptr != 0)? ptr: MFAIL;
-}
-
-/* This function supports releasing coalesed segments */
-static FORCEINLINE int win32munmap(void* ptr, size_t size) {
- MEMORY_BASIC_INFORMATION minfo;
- char* cptr = (char*)ptr;
- while (size) {
- if (VirtualQuery(cptr, &minfo, sizeof(minfo)) == 0)
- return -1;
- if (minfo.BaseAddress != cptr || minfo.AllocationBase != cptr ||
- minfo.State != MEM_COMMIT || minfo.RegionSize > size)
- return -1;
- if (VirtualFree(cptr, 0, MEM_RELEASE) == 0)
- return -1;
- cptr += minfo.RegionSize;
- size -= minfo.RegionSize;
- }
- return 0;
-}
-
-#define MMAP_DEFAULT(s) win32mmap(s)
-#define MUNMAP_DEFAULT(a, s) win32munmap((a), (s))
-#define DIRECT_MMAP_DEFAULT(s) win32direct_mmap(s)
-#endif /* WIN32 */
-#endif /* HAVE_MMAP */
-
-#if HAVE_MREMAP
-#ifndef WIN32
-#define MREMAP_DEFAULT(addr, osz, nsz, mv) mremap((addr), (osz), (nsz), (mv))
-#endif /* WIN32 */
-#endif /* HAVE_MREMAP */
-
-/**
- * Define CALL_MORECORE
- */
-#if HAVE_MORECORE
- #ifdef MORECORE
- #define CALL_MORECORE(S) MORECORE(S)
- #else /* MORECORE */
- #define CALL_MORECORE(S) MORECORE_DEFAULT(S)
- #endif /* MORECORE */
-#else /* HAVE_MORECORE */
- #define CALL_MORECORE(S) MFAIL
-#endif /* HAVE_MORECORE */
-
-/**
- * Define CALL_MMAP/CALL_MUNMAP/CALL_DIRECT_MMAP
- */
-#if HAVE_MMAP
- #define USE_MMAP_BIT (SIZE_T_ONE)
-
- #ifdef MMAP
- #define CALL_MMAP(s) MMAP(s)
- #else /* MMAP */
- #define CALL_MMAP(s) MMAP_DEFAULT(s)
- #endif /* MMAP */
- #ifdef MUNMAP
- #define CALL_MUNMAP(a, s) MUNMAP((a), (s))
- #else /* MUNMAP */
- #define CALL_MUNMAP(a, s) MUNMAP_DEFAULT((a), (s))
- #endif /* MUNMAP */
- #ifdef DIRECT_MMAP
- #define CALL_DIRECT_MMAP(s) DIRECT_MMAP(s)
- #else /* DIRECT_MMAP */
- #define CALL_DIRECT_MMAP(s) DIRECT_MMAP_DEFAULT(s)
- #endif /* DIRECT_MMAP */
-#else /* HAVE_MMAP */
- #define USE_MMAP_BIT (SIZE_T_ZERO)
-
- #define MMAP(s) MFAIL
- #define MUNMAP(a, s) (-1)
- #define DIRECT_MMAP(s) MFAIL
- #define CALL_DIRECT_MMAP(s) DIRECT_MMAP(s)
- #define CALL_MMAP(s) MMAP(s)
- #define CALL_MUNMAP(a, s) MUNMAP((a), (s))
-#endif /* HAVE_MMAP */
-
-/**
- * Define CALL_MREMAP
- */
-#if HAVE_MMAP && HAVE_MREMAP
- #ifdef MREMAP
- #define CALL_MREMAP(addr, osz, nsz, mv) MREMAP((addr), (osz), (nsz), (mv))
- #else /* MREMAP */
- #define CALL_MREMAP(addr, osz, nsz, mv) MREMAP_DEFAULT((addr), (osz), (nsz), (mv))
- #endif /* MREMAP */
-#else /* HAVE_MMAP && HAVE_MREMAP */
- #define CALL_MREMAP(addr, osz, nsz, mv) MFAIL
-#endif /* HAVE_MMAP && HAVE_MREMAP */
-
-/* mstate bit set if continguous morecore disabled or failed */
-#define USE_NONCONTIGUOUS_BIT (4U)
-
-/* segment bit set in create_mspace_with_base */
-#define EXTERN_BIT (8U)
-
-
-/* --------------------------- Lock preliminaries ------------------------ */
-
-/*
- When locks are defined, there is one global lock, plus
- one per-mspace lock.
-
- The global lock_ensures that mparams.magic and other unique
- mparams values are initialized only once. It also protects
- sequences of calls to MORECORE. In many cases sys_alloc requires
- two calls, that should not be interleaved with calls by other
- threads. This does not protect against direct calls to MORECORE
- by other threads not using this lock, so there is still code to
- cope the best we can on interference.
-
- Per-mspace locks surround calls to malloc, free, etc.
- By default, locks are simple non-reentrant mutexes.
-
- Because lock-protected regions generally have bounded times, it is
- OK to use the supplied simple spinlocks. Spinlocks are likely to
- improve performance for lightly contended applications, but worsen
- performance under heavy contention.
-
- If USE_LOCKS is > 1, the definitions of lock routines here are
- bypassed, in which case you will need to define the type MLOCK_T,
- and at least INITIAL_LOCK, DESTROY_LOCK, ACQUIRE_LOCK, RELEASE_LOCK
- and TRY_LOCK. You must also declare a
- static MLOCK_T malloc_global_mutex = { initialization values };.
-
-*/
-
-#if !USE_LOCKS
-#define USE_LOCK_BIT (0U)
-#define INITIAL_LOCK(l) (0)
-#define DESTROY_LOCK(l) (0)
-#define ACQUIRE_MALLOC_GLOBAL_LOCK()
-#define RELEASE_MALLOC_GLOBAL_LOCK()
-
-#else
-#if USE_LOCKS > 1
-/* ----------------------- User-defined locks ------------------------ */
-/* Define your own lock implementation here */
-/* #define INITIAL_LOCK(lk) ... */
-/* #define DESTROY_LOCK(lk) ... */
-/* #define ACQUIRE_LOCK(lk) ... */
-/* #define RELEASE_LOCK(lk) ... */
-/* #define TRY_LOCK(lk) ... */
-/* static MLOCK_T malloc_global_mutex = ... */
-
-// See dlmalloc_config.h for definitions of *_LOCK macros.
-static MLOCK_T malloc_global_mutex;
-static volatile int malloc_global_mutex_status;
-static void init_malloc_global_mutex() {
- if (malloc_global_mutex_status > 0) {
- return;
- }
- INITIAL_LOCK(&malloc_global_mutex);
- malloc_global_mutex_status = 1;
-}
-
-#elif USE_SPIN_LOCKS
-
-/* First, define CAS_LOCK and CLEAR_LOCK on ints */
-/* Note CAS_LOCK defined to return 0 on success */
-
-#if defined(__GNUC__)&& (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1))
-#define CAS_LOCK(sl) __sync_lock_test_and_set(sl, 1)
-#define CLEAR_LOCK(sl) __sync_lock_release(sl)
-
-#elif (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)))
-/* Custom spin locks for older gcc on x86 */
-static FORCEINLINE int x86_cas_lock(int *sl) {
- int ret;
- int val = 1;
- int cmp = 0;
- __asm__ __volatile__ ("lock; cmpxchgl %1, %2"
- : "=a" (ret)
- : "r" (val), "m" (*(sl)), "0"(cmp)
- : "memory", "cc");
- return ret;
-}
-
-static FORCEINLINE void x86_clear_lock(int* sl) {
- assert(*sl != 0);
- int prev = 0;
- int ret;
- __asm__ __volatile__ ("lock; xchgl %0, %1"
- : "=r" (ret)
- : "m" (*(sl)), "0"(prev)
- : "memory");
-}
-
-#define CAS_LOCK(sl) x86_cas_lock(sl)
-#define CLEAR_LOCK(sl) x86_clear_lock(sl)
-
-#else /* Win32 MSC */
-#define CAS_LOCK(sl) interlockedexchange(sl, (LONG)1)
-#define CLEAR_LOCK(sl) interlockedexchange (sl, (LONG)0)
-
-#endif /* ... gcc spins locks ... */
-
-/* How to yield for a spin lock */
-#define SPINS_PER_YIELD 63
-#if defined(_MSC_VER)
-#define SLEEP_EX_DURATION 50 /* delay for yield/sleep */
-#define SPIN_LOCK_YIELD SleepEx(SLEEP_EX_DURATION, FALSE)
-#elif defined (__SVR4) && defined (__sun) /* solaris */
-#define SPIN_LOCK_YIELD thr_yield();
-#elif !defined(LACKS_SCHED_H)
-#define SPIN_LOCK_YIELD sched_yield();
-#else
-#define SPIN_LOCK_YIELD
-#endif /* ... yield ... */
-
-#if !defined(USE_RECURSIVE_LOCKS) || USE_RECURSIVE_LOCKS == 0
-/* Plain spin locks use single word (embedded in malloc_states) */
-static int spin_acquire_lock(int *sl) {
- int spins = 0;
- while (*(volatile int *)sl != 0 || CAS_LOCK(sl)) {
- if ((++spins & SPINS_PER_YIELD) == 0) {
- SPIN_LOCK_YIELD;
- }
- }
- return 0;
-}
-
-#define MLOCK_T int
-#define TRY_LOCK(sl) !CAS_LOCK(sl)
-#define RELEASE_LOCK(sl) CLEAR_LOCK(sl)
-#define ACQUIRE_LOCK(sl) (CAS_LOCK(sl)? spin_acquire_lock(sl) : 0)
-#define INITIAL_LOCK(sl) (*sl = 0)
-#define DESTROY_LOCK(sl) (0)
-static MLOCK_T malloc_global_mutex = 0;
-
-#else /* USE_RECURSIVE_LOCKS */
-/* types for lock owners */
-#ifdef WIN32
-#define THREAD_ID_T DWORD
-#define CURRENT_THREAD GetCurrentThreadId()
-#define EQ_OWNER(X,Y) ((X) == (Y))
-#else
-/*
- Note: the following assume that pthread_t is a type that can be
- initialized to (casted) zero. If this is not the case, you will need to
- somehow redefine these or not use spin locks.
-*/
-#define THREAD_ID_T pthread_t
-#define CURRENT_THREAD pthread_self()
-#define EQ_OWNER(X,Y) pthread_equal(X, Y)
-#endif
-
-struct malloc_recursive_lock {
- int sl;
- unsigned int c;
- THREAD_ID_T threadid;
-};
-
-#define MLOCK_T struct malloc_recursive_lock
-static MLOCK_T malloc_global_mutex = { 0, 0, (THREAD_ID_T)0};
-
-static FORCEINLINE void recursive_release_lock(MLOCK_T *lk) {
- assert(lk->sl != 0);
- if (--lk->c == 0) {
- CLEAR_LOCK(&lk->sl);
- }
-}
-
-static FORCEINLINE int recursive_acquire_lock(MLOCK_T *lk) {
- THREAD_ID_T mythreadid = CURRENT_THREAD;
- int spins = 0;
- for (;;) {
- if (*((volatile int *)(&lk->sl)) == 0) {
- if (!CAS_LOCK(&lk->sl)) {
- lk->threadid = mythreadid;
- lk->c = 1;
- return 0;
- }
- }
- else if (EQ_OWNER(lk->threadid, mythreadid)) {
- ++lk->c;
- return 0;
- }
- if ((++spins & SPINS_PER_YIELD) == 0) {
- SPIN_LOCK_YIELD;
- }
- }
-}
-
-static FORCEINLINE int recursive_try_lock(MLOCK_T *lk) {
- THREAD_ID_T mythreadid = CURRENT_THREAD;
- if (*((volatile int *)(&lk->sl)) == 0) {
- if (!CAS_LOCK(&lk->sl)) {
- lk->threadid = mythreadid;
- lk->c = 1;
- return 1;
- }
- }
- else if (EQ_OWNER(lk->threadid, mythreadid)) {
- ++lk->c;
- return 1;
- }
- return 0;
-}
-
-#define RELEASE_LOCK(lk) recursive_release_lock(lk)
-#define TRY_LOCK(lk) recursive_try_lock(lk)
-#define ACQUIRE_LOCK(lk) recursive_acquire_lock(lk)
-#define INITIAL_LOCK(lk) ((lk)->threadid = (THREAD_ID_T)0, (lk)->sl = 0, (lk)->c = 0)
-#define DESTROY_LOCK(lk) (0)
-#endif /* USE_RECURSIVE_LOCKS */
-
-#elif defined(WIN32) /* Win32 critical sections */
-#define MLOCK_T CRITICAL_SECTION
-#define ACQUIRE_LOCK(lk) (EnterCriticalSection(lk), 0)
-#define RELEASE_LOCK(lk) LeaveCriticalSection(lk)
-#define TRY_LOCK(lk) TryEnterCriticalSection(lk)
-#define INITIAL_LOCK(lk) (!InitializeCriticalSectionAndSpinCount((lk), 0x80000000|4000))
-#define DESTROY_LOCK(lk) (DeleteCriticalSection(lk), 0)
-#define NEED_GLOBAL_LOCK_INIT
-
-static MLOCK_T malloc_global_mutex;
-static volatile LONG malloc_global_mutex_status;
-
-/* Use spin loop to initialize global lock */
-static void init_malloc_global_mutex() {
- for (;;) {
- long stat = malloc_global_mutex_status;
- if (stat > 0)
- return;
- /* transition to < 0 while initializing, then to > 0) */
- if (stat == 0 &&
- interlockedcompareexchange(&malloc_global_mutex_status, (LONG)-1, (LONG)0) == 0) {
- InitializeCriticalSection(&malloc_global_mutex);
- interlockedexchange(&malloc_global_mutex_status, (LONG)1);
- return;
- }
- SleepEx(0, FALSE);
- }
-}
-
-#else /* pthreads-based locks */
-#define MLOCK_T pthread_mutex_t
-#define ACQUIRE_LOCK(lk) pthread_mutex_lock(lk)
-#define RELEASE_LOCK(lk) pthread_mutex_unlock(lk)
-#define TRY_LOCK(lk) (!pthread_mutex_trylock(lk))
-#define INITIAL_LOCK(lk) pthread_init_lock(lk)
-#define DESTROY_LOCK(lk) pthread_mutex_destroy(lk)
-
-#if defined(USE_RECURSIVE_LOCKS) && USE_RECURSIVE_LOCKS != 0 && defined(linux) && !defined(PTHREAD_MUTEX_RECURSIVE)
-/* Cope with old-style linux recursive lock initialization by adding */
-/* skipped internal declaration from pthread.h */
-extern int pthread_mutexattr_setkind_np __P ((pthread_mutexattr_t *__attr,
- int __kind));
-#define PTHREAD_MUTEX_RECURSIVE PTHREAD_MUTEX_RECURSIVE_NP
-#define pthread_mutexattr_settype(x,y) pthread_mutexattr_setkind_np(x,y)
-#endif /* USE_RECURSIVE_LOCKS ... */
-
-static MLOCK_T malloc_global_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-static int pthread_init_lock (MLOCK_T *lk) {
- pthread_mutexattr_t attr;
- if (pthread_mutexattr_init(&attr)) return 1;
-#if defined(USE_RECURSIVE_LOCKS) && USE_RECURSIVE_LOCKS != 0
- if (pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE)) return 1;
-#endif
- if (pthread_mutex_init(lk, &attr)) return 1;
- if (pthread_mutexattr_destroy(&attr)) return 1;
- return 0;
-}
-
-#endif /* ... lock types ... */
-
-/* Common code for all lock types */
-#define USE_LOCK_BIT (2U)
-
-#ifndef ACQUIRE_MALLOC_GLOBAL_LOCK
-#define ACQUIRE_MALLOC_GLOBAL_LOCK() ACQUIRE_LOCK(&malloc_global_mutex);
-#endif
-
-#ifndef RELEASE_MALLOC_GLOBAL_LOCK
-#define RELEASE_MALLOC_GLOBAL_LOCK() RELEASE_LOCK(&malloc_global_mutex);
-#endif
-
-#endif /* USE_LOCKS */
-
-/* ----------------------- Chunk representations ------------------------ */
-
-/*
- (The following includes lightly edited explanations by Colin Plumb.)
-
- The malloc_chunk declaration below is misleading (but accurate and
- necessary). It declares a "view" into memory allowing access to
- necessary fields at known offsets from a given base.
-
- Chunks of memory are maintained using a `boundary tag' method as
- originally described by Knuth. (See the paper by Paul Wilson
- ftp://ftp.cs.utexas.edu/pub/garbage/allocsrv.ps for a survey of such
- techniques.) Sizes of free chunks are stored both in the front of
- each chunk and at the end. This makes consolidating fragmented
- chunks into bigger chunks fast. The head fields also hold bits
- representing whether chunks are free or in use.
-
- Here are some pictures to make it clearer. They are "exploded" to
- show that the state of a chunk can be thought of as extending from
- the high 31 bits of the head field of its header through the
- prev_foot and PINUSE_BIT bit of the following chunk header.
-
- A chunk that's in use looks like:
-
- chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | Size of previous chunk (if P = 0) |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |P|
- | Size of this chunk 1| +-+
- mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | |
- +- -+
- | |
- +- -+
- | :
- +- size - sizeof(size_t) available payload bytes -+
- : |
- chunk-> +- -+
- | |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |1|
- | Size of next chunk (may or may not be in use) | +-+
- mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
- And if it's free, it looks like this:
-
- chunk-> +- -+
- | User payload (must be in use, or we would have merged!) |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |P|
- | Size of this chunk 0| +-+
- mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | Next pointer |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | Prev pointer |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | :
- +- size - sizeof(struct chunk) unused bytes -+
- : |
- chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | Size of this chunk |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |0|
- | Size of next chunk (must be in use, or we would have merged)| +-+
- mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | :
- +- User payload -+
- : |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- |0|
- +-+
- Note that since we always merge adjacent free chunks, the chunks
- adjacent to a free chunk must be in use.
-
- Given a pointer to a chunk (which can be derived trivially from the
- payload pointer) we can, in O(1) time, find out whether the adjacent
- chunks are free, and if so, unlink them from the lists that they
- are on and merge them with the current chunk.
-
- Chunks always begin on even word boundaries, so the mem portion
- (which is returned to the user) is also on an even word boundary, and
- thus at least double-word aligned.
-
- The P (PINUSE_BIT) bit, stored in the unused low-order bit of the
- chunk size (which is always a multiple of two words), is an in-use
- bit for the *previous* chunk. If that bit is *clear*, then the
- word before the current chunk size contains the previous chunk
- size, and can be used to find the front of the previous chunk.
- The very first chunk allocated always has this bit set, preventing
- access to non-existent (or non-owned) memory. If pinuse is set for
- any given chunk, then you CANNOT determine the size of the
- previous chunk, and might even get a memory addressing fault when
- trying to do so.
-
- The C (CINUSE_BIT) bit, stored in the unused second-lowest bit of
- the chunk size redundantly records whether the current chunk is
- inuse (unless the chunk is mmapped). This redundancy enables usage
- checks within free and realloc, and reduces indirection when freeing
- and consolidating chunks.
-
- Each freshly allocated chunk must have both cinuse and pinuse set.
- That is, each allocated chunk borders either a previously allocated
- and still in-use chunk, or the base of its memory arena. This is
- ensured by making all allocations from the `lowest' part of any
- found chunk. Further, no free chunk physically borders another one,
- so each free chunk is known to be preceded and followed by either
- inuse chunks or the ends of memory.
-
- Note that the `foot' of the current chunk is actually represented
- as the prev_foot of the NEXT chunk. This makes it easier to
- deal with alignments etc but can be very confusing when trying
- to extend or adapt this code.
-
- The exceptions to all this are
-
- 1. The special chunk `top' is the top-most available chunk (i.e.,
- the one bordering the end of available memory). It is treated
- specially. Top is never included in any bin, is used only if
- no other chunk is available, and is released back to the
- system if it is very large (see M_TRIM_THRESHOLD). In effect,
- the top chunk is treated as larger (and thus less well
- fitting) than any other available chunk. The top chunk
- doesn't update its trailing size field since there is no next
- contiguous chunk that would have to index off it. However,
- space is still allocated for it (TOP_FOOT_SIZE) to enable
- separation or merging when space is extended.
-
- 3. Chunks allocated via mmap, have both cinuse and pinuse bits
- cleared in their head fields. Because they are allocated
- one-by-one, each must carry its own prev_foot field, which is
- also used to hold the offset this chunk has within its mmapped
- region, which is needed to preserve alignment. Each mmapped
- chunk is trailed by the first two fields of a fake next-chunk
- for sake of usage checks.
-
-*/
-
-struct malloc_chunk {
- size_t prev_foot; /* Size of previous chunk (if free). */
- size_t head; /* Size and inuse bits. */
- struct malloc_chunk* fd; /* double links -- used only if free. */
- struct malloc_chunk* bk;
-};
-
-typedef struct malloc_chunk mchunk;
-typedef struct malloc_chunk* mchunkptr;
-typedef struct malloc_chunk* sbinptr; /* The type of bins of chunks */
-typedef unsigned int bindex_t; /* Described below */
-typedef unsigned int binmap_t; /* Described below */
-typedef unsigned int flag_t; /* The type of various bit flag sets */
-
-/* ------------------- Chunks sizes and alignments ----------------------- */
-
-#define MCHUNK_SIZE (sizeof(mchunk))
-
-#if FOOTERS
-#define CHUNK_OVERHEAD (TWO_SIZE_T_SIZES)
-#else /* FOOTERS */
-#define CHUNK_OVERHEAD (SIZE_T_SIZE)
-#endif /* FOOTERS */
-
-/* MMapped chunks need a second word of overhead ... */
-#define MMAP_CHUNK_OVERHEAD (TWO_SIZE_T_SIZES)
-/* ... and additional padding for fake next-chunk at foot */
-#define MMAP_FOOT_PAD (FOUR_SIZE_T_SIZES)
-
-/* The smallest size we can malloc is an aligned minimal chunk */
-#define MIN_CHUNK_SIZE\
- ((MCHUNK_SIZE + CHUNK_ALIGN_MASK) & ~CHUNK_ALIGN_MASK)
-
-/* conversion from malloc headers to user pointers, and back */
-#define chunk2mem(p) ((void*)((char*)(p) + TWO_SIZE_T_SIZES))
-#define mem2chunk(mem) ((mchunkptr)((char*)(mem) - TWO_SIZE_T_SIZES))
-/* chunk associated with aligned address A */
-#define align_as_chunk(A) (mchunkptr)((A) + align_offset(chunk2mem(A)))
-
-/* Bounds on request (not chunk) sizes. */
-#define MAX_REQUEST ((-MIN_CHUNK_SIZE) << 2)
-#define MIN_REQUEST (MIN_CHUNK_SIZE - CHUNK_OVERHEAD - SIZE_T_ONE)
-
-/* pad request bytes into a usable size */
-#define pad_request(req) \
- (((req) + CHUNK_OVERHEAD + CHUNK_ALIGN_MASK) & ~CHUNK_ALIGN_MASK)
-
-/* pad request, checking for minimum (but not maximum) */
-#define request2size(req) \
- (((req) < MIN_REQUEST)? MIN_CHUNK_SIZE : pad_request(req))
-
-
-/* ------------------ Operations on head and foot fields ----------------- */
-
-/*
- The head field of a chunk is or'ed with PINUSE_BIT when previous
- adjacent chunk in use, and or'ed with CINUSE_BIT if this chunk is in
- use, unless mmapped, in which case both bits are cleared.
-
- FLAG4_BIT is not used by this malloc, but might be useful in extensions.
-*/
-
-#define PINUSE_BIT (SIZE_T_ONE)
-#define CINUSE_BIT (SIZE_T_TWO)
-#define FLAG4_BIT (SIZE_T_FOUR)
-#define INUSE_BITS (PINUSE_BIT|CINUSE_BIT)
-#define FLAG_BITS (PINUSE_BIT|CINUSE_BIT|FLAG4_BIT)
-
-/* Head value for fenceposts */
-#define FENCEPOST_HEAD (INUSE_BITS|SIZE_T_SIZE)
-
-/* extraction of fields from head words */
-#define cinuse(p) ((p)->head & CINUSE_BIT)
-#define pinuse(p) ((p)->head & PINUSE_BIT)
-#define flag4inuse(p) ((p)->head & FLAG4_BIT)
-#define is_inuse(p) (((p)->head & INUSE_BITS) != PINUSE_BIT)
-#define is_mmapped(p) (((p)->head & INUSE_BITS) == 0)
-
-#define chunksize(p) ((p)->head & ~(FLAG_BITS))
-
-#define clear_pinuse(p) ((p)->head &= ~PINUSE_BIT)
-#define set_flag4(p) ((p)->head |= FLAG4_BIT)
-#define clear_flag4(p) ((p)->head &= ~FLAG4_BIT)
-
-/* Treat space at ptr +/- offset as a chunk */
-#define chunk_plus_offset(p, s) ((mchunkptr)(((char*)(p)) + (s)))
-#define chunk_minus_offset(p, s) ((mchunkptr)(((char*)(p)) - (s)))
-
-/* Ptr to next or previous physical malloc_chunk. */
-#define next_chunk(p) ((mchunkptr)( ((char*)(p)) + ((p)->head & ~FLAG_BITS)))
-#define prev_chunk(p) ((mchunkptr)( ((char*)(p)) - ((p)->prev_foot) ))
-
-/* extract next chunk's pinuse bit */
-#define next_pinuse(p) ((next_chunk(p)->head) & PINUSE_BIT)
-
-/* Get/set size at footer */
-#define get_foot(p, s) (((mchunkptr)((char*)(p) + (s)))->prev_foot)
-#define set_foot(p, s) (((mchunkptr)((char*)(p) + (s)))->prev_foot = (s))
-
-/* Set size, pinuse bit, and foot */
-#define set_size_and_pinuse_of_free_chunk(p, s)\
- ((p)->head = (s|PINUSE_BIT), set_foot(p, s))
-
-/* Set size, pinuse bit, foot, and clear next pinuse */
-#define set_free_with_pinuse(p, s, n)\
- (clear_pinuse(n), set_size_and_pinuse_of_free_chunk(p, s))
-
-/* Get the internal overhead associated with chunk p */
-#define overhead_for(p)\
- (is_mmapped(p)? MMAP_CHUNK_OVERHEAD : CHUNK_OVERHEAD)
-
-/* Return true if malloced space is not necessarily cleared */
-#if MMAP_CLEARS
-#define calloc_must_clear(p) (!is_mmapped(p))
-#else /* MMAP_CLEARS */
-#define calloc_must_clear(p) (1)
-#endif /* MMAP_CLEARS */
-
-/* ---------------------- Overlaid data structures ----------------------- */
-
-/*
- When chunks are not in use, they are treated as nodes of either
- lists or trees.
-
- "Small" chunks are stored in circular doubly-linked lists, and look
- like this:
-
- chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | Size of previous chunk |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- `head:' | Size of chunk, in bytes |P|
- mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | Forward pointer to next chunk in list |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | Back pointer to previous chunk in list |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | Unused space (may be 0 bytes long) .
- . .
- . |
-nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- `foot:' | Size of chunk, in bytes |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
- Larger chunks are kept in a form of bitwise digital trees (aka
- tries) keyed on chunksizes. Because malloc_tree_chunks are only for
- free chunks greater than 256 bytes, their size doesn't impose any
- constraints on user chunk sizes. Each node looks like:
-
- chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | Size of previous chunk |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- `head:' | Size of chunk, in bytes |P|
- mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | Forward pointer to next chunk of same size |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | Back pointer to previous chunk of same size |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | Pointer to left child (child[0]) |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | Pointer to right child (child[1]) |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | Pointer to parent |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | bin index of this chunk |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | Unused space .
- . |
-nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- `foot:' | Size of chunk, in bytes |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
- Each tree holding treenodes is a tree of unique chunk sizes. Chunks
- of the same size are arranged in a circularly-linked list, with only
- the oldest chunk (the next to be used, in our FIFO ordering)
- actually in the tree. (Tree members are distinguished by a non-null
- parent pointer.) If a chunk with the same size an an existing node
- is inserted, it is linked off the existing node using pointers that
- work in the same way as fd/bk pointers of small chunks.
-
- Each tree contains a power of 2 sized range of chunk sizes (the
- smallest is 0x100 <= x < 0x180), which is is divided in half at each
- tree level, with the chunks in the smaller half of the range (0x100
- <= x < 0x140 for the top nose) in the left subtree and the larger
- half (0x140 <= x < 0x180) in the right subtree. This is, of course,
- done by inspecting individual bits.
-
- Using these rules, each node's left subtree contains all smaller
- sizes than its right subtree. However, the node at the root of each
- subtree has no particular ordering relationship to either. (The
- dividing line between the subtree sizes is based on trie relation.)
- If we remove the last chunk of a given size from the interior of the
- tree, we need to replace it with a leaf node. The tree ordering
- rules permit a node to be replaced by any leaf below it.
-
- The smallest chunk in a tree (a common operation in a best-fit
- allocator) can be found by walking a path to the leftmost leaf in
- the tree. Unlike a usual binary tree, where we follow left child
- pointers until we reach a null, here we follow the right child
- pointer any time the left one is null, until we reach a leaf with
- both child pointers null. The smallest chunk in the tree will be
- somewhere along that path.
-
- The worst case number of steps to add, find, or remove a node is
- bounded by the number of bits differentiating chunks within
- bins. Under current bin calculations, this ranges from 6 up to 21
- (for 32 bit sizes) or up to 53 (for 64 bit sizes). The typical case
- is of course much better.
-*/
-
-struct malloc_tree_chunk {
- /* The first four fields must be compatible with malloc_chunk */
- size_t prev_foot;
- size_t head;
- struct malloc_tree_chunk* fd;
- struct malloc_tree_chunk* bk;
-
- struct malloc_tree_chunk* child[2];
- struct malloc_tree_chunk* parent;
- bindex_t index;
-};
-
-typedef struct malloc_tree_chunk tchunk;
-typedef struct malloc_tree_chunk* tchunkptr;
-typedef struct malloc_tree_chunk* tbinptr; /* The type of bins of trees */
-
-/* A little helper macro for trees */
-#define leftmost_child(t) ((t)->child[0] != 0? (t)->child[0] : (t)->child[1])
-
-/* ----------------------------- Segments -------------------------------- */
-
-/*
- Each malloc space may include non-contiguous segments, held in a
- list headed by an embedded malloc_segment record representing the
- top-most space. Segments also include flags holding properties of
- the space. Large chunks that are directly allocated by mmap are not
- included in this list. They are instead independently created and
- destroyed without otherwise keeping track of them.
-
- Segment management mainly comes into play for spaces allocated by
- MMAP. Any call to MMAP might or might not return memory that is
- adjacent to an existing segment. MORECORE normally contiguously
- extends the current space, so this space is almost always adjacent,
- which is simpler and faster to deal with. (This is why MORECORE is
- used preferentially to MMAP when both are available -- see
- sys_alloc.) When allocating using MMAP, we don't use any of the
- hinting mechanisms (inconsistently) supported in various
- implementations of unix mmap, or distinguish reserving from
- committing memory. Instead, we just ask for space, and exploit
- contiguity when we get it. It is probably possible to do
- better than this on some systems, but no general scheme seems
- to be significantly better.
-
- Management entails a simpler variant of the consolidation scheme
- used for chunks to reduce fragmentation -- new adjacent memory is
- normally prepended or appended to an existing segment. However,
- there are limitations compared to chunk consolidation that mostly
- reflect the fact that segment processing is relatively infrequent
- (occurring only when getting memory from system) and that we
- don't expect to have huge numbers of segments:
-
- * Segments are not indexed, so traversal requires linear scans. (It
- would be possible to index these, but is not worth the extra
- overhead and complexity for most programs on most platforms.)
- * New segments are only appended to old ones when holding top-most
- memory; if they cannot be prepended to others, they are held in
- different segments.
-
- Except for the top-most segment of an mstate, each segment record
- is kept at the tail of its segment. Segments are added by pushing
- segment records onto the list headed by &mstate.seg for the
- containing mstate.
-
- Segment flags control allocation/merge/deallocation policies:
- * If EXTERN_BIT set, then we did not allocate this segment,
- and so should not try to deallocate or merge with others.
- (This currently holds only for the initial segment passed
- into create_mspace_with_base.)
- * If USE_MMAP_BIT set, the segment may be merged with
- other surrounding mmapped segments and trimmed/de-allocated
- using munmap.
- * If neither bit is set, then the segment was obtained using
- MORECORE so can be merged with surrounding MORECORE'd segments
- and deallocated/trimmed using MORECORE with negative arguments.
-*/
-
-struct malloc_segment {
- char* base; /* base address */
- size_t size; /* allocated size */
- struct malloc_segment* next; /* ptr to next segment */
- flag_t sflags; /* mmap and extern flag */
-};
-
-#define is_mmapped_segment(S) ((S)->sflags & USE_MMAP_BIT)
-#define is_extern_segment(S) ((S)->sflags & EXTERN_BIT)
-
-typedef struct malloc_segment msegment;
-typedef struct malloc_segment* msegmentptr;
-
-/* ---------------------------- malloc_state ----------------------------- */
-
-/*
- A malloc_state holds all of the bookkeeping for a space.
- The main fields are:
-
- Top
- The topmost chunk of the currently active segment. Its size is
- cached in topsize. The actual size of topmost space is
- topsize+TOP_FOOT_SIZE, which includes space reserved for adding
- fenceposts and segment records if necessary when getting more
- space from the system. The size at which to autotrim top is
- cached from mparams in trim_check, except that it is disabled if
- an autotrim fails.
-
- Designated victim (dv)
- This is the preferred chunk for servicing small requests that
- don't have exact fits. It is normally the chunk split off most
- recently to service another small request. Its size is cached in
- dvsize. The link fields of this chunk are not maintained since it
- is not kept in a bin.
-
- SmallBins
- An array of bin headers for free chunks. These bins hold chunks
- with sizes less than MIN_LARGE_SIZE bytes. Each bin contains
- chunks of all the same size, spaced 8 bytes apart. To simplify
- use in double-linked lists, each bin header acts as a malloc_chunk
- pointing to the real first node, if it exists (else pointing to
- itself). This avoids special-casing for headers. But to avoid
- waste, we allocate only the fd/bk pointers of bins, and then use
- repositioning tricks to treat these as the fields of a chunk.
-
- TreeBins
- Treebins are pointers to the roots of trees holding a range of
- sizes. There are 2 equally spaced treebins for each power of two
- from TREE_SHIFT to TREE_SHIFT+16. The last bin holds anything
- larger.
-
- Bin maps
- There is one bit map for small bins ("smallmap") and one for
- treebins ("treemap). Each bin sets its bit when non-empty, and
- clears the bit when empty. Bit operations are then used to avoid
- bin-by-bin searching -- nearly all "search" is done without ever
- looking at bins that won't be selected. The bit maps
- conservatively use 32 bits per map word, even if on 64bit system.
- For a good description of some of the bit-based techniques used
- here, see Henry S. Warren Jr's book "Hacker's Delight" (and
- supplement at http://hackersdelight.org/). Many of these are
- intended to reduce the branchiness of paths through malloc etc, as
- well as to reduce the number of memory locations read or written.
-
- Segments
- A list of segments headed by an embedded malloc_segment record
- representing the initial space.
-
- Address check support
- The least_addr field is the least address ever obtained from
- MORECORE or MMAP. Attempted frees and reallocs of any address less
- than this are trapped (unless INSECURE is defined).
-
- Magic tag
- A cross-check field that should always hold same value as mparams.magic.
-
- Max allowed footprint
- The maximum allowed bytes to allocate from system (zero means no limit)
-
- Flags
- Bits recording whether to use MMAP, locks, or contiguous MORECORE
-
- Statistics
- Each space keeps track of current and maximum system memory
- obtained via MORECORE or MMAP.
-
- Trim support
- Fields holding the amount of unused topmost memory that should trigger
- trimming, and a counter to force periodic scanning to release unused
- non-topmost segments.
-
- Locking
- If USE_LOCKS is defined, the "mutex" lock is acquired and released
- around every public call using this mspace.
-
- Extension support
- A void* pointer and a size_t field that can be used to help implement
- extensions to this malloc.
-*/
-
-/* Bin types, widths and sizes */
-#define NSMALLBINS (32U)
-#define NTREEBINS (32U)
-#define SMALLBIN_SHIFT (3U)
-#define SMALLBIN_WIDTH (SIZE_T_ONE << SMALLBIN_SHIFT)
-#define TREEBIN_SHIFT (8U)
-#define MIN_LARGE_SIZE (SIZE_T_ONE << TREEBIN_SHIFT)
-#define MAX_SMALL_SIZE (MIN_LARGE_SIZE - SIZE_T_ONE)
-#define MAX_SMALL_REQUEST (MAX_SMALL_SIZE - CHUNK_ALIGN_MASK - CHUNK_OVERHEAD)
-
-struct malloc_state {
- binmap_t smallmap;
- binmap_t treemap;
- size_t dvsize;
- size_t topsize;
- char* least_addr;
- mchunkptr dv;
- mchunkptr top;
- size_t trim_check;
- size_t release_checks;
- size_t magic;
- mchunkptr smallbins[(NSMALLBINS+1)*2];
- tbinptr treebins[NTREEBINS];
- size_t footprint;
- size_t max_footprint;
- size_t footprint_limit; /* zero means no limit */
- flag_t mflags;
-#if USE_LOCKS
- MLOCK_T mutex; /* locate lock among fields that rarely change */
-#endif /* USE_LOCKS */
- msegment seg;
- void* extp; /* Unused but available for extensions */
- size_t exts;
- size_t inuse;
-};
-
-typedef struct malloc_state* mstate;
-
-/* ------------- Global malloc_state and malloc_params ------------------- */
-
-/*
- malloc_params holds global properties, including those that can be
- dynamically set using mallopt. There is a single instance, mparams,
- initialized in init_mparams. Note that the non-zeroness of "magic"
- also serves as an initialization flag.
-*/
-
-struct malloc_params {
- size_t magic;
- size_t page_size;
- size_t granularity;
- size_t mmap_threshold;
- size_t trim_threshold;
- flag_t default_mflags;
-};
-
-static struct malloc_params mparams;
-
-/* Ensure mparams initialized */
-#define ensure_initialization() (void)(mparams.magic != 0 || init_mparams())
-
-#if !ONLY_MSPACES
-
-/* The global malloc_state used for all non-"mspace" calls */
-static struct malloc_state _gm_;
-#define gm (&_gm_)
-#define is_global(M) ((M) == &_gm_)
-
-#endif /* !ONLY_MSPACES */
-
-#define is_initialized(M) ((M)->top != 0)
-
-/* -------------------------- system alloc setup ------------------------- */
-
-/* Operations on mflags */
-
-#define use_lock(M) ((M)->mflags & USE_LOCK_BIT)
-#define enable_lock(M) ((M)->mflags |= USE_LOCK_BIT)
-#if USE_LOCKS
-#define disable_lock(M) ((M)->mflags &= ~USE_LOCK_BIT)
-#else
-#define disable_lock(M)
-#endif
-
-#define use_mmap(M) ((M)->mflags & USE_MMAP_BIT)
-#define enable_mmap(M) ((M)->mflags |= USE_MMAP_BIT)
-#if HAVE_MMAP
-#define disable_mmap(M) ((M)->mflags &= ~USE_MMAP_BIT)
-#else
-#define disable_mmap(M)
-#endif
-
-#define use_noncontiguous(M) ((M)->mflags & USE_NONCONTIGUOUS_BIT)
-#define disable_contiguous(M) ((M)->mflags |= USE_NONCONTIGUOUS_BIT)
-
-#define set_lock(M,L)\
- ((M)->mflags = (L)?\
- ((M)->mflags | USE_LOCK_BIT) :\
- ((M)->mflags & ~USE_LOCK_BIT))
-
-/* page-align a size */
-#define page_align(S)\
- (((S) + (mparams.page_size - SIZE_T_ONE)) & ~(mparams.page_size - SIZE_T_ONE))
-
-/* granularity-align a size */
-#define granularity_align(S)\
- (((S) + (mparams.granularity - SIZE_T_ONE))\
- & ~(mparams.granularity - SIZE_T_ONE))
-
-
-/* For mmap, use granularity alignment on windows, else page-align */
-#ifdef WIN32
-#define mmap_align(S) granularity_align(S)
-#else
-#define mmap_align(S) page_align(S)
-#endif
-
-/* For sys_alloc, enough padding to ensure can malloc request on success */
-#define SYS_ALLOC_PADDING (TOP_FOOT_SIZE + MALLOC_ALIGNMENT)
-
-#define is_page_aligned(S)\
- (((size_t)(S) & (mparams.page_size - SIZE_T_ONE)) == 0)
-#define is_granularity_aligned(S)\
- (((size_t)(S) & (mparams.granularity - SIZE_T_ONE)) == 0)
-
-/* True if segment S holds address A */
-#define segment_holds(S, A)\
- ((char*)(A) >= S->base && (char*)(A) < S->base + S->size)
-
-/* Return segment holding given address */
-static msegmentptr segment_holding(mstate m, char* addr) {
- msegmentptr sp = &m->seg;
- for (;;) {
- if (addr >= sp->base && addr < sp->base + sp->size)
- return sp;
- if ((sp = sp->next) == 0)
- return 0;
- }
-}
-
-/* Return true if segment contains a segment link */
-static int has_segment_link(mstate m, msegmentptr ss) {
- msegmentptr sp = &m->seg;
- for (;;) {
- if ((char*)sp >= ss->base && (char*)sp < ss->base + ss->size)
- return 1;
- if ((sp = sp->next) == 0)
- return 0;
- }
-}
-
-#ifndef MORECORE_CANNOT_TRIM
-#define should_trim(M,s) ((s) > (M)->trim_check)
-#else /* MORECORE_CANNOT_TRIM */
-#define should_trim(M,s) (0)
-#endif /* MORECORE_CANNOT_TRIM */
-
-/*
- TOP_FOOT_SIZE is padding at the end of a segment, including space
- that may be needed to place segment records and fenceposts when new
- noncontiguous segments are added.
-*/
-#define TOP_FOOT_SIZE\
- (align_offset(chunk2mem(0))+pad_request(sizeof(struct malloc_segment))+MIN_CHUNK_SIZE)
-
-
-/* ------------------------------- Hooks -------------------------------- */
-
-/*
- PREACTION should be defined to return 0 on success, and nonzero on
- failure. If you are not using locking, you can redefine these to do
- anything you like.
-*/
-
-#if USE_LOCKS
-#define PREACTION(M) ((use_lock(M))? ACQUIRE_LOCK(&(M)->mutex) : 0)
-#define POSTACTION(M) { if (use_lock(M)) RELEASE_LOCK(&(M)->mutex); }
-#else /* USE_LOCKS */
-
-#ifndef PREACTION
-#define PREACTION(M) (0)
-#endif /* PREACTION */
-
-#ifndef POSTACTION
-#define POSTACTION(M)
-#endif /* POSTACTION */
-
-#endif /* USE_LOCKS */
-
-/*
- CORRUPTION_ERROR_ACTION is triggered upon detected bad addresses.
- USAGE_ERROR_ACTION is triggered on detected bad frees and
- reallocs. The argument p is an address that might have triggered the
- fault. It is ignored by the two predefined actions, but might be
- useful in custom actions that try to help diagnose errors.
-*/
-
-#if PROCEED_ON_ERROR
-
-/* A count of the number of corruption errors causing resets */
-int malloc_corruption_error_count;
-
-/* default corruption action */
-static void reset_on_error(mstate m);
-
-#define CORRUPTION_ERROR_ACTION(m) reset_on_error(m)
-#define USAGE_ERROR_ACTION(m, p)
-
-#else /* PROCEED_ON_ERROR */
-
-#ifndef CORRUPTION_ERROR_ACTION
-#define CORRUPTION_ERROR_ACTION(m) ABORT
-#endif /* CORRUPTION_ERROR_ACTION */
-
-#ifndef USAGE_ERROR_ACTION
-#define USAGE_ERROR_ACTION(m,p) ABORT
-#endif /* USAGE_ERROR_ACTION */
-
-#endif /* PROCEED_ON_ERROR */
-
-
-/* -------------------------- Debugging setup ---------------------------- */
-
-#if ! DEBUG
-
-#define check_free_chunk(M,P)
-#define check_inuse_chunk(M,P)
-#define check_malloced_chunk(M,P,N)
-#define check_mmapped_chunk(M,P)
-#define check_malloc_state(M)
-#define check_top_chunk(M,P)
-
-#else /* DEBUG */
-#define check_free_chunk(M,P) do_check_free_chunk(M,P)
-#define check_inuse_chunk(M,P) do_check_inuse_chunk(M,P)
-#define check_top_chunk(M,P) do_check_top_chunk(M,P)
-#define check_malloced_chunk(M,P,N) do_check_malloced_chunk(M,P,N)
-#define check_mmapped_chunk(M,P) do_check_mmapped_chunk(M,P)
-#define check_malloc_state(M) do_check_malloc_state(M)
-
-static void do_check_any_chunk(mstate m, mchunkptr p);
-static void do_check_top_chunk(mstate m, mchunkptr p);
-static void do_check_mmapped_chunk(mstate m, mchunkptr p);
-static void do_check_inuse_chunk(mstate m, mchunkptr p);
-static void do_check_free_chunk(mstate m, mchunkptr p);
-static void do_check_malloced_chunk(mstate m, void* mem, size_t s);
-static void do_check_tree(mstate m, tchunkptr t);
-static void do_check_treebin(mstate m, bindex_t i);
-static void do_check_smallbin(mstate m, bindex_t i);
-static void do_check_malloc_state(mstate m);
-static int bin_find(mstate m, mchunkptr x);
-static size_t traverse_and_check(mstate m);
-#endif /* DEBUG */
-
-/* ---------------------------- Indexing Bins ---------------------------- */
-
-#define is_small(s) (((s) >> SMALLBIN_SHIFT) < NSMALLBINS)
-#define small_index(s) (bindex_t)((s) >> SMALLBIN_SHIFT)
-#define small_index2size(i) ((i) << SMALLBIN_SHIFT)
-#define MIN_SMALL_INDEX (small_index(MIN_CHUNK_SIZE))
-
-/* addressing by index. See above about smallbin repositioning */
-#define smallbin_at(M, i) ((sbinptr)((char*)&((M)->smallbins[(i)<<1])))
-#define treebin_at(M,i) (&((M)->treebins[i]))
-
-/* assign tree index for size S to variable I. Use x86 asm if possible */
-#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
-#define compute_tree_index(S, I)\
-{\
- unsigned int X = S >> TREEBIN_SHIFT;\
- if (X == 0)\
- I = 0;\
- else if (X > 0xFFFF)\
- I = NTREEBINS-1;\
- else {\
- unsigned int K = (unsigned) sizeof(X)*__CHAR_BIT__ - 1 - (unsigned) __builtin_clz(X); \
- I = (bindex_t)((K << 1) + ((S >> (K + (TREEBIN_SHIFT-1)) & 1)));\
- }\
-}
-
-#elif defined (__INTEL_COMPILER)
-#define compute_tree_index(S, I)\
-{\
- size_t X = S >> TREEBIN_SHIFT;\
- if (X == 0)\
- I = 0;\
- else if (X > 0xFFFF)\
- I = NTREEBINS-1;\
- else {\
- unsigned int K = _bit_scan_reverse (X); \
- I = (bindex_t)((K << 1) + ((S >> (K + (TREEBIN_SHIFT-1)) & 1)));\
- }\
-}
-
-#elif defined(_MSC_VER) && _MSC_VER>=1300 && !defined(__LB_XB360__)
-#define compute_tree_index(S, I)\
-{\
- size_t X = S >> TREEBIN_SHIFT;\
- if (X == 0)\
- I = 0;\
- else if (X > 0xFFFF)\
- I = NTREEBINS-1;\
- else {\
- unsigned int K;\
- _BitScanReverse((DWORD *) &K, (DWORD) X);\
- I = (bindex_t)((K << 1) + ((S >> (K + (TREEBIN_SHIFT-1)) & 1)));\
- }\
-}
-
-#else /* GNUC */
-#define compute_tree_index(S, I)\
-{\
- size_t X = S >> TREEBIN_SHIFT;\
- if (X == 0)\
- I = 0;\
- else if (X > 0xFFFF)\
- I = NTREEBINS-1;\
- else {\
- unsigned int Y = (unsigned int)X;\
- unsigned int N = ((Y - 0x100) >> 16) & 8;\
- unsigned int K = (((Y <<= N) - 0x1000) >> 16) & 4;\
- N += K;\
- N += K = (((Y <<= K) - 0x4000) >> 16) & 2;\
- K = 14 - N + ((Y <<= K) >> 15);\
- I = (K << 1) + ((S >> (K + (TREEBIN_SHIFT-1)) & 1));\
- }\
-}
-#endif /* GNUC */
-
-/* Bit representing maximum resolved size in a treebin at i */
-#define bit_for_tree_index(i) \
- (i == NTREEBINS-1)? (SIZE_T_BITSIZE-1) : (((i) >> 1) + TREEBIN_SHIFT - 2)
-
-/* Shift placing maximum resolved bit in a treebin at i as sign bit */
-#define leftshift_for_tree_index(i) \
- ((i == NTREEBINS-1)? 0 : \
- ((SIZE_T_BITSIZE-SIZE_T_ONE) - (((i) >> 1) + TREEBIN_SHIFT - 2)))
-
-/* The size of the smallest chunk held in bin with index i */
-#define minsize_for_tree_index(i) \
- ((SIZE_T_ONE << (((i) >> 1) + TREEBIN_SHIFT)) | \
- (((size_t)((i) & SIZE_T_ONE)) << (((i) >> 1) + TREEBIN_SHIFT - 1)))
-
-
-/* ------------------------ Operations on bin maps ----------------------- */
-
-/* bit corresponding to given index */
-#define idx2bit(i) ((binmap_t)(1) << (i))
-
-/* Mark/Clear bits with given index */
-#define mark_smallmap(M,i) ((M)->smallmap |= idx2bit(i))
-#define clear_smallmap(M,i) ((M)->smallmap &= ~idx2bit(i))
-#define smallmap_is_marked(M,i) ((M)->smallmap & idx2bit(i))
-
-#define mark_treemap(M,i) ((M)->treemap |= idx2bit(i))
-#define clear_treemap(M,i) ((M)->treemap &= ~idx2bit(i))
-#define treemap_is_marked(M,i) ((M)->treemap & idx2bit(i))
-
-/* isolate the least set bit of a bitmap */
-#define least_bit(x) ((x) & -(x))
-
-/* mask with all bits to left of least bit of x on */
-#define left_bits(x) ((x<<1) | -(x<<1))
-
-/* mask with all bits to left of or equal to least bit of x on */
-#define same_or_left_bits(x) ((x) | -(x))
-
-/* index corresponding to given bit. Use x86 asm if possible */
-
-#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
-#define compute_bit2idx(X, I)\
-{\
- unsigned int J;\
- J = __builtin_ctz(X); \
- I = (bindex_t)J;\
-}
-
-#elif defined (__INTEL_COMPILER)
-#define compute_bit2idx(X, I)\
-{\
- unsigned int J;\
- J = _bit_scan_forward (X); \
- I = (bindex_t)J;\
-}
-
-#elif defined(_MSC_VER) && _MSC_VER>=1300 && !defined(__LB_XB360__)
-#define compute_bit2idx(X, I)\
-{\
- unsigned int J;\
- _BitScanForward((DWORD *) &J, X);\
- I = (bindex_t)J;\
-}
-
-#elif USE_BUILTIN_FFS
-#define compute_bit2idx(X, I) I = ffs(X)-1
-
-#else
-#define compute_bit2idx(X, I)\
-{\
- unsigned int Y = X - 1;\
- unsigned int K = Y >> (16-4) & 16;\
- unsigned int N = K; Y >>= K;\
- N += K = Y >> (8-3) & 8; Y >>= K;\
- N += K = Y >> (4-2) & 4; Y >>= K;\
- N += K = Y >> (2-1) & 2; Y >>= K;\
- N += K = Y >> (1-0) & 1; Y >>= K;\
- I = (bindex_t)(N + Y);\
-}
-#endif /* GNUC */
-
-
-/* ----------------------- Runtime Check Support ------------------------- */
-
-/*
- For security, the main invariant is that malloc/free/etc never
- writes to a static address other than malloc_state, unless static
- malloc_state itself has been corrupted, which cannot occur via
- malloc (because of these checks). In essence this means that we
- believe all pointers, sizes, maps etc held in malloc_state, but
- check all of those linked or offsetted from other embedded data
- structures. These checks are interspersed with main code in a way
- that tends to minimize their run-time cost.
-
- When FOOTERS is defined, in addition to range checking, we also
- verify footer fields of inuse chunks, which can be used guarantee
- that the mstate controlling malloc/free is intact. This is a
- streamlined version of the approach described by William Robertson
- et al in "Run-time Detection of Heap-based Overflows" LISA'03
- http://www.usenix.org/events/lisa03/tech/robertson.html The footer
- of an inuse chunk holds the xor of its mstate and a random seed,
- that is checked upon calls to free() and realloc(). This is
- (probabalistically) unguessable from outside the program, but can be
- computed by any code successfully malloc'ing any chunk, so does not
- itself provide protection against code that has already broken
- security through some other means. Unlike Robertson et al, we
- always dynamically check addresses of all offset chunks (previous,
- next, etc). This turns out to be cheaper than relying on hashes.
-*/
-
-#if !INSECURE
-/* Check if address a is at least as high as any from MORECORE or MMAP */
-#define ok_address(M, a) ((char*)(a) >= (M)->least_addr)
-/* Check if address of next chunk n is higher than base chunk p */
-#define ok_next(p, n) ((char*)(p) < (char*)(n))
-/* Check if p has inuse status */
-#define ok_inuse(p) is_inuse(p)
-/* Check if p has its pinuse bit on */
-#define ok_pinuse(p) pinuse(p)
-
-#else /* !INSECURE */
-#define ok_address(M, a) (1)
-#define ok_next(b, n) (1)
-#define ok_inuse(p) (1)
-#define ok_pinuse(p) (1)
-#endif /* !INSECURE */
-
-#if (FOOTERS && !INSECURE)
-/* Check if (alleged) mstate m has expected magic field */
-#define ok_magic(M) ((M)->magic == mparams.magic)
-#else /* (FOOTERS && !INSECURE) */
-#define ok_magic(M) (1)
-#endif /* (FOOTERS && !INSECURE) */
-
-/* In gcc, use __builtin_expect to minimize impact of checks */
-#if !INSECURE
-#if defined(__GNUC__) && __GNUC__ >= 3
-#define RTCHECK(e) __builtin_expect(e, 1)
-#else /* GNUC */
-#define RTCHECK(e) (e)
-#endif /* GNUC */
-#else /* !INSECURE */
-#define RTCHECK(e) (1)
-#endif /* !INSECURE */
-
-/* macros to set up inuse chunks with or without footers */
-
-#if !FOOTERS
-
-#define mark_inuse_foot(M,p,s)
-
-/* Macros for setting head/foot of non-mmapped chunks */
-
-/* Set cinuse bit and pinuse bit of next chunk */
-#define set_inuse(M,p,s)\
- ((p)->head = (((p)->head & PINUSE_BIT)|s|CINUSE_BIT),\
- ((mchunkptr)(((char*)(p)) + (s)))->head |= PINUSE_BIT)
-
-/* Set cinuse and pinuse of this chunk and pinuse of next chunk */
-#define set_inuse_and_pinuse(M,p,s)\
- ((p)->head = (s|PINUSE_BIT|CINUSE_BIT),\
- ((mchunkptr)(((char*)(p)) + (s)))->head |= PINUSE_BIT)
-
-/* Set size, cinuse and pinuse bit of this chunk */
-#define set_size_and_pinuse_of_inuse_chunk(M, p, s)\
- ((p)->head = (s|PINUSE_BIT|CINUSE_BIT))
-
-#else /* FOOTERS */
-
-/* Set foot of inuse chunk to be xor of mstate and seed */
-#define mark_inuse_foot(M,p,s)\
- (((mchunkptr)((char*)(p) + (s)))->prev_foot = ((size_t)(M) ^ mparams.magic))
-
-#define get_mstate_for(p)\
- ((mstate)(((mchunkptr)((char*)(p) +\
- (chunksize(p))))->prev_foot ^ mparams.magic))
-
-#define set_inuse(M,p,s)\
- ((p)->head = (((p)->head & PINUSE_BIT)|s|CINUSE_BIT),\
- (((mchunkptr)(((char*)(p)) + (s)))->head |= PINUSE_BIT), \
- mark_inuse_foot(M,p,s))
-
-#define set_inuse_and_pinuse(M,p,s)\
- ((p)->head = (s|PINUSE_BIT|CINUSE_BIT),\
- (((mchunkptr)(((char*)(p)) + (s)))->head |= PINUSE_BIT),\
- mark_inuse_foot(M,p,s))
-
-#define set_size_and_pinuse_of_inuse_chunk(M, p, s)\
- ((p)->head = (s|PINUSE_BIT|CINUSE_BIT),\
- mark_inuse_foot(M, p, s))
-
-#endif /* !FOOTERS */
-
-/* ---------------------------- setting mparams -------------------------- */
-
-#if LOCK_AT_FORK
-static void pre_fork(void) { ACQUIRE_LOCK(&(gm)->mutex); }
-static void post_fork_parent(void) { RELEASE_LOCK(&(gm)->mutex); }
-static void post_fork_child(void) { INITIAL_LOCK(&(gm)->mutex); }
-#endif /* LOCK_AT_FORK */
-
-#if defined(__LB_SHELL__) || defined(STARBOARD)
-static void dl_heap_init();
-#endif
-
-/* Initialize mparams */
-static int init_mparams(void) {
-#ifdef NEED_GLOBAL_LOCK_INIT
- if (malloc_global_mutex_status <= 0)
- init_malloc_global_mutex();
-#endif
-
- ACQUIRE_MALLOC_GLOBAL_LOCK();
- if (mparams.magic == 0) {
- size_t magic;
- size_t psize;
- size_t gsize;
-
-#ifndef WIN32
- psize = malloc_getpagesize;
- gsize = ((DEFAULT_GRANULARITY != 0)? DEFAULT_GRANULARITY : psize);
-#else /* WIN32 */
- {
- SYSTEM_INFO system_info;
- GetSystemInfo(&system_info);
- psize = system_info.dwPageSize;
- gsize = ((DEFAULT_GRANULARITY != 0)?
- DEFAULT_GRANULARITY : system_info.dwAllocationGranularity);
- }
-#endif /* WIN32 */
-
- /* Sanity-check configuration:
- size_t must be unsigned and as wide as pointer type.
- ints must be at least 4 bytes.
- alignment must be at least 8.
- Alignment, min chunk size, and page size must all be powers of 2.
- */
- if ((sizeof(size_t) != sizeof(char*)) ||
- (MAX_SIZE_T < MIN_CHUNK_SIZE) ||
- (sizeof(int) < 4) ||
- (MALLOC_ALIGNMENT < (size_t)8U) ||
- ((MALLOC_ALIGNMENT & (MALLOC_ALIGNMENT-SIZE_T_ONE)) != 0) ||
- ((MCHUNK_SIZE & (MCHUNK_SIZE-SIZE_T_ONE)) != 0) ||
- ((gsize & (gsize-SIZE_T_ONE)) != 0) ||
- ((psize & (psize-SIZE_T_ONE)) != 0))
- ABORT;
- mparams.granularity = gsize;
- mparams.page_size = psize;
- mparams.mmap_threshold = DEFAULT_MMAP_THRESHOLD;
- mparams.trim_threshold = DEFAULT_TRIM_THRESHOLD;
-#if MORECORE_CONTIGUOUS
- mparams.default_mflags = USE_LOCK_BIT|USE_MMAP_BIT;
-#else /* MORECORE_CONTIGUOUS */
- mparams.default_mflags = USE_LOCK_BIT|USE_MMAP_BIT|USE_NONCONTIGUOUS_BIT;
-#endif /* MORECORE_CONTIGUOUS */
-
-#if !ONLY_MSPACES
- /* Set up lock for main malloc area */
- gm->mflags = mparams.default_mflags;
- (void)INITIAL_LOCK(&gm->mutex);
-#endif
-#if LOCK_AT_FORK
- pthread_atfork(&pre_fork, &post_fork_parent, &post_fork_child);
-#endif
-
- {
-#if USE_DEV_RANDOM
- int fd;
- unsigned char buf[sizeof(size_t)];
- /* Try to use /dev/urandom, else fall back on using time */
- if ((fd = open("/dev/urandom", O_RDONLY)) >= 0 &&
- read(fd, buf, sizeof(buf)) == sizeof(buf)) {
- magic = *((size_t *) buf);
- close(fd);
- }
- else
-#endif /* USE_DEV_RANDOM */
-#ifdef WIN32
- magic = (size_t)(GetTickCount() ^ (size_t)0x55555555U);
-#elif defined(LACKS_TIME_H)
- magic = (size_t)&magic ^ (size_t)0x55555555U;
-#else
- magic = (size_t)(time(0) ^ (size_t)0x55555555U);
-#endif
- magic |= (size_t)8U; /* ensure nonzero */
- magic &= ~(size_t)7U; /* improve chances of fault for bad values */
- /* Until memory modes commonly available, use volatile-write */
- (*(volatile size_t *)(&(mparams.magic))) = magic;
- }
-#if defined(__LB_SHELL__) || defined(STARBOARD)
- // Call our own initialization functions.
- dl_heap_init();
-#endif
- }
- RELEASE_MALLOC_GLOBAL_LOCK();
- return 1;
-}
-
-/* support for mallopt */
-static int change_mparam(int param_number, int value) {
- size_t val;
- ensure_initialization();
- val = (value == -1)? MAX_SIZE_T : (size_t)value;
- switch(param_number) {
- case M_TRIM_THRESHOLD:
- mparams.trim_threshold = val;
- return 1;
- case M_GRANULARITY:
- if (val >= mparams.page_size && ((val & (val-1)) == 0)) {
- mparams.granularity = val;
- return 1;
- }
- else
- return 0;
- case M_MMAP_THRESHOLD:
- mparams.mmap_threshold = val;
- return 1;
- default:
- return 0;
- }
-}
-
-#if DEBUG
-/* ------------------------- Debugging Support --------------------------- */
-
-/* Check properties of any chunk, whether free, inuse, mmapped etc */
-static void do_check_any_chunk(mstate m, mchunkptr p) {
- assert((is_aligned(chunk2mem(p))) || (p->head == FENCEPOST_HEAD));
- assert(ok_address(m, p));
-}
-
-/* Check properties of top chunk */
-static void do_check_top_chunk(mstate m, mchunkptr p) {
- msegmentptr sp = segment_holding(m, (char*)p);
- size_t sz = p->head & ~INUSE_BITS; /* third-lowest bit can be set! */
- assert(sp != 0);
- assert((is_aligned(chunk2mem(p))) || (p->head == FENCEPOST_HEAD));
- assert(ok_address(m, p));
- assert(sz == m->topsize);
- assert(sz > 0);
- assert(sz == ((sp->base + sp->size) - (char*)p) - TOP_FOOT_SIZE);
- assert(pinuse(p));
- assert(!pinuse(chunk_plus_offset(p, sz)));
-}
-
-/* Check properties of (inuse) mmapped chunks */
-static void do_check_mmapped_chunk(mstate m, mchunkptr p) {
- size_t sz = chunksize(p);
- size_t len = (sz + (p->prev_foot) + MMAP_FOOT_PAD);
- assert(is_mmapped(p));
- assert(use_mmap(m));
- assert((is_aligned(chunk2mem(p))) || (p->head == FENCEPOST_HEAD));
- assert(ok_address(m, p));
- assert(!is_small(sz));
- assert((len & (mparams.page_size-SIZE_T_ONE)) == 0);
- assert(chunk_plus_offset(p, sz)->head == FENCEPOST_HEAD);
- assert(chunk_plus_offset(p, sz+SIZE_T_SIZE)->head == 0);
-}
-
-/* Check properties of inuse chunks */
-static void do_check_inuse_chunk(mstate m, mchunkptr p) {
- do_check_any_chunk(m, p);
- assert(is_inuse(p));
- assert(next_pinuse(p));
- /* If not pinuse and not mmapped, previous chunk has OK offset */
- assert(is_mmapped(p) || pinuse(p) || next_chunk(prev_chunk(p)) == p);
- if (is_mmapped(p))
- do_check_mmapped_chunk(m, p);
-}
-
-/* Check properties of free chunks */
-static void do_check_free_chunk(mstate m, mchunkptr p) {
- size_t sz = chunksize(p);
- mchunkptr next = chunk_plus_offset(p, sz);
- do_check_any_chunk(m, p);
- assert(!is_inuse(p));
- assert(!next_pinuse(p));
- assert (!is_mmapped(p));
- if (p != m->dv && p != m->top) {
- if (sz >= MIN_CHUNK_SIZE) {
- assert((sz & CHUNK_ALIGN_MASK) == 0);
- assert(is_aligned(chunk2mem(p)));
- assert(next->prev_foot == sz);
- assert(pinuse(p));
- assert (next == m->top || is_inuse(next));
- assert(p->fd->bk == p);
- assert(p->bk->fd == p);
- }
- else /* markers are always of size SIZE_T_SIZE */
- assert(sz == SIZE_T_SIZE);
- }
-}
-
-/* Check properties of malloced chunks at the point they are malloced */
-static void do_check_malloced_chunk(mstate m, void* mem, size_t s) {
- if (mem != 0) {
- mchunkptr p = mem2chunk(mem);
- size_t sz = p->head & ~INUSE_BITS;
- do_check_inuse_chunk(m, p);
- assert((sz & CHUNK_ALIGN_MASK) == 0);
- assert(sz >= MIN_CHUNK_SIZE);
- assert(sz >= s);
- /* unless mmapped, size is less than MIN_CHUNK_SIZE more than request */
- assert(is_mmapped(p) || sz < (s + MIN_CHUNK_SIZE));
- }
-}
-
-/* Check a tree and its subtrees. */
-static void do_check_tree(mstate m, tchunkptr t) {
- tchunkptr head = 0;
- tchunkptr u = t;
- bindex_t tindex = t->index;
- size_t tsize = chunksize(t);
- bindex_t idx;
- compute_tree_index(tsize, idx);
- assert(tindex == idx);
- assert(tsize >= MIN_LARGE_SIZE);
- assert(tsize >= minsize_for_tree_index(idx));
- assert((idx == NTREEBINS-1) || (tsize < minsize_for_tree_index((idx+1))));
-
- do { /* traverse through chain of same-sized nodes */
- do_check_any_chunk(m, ((mchunkptr)u));
- assert(u->index == tindex);
- assert(chunksize(u) == tsize);
- assert(!is_inuse(u));
- assert(!next_pinuse(u));
- assert(u->fd->bk == u);
- assert(u->bk->fd == u);
- if (u->parent == 0) {
- assert(u->child[0] == 0);
- assert(u->child[1] == 0);
- }
- else {
- assert(head == 0); /* only one node on chain has parent */
- head = u;
- assert(u->parent != u);
- assert (u->parent->child[0] == u ||
- u->parent->child[1] == u ||
- *((tbinptr*)(u->parent)) == u);
- if (u->child[0] != 0) {
- assert(u->child[0]->parent == u);
- assert(u->child[0] != u);
- do_check_tree(m, u->child[0]);
- }
- if (u->child[1] != 0) {
- assert(u->child[1]->parent == u);
- assert(u->child[1] != u);
- do_check_tree(m, u->child[1]);
- }
- if (u->child[0] != 0 && u->child[1] != 0) {
- assert(chunksize(u->child[0]) < chunksize(u->child[1]));
- }
- }
- u = u->fd;
- } while (u != t);
- assert(head != 0);
-}
-
-/* Check all the chunks in a treebin. */
-static void do_check_treebin(mstate m, bindex_t i) {
- tbinptr* tb = treebin_at(m, i);
- tchunkptr t = *tb;
- int empty = (m->treemap & (1U << i)) == 0;
- if (t == 0)
- assert(empty);
- if (!empty)
- do_check_tree(m, t);
-}
-
-/* Check all the chunks in a smallbin. */
-static void do_check_smallbin(mstate m, bindex_t i) {
- sbinptr b = smallbin_at(m, i);
- mchunkptr p = b->bk;
- unsigned int empty = (m->smallmap & (1U << i)) == 0;
- if (p == b)
- assert(empty);
- if (!empty) {
- for (; p != b; p = p->bk) {
- size_t size = chunksize(p);
- mchunkptr q;
- /* each chunk claims to be free */
- do_check_free_chunk(m, p);
- /* chunk belongs in bin */
- assert(small_index(size) == i);
- assert(p->bk == b || chunksize(p->bk) == chunksize(p));
- /* chunk is followed by an inuse chunk */
- q = next_chunk(p);
- if (q->head != FENCEPOST_HEAD)
- do_check_inuse_chunk(m, q);
- }
- }
-}
-
-/* Find x in a bin. Used in other check functions. */
-static int bin_find(mstate m, mchunkptr x) {
- size_t size = chunksize(x);
- if (is_small(size)) {
- bindex_t sidx = small_index(size);
- sbinptr b = smallbin_at(m, sidx);
- if (smallmap_is_marked(m, sidx)) {
- mchunkptr p = b;
- do {
- if (p == x)
- return 1;
- } while ((p = p->fd) != b);
- }
- }
- else {
- bindex_t tidx;
- compute_tree_index(size, tidx);
- if (treemap_is_marked(m, tidx)) {
- tchunkptr t = *treebin_at(m, tidx);
- size_t sizebits = size << leftshift_for_tree_index(tidx);
- while (t != 0 && chunksize(t) != size) {
- t = t->child[(sizebits >> (SIZE_T_BITSIZE-SIZE_T_ONE)) & 1];
- sizebits <<= 1;
- }
- if (t != 0) {
- tchunkptr u = t;
- do {
- if (u == (tchunkptr)x)
- return 1;
- } while ((u = u->fd) != t);
- }
- }
- }
- return 0;
-}
-
-/* Traverse each chunk and check it; return total */
-static size_t traverse_and_check(mstate m) {
- size_t sum = 0;
- if (is_initialized(m)) {
- msegmentptr s = &m->seg;
- sum += m->topsize + TOP_FOOT_SIZE;
- while (s != 0) {
- mchunkptr q = align_as_chunk(s->base);
- mchunkptr lastq = 0;
- assert(pinuse(q));
- while (segment_holds(s, q) &&
- q != m->top && q->head != FENCEPOST_HEAD) {
- sum += chunksize(q);
- if (is_inuse(q)) {
- assert(!bin_find(m, q));
- do_check_inuse_chunk(m, q);
- }
- else {
- assert(q == m->dv || bin_find(m, q));
- assert(lastq == 0 || is_inuse(lastq)); /* Not 2 consecutive free */
- do_check_free_chunk(m, q);
- }
- lastq = q;
- q = next_chunk(q);
- }
- s = s->next;
- }
- }
- return sum;
-}
-
-
-/* Check all properties of malloc_state. */
-static void do_check_malloc_state(mstate m) {
- bindex_t i;
- size_t total;
- /* check bins */
- for (i = 0; i < NSMALLBINS; ++i)
- do_check_smallbin(m, i);
- for (i = 0; i < NTREEBINS; ++i)
- do_check_treebin(m, i);
-
- if (m->dvsize != 0) { /* check dv chunk */
- do_check_any_chunk(m, m->dv);
- assert(m->dvsize == chunksize(m->dv));
- assert(m->dvsize >= MIN_CHUNK_SIZE);
- assert(bin_find(m, m->dv) == 0);
- }
-
- if (m->top != 0) { /* check top chunk */
- do_check_top_chunk(m, m->top);
- /*assert(m->topsize == chunksize(m->top)); redundant */
- assert(m->topsize > 0);
- assert(bin_find(m, m->top) == 0);
- }
-
- total = traverse_and_check(m);
- assert(total <= m->footprint);
- assert(m->footprint <= m->max_footprint);
-}
-#endif /* DEBUG */
-
-/* ----------------------------- statistics ------------------------------ */
-
-#if !NO_MALLINFO
-static struct mallinfo internal_mallinfo(mstate m) {
- struct mallinfo nm = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
- ensure_initialization();
- if (!PREACTION(m)) {
- check_malloc_state(m);
- if (is_initialized(m)) {
- size_t nfree = SIZE_T_ONE; /* top always free */
- size_t mfree = m->topsize + TOP_FOOT_SIZE;
- size_t sum = mfree;
- msegmentptr s = &m->seg;
- while (s != 0) {
- mchunkptr q = align_as_chunk(s->base);
- while (segment_holds(s, q) &&
- q != m->top && q->head != FENCEPOST_HEAD) {
- size_t sz = chunksize(q);
- sum += sz;
- if (!is_inuse(q)) {
- mfree += sz;
- ++nfree;
- }
- q = next_chunk(q);
- }
- s = s->next;
- }
-
- nm.arena = sum;
- nm.ordblks = nfree;
- nm.hblkhd = m->footprint - sum;
- nm.usmblks = m->max_footprint;
- nm.uordblks = m->footprint - mfree;
- nm.fordblks = mfree;
- nm.keepcost = m->topsize;
- }
-
- POSTACTION(m);
- }
- return nm;
-}
-#endif /* !NO_MALLINFO */
-
-#if !NO_MALLOC_STATS
-static void internal_malloc_stats(mstate m) {
- ensure_initialization();
- if (!PREACTION(m)) {
- size_t maxfp = 0;
- size_t fp = 0;
- size_t used = 0;
- check_malloc_state(m);
- if (is_initialized(m)) {
- msegmentptr s = &m->seg;
- maxfp = m->max_footprint;
- fp = m->footprint;
- used = fp - (m->topsize + TOP_FOOT_SIZE);
-
- while (s != 0) {
- mchunkptr q = align_as_chunk(s->base);
- while (segment_holds(s, q) &&
- q != m->top && q->head != FENCEPOST_HEAD) {
- if (!is_inuse(q))
- used -= chunksize(q);
- q = next_chunk(q);
- }
- s = s->next;
- }
- }
- POSTACTION(m); /* drop lock */
- fprintf(stderr, "max system bytes = %10lu\n", (unsigned long)(maxfp));
- fprintf(stderr, "system bytes = %10lu\n", (unsigned long)(fp));
- fprintf(stderr, "in use bytes = %10lu\n", (unsigned long)(used));
- }
-}
-#endif /* NO_MALLOC_STATS */
-
-/* ----------------------- Operations on smallbins ----------------------- */
-
-/*
- Various forms of linking and unlinking are defined as macros. Even
- the ones for trees, which are very long but have very short typical
- paths. This is ugly but reduces reliance on inlining support of
- compilers.
-*/
-
-/* Link a free chunk into a smallbin */
-#define insert_small_chunk(M, P, S) {\
- bindex_t I = small_index(S);\
- mchunkptr B = smallbin_at(M, I);\
- mchunkptr F = B;\
- assert(S >= MIN_CHUNK_SIZE);\
- if (!smallmap_is_marked(M, I))\
- mark_smallmap(M, I);\
- else if (RTCHECK(ok_address(M, B->fd)))\
- F = B->fd;\
- else {\
- CORRUPTION_ERROR_ACTION(M);\
- }\
- B->fd = P;\
- F->bk = P;\
- P->fd = F;\
- P->bk = B;\
-}
-
-/* Unlink a chunk from a smallbin */
-#define unlink_small_chunk(M, P, S) {\
- mchunkptr F = P->fd;\
- mchunkptr B = P->bk;\
- bindex_t I = small_index(S);\
- assert(P != B);\
- assert(P != F);\
- assert(chunksize(P) == small_index2size(I));\
- if (RTCHECK(F == smallbin_at(M,I) || (ok_address(M, F) && F->bk == P))) { \
- if (B == F) {\
- clear_smallmap(M, I);\
- }\
- else if (RTCHECK(B == smallbin_at(M,I) ||\
- (ok_address(M, B) && B->fd == P))) {\
- F->bk = B;\
- B->fd = F;\
- }\
- else {\
- CORRUPTION_ERROR_ACTION(M);\
- }\
- }\
- else {\
- CORRUPTION_ERROR_ACTION(M);\
- }\
-}
-
-/* Unlink the first chunk from a smallbin */
-#define unlink_first_small_chunk(M, B, P, I) {\
- mchunkptr F = P->fd;\
- assert(P != B);\
- assert(P != F);\
- assert(chunksize(P) == small_index2size(I));\
- if (B == F) {\
- clear_smallmap(M, I);\
- }\
- else if (RTCHECK(ok_address(M, F) && F->bk == P)) {\
- F->bk = B;\
- B->fd = F;\
- }\
- else {\
- CORRUPTION_ERROR_ACTION(M);\
- }\
-}
-
-/* Replace dv node, binning the old one */
-/* Used only when dvsize known to be small */
-#define replace_dv(M, P, S) {\
- size_t DVS = M->dvsize;\
- assert(is_small(DVS));\
- if (DVS != 0) {\
- mchunkptr DV = M->dv;\
- insert_small_chunk(M, DV, DVS);\
- }\
- M->dvsize = S;\
- M->dv = P;\
-}
-
-/* ------------------------- Operations on trees ------------------------- */
-
-/* Insert chunk into tree */
-#define insert_large_chunk(M, X, S) {\
- tbinptr* H;\
- bindex_t I;\
- compute_tree_index(S, I);\
- H = treebin_at(M, I);\
- X->index = I;\
- X->child[0] = X->child[1] = 0;\
- if (!treemap_is_marked(M, I)) {\
- mark_treemap(M, I);\
- *H = X;\
- X->parent = (tchunkptr)H;\
- X->fd = X->bk = X;\
- }\
- else {\
- tchunkptr T = *H;\
- size_t K = S << leftshift_for_tree_index(I);\
- for (;;) {\
- if (chunksize(T) != S) {\
- tchunkptr* C = &(T->child[(K >> (SIZE_T_BITSIZE-SIZE_T_ONE)) & 1]);\
- K <<= 1;\
- if (*C != 0)\
- T = *C;\
- else if (RTCHECK(ok_address(M, C))) {\
- *C = X;\
- X->parent = T;\
- X->fd = X->bk = X;\
- break;\
- }\
- else {\
- CORRUPTION_ERROR_ACTION(M);\
- break;\
- }\
- }\
- else {\
- tchunkptr F = T->fd;\
- if (RTCHECK(ok_address(M, T) && ok_address(M, F))) {\
- T->fd = F->bk = X;\
- X->fd = F;\
- X->bk = T;\
- X->parent = 0;\
- break;\
- }\
- else {\
- CORRUPTION_ERROR_ACTION(M);\
- break;\
- }\
- }\
- }\
- }\
-}
-
-/*
- Unlink steps:
-
- 1. If x is a chained node, unlink it from its same-sized fd/bk links
- and choose its bk node as its replacement.
- 2. If x was the last node of its size, but not a leaf node, it must
- be replaced with a leaf node (not merely one with an open left or
- right), to make sure that lefts and rights of descendents
- correspond properly to bit masks. We use the rightmost descendent
- of x. We could use any other leaf, but this is easy to locate and
- tends to counteract removal of leftmosts elsewhere, and so keeps
- paths shorter than minimally guaranteed. This doesn't loop much
- because on average a node in a tree is near the bottom.
- 3. If x is the base of a chain (i.e., has parent links) relink
- x's parent and children to x's replacement (or null if none).
-*/
-
-#define unlink_large_chunk(M, X) {\
- tchunkptr XP = X->parent;\
- tchunkptr R;\
- if (X->bk != X) {\
- tchunkptr F = X->fd;\
- R = X->bk;\
- if (RTCHECK(ok_address(M, F) && F->bk == X && R->fd == X)) {\
- F->bk = R;\
- R->fd = F;\
- }\
- else {\
- CORRUPTION_ERROR_ACTION(M);\
- }\
- }\
- else {\
- tchunkptr* RP;\
- if (((R = *(RP = &(X->child[1]))) != 0) ||\
- ((R = *(RP = &(X->child[0]))) != 0)) {\
- tchunkptr* CP;\
- while ((*(CP = &(R->child[1])) != 0) ||\
- (*(CP = &(R->child[0])) != 0)) {\
- R = *(RP = CP);\
- }\
- if (RTCHECK(ok_address(M, RP)))\
- *RP = 0;\
- else {\
- CORRUPTION_ERROR_ACTION(M);\
- }\
- }\
- }\
- if (XP != 0) {\
- tbinptr* H = treebin_at(M, X->index);\
- if (X == *H) {\
- if ((*H = R) == 0) \
- clear_treemap(M, X->index);\
- }\
- else if (RTCHECK(ok_address(M, XP))) {\
- if (XP->child[0] == X) \
- XP->child[0] = R;\
- else \
- XP->child[1] = R;\
- }\
- else\
- CORRUPTION_ERROR_ACTION(M);\
- if (R != 0) {\
- if (RTCHECK(ok_address(M, R))) {\
- tchunkptr C0, C1;\
- R->parent = XP;\
- if ((C0 = X->child[0]) != 0) {\
- if (RTCHECK(ok_address(M, C0))) {\
- R->child[0] = C0;\
- C0->parent = R;\
- }\
- else\
- CORRUPTION_ERROR_ACTION(M);\
- }\
- if ((C1 = X->child[1]) != 0) {\
- if (RTCHECK(ok_address(M, C1))) {\
- R->child[1] = C1;\
- C1->parent = R;\
- }\
- else\
- CORRUPTION_ERROR_ACTION(M);\
- }\
- }\
- else\
- CORRUPTION_ERROR_ACTION(M);\
- }\
- }\
-}
-
-/* Relays to large vs small bin operations */
-
-#define insert_chunk(M, P, S)\
- if (is_small(S)) insert_small_chunk(M, P, S)\
- else { tchunkptr TP = (tchunkptr)(P); insert_large_chunk(M, TP, S); }
-
-#define unlink_chunk(M, P, S)\
- if (is_small(S)) unlink_small_chunk(M, P, S)\
- else { tchunkptr TP = (tchunkptr)(P); unlink_large_chunk(M, TP); }
-
-
-/* Relays to internal calls to malloc/free from realloc, memalign etc */
-
-#if ONLY_MSPACES
-#define internal_malloc(m, b) mspace_malloc(m, b)
-#define internal_free(m, mem) mspace_free(m,mem);
-#else /* ONLY_MSPACES */
-#if MSPACES
-#define internal_malloc(m, b)\
- ((m == gm)? dlmalloc(b) : mspace_malloc(m, b))
-#define internal_free(m, mem)\
- if (m == gm) dlfree(mem); else mspace_free(m,mem);
-#else /* MSPACES */
-#define internal_malloc(m, b) dlmalloc(b)
-#define internal_free(m, mem) dlfree(mem)
-#endif /* MSPACES */
-#endif /* ONLY_MSPACES */
-
-/* ----------------------- Direct-mmapping chunks ----------------------- */
-
-/*
- Directly mmapped chunks are set up with an offset to the start of
- the mmapped region stored in the prev_foot field of the chunk. This
- allows reconstruction of the required argument to MUNMAP when freed,
- and also allows adjustment of the returned chunk to meet alignment
- requirements (especially in memalign).
-*/
-
-/* Malloc using mmap */
-static void* mmap_alloc(mstate m, size_t nb) {
- size_t mmsize = mmap_align(nb + SIX_SIZE_T_SIZES + CHUNK_ALIGN_MASK);
- if (m->footprint_limit != 0) {
- size_t fp = m->footprint + mmsize;
- if (fp <= m->footprint || fp > m->footprint_limit)
- return 0;
- }
- if (mmsize > nb) { /* Check for wrap around 0 */
- char* mm = (char*)(CALL_DIRECT_MMAP(mmsize));
- if (mm != CMFAIL) {
- size_t offset = align_offset(chunk2mem(mm));
- size_t psize = mmsize - offset - MMAP_FOOT_PAD;
- mchunkptr p = (mchunkptr)(mm + offset);
- p->prev_foot = offset;
- p->head = psize;
- mark_inuse_foot(m, p, psize);
- chunk_plus_offset(p, psize)->head = FENCEPOST_HEAD;
- chunk_plus_offset(p, psize+SIZE_T_SIZE)->head = 0;
-
- if (m->least_addr == 0 || mm < m->least_addr)
- m->least_addr = mm;
- if ((m->footprint += mmsize) > m->max_footprint)
- m->max_footprint = m->footprint;
- assert(is_aligned(chunk2mem(p)));
- check_mmapped_chunk(m, p);
- gm->inuse += psize;
- return chunk2mem(p);
- }
- }
- return 0;
-}
-
-/* Realloc using mmap */
-static mchunkptr mmap_resize(mstate m, mchunkptr oldp, size_t nb, int flags) {
- size_t oldsize = chunksize(oldp);
- (void)flags; /* placate people compiling -Wunused */
- if (is_small(nb)) /* Can't shrink mmap regions below small size */
- return 0;
- /* Keep old chunk if big enough but not too big */
- if (oldsize >= nb + SIZE_T_SIZE &&
- (oldsize - nb) <= (mparams.granularity << 1))
- return oldp;
- else {
- size_t offset = oldp->prev_foot;
- size_t oldmmsize = oldsize + offset + MMAP_FOOT_PAD;
- size_t newmmsize = mmap_align(nb + SIX_SIZE_T_SIZES + CHUNK_ALIGN_MASK);
- char* cp = (char*)CALL_MREMAP((char*)oldp - offset,
- oldmmsize, newmmsize, flags);
- if (cp != CMFAIL) {
- mchunkptr newp = (mchunkptr)(cp + offset);
- size_t psize = newmmsize - offset - MMAP_FOOT_PAD;
- newp->head = psize;
- mark_inuse_foot(m, newp, psize);
- chunk_plus_offset(newp, psize)->head = FENCEPOST_HEAD;
- chunk_plus_offset(newp, psize+SIZE_T_SIZE)->head = 0;
-
- if (cp < m->least_addr)
- m->least_addr = cp;
- if ((m->footprint += newmmsize - oldmmsize) > m->max_footprint)
- m->max_footprint = m->footprint;
- check_mmapped_chunk(m, newp);
- gm->inuse += psize - oldsize;
- return newp;
- }
- }
- return 0;
-}
-
-
-/* -------------------------- mspace management -------------------------- */
-
-/* Initialize top chunk and its size */
-static void init_top(mstate m, mchunkptr p, size_t psize) {
- /* Ensure alignment */
- size_t offset = align_offset(chunk2mem(p));
- p = (mchunkptr)((char*)p + offset);
- psize -= offset;
-
- m->top = p;
- m->topsize = psize;
- p->head = psize | PINUSE_BIT;
- /* set size of fake trailing chunk holding overhead space only once */
- chunk_plus_offset(p, psize)->head = TOP_FOOT_SIZE;
- m->trim_check = mparams.trim_threshold; /* reset on each update */
-}
-
-/* Initialize bins for a new mstate that is otherwise zeroed out */
-static void init_bins(mstate m) {
- /* Establish circular links for smallbins */
- bindex_t i;
- for (i = 0; i < NSMALLBINS; ++i) {
- sbinptr bin = smallbin_at(m,i);
- bin->fd = bin->bk = bin;
- }
-}
-
-#if PROCEED_ON_ERROR
-
-/* default corruption action */
-static void reset_on_error(mstate m) {
- int i;
- ++malloc_corruption_error_count;
- /* Reinitialize fields to forget about all memory */
- m->smallmap = m->treemap = 0;
- m->dvsize = m->topsize = 0;
- m->seg.base = 0;
- m->seg.size = 0;
- m->seg.next = 0;
- m->top = m->dv = 0;
- for (i = 0; i < NTREEBINS; ++i)
- *treebin_at(m, i) = 0;
- init_bins(m);
-}
-#endif /* PROCEED_ON_ERROR */
-
-/* Allocate chunk and prepend remainder with chunk in successor base. */
-static void* prepend_alloc(mstate m, char* newbase, char* oldbase,
- size_t nb) {
- mchunkptr p = align_as_chunk(newbase);
- mchunkptr oldfirst = align_as_chunk(oldbase);
- size_t psize = (char*)oldfirst - (char*)p;
- mchunkptr q = chunk_plus_offset(p, nb);
- size_t qsize = psize - nb;
- set_size_and_pinuse_of_inuse_chunk(m, p, nb);
-
- assert((char*)oldfirst > (char*)q);
- assert(pinuse(oldfirst));
- assert(qsize >= MIN_CHUNK_SIZE);
-
- /* consolidate remainder with first chunk of old base */
- if (oldfirst == m->top) {
- size_t tsize = m->topsize += qsize;
- m->top = q;
- q->head = tsize | PINUSE_BIT;
- check_top_chunk(m, q);
- }
- else if (oldfirst == m->dv) {
- size_t dsize = m->dvsize += qsize;
- m->dv = q;
- set_size_and_pinuse_of_free_chunk(q, dsize);
- }
- else {
- if (!is_inuse(oldfirst)) {
- size_t nsize = chunksize(oldfirst);
- unlink_chunk(m, oldfirst, nsize);
- oldfirst = chunk_plus_offset(oldfirst, nsize);
- qsize += nsize;
- }
- set_free_with_pinuse(q, qsize, oldfirst);
- insert_chunk(m, q, qsize);
- check_free_chunk(m, q);
- }
-
- check_malloced_chunk(m, chunk2mem(p), nb);
- gm->inuse += chunksize(p);
- return chunk2mem(p);
-}
-
-/* Add a segment to hold a new noncontiguous region */
-static void add_segment(mstate m, char* tbase, size_t tsize, flag_t mmapped) {
- /* Determine locations and sizes of segment, fenceposts, old top */
- char* old_top = (char*)m->top;
- msegmentptr oldsp = segment_holding(m, old_top);
- char* old_end = oldsp->base + oldsp->size;
- size_t ssize = pad_request(sizeof(struct malloc_segment));
- char* rawsp = old_end - (ssize + FOUR_SIZE_T_SIZES + CHUNK_ALIGN_MASK);
- size_t offset = align_offset(chunk2mem(rawsp));
- char* asp = rawsp + offset;
- char* csp = (asp < (old_top + MIN_CHUNK_SIZE))? old_top : asp;
- mchunkptr sp = (mchunkptr)csp;
- msegmentptr ss = (msegmentptr)(chunk2mem(sp));
- mchunkptr tnext = chunk_plus_offset(sp, ssize);
- mchunkptr p = tnext;
- int nfences = 0;
-
- /* reset top to new space */
- init_top(m, (mchunkptr)tbase, tsize - TOP_FOOT_SIZE);
-
- /* Set up segment record */
- assert(is_aligned(ss));
- set_size_and_pinuse_of_inuse_chunk(m, sp, ssize);
- *ss = m->seg; /* Push current record */
- m->seg.base = tbase;
- m->seg.size = tsize;
- m->seg.sflags = mmapped;
- m->seg.next = ss;
-
- /* Insert trailing fenceposts */
- for (;;) {
- mchunkptr nextp = chunk_plus_offset(p, SIZE_T_SIZE);
- p->head = FENCEPOST_HEAD;
- ++nfences;
- if ((char*)(&(nextp->head)) < old_end)
- p = nextp;
- else
- break;
- }
- assert(nfences >= 2);
-
- /* Insert the rest of old top into a bin as an ordinary free chunk */
- if (csp != old_top) {
- mchunkptr q = (mchunkptr)old_top;
- size_t psize = csp - old_top;
- mchunkptr tn = chunk_plus_offset(q, psize);
- set_free_with_pinuse(q, psize, tn);
- insert_chunk(m, q, psize);
- }
-
- check_top_chunk(m, m->top);
-}
-
-/* -------------------------- System allocation -------------------------- */
-
-/* Get memory from system using MORECORE or MMAP */
-static void* sys_alloc(mstate m, size_t nb) {
- char* tbase = CMFAIL;
- size_t tsize = 0;
- flag_t mmap_flag = 0;
- size_t asize; /* allocation size */
-
- ensure_initialization();
-
- /* Directly map large chunks, but only if already initialized */
- if (use_mmap(m) && nb >= mparams.mmap_threshold && m->topsize != 0) {
- void* mem = mmap_alloc(m, nb);
- if (mem != 0)
- return mem;
- }
-
- asize = granularity_align(nb + SYS_ALLOC_PADDING);
- if (asize <= nb)
- return 0; /* wraparound */
- if (m->footprint_limit != 0) {
- size_t fp = m->footprint + asize;
- if (fp <= m->footprint || fp > m->footprint_limit)
- return 0;
- }
-
- /*
- Try getting memory in any of three ways (in most-preferred to
- least-preferred order):
- 1. A call to MORECORE that can normally contiguously extend memory.
- (disabled if not MORECORE_CONTIGUOUS or not HAVE_MORECORE or
- or main space is mmapped or a previous contiguous call failed)
- 2. A call to MMAP new space (disabled if not HAVE_MMAP).
- Note that under the default settings, if MORECORE is unable to
- fulfill a request, and HAVE_MMAP is true, then mmap is
- used as a noncontiguous system allocator. This is a useful backup
- strategy for systems with holes in address spaces -- in this case
- sbrk cannot contiguously expand the heap, but mmap may be able to
- find space.
- 3. A call to MORECORE that cannot usually contiguously extend memory.
- (disabled if not HAVE_MORECORE)
-
- In all cases, we need to request enough bytes from system to ensure
- we can malloc nb bytes upon success, so pad with enough space for
- top_foot, plus alignment-pad to make sure we don't lose bytes if
- not on boundary, and round this up to a granularity unit.
- */
-
- if (MORECORE_CONTIGUOUS && !use_noncontiguous(m)) {
- char* br = CMFAIL;
- size_t ssize = asize; /* sbrk call size */
- msegmentptr ss = (m->top == 0)? 0 : segment_holding(m, (char*)m->top);
- ACQUIRE_MALLOC_GLOBAL_LOCK();
-
- if (ss == 0) { /* First time through or recovery */
- char* base = (char*)CALL_MORECORE(0);
- if (base != CMFAIL) {
- size_t fp;
- /* Adjust to end on a page boundary */
- if (!is_page_aligned(base))
- ssize += (page_align((size_t)base) - (size_t)base);
- fp = m->footprint + ssize; /* recheck limits */
- if (ssize > nb && ssize < HALF_MAX_SIZE_T &&
- (m->footprint_limit == 0 ||
- (fp > m->footprint && fp <= m->footprint_limit)) &&
- (br = (char*)(CALL_MORECORE(ssize))) == base) {
- tbase = base;
- tsize = ssize;
- }
- }
- }
- else {
- /* Subtract out existing available top space from MORECORE request. */
- ssize = granularity_align(nb - m->topsize + SYS_ALLOC_PADDING);
- /* Use mem here only if it did continuously extend old space */
- if (ssize < HALF_MAX_SIZE_T &&
- (br = (char*)(CALL_MORECORE(ssize))) == ss->base+ss->size) {
- tbase = br;
- tsize = ssize;
- }
- }
-
- if (tbase == CMFAIL) { /* Cope with partial failure */
- if (br != CMFAIL) { /* Try to use/extend the space we did get */
- if (ssize < HALF_MAX_SIZE_T &&
- ssize < nb + SYS_ALLOC_PADDING) {
- size_t esize = granularity_align(nb + SYS_ALLOC_PADDING - ssize);
- if (esize < HALF_MAX_SIZE_T) {
- char* end = (char*)CALL_MORECORE(esize);
- if (end != CMFAIL)
- ssize += esize;
- else { /* Can't use; try to release */
- (void) CALL_MORECORE(-ssize);
- br = CMFAIL;
- }
- }
- }
- }
- if (br != CMFAIL) { /* Use the space we did get */
- tbase = br;
- tsize = ssize;
- }
- else
- disable_contiguous(m); /* Don't try contiguous path in the future */
- }
-
- RELEASE_MALLOC_GLOBAL_LOCK();
- }
-
- if (HAVE_MMAP && tbase == CMFAIL) { /* Try MMAP */
- char* mp = (char*)(CALL_MMAP(asize));
- if (mp != CMFAIL) {
- tbase = mp;
- tsize = asize;
- mmap_flag = USE_MMAP_BIT;
- }
- }
-
- if (HAVE_MORECORE && tbase == CMFAIL) { /* Try noncontiguous MORECORE */
- if (asize < HALF_MAX_SIZE_T) {
- char* br = CMFAIL;
- char* end = CMFAIL;
- ACQUIRE_MALLOC_GLOBAL_LOCK();
- br = (char*)(CALL_MORECORE(asize));
- end = (char*)(CALL_MORECORE(0));
- RELEASE_MALLOC_GLOBAL_LOCK();
- if (br != CMFAIL && end != CMFAIL && br < end) {
- size_t ssize = end - br;
- if (ssize > nb + TOP_FOOT_SIZE) {
- tbase = br;
- tsize = ssize;
- }
- }
- }
- }
-
- if (tbase != CMFAIL) {
-
- if ((m->footprint += tsize) > m->max_footprint)
- m->max_footprint = m->footprint;
-
- if (!is_initialized(m)) { /* first-time initialization */
- if (m->least_addr == 0 || tbase < m->least_addr)
- m->least_addr = tbase;
- m->seg.base = tbase;
- m->seg.size = tsize;
- m->seg.sflags = mmap_flag;
- m->magic = mparams.magic;
- m->release_checks = MAX_RELEASE_CHECK_RATE;
- m->inuse = 0;
- init_bins(m);
-#if !ONLY_MSPACES
- if (is_global(m))
- init_top(m, (mchunkptr)tbase, tsize - TOP_FOOT_SIZE);
- else
-#endif
- {
- /* Offset top by embedded malloc_state */
- mchunkptr mn = next_chunk(mem2chunk(m));
- init_top(m, mn, (size_t)((tbase + tsize) - (char*)mn) -TOP_FOOT_SIZE);
- }
- }
-
- else {
- /* Try to merge with an existing segment */
- msegmentptr sp = &m->seg;
- /* Only consider most recent segment if traversal suppressed */
- while (sp != 0 && tbase != sp->base + sp->size)
- sp = (NO_SEGMENT_TRAVERSAL) ? 0 : sp->next;
- if (sp != 0 &&
- !is_extern_segment(sp) &&
- (sp->sflags & USE_MMAP_BIT) == mmap_flag &&
- segment_holds(sp, m->top)) { /* append */
- sp->size += tsize;
- init_top(m, m->top, m->topsize + tsize);
- }
- else {
- if (tbase < m->least_addr)
- m->least_addr = tbase;
- sp = &m->seg;
- while (sp != 0 && sp->base != tbase + tsize)
- sp = (NO_SEGMENT_TRAVERSAL) ? 0 : sp->next;
- if (sp != 0 &&
- !is_extern_segment(sp) &&
- (sp->sflags & USE_MMAP_BIT) == mmap_flag) {
- char* oldbase = sp->base;
- sp->base = tbase;
- sp->size += tsize;
- return prepend_alloc(m, tbase, oldbase, nb);
- }
- else
- add_segment(m, tbase, tsize, mmap_flag);
- }
- }
-
- if (nb < m->topsize) { /* Allocate from new or extended top space */
- size_t rsize = m->topsize -= nb;
- mchunkptr p = m->top;
- mchunkptr r = m->top = chunk_plus_offset(p, nb);
- r->head = rsize | PINUSE_BIT;
- set_size_and_pinuse_of_inuse_chunk(m, p, nb);
- check_top_chunk(m, m->top);
- check_malloced_chunk(m, chunk2mem(p), nb);
- gm->inuse += chunksize(p);
- return chunk2mem(p);
- }
- }
-
- MALLOC_FAILURE_ACTION;
- return 0;
-}
-
-/* ----------------------- system deallocation -------------------------- */
-
-/* Unmap and unlink any mmapped segments that don't contain used chunks */
-static size_t release_unused_segments(mstate m) {
- size_t released = 0;
- int nsegs = 0;
- msegmentptr pred = &m->seg;
- msegmentptr sp = pred->next;
- while (sp != 0) {
- char* base = sp->base;
- size_t size = sp->size;
- msegmentptr next = sp->next;
- ++nsegs;
- if (is_mmapped_segment(sp) && !is_extern_segment(sp)) {
- mchunkptr p = align_as_chunk(base);
- size_t psize = chunksize(p);
- /* Can unmap if first chunk holds entire segment and not pinned */
- if (!is_inuse(p) && (char*)p + psize >= base + size - TOP_FOOT_SIZE) {
- tchunkptr tp = (tchunkptr)p;
- assert(segment_holds(sp, (char*)sp));
- if (p == m->dv) {
- m->dv = 0;
- m->dvsize = 0;
- }
- else {
- unlink_large_chunk(m, tp);
- }
- if (CALL_MUNMAP(base, size) == 0) {
- released += size;
- m->footprint -= size;
- /* unlink obsoleted record */
- sp = pred;
- sp->next = next;
- }
- else { /* back out if cannot unmap */
- insert_large_chunk(m, tp, psize);
- }
- }
- }
- if (NO_SEGMENT_TRAVERSAL) /* scan only first segment */
- break;
- pred = sp;
- sp = next;
- }
- /* Reset check counter */
- m->release_checks = (((size_t) nsegs > (size_t) MAX_RELEASE_CHECK_RATE)?
- (size_t) nsegs : (size_t) MAX_RELEASE_CHECK_RATE);
- return released;
-}
-
-static int sys_trim(mstate m, size_t pad) {
- size_t released = 0;
- ensure_initialization();
- if (pad < MAX_REQUEST && is_initialized(m)) {
- pad += TOP_FOOT_SIZE; /* ensure enough room for segment overhead */
-
- if (m->topsize > pad) {
- /* Shrink top space in granularity-size units, keeping at least one */
- size_t unit = mparams.granularity;
- size_t extra = ((m->topsize - pad + (unit - SIZE_T_ONE)) / unit -
- SIZE_T_ONE) * unit;
- msegmentptr sp = segment_holding(m, (char*)m->top);
-
- if (!is_extern_segment(sp)) {
- if (is_mmapped_segment(sp)) {
- if (HAVE_MMAP &&
- sp->size >= extra &&
- !has_segment_link(m, sp)) { /* can't shrink if pinned */
- size_t newsize = sp->size - extra;
- (void)newsize; /* placate people compiling -Wunused-variable */
- /* Prefer mremap, fall back to munmap */
- if ((CALL_MREMAP(sp->base, sp->size, newsize, 0) != MFAIL) ||
- (CALL_MUNMAP(sp->base + newsize, extra) == 0)) {
- released = extra;
- }
- }
- }
- else if (HAVE_MORECORE) {
- if (extra >= HALF_MAX_SIZE_T) /* Avoid wrapping negative */
- extra = (HALF_MAX_SIZE_T) + SIZE_T_ONE - unit;
- ACQUIRE_MALLOC_GLOBAL_LOCK();
- {
- /* Make sure end of memory is where we last set it. */
- char* old_br = (char*)(CALL_MORECORE(0));
- if (old_br == sp->base + sp->size) {
- char* rel_br = (char*)(CALL_MORECORE(-extra));
- char* new_br = (char*)(CALL_MORECORE(0));
- if (rel_br != CMFAIL && new_br < old_br)
- released = old_br - new_br;
- }
- }
- RELEASE_MALLOC_GLOBAL_LOCK();
- }
- }
-
- if (released != 0) {
- sp->size -= released;
- m->footprint -= released;
- init_top(m, m->top, m->topsize - released);
- check_top_chunk(m, m->top);
- }
- }
-
- /* Unmap any unused mmapped segments */
- if (HAVE_MMAP)
- released += release_unused_segments(m);
-
- /* On failure, disable autotrim to avoid repeated failed future calls */
- if (released == 0 && m->topsize > m->trim_check)
- m->trim_check = MAX_SIZE_T;
- }
-
- return (released != 0)? 1 : 0;
-}
-
-/* Consolidate and bin a chunk. Differs from exported versions
- of free mainly in that the chunk need not be marked as inuse.
-*/
-static void dispose_chunk(mstate m, mchunkptr p, size_t psize) {
- mchunkptr next = chunk_plus_offset(p, psize);
- if (!pinuse(p)) {
- mchunkptr prev;
- size_t prevsize = p->prev_foot;
- if (is_mmapped(p)) {
- psize += prevsize + MMAP_FOOT_PAD;
- if (CALL_MUNMAP((char*)p - prevsize, psize) == 0)
- m->footprint -= psize;
- return;
- }
- prev = chunk_minus_offset(p, prevsize);
- psize += prevsize;
- p = prev;
- if (RTCHECK(ok_address(m, prev))) { /* consolidate backward */
- if (p != m->dv) {
- unlink_chunk(m, p, prevsize);
- }
- else if ((next->head & INUSE_BITS) == INUSE_BITS) {
- m->dvsize = psize;
- set_free_with_pinuse(p, psize, next);
- return;
- }
- }
- else {
- CORRUPTION_ERROR_ACTION(m);
- return;
- }
- }
- if (RTCHECK(ok_address(m, next))) {
- if (!cinuse(next)) { /* consolidate forward */
- if (next == m->top) {
- size_t tsize = m->topsize += psize;
- m->top = p;
- p->head = tsize | PINUSE_BIT;
- if (p == m->dv) {
- m->dv = 0;
- m->dvsize = 0;
- }
- return;
- }
- else if (next == m->dv) {
- size_t dsize = m->dvsize += psize;
- m->dv = p;
- set_size_and_pinuse_of_free_chunk(p, dsize);
- return;
- }
- else {
- size_t nsize = chunksize(next);
- psize += nsize;
- unlink_chunk(m, next, nsize);
- set_size_and_pinuse_of_free_chunk(p, psize);
- if (p == m->dv) {
- m->dvsize = psize;
- return;
- }
- }
- }
- else {
- set_free_with_pinuse(p, psize, next);
- }
- insert_chunk(m, p, psize);
- }
- else {
- CORRUPTION_ERROR_ACTION(m);
- }
-}
-
-/* ---------------------------- malloc --------------------------- */
-
-/* allocate a large request from the best fitting chunk in a treebin */
-static void* tmalloc_large(mstate m, size_t nb) {
- tchunkptr v = 0;
- size_t rsize = -nb; /* Unsigned negation */
- tchunkptr t;
- bindex_t idx;
- compute_tree_index(nb, idx);
- if ((t = *treebin_at(m, idx)) != 0) {
- /* Traverse tree for this bin looking for node with size == nb */
- size_t sizebits = nb << leftshift_for_tree_index(idx);
- tchunkptr rst = 0; /* The deepest untaken right subtree */
- for (;;) {
- tchunkptr rt;
- size_t trem = chunksize(t) - nb;
- if (trem < rsize) {
- v = t;
- if ((rsize = trem) == 0)
- break;
- }
- rt = t->child[1];
- t = t->child[(sizebits >> (SIZE_T_BITSIZE-SIZE_T_ONE)) & 1];
- if (rt != 0 && rt != t)
- rst = rt;
- if (t == 0) {
- t = rst; /* set t to least subtree holding sizes > nb */
- break;
- }
- sizebits <<= 1;
- }
- }
- if (t == 0 && v == 0) { /* set t to root of next non-empty treebin */
- binmap_t leftbits = left_bits(idx2bit(idx)) & m->treemap;
- if (leftbits != 0) {
- bindex_t i;
- binmap_t leastbit = least_bit(leftbits);
- compute_bit2idx(leastbit, i);
- t = *treebin_at(m, i);
- }
- }
-
- while (t != 0) { /* find smallest of tree or subtree */
- size_t trem = chunksize(t) - nb;
- if (trem < rsize) {
- rsize = trem;
- v = t;
- }
- t = leftmost_child(t);
- }
-
- /* If dv is a better fit, return 0 so malloc will use it */
- if (v != 0 && rsize < (size_t)(m->dvsize - nb)) {
- if (RTCHECK(ok_address(m, v))) { /* split */
- mchunkptr r = chunk_plus_offset(v, nb);
- assert(chunksize(v) == rsize + nb);
- if (RTCHECK(ok_next(v, r))) {
- unlink_large_chunk(m, v);
- if (rsize < MIN_CHUNK_SIZE)
- set_inuse_and_pinuse(m, v, (rsize + nb));
- else {
- set_size_and_pinuse_of_inuse_chunk(m, v, nb);
- set_size_and_pinuse_of_free_chunk(r, rsize);
- insert_chunk(m, r, rsize);
- }
- return chunk2mem(v);
- }
- }
- CORRUPTION_ERROR_ACTION(m);
- }
- return 0;
-}
-
-/* allocate a small request from the best fitting chunk in a treebin */
-static void* tmalloc_small(mstate m, size_t nb) {
- tchunkptr t, v;
- size_t rsize;
- bindex_t i;
- binmap_t leastbit = least_bit(m->treemap);
- compute_bit2idx(leastbit, i);
- v = t = *treebin_at(m, i);
- rsize = chunksize(t) - nb;
-
- while ((t = leftmost_child(t)) != 0) {
- size_t trem = chunksize(t) - nb;
- if (trem < rsize) {
- rsize = trem;
- v = t;
- }
- }
-
- if (RTCHECK(ok_address(m, v))) {
- mchunkptr r = chunk_plus_offset(v, nb);
- assert(chunksize(v) == rsize + nb);
- if (RTCHECK(ok_next(v, r))) {
- unlink_large_chunk(m, v);
- if (rsize < MIN_CHUNK_SIZE)
- set_inuse_and_pinuse(m, v, (rsize + nb));
- else {
- set_size_and_pinuse_of_inuse_chunk(m, v, nb);
- set_size_and_pinuse_of_free_chunk(r, rsize);
- replace_dv(m, r, rsize);
- }
- return chunk2mem(v);
- }
- }
-
- CORRUPTION_ERROR_ACTION(m);
- return 0;
-}
-
-#if !ONLY_MSPACES
-
-void* dlmalloc(size_t bytes) {
- /*
- Basic algorithm:
- If a small request (< 256 bytes minus per-chunk overhead):
- 1. If one exists, use a remainderless chunk in associated smallbin.
- (Remainderless means that there are too few excess bytes to
- represent as a chunk.)
- 2. If it is big enough, use the dv chunk, which is normally the
- chunk adjacent to the one used for the most recent small request.
- 3. If one exists, split the smallest available chunk in a bin,
- saving remainder in dv.
- 4. If it is big enough, use the top chunk.
- 5. If available, get memory from system and use it
- Otherwise, for a large request:
- 1. Find the smallest available binned chunk that fits, and use it
- if it is better fitting than dv chunk, splitting if necessary.
- 2. If better fitting than any binned chunk, use the dv chunk.
- 3. If it is big enough, use the top chunk.
- 4. If request size >= mmap threshold, try to directly mmap this chunk.
- 5. If available, get memory from system and use it
-
- The ugly goto's here ensure that postaction occurs along all paths.
- */
-
-#if USE_LOCKS
- ensure_initialization(); /* initialize in sys_alloc if not using locks */
-#endif
-
- if (!PREACTION(gm)) {
- void* mem;
- size_t nb;
- if (bytes <= MAX_SMALL_REQUEST) {
- bindex_t idx;
- binmap_t smallbits;
- nb = (bytes < MIN_REQUEST)? MIN_CHUNK_SIZE : pad_request(bytes);
- idx = small_index(nb);
- smallbits = gm->smallmap >> idx;
-
- if ((smallbits & 0x3U) != 0) { /* Remainderless fit to a smallbin. */
- mchunkptr b, p;
- idx += ~smallbits & 1; /* Uses next bin if idx empty */
- b = smallbin_at(gm, idx);
- p = b->fd;
- assert(chunksize(p) == small_index2size(idx));
- unlink_first_small_chunk(gm, b, p, idx);
- set_inuse_and_pinuse(gm, p, small_index2size(idx));
- mem = chunk2mem(p);
- check_malloced_chunk(gm, mem, nb);
- gm->inuse += chunksize(p);
- goto postaction;
- }
-
- else if (nb > gm->dvsize) {
- if (smallbits != 0) { /* Use chunk in next nonempty smallbin */
- mchunkptr b, p, r;
- size_t rsize;
- bindex_t i;
- binmap_t leftbits = (smallbits << idx) & left_bits(idx2bit(idx));
- binmap_t leastbit = least_bit(leftbits);
- compute_bit2idx(leastbit, i);
- b = smallbin_at(gm, i);
- p = b->fd;
- assert(chunksize(p) == small_index2size(i));
- unlink_first_small_chunk(gm, b, p, i);
- rsize = small_index2size(i) - nb;
- /* Fit here cannot be remainderless if 4byte sizes */
- if (SIZE_T_SIZE != 4 && rsize < MIN_CHUNK_SIZE)
- set_inuse_and_pinuse(gm, p, small_index2size(i));
- else {
- set_size_and_pinuse_of_inuse_chunk(gm, p, nb);
- r = chunk_plus_offset(p, nb);
- set_size_and_pinuse_of_free_chunk(r, rsize);
- replace_dv(gm, r, rsize);
- }
- mem = chunk2mem(p);
- check_malloced_chunk(gm, mem, nb);
- gm->inuse += chunksize(p);
- goto postaction;
- }
-
- else if (gm->treemap != 0 && (mem = tmalloc_small(gm, nb)) != 0) {
- check_malloced_chunk(gm, mem, nb);
- gm->inuse += chunksize(mem2chunk(mem));
- goto postaction;
- }
- }
- }
- else if (bytes >= MAX_REQUEST)
- nb = MAX_SIZE_T; /* Too big to allocate. Force failure (in sys alloc) */
- else {
- nb = pad_request(bytes);
- if (gm->treemap != 0 && (mem = tmalloc_large(gm, nb)) != 0) {
- check_malloced_chunk(gm, mem, nb);
- gm->inuse += chunksize(mem2chunk(mem));
- goto postaction;
- }
- }
-
- if (nb <= gm->dvsize) {
- size_t rsize = gm->dvsize - nb;
- mchunkptr p = gm->dv;
- if (rsize >= MIN_CHUNK_SIZE) { /* split dv */
- mchunkptr r = gm->dv = chunk_plus_offset(p, nb);
- gm->dvsize = rsize;
- set_size_and_pinuse_of_free_chunk(r, rsize);
- set_size_and_pinuse_of_inuse_chunk(gm, p, nb);
- }
- else { /* exhaust dv */
- size_t dvs = gm->dvsize;
- gm->dvsize = 0;
- gm->dv = 0;
- set_inuse_and_pinuse(gm, p, dvs);
- }
- mem = chunk2mem(p);
- check_malloced_chunk(gm, mem, nb);
- gm->inuse += chunksize(p);
- goto postaction;
- }
-
- else if (nb < gm->topsize) { /* Split top */
- size_t rsize = gm->topsize -= nb;
- mchunkptr p = gm->top;
- mchunkptr r = gm->top = chunk_plus_offset(p, nb);
- r->head = rsize | PINUSE_BIT;
- set_size_and_pinuse_of_inuse_chunk(gm, p, nb);
- mem = chunk2mem(p);
- check_top_chunk(gm, gm->top);
- check_malloced_chunk(gm, mem, nb);
- gm->inuse += chunksize(p);
- goto postaction;
- }
-
- mem = sys_alloc(gm, nb);
-
- postaction:
- POSTACTION(gm);
- return mem;
- }
-
- return 0;
-}
-
-/* ---------------------------- free --------------------------- */
-
-void dlfree(void* mem) {
- /*
- Consolidate freed chunks with preceeding or succeeding bordering
- free chunks, if they exist, and then place in a bin. Intermixed
- with special cases for top, dv, mmapped chunks, and usage errors.
- */
-
- if (mem != 0) {
- mchunkptr p = mem2chunk(mem);
-#if FOOTERS
- mstate fm = get_mstate_for(p);
- if (!ok_magic(fm)) {
- USAGE_ERROR_ACTION(fm, p);
- return;
- }
-#else /* FOOTERS */
-#define fm gm
-#endif /* FOOTERS */
- if (!PREACTION(fm)) {
- check_inuse_chunk(fm, p);
- if (RTCHECK(ok_address(fm, p) && ok_inuse(p))) {
- size_t psize = chunksize(p);
- gm->inuse -= psize;
- mchunkptr next = chunk_plus_offset(p, psize);
- if (!pinuse(p)) {
- size_t prevsize = p->prev_foot;
- if (is_mmapped(p)) {
- psize += prevsize + MMAP_FOOT_PAD;
- if (CALL_MUNMAP((char*)p - prevsize, psize) == 0)
- fm->footprint -= psize;
- goto postaction;
- }
- else {
- mchunkptr prev = chunk_minus_offset(p, prevsize);
- psize += prevsize;
- p = prev;
- if (RTCHECK(ok_address(fm, prev))) { /* consolidate backward */
- if (p != fm->dv) {
- unlink_chunk(fm, p, prevsize);
- }
- else if ((next->head & INUSE_BITS) == INUSE_BITS) {
- fm->dvsize = psize;
- set_free_with_pinuse(p, psize, next);
- goto postaction;
- }
- }
- else
- goto erroraction;
- }
- }
-
- if (RTCHECK(ok_next(p, next) && ok_pinuse(next))) {
- if (!cinuse(next)) { /* consolidate forward */
- if (next == fm->top) {
- size_t tsize = fm->topsize += psize;
- fm->top = p;
- p->head = tsize | PINUSE_BIT;
- if (p == fm->dv) {
- fm->dv = 0;
- fm->dvsize = 0;
- }
- if (should_trim(fm, tsize))
- sys_trim(fm, 0);
- goto postaction;
- }
- else if (next == fm->dv) {
- size_t dsize = fm->dvsize += psize;
- fm->dv = p;
- set_size_and_pinuse_of_free_chunk(p, dsize);
- goto postaction;
- }
- else {
- size_t nsize = chunksize(next);
- psize += nsize;
- unlink_chunk(fm, next, nsize);
- set_size_and_pinuse_of_free_chunk(p, psize);
- if (p == fm->dv) {
- fm->dvsize = psize;
- goto postaction;
- }
- }
- }
- else
- set_free_with_pinuse(p, psize, next);
-
- if (is_small(psize)) {
- insert_small_chunk(fm, p, psize);
- check_free_chunk(fm, p);
- }
- else {
- tchunkptr tp = (tchunkptr)p;
- insert_large_chunk(fm, tp, psize);
- check_free_chunk(fm, p);
- if (--fm->release_checks == 0)
- release_unused_segments(fm);
- }
- goto postaction;
- }
- }
- erroraction:
- USAGE_ERROR_ACTION(fm, p);
- postaction:
- POSTACTION(fm);
- }
- }
-#if !FOOTERS
-#undef fm
-#endif /* FOOTERS */
-}
-
-void* dlcalloc(size_t n_elements, size_t elem_size) {
- void* mem;
- size_t req = 0;
- if (n_elements != 0) {
- req = n_elements * elem_size;
- if (((n_elements | elem_size) & ~(size_t)0xffff) &&
- (req / n_elements != elem_size))
- req = MAX_SIZE_T; /* force downstream failure on overflow */
- }
- mem = dlmalloc(req);
- if (mem != 0 && calloc_must_clear(mem2chunk(mem)))
- memset(mem, 0, req);
- return mem;
-}
-
-#endif /* !ONLY_MSPACES */
-
-/* ------------ Internal support for realloc, memalign, etc -------------- */
-
-/* Try to realloc; only in-place unless can_move true */
-static mchunkptr try_realloc_chunk(mstate m, mchunkptr p, size_t nb,
- int can_move) {
- mchunkptr newp = 0;
- size_t oldsize = chunksize(p);
- mchunkptr next = chunk_plus_offset(p, oldsize);
- if (RTCHECK(ok_address(m, p) && ok_inuse(p) &&
- ok_next(p, next) && ok_pinuse(next))) {
- if (is_mmapped(p)) {
- newp = mmap_resize(m, p, nb, can_move);
- }
- else if (oldsize >= nb) { /* already big enough */
- size_t rsize = oldsize - nb;
- if (rsize >= MIN_CHUNK_SIZE) { /* split off remainder */
- mchunkptr r = chunk_plus_offset(p, nb);
- set_inuse(m, p, nb);
- set_inuse(m, r, rsize);
- dispose_chunk(m, r, rsize);
- gm->inuse -= rsize;
- }
- newp = p;
- }
- else if (next == m->top) { /* extend into top */
- if (oldsize + m->topsize > nb) {
- size_t newsize = oldsize + m->topsize;
- size_t newtopsize = newsize - nb;
- mchunkptr newtop = chunk_plus_offset(p, nb);
- set_inuse(m, p, nb);
- newtop->head = newtopsize |PINUSE_BIT;
- m->top = newtop;
- m->topsize = newtopsize;
- gm->inuse += nb - oldsize;
- newp = p;
- }
- }
- else if (next == m->dv) { /* extend into dv */
- size_t dvs = m->dvsize;
- if (oldsize + dvs >= nb) {
- size_t dsize = oldsize + dvs - nb;
- if (dsize >= MIN_CHUNK_SIZE) {
- mchunkptr r = chunk_plus_offset(p, nb);
- mchunkptr n = chunk_plus_offset(r, dsize);
- set_inuse(m, p, nb);
- set_size_and_pinuse_of_free_chunk(r, dsize);
- clear_pinuse(n);
- m->dvsize = dsize;
- m->dv = r;
- }
- else { /* exhaust dv */
- size_t newsize = oldsize + dvs;
- set_inuse(m, p, newsize);
- m->dvsize = 0;
- m->dv = 0;
- }
- gm->inuse += nb - oldsize;
- newp = p;
- }
- }
- else if (!cinuse(next)) { /* extend into next free chunk */
- size_t nextsize = chunksize(next);
- if (oldsize + nextsize >= nb) {
- size_t rsize = oldsize + nextsize - nb;
- unlink_chunk(m, next, nextsize);
- if (rsize < MIN_CHUNK_SIZE) {
- size_t newsize = oldsize + nextsize;
- set_inuse(m, p, newsize);
- }
- else {
- mchunkptr r = chunk_plus_offset(p, nb);
- set_inuse(m, p, nb);
- set_inuse(m, r, rsize);
- dispose_chunk(m, r, rsize);
- }
- gm->inuse += nb - oldsize;
- newp = p;
- }
- }
- }
- else {
- USAGE_ERROR_ACTION(m, chunk2mem(p));
- }
- return newp;
-}
-
-static void* internal_memalign(mstate m, size_t alignment, size_t bytes) {
- void* mem = 0;
- if (alignment < MIN_CHUNK_SIZE) /* must be at least a minimum chunk size */
- alignment = MIN_CHUNK_SIZE;
- if ((alignment & (alignment-SIZE_T_ONE)) != 0) {/* Ensure a power of 2 */
- size_t a = MALLOC_ALIGNMENT << 1;
- while (a < alignment) a <<= 1;
- alignment = a;
- }
- if (bytes >= MAX_REQUEST - alignment) {
- if (m != 0) { /* Test isn't needed but avoids compiler warning */
- MALLOC_FAILURE_ACTION;
- }
- }
- else {
- size_t nb = request2size(bytes);
- size_t req = nb + alignment + MIN_CHUNK_SIZE - CHUNK_OVERHEAD;
- mem = internal_malloc(m, req);
- if (mem != 0) {
- mchunkptr p = mem2chunk(mem);
- if (PREACTION(m))
- return 0;
- if ((((size_t)(mem)) & (alignment - 1)) != 0) { /* misaligned */
- /*
- Find an aligned spot inside chunk. Since we need to give
- back leading space in a chunk of at least MIN_CHUNK_SIZE, if
- the first calculation places us at a spot with less than
- MIN_CHUNK_SIZE leader, we can move to the next aligned spot.
- We've allocated enough total room so that this is always
- possible.
- */
- char* br = (char*)mem2chunk((size_t)(((size_t)((char*)mem + alignment -
- SIZE_T_ONE)) &
- -alignment));
- char* pos = ((size_t)(br - (char*)(p)) >= MIN_CHUNK_SIZE)?
- br : br+alignment;
- mchunkptr newp = (mchunkptr)pos;
- size_t leadsize = pos - (char*)(p);
- size_t newsize = chunksize(p) - leadsize;
-
- if (is_mmapped(p)) { /* For mmapped chunks, just adjust offset */
- newp->prev_foot = p->prev_foot + leadsize;
- newp->head = newsize;
- }
- else { /* Otherwise, give back leader, use the rest */
- set_inuse(m, newp, newsize);
- set_inuse(m, p, leadsize);
- dispose_chunk(m, p, leadsize);
- gm->inuse -= leadsize;
- }
- p = newp;
- }
-
- /* Give back spare room at the end */
- if (!is_mmapped(p)) {
- size_t size = chunksize(p);
- if (size > nb + MIN_CHUNK_SIZE) {
- size_t remainder_size = size - nb;
- mchunkptr remainder = chunk_plus_offset(p, nb);
- set_inuse(m, p, nb);
- set_inuse(m, remainder, remainder_size);
- dispose_chunk(m, remainder, remainder_size);
- gm->inuse -= remainder_size;
- }
- }
-
- mem = chunk2mem(p);
- assert (chunksize(p) >= nb);
- assert(((size_t)mem & (alignment - 1)) == 0);
- check_inuse_chunk(m, p);
- POSTACTION(m);
- }
- }
- return mem;
-}
-
-/*
- Common support for independent_X routines, handling
- all of the combinations that can result.
- The opts arg has:
- bit 0 set if all elements are same size (using sizes[0])
- bit 1 set if elements should be zeroed
-*/
-static void** ialloc(mstate m,
- size_t n_elements,
- size_t* sizes,
- int opts,
- void* chunks[]) {
-
- size_t element_size; /* chunksize of each element, if all same */
- size_t contents_size; /* total size of elements */
- size_t array_size; /* request size of pointer array */
- void* mem; /* malloced aggregate space */
- mchunkptr p; /* corresponding chunk */
- size_t remainder_size; /* remaining bytes while splitting */
- void** marray; /* either "chunks" or malloced ptr array */
- mchunkptr array_chunk; /* chunk for malloced ptr array */
- flag_t was_enabled; /* to disable mmap */
- size_t size;
- size_t i;
-
- ensure_initialization();
- /* compute array length, if needed */
- if (chunks != 0) {
- if (n_elements == 0)
- return chunks; /* nothing to do */
- marray = chunks;
- array_size = 0;
- }
- else {
- /* if empty req, must still return chunk representing empty array */
- if (n_elements == 0)
- return (void**)internal_malloc(m, 0);
- marray = 0;
- array_size = request2size(n_elements * (sizeof(void*)));
- }
-
- /* compute total element size */
- if (opts & 0x1) { /* all-same-size */
- element_size = request2size(*sizes);
- contents_size = n_elements * element_size;
- }
- else { /* add up all the sizes */
- element_size = 0;
- contents_size = 0;
- for (i = 0; i != n_elements; ++i)
- contents_size += request2size(sizes[i]);
- }
-
- size = contents_size + array_size;
-
- /*
- Allocate the aggregate chunk. First disable direct-mmapping so
- malloc won't use it, since we would not be able to later
- free/realloc space internal to a segregated mmap region.
- */
- was_enabled = use_mmap(m);
- disable_mmap(m);
- mem = internal_malloc(m, size - CHUNK_OVERHEAD);
- if (was_enabled)
- enable_mmap(m);
- if (mem == 0)
- return 0;
-
- if (PREACTION(m)) return 0;
- p = mem2chunk(mem);
- remainder_size = chunksize(p);
-
- assert(!is_mmapped(p));
-
- if (opts & 0x2) { /* optionally clear the elements */
- memset((size_t*)mem, 0, remainder_size - SIZE_T_SIZE - array_size);
- }
-
- /* If not provided, allocate the pointer array as final part of chunk */
- if (marray == 0) {
- size_t array_chunk_size;
- array_chunk = chunk_plus_offset(p, contents_size);
- array_chunk_size = remainder_size - contents_size;
- marray = (void**) (chunk2mem(array_chunk));
- set_size_and_pinuse_of_inuse_chunk(m, array_chunk, array_chunk_size);
- remainder_size = contents_size;
- }
-
- /* split out elements */
- for (i = 0; ; ++i) {
- marray[i] = chunk2mem(p);
- if (i != n_elements-1) {
- if (element_size != 0)
- size = element_size;
- else
- size = request2size(sizes[i]);
- remainder_size -= size;
- set_size_and_pinuse_of_inuse_chunk(m, p, size);
- p = chunk_plus_offset(p, size);
- }
- else { /* the final element absorbs any overallocation slop */
- set_size_and_pinuse_of_inuse_chunk(m, p, remainder_size);
- break;
- }
- }
-
-#if DEBUG
- if (marray != chunks) {
- /* final element must have exactly exhausted chunk */
- if (element_size != 0) {
- assert(remainder_size == element_size);
- }
- else {
- assert(remainder_size == request2size(sizes[i]));
- }
- check_inuse_chunk(m, mem2chunk(marray));
- }
- for (i = 0; i != n_elements; ++i)
- check_inuse_chunk(m, mem2chunk(marray[i]));
-
-#endif /* DEBUG */
-
- POSTACTION(m);
- return marray;
-}
-
-/* Try to free all pointers in the given array.
- Note: this could be made faster, by delaying consolidation,
- at the price of disabling some user integrity checks, We
- still optimize some consolidations by combining adjacent
- chunks before freeing, which will occur often if allocated
- with ialloc or the array is sorted.
-*/
-static size_t internal_bulk_free(mstate m, void* array[], size_t nelem) {
- size_t unfreed = 0;
- if (!PREACTION(m)) {
- void** a;
- void** fence = &(array[nelem]);
- for (a = array; a != fence; ++a) {
- void* mem = *a;
- if (mem != 0) {
- mchunkptr p = mem2chunk(mem);
- size_t psize = chunksize(p);
-#if FOOTERS
- if (get_mstate_for(p) != m) {
- ++unfreed;
- continue;
- }
-#endif
- check_inuse_chunk(m, p);
- *a = 0;
- if (RTCHECK(ok_address(m, p) && ok_inuse(p))) {
- void ** b = a + 1; /* try to merge with next chunk */
- mchunkptr next = next_chunk(p);
- if (b != fence && *b == chunk2mem(next)) {
- size_t newsize = chunksize(next) + psize;
- set_inuse(m, p, newsize);
- *b = chunk2mem(p);
- }
- else
- dispose_chunk(m, p, psize);
- gm->inuse -= psize;
- }
- else {
- CORRUPTION_ERROR_ACTION(m);
- break;
- }
- }
- }
- if (should_trim(m, m->topsize))
- sys_trim(m, 0);
- POSTACTION(m);
- }
- return unfreed;
-}
-
-/* Traversal */
-#if MALLOC_INSPECT_ALL
-static void internal_inspect_all(mstate m,
- void(*handler)(void *start,
- void *end,
- size_t used_bytes,
- void* callback_arg),
- void* arg) {
- if (is_initialized(m)) {
- mchunkptr top = m->top;
- msegmentptr s;
- for (s = &m->seg; s != 0; s = s->next) {
- mchunkptr q = align_as_chunk(s->base);
- while (segment_holds(s, q) && q->head != FENCEPOST_HEAD) {
- mchunkptr next = next_chunk(q);
- size_t sz = chunksize(q);
- size_t used;
- void* start;
- if (is_inuse(q)) {
- used = sz - CHUNK_OVERHEAD; /* must not be mmapped */
- start = chunk2mem(q);
- }
- else {
- used = 0;
- if (is_small(sz)) { /* offset by possible bookkeeping */
- start = (void*)((char*)q + sizeof(struct malloc_chunk));
- }
- else {
- start = (void*)((char*)q + sizeof(struct malloc_tree_chunk));
- }
- }
- if (start < (void*)next) /* skip if all space is bookkeeping */
- handler(start, next, used, arg);
- if (q == top)
- break;
- q = next;
- }
- }
- }
-}
-#endif /* MALLOC_INSPECT_ALL */
-
-/* ------------------ Exported realloc, memalign, etc -------------------- */
-
-#if !ONLY_MSPACES
-
-void* dlrealloc(void* oldmem, size_t bytes) {
- void* mem = 0;
- if (oldmem == 0) {
- mem = dlmalloc(bytes);
- }
- else if (bytes >= MAX_REQUEST) {
- MALLOC_FAILURE_ACTION;
- }
-#ifdef REALLOC_ZERO_BYTES_FREES
- else if (bytes == 0) {
- dlfree(oldmem);
- }
-#endif /* REALLOC_ZERO_BYTES_FREES */
- else {
- size_t nb = request2size(bytes);
- mchunkptr oldp = mem2chunk(oldmem);
-#if ! FOOTERS
- mstate m = gm;
-#else /* FOOTERS */
- mstate m = get_mstate_for(oldp);
- if (!ok_magic(m)) {
- USAGE_ERROR_ACTION(m, oldmem);
- return 0;
- }
-#endif /* FOOTERS */
- if (!PREACTION(m)) {
- mchunkptr newp = try_realloc_chunk(m, oldp, nb, 1);
- POSTACTION(m);
- if (newp != 0) {
- check_inuse_chunk(m, newp);
- mem = chunk2mem(newp);
- }
- else {
- mem = internal_malloc(m, bytes);
- if (mem != 0) {
- size_t oc = chunksize(oldp) - overhead_for(oldp);
- memcpy(mem, oldmem, (oc < bytes)? oc : bytes);
- internal_free(m, oldmem);
- }
- }
- }
- }
- return mem;
-}
-
-void* dlrealloc_in_place(void* oldmem, size_t bytes) {
- void* mem = 0;
- if (oldmem != 0) {
- if (bytes >= MAX_REQUEST) {
- MALLOC_FAILURE_ACTION;
- }
- else {
- size_t nb = request2size(bytes);
- mchunkptr oldp = mem2chunk(oldmem);
-#if ! FOOTERS
- mstate m = gm;
-#else /* FOOTERS */
- mstate m = get_mstate_for(oldp);
- if (!ok_magic(m)) {
- USAGE_ERROR_ACTION(m, oldmem);
- return 0;
- }
-#endif /* FOOTERS */
- if (!PREACTION(m)) {
- mchunkptr newp = try_realloc_chunk(m, oldp, nb, 0);
- POSTACTION(m);
- if (newp == oldp) {
- check_inuse_chunk(m, newp);
- mem = oldmem;
- }
- }
- }
- }
- return mem;
-}
-
-void* dlmemalign(size_t alignment, size_t bytes) {
- if (alignment <= MALLOC_ALIGNMENT) {
- return dlmalloc(bytes);
- }
- return internal_memalign(gm, alignment, bytes);
-}
-
-int dlposix_memalign(void** pp, size_t alignment, size_t bytes) {
- void* mem = 0;
- if (alignment == MALLOC_ALIGNMENT)
- mem = dlmalloc(bytes);
- else {
- size_t d = alignment / sizeof(void*);
- size_t r = alignment % sizeof(void*);
- if (r != 0 || d == 0 || (d & (d-SIZE_T_ONE)) != 0)
- return EINVAL;
- else if (bytes <= MAX_REQUEST - alignment) {
- if (alignment < MIN_CHUNK_SIZE)
- alignment = MIN_CHUNK_SIZE;
- mem = internal_memalign(gm, alignment, bytes);
- }
- }
- if (mem == 0)
- return ENOMEM;
- else {
- *pp = mem;
- return 0;
- }
-}
-
-void* dlvalloc(size_t bytes) {
- size_t pagesz;
- ensure_initialization();
- pagesz = mparams.page_size;
- return dlmemalign(pagesz, bytes);
-}
-
-void* dlpvalloc(size_t bytes) {
- size_t pagesz;
- ensure_initialization();
- pagesz = mparams.page_size;
- return dlmemalign(pagesz, (bytes + pagesz - SIZE_T_ONE) & ~(pagesz - SIZE_T_ONE));
-}
-
-void** dlindependent_calloc(size_t n_elements, size_t elem_size,
- void* chunks[]) {
- size_t sz = elem_size; /* serves as 1-element array */
- return ialloc(gm, n_elements, &sz, 3, chunks);
-}
-
-void** dlindependent_comalloc(size_t n_elements, size_t sizes[],
- void* chunks[]) {
- return ialloc(gm, n_elements, sizes, 0, chunks);
-}
-
-size_t dlbulk_free(void* array[], size_t nelem) {
- return internal_bulk_free(gm, array, nelem);
-}
-
-#if MALLOC_INSPECT_ALL
-void dlmalloc_inspect_all(void(*handler)(void *start,
- void *end,
- size_t used_bytes,
- void* callback_arg),
- void* arg) {
- ensure_initialization();
- if (!PREACTION(gm)) {
- internal_inspect_all(gm, handler, arg);
- POSTACTION(gm);
- }
-}
-#endif /* MALLOC_INSPECT_ALL */
-
-int dlmalloc_trim(size_t pad) {
- int result = 0;
- ensure_initialization();
- if (!PREACTION(gm)) {
- result = sys_trim(gm, pad);
- POSTACTION(gm);
- }
- return result;
-}
-
-size_t dlmalloc_footprint(void) {
- return gm->footprint;
-}
-
-size_t dlmalloc_max_footprint(void) {
- return gm->max_footprint;
-}
-
-size_t dlmalloc_footprint_limit(void) {
- size_t maf = gm->footprint_limit;
- return maf == 0 ? MAX_SIZE_T : maf;
-}
-
-size_t dlmalloc_set_footprint_limit(size_t bytes) {
- size_t result; /* invert sense of 0 */
- if (bytes == 0)
- result = granularity_align(1); /* Use minimal size */
- if (bytes == MAX_SIZE_T)
- result = 0; /* disable */
- else
- result = granularity_align(bytes);
- return gm->footprint_limit = result;
-}
-
-#if !NO_MALLINFO
-struct mallinfo dlmallinfo(void) {
- return internal_mallinfo(gm);
-}
-#endif /* NO_MALLINFO */
-
-#if !NO_MALLOC_STATS
-void dlmalloc_stats() {
- internal_malloc_stats(gm);
-}
-#endif /* NO_MALLOC_STATS */
-
-int dlmallopt(int param_number, int value) {
- return change_mparam(param_number, value);
-}
-
-size_t dlmalloc_usable_size(void* mem) {
- if (mem != 0) {
- mchunkptr p = mem2chunk(mem);
- if (is_inuse(p))
- return chunksize(p) - overhead_for(p);
- }
- return 0;
-}
-
-#endif /* !ONLY_MSPACES */
-
-/* ----------------------------- user mspaces ---------------------------- */
-
-#if MSPACES
-
-static mstate init_user_mstate(char* tbase, size_t tsize) {
- size_t msize = pad_request(sizeof(struct malloc_state));
- mchunkptr mn;
- mchunkptr msp = align_as_chunk(tbase);
- mstate m = (mstate)(chunk2mem(msp));
- memset(m, 0, msize);
- (void)INITIAL_LOCK(&m->mutex);
- msp->head = (msize|INUSE_BITS);
- m->seg.base = m->least_addr = tbase;
- m->seg.size = m->footprint = m->max_footprint = tsize;
- m->magic = mparams.magic;
- m->release_checks = MAX_RELEASE_CHECK_RATE;
- m->mflags = mparams.default_mflags;
- m->extp = 0;
- m->exts = 0;
- m->inuse = 0;
- disable_contiguous(m);
- init_bins(m);
- mn = next_chunk(mem2chunk(m));
- init_top(m, mn, (size_t)((tbase + tsize) - (char*)mn) - TOP_FOOT_SIZE);
- check_top_chunk(m, m->top);
- return m;
-}
-
-mspace create_mspace(size_t capacity, int locked) {
- mstate m = 0;
- size_t msize;
- ensure_initialization();
- msize = pad_request(sizeof(struct malloc_state));
- if (capacity < (size_t) -(msize + TOP_FOOT_SIZE + mparams.page_size)) {
- size_t rs = ((capacity == 0)? mparams.granularity :
- (capacity + TOP_FOOT_SIZE + msize));
- size_t tsize = granularity_align(rs);
- char* tbase = (char*)(CALL_MMAP(tsize));
- if (tbase != CMFAIL) {
- m = init_user_mstate(tbase, tsize);
- m->seg.sflags = USE_MMAP_BIT;
- set_lock(m, locked);
- }
- }
- return (mspace)m;
-}
-
-mspace create_mspace_with_base(void* base, size_t capacity, int locked) {
- mstate m = 0;
- size_t msize;
- ensure_initialization();
- msize = pad_request(sizeof(struct malloc_state));
- if (capacity > msize + TOP_FOOT_SIZE &&
- capacity < (size_t) -(msize + TOP_FOOT_SIZE + mparams.page_size)) {
- m = init_user_mstate((char*)base, capacity);
- m->seg.sflags = EXTERN_BIT;
- set_lock(m, locked);
- }
- return (mspace)m;
-}
-
-int mspace_track_large_chunks(mspace msp, int enable) {
- int ret = 0;
- mstate ms = (mstate)msp;
- if (!PREACTION(ms)) {
- if (!use_mmap(ms)) {
- ret = 1;
- }
- if (!enable) {
- enable_mmap(ms);
- } else {
- disable_mmap(ms);
- }
- POSTACTION(ms);
- }
- return ret;
-}
-
-size_t destroy_mspace(mspace msp) {
- size_t freed = 0;
- mstate ms = (mstate)msp;
- if (ok_magic(ms)) {
- msegmentptr sp = &ms->seg;
- (void)DESTROY_LOCK(&ms->mutex); /* destroy before unmapped */
- while (sp != 0) {
- char* base = sp->base;
- size_t size = sp->size;
- flag_t flag = sp->sflags;
- (void)base; /* placate people compiling -Wunused-variable */
- sp = sp->next;
- if ((flag & USE_MMAP_BIT) && !(flag & EXTERN_BIT) &&
- CALL_MUNMAP(base, size) == 0)
- freed += size;
- }
- }
- else {
- USAGE_ERROR_ACTION(ms,ms);
- }
- return freed;
-}
-
-/*
- mspace versions of routines are near-clones of the global
- versions. This is not so nice but better than the alternatives.
-*/
-
-void* mspace_malloc(mspace msp, size_t bytes) {
- mstate ms = (mstate)msp;
- if (!ok_magic(ms)) {
- USAGE_ERROR_ACTION(ms,ms);
- return 0;
- }
- if (!PREACTION(ms)) {
- void* mem;
- size_t nb;
- if (bytes <= MAX_SMALL_REQUEST) {
- bindex_t idx;
- binmap_t smallbits;
- nb = (bytes < MIN_REQUEST)? MIN_CHUNK_SIZE : pad_request(bytes);
- idx = small_index(nb);
- smallbits = ms->smallmap >> idx;
-
- if ((smallbits & 0x3U) != 0) { /* Remainderless fit to a smallbin. */
- mchunkptr b, p;
- idx += ~smallbits & 1; /* Uses next bin if idx empty */
- b = smallbin_at(ms, idx);
- p = b->fd;
- assert(chunksize(p) == small_index2size(idx));
- unlink_first_small_chunk(ms, b, p, idx);
- set_inuse_and_pinuse(ms, p, small_index2size(idx));
- mem = chunk2mem(p);
- check_malloced_chunk(ms, mem, nb);
- goto postaction;
- }
-
- else if (nb > ms->dvsize) {
- if (smallbits != 0) { /* Use chunk in next nonempty smallbin */
- mchunkptr b, p, r;
- size_t rsize;
- bindex_t i;
- binmap_t leftbits = (smallbits << idx) & left_bits(idx2bit(idx));
- binmap_t leastbit = least_bit(leftbits);
- compute_bit2idx(leastbit, i);
- b = smallbin_at(ms, i);
- p = b->fd;
- assert(chunksize(p) == small_index2size(i));
- unlink_first_small_chunk(ms, b, p, i);
- rsize = small_index2size(i) - nb;
- /* Fit here cannot be remainderless if 4byte sizes */
- if (SIZE_T_SIZE != 4 && rsize < MIN_CHUNK_SIZE)
- set_inuse_and_pinuse(ms, p, small_index2size(i));
- else {
- set_size_and_pinuse_of_inuse_chunk(ms, p, nb);
- r = chunk_plus_offset(p, nb);
- set_size_and_pinuse_of_free_chunk(r, rsize);
- replace_dv(ms, r, rsize);
- }
- mem = chunk2mem(p);
- check_malloced_chunk(ms, mem, nb);
- goto postaction;
- }
-
- else if (ms->treemap != 0 && (mem = tmalloc_small(ms, nb)) != 0) {
- check_malloced_chunk(ms, mem, nb);
- goto postaction;
- }
- }
- }
- else if (bytes >= MAX_REQUEST)
- nb = MAX_SIZE_T; /* Too big to allocate. Force failure (in sys alloc) */
- else {
- nb = pad_request(bytes);
- if (ms->treemap != 0 && (mem = tmalloc_large(ms, nb)) != 0) {
- check_malloced_chunk(ms, mem, nb);
- goto postaction;
- }
- }
-
- if (nb <= ms->dvsize) {
- size_t rsize = ms->dvsize - nb;
- mchunkptr p = ms->dv;
- if (rsize >= MIN_CHUNK_SIZE) { /* split dv */
- mchunkptr r = ms->dv = chunk_plus_offset(p, nb);
- ms->dvsize = rsize;
- set_size_and_pinuse_of_free_chunk(r, rsize);
- set_size_and_pinuse_of_inuse_chunk(ms, p, nb);
- }
- else { /* exhaust dv */
- size_t dvs = ms->dvsize;
- ms->dvsize = 0;
- ms->dv = 0;
- set_inuse_and_pinuse(ms, p, dvs);
- }
- mem = chunk2mem(p);
- check_malloced_chunk(ms, mem, nb);
- goto postaction;
- }
-
- else if (nb < ms->topsize) { /* Split top */
- size_t rsize = ms->topsize -= nb;
- mchunkptr p = ms->top;
- mchunkptr r = ms->top = chunk_plus_offset(p, nb);
- r->head = rsize | PINUSE_BIT;
- set_size_and_pinuse_of_inuse_chunk(ms, p, nb);
- mem = chunk2mem(p);
- check_top_chunk(ms, ms->top);
- check_malloced_chunk(ms, mem, nb);
- goto postaction;
- }
-
- mem = sys_alloc(ms, nb);
-
- postaction:
- POSTACTION(ms);
- return mem;
- }
-
- return 0;
-}
-
-void mspace_free(mspace msp, void* mem) {
- if (mem != 0) {
- mchunkptr p = mem2chunk(mem);
-#if FOOTERS
- mstate fm = get_mstate_for(p);
- (void)msp; /* placate people compiling -Wunused */
-#else /* FOOTERS */
- mstate fm = (mstate)msp;
-#endif /* FOOTERS */
- if (!ok_magic(fm)) {
- USAGE_ERROR_ACTION(fm, p);
- return;
- }
- if (!PREACTION(fm)) {
- check_inuse_chunk(fm, p);
- if (RTCHECK(ok_address(fm, p) && ok_inuse(p))) {
- size_t psize = chunksize(p);
- mchunkptr next = chunk_plus_offset(p, psize);
- if (!pinuse(p)) {
- size_t prevsize = p->prev_foot;
- if (is_mmapped(p)) {
- psize += prevsize + MMAP_FOOT_PAD;
- if (CALL_MUNMAP((char*)p - prevsize, psize) == 0)
- fm->footprint -= psize;
- goto postaction;
- }
- else {
- mchunkptr prev = chunk_minus_offset(p, prevsize);
- psize += prevsize;
- p = prev;
- if (RTCHECK(ok_address(fm, prev))) { /* consolidate backward */
- if (p != fm->dv) {
- unlink_chunk(fm, p, prevsize);
- }
- else if ((next->head & INUSE_BITS) == INUSE_BITS) {
- fm->dvsize = psize;
- set_free_with_pinuse(p, psize, next);
- goto postaction;
- }
- }
- else
- goto erroraction;
- }
- }
-
- if (RTCHECK(ok_next(p, next) && ok_pinuse(next))) {
- if (!cinuse(next)) { /* consolidate forward */
- if (next == fm->top) {
- size_t tsize = fm->topsize += psize;
- fm->top = p;
- p->head = tsize | PINUSE_BIT;
- if (p == fm->dv) {
- fm->dv = 0;
- fm->dvsize = 0;
- }
- if (should_trim(fm, tsize))
- sys_trim(fm, 0);
- goto postaction;
- }
- else if (next == fm->dv) {
- size_t dsize = fm->dvsize += psize;
- fm->dv = p;
- set_size_and_pinuse_of_free_chunk(p, dsize);
- goto postaction;
- }
- else {
- size_t nsize = chunksize(next);
- psize += nsize;
- unlink_chunk(fm, next, nsize);
- set_size_and_pinuse_of_free_chunk(p, psize);
- if (p == fm->dv) {
- fm->dvsize = psize;
- goto postaction;
- }
- }
- }
- else
- set_free_with_pinuse(p, psize, next);
-
- if (is_small(psize)) {
- insert_small_chunk(fm, p, psize);
- check_free_chunk(fm, p);
- }
- else {
- tchunkptr tp = (tchunkptr)p;
- insert_large_chunk(fm, tp, psize);
- check_free_chunk(fm, p);
- if (--fm->release_checks == 0)
- release_unused_segments(fm);
- }
- goto postaction;
- }
- }
- erroraction:
- USAGE_ERROR_ACTION(fm, p);
- postaction:
- POSTACTION(fm);
- }
- }
-}
-
-void* mspace_calloc(mspace msp, size_t n_elements, size_t elem_size) {
- void* mem;
- size_t req = 0;
- mstate ms = (mstate)msp;
- if (!ok_magic(ms)) {
- USAGE_ERROR_ACTION(ms,ms);
- return 0;
- }
- if (n_elements != 0) {
- req = n_elements * elem_size;
- if (((n_elements | elem_size) & ~(size_t)0xffff) &&
- (req / n_elements != elem_size))
- req = MAX_SIZE_T; /* force downstream failure on overflow */
- }
- mem = internal_malloc(ms, req);
- if (mem != 0 && calloc_must_clear(mem2chunk(mem)))
- memset(mem, 0, req);
- return mem;
-}
-
-void* mspace_realloc(mspace msp, void* oldmem, size_t bytes) {
- void* mem = 0;
- if (oldmem == 0) {
- mem = mspace_malloc(msp, bytes);
- }
- else if (bytes >= MAX_REQUEST) {
- MALLOC_FAILURE_ACTION;
- }
-#ifdef REALLOC_ZERO_BYTES_FREES
- else if (bytes == 0) {
- mspace_free(msp, oldmem);
- }
-#endif /* REALLOC_ZERO_BYTES_FREES */
- else {
- size_t nb = request2size(bytes);
- mchunkptr oldp = mem2chunk(oldmem);
-#if ! FOOTERS
- mstate m = (mstate)msp;
-#else /* FOOTERS */
- mstate m = get_mstate_for(oldp);
- if (!ok_magic(m)) {
- USAGE_ERROR_ACTION(m, oldmem);
- return 0;
- }
-#endif /* FOOTERS */
- if (!PREACTION(m)) {
- mchunkptr newp = try_realloc_chunk(m, oldp, nb, 1);
- POSTACTION(m);
- if (newp != 0) {
- check_inuse_chunk(m, newp);
- mem = chunk2mem(newp);
- }
- else {
- mem = mspace_malloc(m, bytes);
- if (mem != 0) {
- size_t oc = chunksize(oldp) - overhead_for(oldp);
- memcpy(mem, oldmem, (oc < bytes)? oc : bytes);
- mspace_free(m, oldmem);
- }
- }
- }
- }
- return mem;
-}
-
-void* mspace_realloc_in_place(mspace msp, void* oldmem, size_t bytes) {
- void* mem = 0;
- if (oldmem != 0) {
- if (bytes >= MAX_REQUEST) {
- MALLOC_FAILURE_ACTION;
- }
- else {
- size_t nb = request2size(bytes);
- mchunkptr oldp = mem2chunk(oldmem);
-#if ! FOOTERS
- mstate m = (mstate)msp;
-#else /* FOOTERS */
- mstate m = get_mstate_for(oldp);
- (void)msp; /* placate people compiling -Wunused */
- if (!ok_magic(m)) {
- USAGE_ERROR_ACTION(m, oldmem);
- return 0;
- }
-#endif /* FOOTERS */
- if (!PREACTION(m)) {
- mchunkptr newp = try_realloc_chunk(m, oldp, nb, 0);
- POSTACTION(m);
- if (newp == oldp) {
- check_inuse_chunk(m, newp);
- mem = oldmem;
- }
- }
- }
- }
- return mem;
-}
-
-void* mspace_memalign(mspace msp, size_t alignment, size_t bytes) {
- mstate ms = (mstate)msp;
- if (!ok_magic(ms)) {
- USAGE_ERROR_ACTION(ms,ms);
- return 0;
- }
- if (alignment <= MALLOC_ALIGNMENT)
- return mspace_malloc(msp, bytes);
- return internal_memalign(ms, alignment, bytes);
-}
-
-void** mspace_independent_calloc(mspace msp, size_t n_elements,
- size_t elem_size, void* chunks[]) {
- size_t sz = elem_size; /* serves as 1-element array */
- mstate ms = (mstate)msp;
- if (!ok_magic(ms)) {
- USAGE_ERROR_ACTION(ms,ms);
- return 0;
- }
- return ialloc(ms, n_elements, &sz, 3, chunks);
-}
-
-void** mspace_independent_comalloc(mspace msp, size_t n_elements,
- size_t sizes[], void* chunks[]) {
- mstate ms = (mstate)msp;
- if (!ok_magic(ms)) {
- USAGE_ERROR_ACTION(ms,ms);
- return 0;
- }
- return ialloc(ms, n_elements, sizes, 0, chunks);
-}
-
-size_t mspace_bulk_free(mspace msp, void* array[], size_t nelem) {
- return internal_bulk_free((mstate)msp, array, nelem);
-}
-
-#if MALLOC_INSPECT_ALL
-void mspace_inspect_all(mspace msp,
- void(*handler)(void *start,
- void *end,
- size_t used_bytes,
- void* callback_arg),
- void* arg) {
- mstate ms = (mstate)msp;
- if (ok_magic(ms)) {
- if (!PREACTION(ms)) {
- internal_inspect_all(ms, handler, arg);
- POSTACTION(ms);
- }
- }
- else {
- USAGE_ERROR_ACTION(ms,ms);
- }
-}
-#endif /* MALLOC_INSPECT_ALL */
-
-int mspace_trim(mspace msp, size_t pad) {
- int result = 0;
- mstate ms = (mstate)msp;
- if (ok_magic(ms)) {
- if (!PREACTION(ms)) {
- result = sys_trim(ms, pad);
- POSTACTION(ms);
- }
- }
- else {
- USAGE_ERROR_ACTION(ms,ms);
- }
- return result;
-}
-
-#if !NO_MALLOC_STATS
-void mspace_malloc_stats(mspace msp) {
- mstate ms = (mstate)msp;
- if (ok_magic(ms)) {
- internal_malloc_stats(ms);
- }
- else {
- USAGE_ERROR_ACTION(ms,ms);
- }
-}
-#endif /* NO_MALLOC_STATS */
-
-size_t mspace_footprint(mspace msp) {
- size_t result = 0;
- mstate ms = (mstate)msp;
- if (ok_magic(ms)) {
- result = ms->footprint;
- }
- else {
- USAGE_ERROR_ACTION(ms,ms);
- }
- return result;
-}
-
-size_t mspace_max_footprint(mspace msp) {
- size_t result = 0;
- mstate ms = (mstate)msp;
- if (ok_magic(ms)) {
- result = ms->max_footprint;
- }
- else {
- USAGE_ERROR_ACTION(ms,ms);
- }
- return result;
-}
-
-size_t mspace_footprint_limit(mspace msp) {
- size_t result = 0;
- mstate ms = (mstate)msp;
- if (ok_magic(ms)) {
- size_t maf = ms->footprint_limit;
- result = (maf == 0) ? MAX_SIZE_T : maf;
- }
- else {
- USAGE_ERROR_ACTION(ms,ms);
- }
- return result;
-}
-
-size_t mspace_set_footprint_limit(mspace msp, size_t bytes) {
- size_t result = 0;
- mstate ms = (mstate)msp;
- if (ok_magic(ms)) {
- if (bytes == 0)
- result = granularity_align(1); /* Use minimal size */
- if (bytes == MAX_SIZE_T)
- result = 0; /* disable */
- else
- result = granularity_align(bytes);
- ms->footprint_limit = result;
- }
- else {
- USAGE_ERROR_ACTION(ms,ms);
- }
- return result;
-}
-
-#if !NO_MALLINFO
-struct mallinfo mspace_mallinfo(mspace msp) {
- mstate ms = (mstate)msp;
- if (!ok_magic(ms)) {
- USAGE_ERROR_ACTION(ms,ms);
- }
- return internal_mallinfo(ms);
-}
-#endif /* NO_MALLINFO */
-
-size_t mspace_usable_size(const void* mem) {
- if (mem != 0) {
- mchunkptr p = mem2chunk(mem);
- if (is_inuse(p))
- return chunksize(p) - overhead_for(p);
- }
- return 0;
-}
-
-int mspace_mallopt(int param_number, int value) {
- return change_mparam(param_number, value);
-}
-
-#endif /* MSPACES */
-
-#if defined(__LB_SHELL__) || defined(STARBOARD)
-/*
- Start of lb_shell specific MMAP and MORECORE implementation.
- We manage two virtual address spaces- one for the main heap
- and one for large blocks (size >= MMAP_THRESHOLD).
- The main heap grows (or shrinks) when MORECORE is called.
- The large block heap has physical pages mapped in as needed.
-*/
-
-typedef struct HeapInfo {
- lb_virtual_mem_t mem_base;
- // Current top of the heap.
- uintptr_t sbrk_top;
-} HeapInfo;
-
-// This tracks our global contiguous heap.
-static HeapInfo global_heap;
-
-static FORCEINLINE size_t align(size_t val, size_t boundary) {
- return (val + boundary - 1) & ~(boundary - 1);
-}
-
-static FORCEINLINE size_t min(size_t lhs, size_t rhs) {
- return lhs < rhs ? lhs : rhs;
-}
-
-
-static void dl_heap_init() {
- assert(mparams.page_size == LB_PAGE_SIZE);
-#if HAVE_MORECORE
- const size_t region_size = lb_get_virtual_region_size();
- global_heap.mem_base = lb_reserve_virtual_region(region_size);
- global_heap.sbrk_top = (uintptr_t)global_heap.mem_base;
-#endif
-#if defined(__LB_WIIU__)
- // override the OS's weak symbols for allocation.
- extern void lb_hijack_weak_allocators();
- lb_hijack_weak_allocators();
-#endif
-}
-
-void dl_malloc_init() {
- // No-op. Let all initialization happen in init_mparams().
- // On most systems, we can't guarantee this
- // will run before the first call to malloc().
- // This is just provided so the linker can succeed when ALLOCATOR
- // is set to 'dl' in lb_memory_manager.h.
-}
-
-void dl_malloc_finalize() {
-#if HAVE_MORECORE
- // Free all pages owned by the global heap.
- size_t heap_size = global_heap.sbrk_top - (uintptr_t)global_heap.mem_base;
- lb_unmap_and_free_physical(global_heap.mem_base, heap_size);
- lb_release_virtual_region(global_heap.mem_base);
-#endif
-}
-
-void dlmalloc_ranges_np(uintptr_t *start1, uintptr_t *end1,
- uintptr_t *start2, uintptr_t *end2,
- uintptr_t *start3, uintptr_t *end3) {
- *start1 = (uintptr_t)global_heap.mem_base;
- *end1 = (uintptr_t)global_heap.mem_base + lb_get_total_system_memory();
- // No second range.
- *start2 = *end2 = *end1;
- // No third range.
- *start3 = *end3 = *end2;
-}
-
-#if !defined(COBALT_BUILD_TYPE_GOLD)
-// Track and print contiguous ranges of allocations / free blocks.
-typedef struct HeapWalker {
- // Allocated blocks, not including allocator overhead.
- size_t total_used_bytes;
- // Total allocated blocks, including overhead.
- size_t total_block_bytes;
- // Ther largest contiguous free space.
- size_t largest_free_block_bytes;
- // Number of free blocks- a potential measure of fragmentation.
- int total_free_blocks;
- size_t total_free_bytes;
- // File descriptor for writing to dump file.
-#if defined(STARBOARD)
- SbFile file_descriptor;
-#else
- int file_descriptor;
-#endif
- // Track the current contiguous range.
- uintptr_t cur_range_start;
- size_t cur_range_size;
- int cur_range_is_free;
- int cur_range_block_count;
-
- // Buffer for file writing.
- char file_buf[4096];
- int file_buf_len;
-} HeapWalker;
-
-#if defined(STARBOARD)
-#undef snprintf
-#define snprintf SbStringFormatF
-#define MEMORY_LOG_PATH kSbMemoryLogPath
-
-static bool heap_walker_is_valid_file(SbFile fd) {
- return SbFileIsValid(fd);
-}
-
-static SbFile heap_walker_open_file(const char* file) {
- return SbFileOpen(file, kSbFileCreateAlways | kSbFileWrite, NULL, NULL);
-}
-
-static void heap_walker_write_file(SbFile fd, const char *data, int data_size) {
- SbFileWrite(fd, data, data_size);
-}
-
-static SbFile heap_walker_close_file(SbFile fd) {
- SbFileClose(fd);
- return kSbFileInvalid;
-}
-#else
-#if defined(_MSC_VER)
-#define bool int
-#else
-#include <stdbool.h>
-#endif
-
-static bool heap_walker_is_valid_file(int fd) {
- return fd >= 0;
-}
-
-static int heap_walker_open_file(const char* file) {
- return open(file, O_WRONLY|O_CREAT|O_TRUNC, 0644);
-}
-
-static void heap_walker_write_file(int fd, const char *data, int data_size) {
- write(fd, data, data_size);
-}
-
-static int heap_walker_close_file(int fd) {
- close(fd);
- return -1;
-}
-#endif
-
-static void heap_walker_init(HeapWalker* hw, const char* file) {
- memset(hw, 0, sizeof(HeapWalker));
- char path[256];
- snprintf(path, sizeof(path), "%s/%s", MEMORY_LOG_PATH, file);
- hw->file_descriptor = heap_walker_open_file(path);
- if (heap_walker_is_valid_file(hw->file_descriptor)) {
- oom_fprintf(1, "Writing allocations to %s\n", path);
- } else {
- oom_fprintf(1, "Could not open file %s\n", path);
- }
-}
-
-static void heap_walker_flush(HeapWalker* hw) {
- if (heap_walker_is_valid_file(hw->file_descriptor)) {
- heap_walker_write_file(hw->file_descriptor, hw->file_buf, hw->file_buf_len);
- }
- hw->file_buf_len = 0;
-}
-
-static void heap_walker_write(HeapWalker* hw, const char* buf, int buf_len) {
- if (hw->file_buf_len + buf_len > sizeof(hw->file_buf)) {
- heap_walker_flush(hw);
- }
-
- memcpy(hw->file_buf + hw->file_buf_len, buf, buf_len);
- hw->file_buf_len += buf_len;
-}
-
-static void heap_walker_start_range(HeapWalker* hw, int is_free,
- uintptr_t start, size_t bytes) {
- hw->cur_range_is_free = is_free;
- hw->cur_range_start = start;
- hw->cur_range_size = bytes;
- hw->cur_range_block_count = 1;
-}
-
-static void heap_walker_end_range(HeapWalker* hw) {
- // Print and write the range.
- if (hw->cur_range_start == 0) {
- return;
- }
-
- if (hw->cur_range_is_free &&
- hw->cur_range_size > hw->largest_free_block_bytes) {
- hw->largest_free_block_bytes = hw->cur_range_size;
- }
-
- if (heap_walker_is_valid_file(hw->file_descriptor)) {
- char buf[128];
- int len = snprintf(buf, sizeof(buf),
- "%s\t[0x%" PRIxPTR " - 0x%" PRIxPTR "]\t%d\t%d\n",
- hw->cur_range_is_free != 0 ? "F" : "A",
- hw->cur_range_start,
- hw->cur_range_start + hw->cur_range_size,
- (int)(hw->cur_range_size),
- hw->cur_range_block_count);
- heap_walker_write(hw, buf, len);
- }
-}
-
-static void heap_walker_update_stats(HeapWalker* hw, int is_free,
- size_t block_bytes, size_t used_bytes) {
- if (is_free == 1) {
- hw->total_free_blocks++;
- hw->total_free_bytes += block_bytes;
- } else {
- hw->total_block_bytes += block_bytes;
- hw->total_used_bytes += used_bytes;
- }
-}
-
-static void heap_walker_update_range(HeapWalker* hw, int is_free,
- uintptr_t start, size_t bytes) {
- // Try to merge contiguous blocks.
- if (is_free == hw->cur_range_is_free &&
- hw->cur_range_start + hw->cur_range_size == start) {
- // Blocks are of the same type and contiguous. Extend the current range.
- hw->cur_range_size += bytes;
- hw->cur_range_block_count++;
- } else {
- heap_walker_end_range(hw);
- heap_walker_start_range(hw, is_free, start, bytes);
- }
-}
-
-static void heap_walker_terminate(HeapWalker* hw) {
- heap_walker_end_range(hw);
- heap_walker_flush(hw);
-
- if (heap_walker_is_valid_file(hw->file_descriptor)) {
- hw->file_descriptor = heap_walker_close_file(hw->file_descriptor);
- }
-}
-
-static void heap_walker_log(
- HeapWalker* hw, void* start, void* end, size_t used_bytes) {
- // |start| is the beginning of user data.
- // |end| is the end of the chunk.
-
- int is_free = used_bytes == 0;
- uintptr_t block_start;
- if (is_free) {
- // We don't know where the chunk start is- it depends on the size.
- // So we probably won't be able to merge consecutive free blocks,
- // but that's dlmalloc's job anyway.
- block_start = (uintptr_t)start;
- } else {
- // Convert the "mem" / userdata pointer back to the chunk pointer.
- // This wil allow merging chunks for logging.
- block_start = (uintptr_t)mem2chunk(start);
- }
- uintptr_t block_end = (uintptr_t)end;
- size_t block_bytes = block_end - block_start;
-
- heap_walker_update_stats(hw, is_free, block_bytes, used_bytes);
- heap_walker_update_range(hw, is_free, block_start, block_bytes);
-}
-
-static void heap_walker_finish(HeapWalker* hw) {
- heap_walker_terminate(hw);
- oom_fprintf(1, "\nTotal Used Bytes: %d"
- "\tTotal Block Bytes: %d\tTotal Overhead: %d\n",
- hw->total_used_bytes,
- hw->total_block_bytes,
- (hw->total_block_bytes - hw->total_used_bytes));
- oom_fprintf(1, "\nNumber of free blocks: %d\tLargest free block: %d\n",
- hw->total_free_blocks, hw->largest_free_block_bytes);
-
-}
-
-static void heap_walker(void* start, void* end, size_t used_bytes, void* arg) {
- HeapWalker* hw = (HeapWalker*)arg;
- heap_walker_log(hw, start, end, used_bytes);
-}
-
-void dldump_heap() {
- ACQUIRE_MALLOC_GLOBAL_LOCK();
- oom_fprintf(1, "Dumping dlmalloc heap info:\n");
- oom_fprintf(1,
- "bytes allocated directly via lb_mmap (external to dlmalloc): %6dKB\n",
- lb_get_mmapped_bytes() / 1024);
- oom_fprintf(1, "mallinfo stats:\n");
- struct mallinfo info = dlmallinfo();
- oom_fprintf(1, "\ttotal in use: %6dKB\n", info.uordblks / 1024);
- oom_fprintf(1, "\ttotal free: %6dKB\n", info.fordblks / 1024);
- oom_fprintf(1, "arena:\n");
- oom_fprintf(1, "\ttotal allocated: %6dKB\n", info.arena / 1024);
- oom_fprintf(1, "direct mmapped:\n");
- oom_fprintf(1, "\tmmapped bytes: %6dKB\n", info.hblkhd / 1024);
-
- oom_fprintf(1,
- "Writing global heap (not including large mmapped blocks).\n");
- HeapWalker hw;
- heap_walker_init(&hw, "global_heap.txt");
- dlmalloc_inspect_all(heap_walker, &hw);
- heap_walker_finish(&hw);
- RELEASE_MALLOC_GLOBAL_LOCK();
-}
-
-#endif /* defined(COBALT_BUILD_TYPE_GOLD) */
-
-int dlmalloc_stats_np(size_t *system_size, size_t *in_use_size) {
- // Same as dlmalloc_stats, but returns values
- // instead of printing them out.
- mstate m = gm;
- ensure_initialization();
- if (!PREACTION(m)) {
- size_t maxfp = 0;
- size_t fp = 0;
- size_t used = 0;
- check_malloc_state(m);
- if (is_initialized(m)) {
- msegmentptr s = &m->seg;
- maxfp = m->max_footprint;
- fp = m->footprint;
-
-#ifdef VALIDATE_INUSE_STATS
- used = fp - (m->topsize + TOP_FOOT_SIZE);
-
- while (s != 0) {
- mchunkptr q = align_as_chunk(s->base);
- while (segment_holds(s, q) &&
- q != m->top && q->head != FENCEPOST_HEAD) {
- if (!is_inuse(q))
- used -= chunksize(q);
- q = next_chunk(q);
- }
- s = s->next;
- }
-#endif
- }
- // All system memory:
- *system_size = fp;
- // The memory allocated:
- *in_use_size = gm->inuse;
-
-#ifdef VALIDATE_INUSE_STATS
- oom_fprintf(1, "used = %d, est = %d, diff = %d\n",
- used, gm->inuse, used - gm->inuse);
- if (used != gm->inuse) CRASH();
-#endif
- }
- POSTACTION(m); /* drop lock */
- return 0;
-}
-#if HAVE_MORECORE
-static void* lbshell_morecore(ssize_t size) {
- void* ptr = (void*)global_heap.sbrk_top;
- if (size > 0) {
- size = align(size, mparams.page_size);
- int ret = lb_allocate_physical_and_map(
- (lb_virtual_mem_t)global_heap.sbrk_top, size);
- if (ret != 0) {
- return (void*)-1;
- }
- global_heap.sbrk_top += size;
- } else if (size < 0) {
- global_heap.sbrk_top -= -size;
- lb_unmap_and_free_physical((lb_virtual_mem_t)global_heap.sbrk_top, -size);
- ptr = (void*)global_heap.sbrk_top;
- } else {
- // size 0 is a query for current position.
- }
- return ptr;
-}
-#endif
-
-#endif /* defined(__LB_SHELL__) || defined(STARBOARD) */
-/* -------------------- Alternative MORECORE functions ------------------- */
-
-/*
- Guidelines for creating a custom version of MORECORE:
-
- * For best performance, MORECORE should allocate in multiples of pagesize.
- * MORECORE may allocate more memory than requested. (Or even less,
- but this will usually result in a malloc failure.)
- * MORECORE must not allocate memory when given argument zero, but
- instead return one past the end address of memory from previous
- nonzero call.
- * For best performance, consecutive calls to MORECORE with positive
- arguments should return increasing addresses, indicating that
- space has been contiguously extended.
- * Even though consecutive calls to MORECORE need not return contiguous
- addresses, it must be OK for malloc'ed chunks to span multiple
- regions in those cases where they do happen to be contiguous.
- * MORECORE need not handle negative arguments -- it may instead
- just return MFAIL when given negative arguments.
- Negative arguments are always multiples of pagesize. MORECORE
- must not misinterpret negative args as large positive unsigned
- args. You can suppress all such calls from even occurring by defining
- MORECORE_CANNOT_TRIM,
-
- As an example alternative MORECORE, here is a custom allocator
- kindly contributed for pre-OSX macOS. It uses virtually but not
- necessarily physically contiguous non-paged memory (locked in,
- present and won't get swapped out). You can use it by uncommenting
- this section, adding some #includes, and setting up the appropriate
- defines above:
-
- #define MORECORE osMoreCore
-
- There is also a shutdown routine that should somehow be called for
- cleanup upon program exit.
-
- #define MAX_POOL_ENTRIES 100
- #define MINIMUM_MORECORE_SIZE (64 * 1024U)
- static int next_os_pool;
- void *our_os_pools[MAX_POOL_ENTRIES];
-
- void *osMoreCore(int size)
- {
- void *ptr = 0;
- static void *sbrk_top = 0;
-
- if (size > 0)
- {
- if (size < MINIMUM_MORECORE_SIZE)
- size = MINIMUM_MORECORE_SIZE;
- if (CurrentExecutionLevel() == kTaskLevel)
- ptr = PoolAllocateResident(size + RM_PAGE_SIZE, 0);
- if (ptr == 0)
- {
- return (void *) MFAIL;
- }
- // save ptrs so they can be freed during cleanup
- our_os_pools[next_os_pool] = ptr;
- next_os_pool++;
- ptr = (void *) ((((size_t) ptr) + RM_PAGE_MASK) & ~RM_PAGE_MASK);
- sbrk_top = (char *) ptr + size;
- return ptr;
- }
- else if (size < 0)
- {
- // we don't currently support shrink behavior
- return (void *) MFAIL;
- }
- else
- {
- return sbrk_top;
- }
- }
-
- // cleanup any allocated memory pools
- // called as last thing before shutting down driver
-
- void osCleanupMem(void)
- {
- void **ptr;
-
- for (ptr = our_os_pools; ptr < &our_os_pools[MAX_POOL_ENTRIES]; ptr++)
- if (*ptr)
- {
- PoolDeallocate(*ptr);
- *ptr = 0;
- }
- }
-
-*/
-
-
-/* -----------------------------------------------------------------------
-History:
- v2.8.6 Wed Aug 29 06:57:58 2012 Doug Lea
- * fix bad comparison in dlposix_memalign
- * don't reuse adjusted asize in sys_alloc
- * add LOCK_AT_FORK -- thanks to Kirill Artamonov for the suggestion
- * reduce compiler warnings -- thanks to all who reported/suggested these
-
- v2.8.5 Sun May 22 10:26:02 2011 Doug Lea (dl at gee)
- * Always perform unlink checks unless INSECURE
- * Add posix_memalign.
- * Improve realloc to expand in more cases; expose realloc_in_place.
- Thanks to Peter Buhr for the suggestion.
- * Add footprint_limit, inspect_all, bulk_free. Thanks
- to Barry Hayes and others for the suggestions.
- * Internal refactorings to avoid calls while holding locks
- * Use non-reentrant locks by default. Thanks to Roland McGrath
- for the suggestion.
- * Small fixes to mspace_destroy, reset_on_error.
- * Various configuration extensions/changes. Thanks
- to all who contributed these.
-
- V2.8.4a Thu Apr 28 14:39:43 2011 (dl at gee.cs.oswego.edu)
- * Update Creative Commons URL
-
- V2.8.4 Wed May 27 09:56:23 2009 Doug Lea (dl at gee)
- * Use zeros instead of prev foot for is_mmapped
- * Add mspace_track_large_chunks; thanks to Jean Brouwers
- * Fix set_inuse in internal_realloc; thanks to Jean Brouwers
- * Fix insufficient sys_alloc padding when using 16byte alignment
- * Fix bad error check in mspace_footprint
- * Adaptations for ptmalloc; thanks to Wolfram Gloger.
- * Reentrant spin locks; thanks to Earl Chew and others
- * Win32 improvements; thanks to Niall Douglas and Earl Chew
- * Add NO_SEGMENT_TRAVERSAL and MAX_RELEASE_CHECK_RATE options
- * Extension hook in malloc_state
- * Various small adjustments to reduce warnings on some compilers
- * Various configuration extensions/changes for more platforms. Thanks
- to all who contributed these.
-
- V2.8.3 Thu Sep 22 11:16:32 2005 Doug Lea (dl at gee)
- * Add max_footprint functions
- * Ensure all appropriate literals are size_t
- * Fix conditional compilation problem for some #define settings
- * Avoid concatenating segments with the one provided
- in create_mspace_with_base
- * Rename some variables to avoid compiler shadowing warnings
- * Use explicit lock initialization.
- * Better handling of sbrk interference.
- * Simplify and fix segment insertion, trimming and mspace_destroy
- * Reinstate REALLOC_ZERO_BYTES_FREES option from 2.7.x
- * Thanks especially to Dennis Flanagan for help on these.
-
- V2.8.2 Sun Jun 12 16:01:10 2005 Doug Lea (dl at gee)
- * Fix memalign brace error.
-
- V2.8.1 Wed Jun 8 16:11:46 2005 Doug Lea (dl at gee)
- * Fix improper #endif nesting in C++
- * Add explicit casts needed for C++
-
- V2.8.0 Mon May 30 14:09:02 2005 Doug Lea (dl at gee)
- * Use trees for large bins
- * Support mspaces
- * Use segments to unify sbrk-based and mmap-based system allocation,
- removing need for emulation on most platforms without sbrk.
- * Default safety checks
- * Optional footer checks. Thanks to William Robertson for the idea.
- * Internal code refactoring
- * Incorporate suggestions and platform-specific changes.
- Thanks to Dennis Flanagan, Colin Plumb, Niall Douglas,
- Aaron Bachmann, Emery Berger, and others.
- * Speed up non-fastbin processing enough to remove fastbins.
- * Remove useless cfree() to avoid conflicts with other apps.
- * Remove internal memcpy, memset. Compilers handle builtins better.
- * Remove some options that no one ever used and rename others.
-
- V2.7.2 Sat Aug 17 09:07:30 2002 Doug Lea (dl at gee)
- * Fix malloc_state bitmap array misdeclaration
-
- V2.7.1 Thu Jul 25 10:58:03 2002 Doug Lea (dl at gee)
- * Allow tuning of FIRST_SORTED_BIN_SIZE
- * Use PTR_UINT as type for all ptr->int casts. Thanks to John Belmonte.
- * Better detection and support for non-contiguousness of MORECORE.
- Thanks to Andreas Mueller, Conal Walsh, and Wolfram Gloger
- * Bypass most of malloc if no frees. Thanks To Emery Berger.
- * Fix freeing of old top non-contiguous chunk im sysmalloc.
- * Raised default trim and map thresholds to 256K.
- * Fix mmap-related #defines. Thanks to Lubos Lunak.
- * Fix copy macros; added LACKS_FCNTL_H. Thanks to Neal Walfield.
- * Branch-free bin calculation
- * Default trim and mmap thresholds now 256K.
-
- V2.7.0 Sun Mar 11 14:14:06 2001 Doug Lea (dl at gee)
- * Introduce independent_comalloc and independent_calloc.
- Thanks to Michael Pachos for motivation and help.
- * Make optional .h file available
- * Allow > 2GB requests on 32bit systems.
- * new WIN32 sbrk, mmap, munmap, lock code from <Walter@GeNeSys-e.de>.
- Thanks also to Andreas Mueller <a.mueller at paradatec.de>,
- and Anonymous.
- * Allow override of MALLOC_ALIGNMENT (Thanks to Ruud Waij for
- helping test this.)
- * memalign: check alignment arg
- * realloc: don't try to shift chunks backwards, since this
- leads to more fragmentation in some programs and doesn't
- seem to help in any others.
- * Collect all cases in malloc requiring system memory into sysmalloc
- * Use mmap as backup to sbrk
- * Place all internal state in malloc_state
- * Introduce fastbins (although similar to 2.5.1)
- * Many minor tunings and cosmetic improvements
- * Introduce USE_PUBLIC_MALLOC_WRAPPERS, USE_MALLOC_LOCK
- * Introduce MALLOC_FAILURE_ACTION, MORECORE_CONTIGUOUS
- Thanks to Tony E. Bennett <tbennett@nvidia.com> and others.
- * Include errno.h to support default failure action.
-
- V2.6.6 Sun Dec 5 07:42:19 1999 Doug Lea (dl at gee)
- * return null for negative arguments
- * Added Several WIN32 cleanups from Martin C. Fong <mcfong at yahoo.com>
- * Add 'LACKS_SYS_PARAM_H' for those systems without 'sys/param.h'
- (e.g. WIN32 platforms)
- * Cleanup header file inclusion for WIN32 platforms
- * Cleanup code to avoid Microsoft Visual C++ compiler complaints
- * Add 'USE_DL_PREFIX' to quickly allow co-existence with existing
- memory allocation routines
- * Set 'malloc_getpagesize' for WIN32 platforms (needs more work)
- * Use 'assert' rather than 'ASSERT' in WIN32 code to conform to
- usage of 'assert' in non-WIN32 code
- * Improve WIN32 'sbrk()' emulation's 'findRegion()' routine to
- avoid infinite loop
- * Always call 'fREe()' rather than 'free()'
-
- V2.6.5 Wed Jun 17 15:57:31 1998 Doug Lea (dl at gee)
- * Fixed ordering problem with boundary-stamping
-
- V2.6.3 Sun May 19 08:17:58 1996 Doug Lea (dl at gee)
- * Added pvalloc, as recommended by H.J. Liu
- * Added 64bit pointer support mainly from Wolfram Gloger
- * Added anonymously donated WIN32 sbrk emulation
- * Malloc, calloc, getpagesize: add optimizations from Raymond Nijssen
- * malloc_extend_top: fix mask error that caused wastage after
- foreign sbrks
- * Add linux mremap support code from HJ Liu
-
- V2.6.2 Tue Dec 5 06:52:55 1995 Doug Lea (dl at gee)
- * Integrated most documentation with the code.
- * Add support for mmap, with help from
- Wolfram Gloger (Gloger@lrz.uni-muenchen.de).
- * Use last_remainder in more cases.
- * Pack bins using idea from colin@nyx10.cs.du.edu
- * Use ordered bins instead of best-fit threshhold
- * Eliminate block-local decls to simplify tracing and debugging.
- * Support another case of realloc via move into top
- * Fix error occuring when initial sbrk_base not word-aligned.
- * Rely on page size for units instead of SBRK_UNIT to
- avoid surprises about sbrk alignment conventions.
- * Add mallinfo, mallopt. Thanks to Raymond Nijssen
- (raymond@es.ele.tue.nl) for the suggestion.
- * Add `pad' argument to malloc_trim and top_pad mallopt parameter.
- * More precautions for cases where other routines call sbrk,
- courtesy of Wolfram Gloger (Gloger@lrz.uni-muenchen.de).
- * Added macros etc., allowing use in linux libc from
- H.J. Lu (hjl@gnu.ai.mit.edu)
- * Inverted this history list
-
- V2.6.1 Sat Dec 2 14:10:57 1995 Doug Lea (dl at gee)
- * Re-tuned and fixed to behave more nicely with V2.6.0 changes.
- * Removed all preallocation code since under current scheme
- the work required to undo bad preallocations exceeds
- the work saved in good cases for most test programs.
- * No longer use return list or unconsolidated bins since
- no scheme using them consistently outperforms those that don't
- given above changes.
- * Use best fit for very large chunks to prevent some worst-cases.
- * Added some support for debugging
-
- V2.6.0 Sat Nov 4 07:05:23 1995 Doug Lea (dl at gee)
- * Removed footers when chunks are in use. Thanks to
- Paul Wilson (wilson@cs.texas.edu) for the suggestion.
-
- V2.5.4 Wed Nov 1 07:54:51 1995 Doug Lea (dl at gee)
- * Added malloc_trim, with help from Wolfram Gloger
- (wmglo@Dent.MED.Uni-Muenchen.DE).
-
- V2.5.3 Tue Apr 26 10:16:01 1994 Doug Lea (dl at g)
-
- V2.5.2 Tue Apr 5 16:20:40 1994 Doug Lea (dl at g)
- * realloc: try to expand in both directions
- * malloc: swap order of clean-bin strategy;
- * realloc: only conditionally expand backwards
- * Try not to scavenge used bins
- * Use bin counts as a guide to preallocation
- * Occasionally bin return list chunks in first scan
- * Add a few optimizations from colin@nyx10.cs.du.edu
-
- V2.5.1 Sat Aug 14 15:40:43 1993 Doug Lea (dl at g)
- * faster bin computation & slightly different binning
- * merged all consolidations to one part of malloc proper
- (eliminating old malloc_find_space & malloc_clean_bin)
- * Scan 2 returns chunks (not just 1)
- * Propagate failure in realloc if malloc returns 0
- * Add stuff to allow compilation on non-ANSI compilers
- from kpv@research.att.com
-
- V2.5 Sat Aug 7 07:41:59 1993 Doug Lea (dl at g.oswego.edu)
- * removed potential for odd address access in prev_chunk
- * removed dependency on getpagesize.h
- * misc cosmetics and a bit more internal documentation
- * anticosmetics: mangled names in macros to evade debugger strangeness
- * tested on sparc, hp-700, dec-mips, rs6000
- with gcc & native cc (hp, dec only) allowing
- Detlefs & Zorn comparison study (in SIGPLAN Notices.)
-
- Trial version Fri Aug 28 13:14:29 1992 Doug Lea (dl at g.oswego.edu)
- * Based loosely on libg++-1.2X malloc. (It retains some of the overall
- structure of old version, but most details differ.)
-
-*/
diff --git a/src/third_party/dlmalloc/dlmalloc.gyp b/src/third_party/dlmalloc/dlmalloc.gyp
deleted file mode 100644
index ac5b394..0000000
--- a/src/third_party/dlmalloc/dlmalloc.gyp
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright (c) 2013 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
- 'variables': {
- 'optimize_target_for_speed': 1,
- },
- 'targets': [
- {
- 'target_name': 'dlmalloc',
- 'type': '<(library)',
- 'sources': [
- 'dlmalloc.c',
- ],
- 'include_dirs': [
- ],
- 'conditions': [
- ['target_os=="win"', {
- # Compile dlmalloc.c as C++ on MSVC.
- 'msvs_settings': {
- 'VCCLCompilerTool': {
- 'AdditionalOptions': ['/TP'],
- },
- },
- },],
- ['target_arch=="android"', {
- 'cflags': [
- '-std=c99',
- ],
- }],
- ],
- },
- ],
-}
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/src/third_party/dlmalloc/dlmalloc_config.h b/src/third_party/dlmalloc/dlmalloc_config.h
deleted file mode 100644
index 7ef0a95..0000000
--- a/src/third_party/dlmalloc/dlmalloc_config.h
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * Copyright 2013 Google Inc. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef _DLMALLOC_CONFIG_H_
-#define _DLMALLOC_CONFIG_H_
-
-#if defined(STARBOARD)
-#include <sys/types.h> // for ssize_t, maybe should add to starboard/types.h
-#include "starboard/configuration.h"
-#include "starboard/configuration_constants.h"
-#include "starboard/mutex.h"
-// Define STARBOARD_IMPLEMENTATION to allow inclusion of an internal Starboard
-// header. This is "okay" because dlmalloc is essentially an implementation
-// detail of Starboard, and it would be statically linked into the Starboard DSO
-// if Starboard was made into one.
-#define STARBOARD_IMPLEMENTATION
-#include "starboard/shared/dlmalloc/page_internal.h"
-#else
-#include <fcntl.h> // For HeapWalker to open files
-#include <inttypes.h>
-#include <stdint.h>
-
-#include "lb_memory_pages.h"
-#include "lb_mutex.h"
-#include "lb_platform.h"
-#endif
-
-// Want this for all our targets so these symbols
-// dont conflict with the normal malloc functions.
-#define USE_DL_PREFIX 1
-
-#if !defined(COBALT_BUILD_TYPE_GOLD)
-#define MALLOC_INSPECT_ALL 1
-#endif
-
-// Only turn this on if needed- it's quite slow.
-//#define DEBUG 1
-#define ABORT_ON_ASSERT_FAILURE 0
-
-#define USE_LOCKS 2 // Use our custom lock implementation
-#define USE_SPIN_LOCKS 0
-/* Locks */
-#if defined(STARBOARD)
-#define MLOCK_T SbMutex
-#define INITIAL_LOCK(lk) (SbMutexCreate(lk) ? 0 : 1)
-#define DESTROY_LOCK(lk) (SbMutexDestroy(lk) ? 0 : 1)
-#define ACQUIRE_LOCK(lk) (SbMutexIsSuccess(SbMutexAcquire(lk)) ? 0 : 1)
-#define RELEASE_LOCK(lk) (SbMutexRelease(lk) ? 0 : 1)
-#define TRY_LOCK(lk) (SbMutexIsSuccess(SbMutexAcquireTry(lk)) ? 0 : 1)
-#elif defined(__LB_XB360__)
-#define MLOCK_T CRITICAL_SECTION
-// The ..., 0 in some of these is to provide a "return value" of 0 to mimic
-// pthread-style API.
-#define ACQUIRE_LOCK(lk) (EnterCriticalSection(lk), 0)
-#define RELEASE_LOCK(lk) LeaveCriticalSection(lk)
-#define TRY_LOCK(lk) TryEnterCriticalSection(lk)
-#define INITIAL_LOCK(lk) (InitializeCriticalSection(lk), 0)
-#define DESTROY_LOCK(lk) (DeleteCriticalSection(lk), 0)
-#else
-#define MLOCK_T lb_shell_mutex_t
-#define INITIAL_LOCK(lk) lb_shell_mutex_init(lk)
-#define DESTROY_LOCK(lk) lb_shell_mutex_destroy(lk)
-#define ACQUIRE_LOCK(lk) lb_shell_mutex_lock(lk)
-#define RELEASE_LOCK(lk) lb_shell_mutex_unlock(lk)
-#define TRY_LOCK(lk) lb_shell_mutex_trylock(lk)
-#endif
-
-#define NEED_GLOBAL_LOCK_INIT
-
-#define HAVE_MREMAP 0
-
-#if defined(STARBOARD)
-#if SB_HAS_QUIRK(NO_FFS)
-#define USE_BUILTIN_FFS 0
-#else
-#define USE_BUILTIN_FFS 1
-#endif // SB_HAS_QUIRK(NO_FFS)
-#else
-#define USE_BUILTIN_FFS 1
-#endif // defined(STARBOARD)
-
-#if defined(STARBOARD)
-#define malloc_getpagesize kSbMemoryPageSize
-#else
-#define malloc_getpagesize LB_PAGE_SIZE
-#endif
-
-// Adapt Starboard configuration to old LBShell-style configuration.
-#if defined(STARBOARD)
-#if SB_API_VERSION >= 12 || SB_HAS(MMAP)
-#define LB_HAS_MMAP
-#endif
-#if SB_API_VERSION < 12 && SB_HAS(VIRTUAL_REGIONS)
-#define LB_HAS_VIRTUAL_REGIONS
-#endif
-#endif // defined(STARBOARD)
-
-#if defined(LB_HAS_MMAP)
-#define HAVE_MMAP 2 // 2 == use our custom implementation
-#else
-#define HAVE_MMAP 0
-#endif
-
-#if defined(LB_HAS_VIRTUAL_REGIONS)
-#define HAVE_MORECORE 1
-#define MORECORE lbshell_morecore
-#else
-#define HAVE_MORECORE 0
-#endif
-
-#if defined(STARBOARD)
-// This is handled in SbAllocateChecked and friends.
-#define MALLOC_FAILURE_ACTION NULL
-#else
-#define MALLOC_FAILURE_ACTION ABORT
-#endif
-
-#if defined(STARBOARD)
-
-#if SB_API_VERSION >= 12 || SB_HAS(MMAP)
-#define DEFAULT_MMAP_THRESHOLD kSbDefaultMmapThreshold
-#endif
-
-#define MALLOC_ALIGNMENT kSbMallocAlignment
-#define FORCEINLINE SB_C_FORCE_INLINE
-#define NOINLINE SB_C_NOINLINE
-#define LACKS_UNISTD_H 1
-#define LACKS_FCNTL_H 1
-#define LACKS_SYS_PARAM_H 1
-#define LACKS_SYS_MMAN_H 1
-#define LACKS_STRINGS_H 1
-#define LACKS_SYS_TYPES_H 1
-#define LACKS_ERRNO_H 1
-#define LACKS_STDLIB_H 1
-#define LACKS_SCHED_H 1
-#define LACKS_TIME_H 1
-#undef EINVAL
-#define EINVAL 1
-#undef ENOMEM
-#define ENOMEM 1
-
-// Compatibility patching back to LBShell names.
-// TODO: Collapse this out when LBShell is gone.
-#define lb_virtual_mem_t SbPageVirtualMemory
-#define lb_get_total_system_memory SbPageGetTotalPhysicalMemoryBytes
-#define lb_get_mmapped_bytes SbPageGetMappedBytes
-#define lb_get_virtual_region_size SbPageGetVirtualRegionSize
-#define lb_reserve_virtual_region SbPageReserveVirtualRegion
-#define lb_unmap_and_free_physical SbPageUnmapAndFreePhysical
-#define lb_release_virtual_region SbPageReleaseVirtualRegion
-#define lb_allocate_physical_and_map SbPageAllocatePhysicalAndMap
-
-// Other compatibility adjustments, forcing system calls back to Starboard.
-#include "starboard/common/log.h"
-#include "starboard/directory.h"
-#include "starboard/file.h"
-#define write SbFileWrite
-#define close SbFileClose
-
-void oom_fprintf(int ignored, const char *format, ...) {
- va_list arguments;
- va_start(arguments, format);
- SbLogRawFormat(format, arguments);
- va_end(arguments);
-}
-
-#elif defined(__LB_ANDROID__)
-#define MALLOC_ALIGNMENT ((size_t)16U)
-
-#elif defined(__LB_LINUX__)
-#define MALLOC_ALIGNMENT ((size_t)16U)
-
-#elif defined(__LB_PS3__)
-#define MALLOC_ALIGNMENT ((size_t)16U)
-#define DEFAULT_MMAP_THRESHOLD ((size_t)(256 * 1024U))
-
-#elif defined(__LB_PS4__)
-#define MALLOC_ALIGNMENT ((size_t)16U)
-// "Large" blocks come from a separate VM region.
-#define DEFAULT_MMAP_THRESHOLD ((size_t)(256 * 1024U))
-
-#elif defined(__LB_WIIU__)
-#define MALLOC_ALIGNMENT ((size_t)8U)
-#define DEFAULT_MMAP_THRESHOLD MAX_SIZE_T
-
-#elif defined(__LB_XB1__)
-#define MALLOC_ALIGNMENT ((size_t)16U)
-#define DEFAULT_MMAP_THRESHOLD ((size_t)(256 * 1024U))
-
-#define FORCEINLINE __forceinline
-
-#elif defined(__LB_XB360__)
-#define MALLOC_ALIGNMENT ((size_t)16U)
-#define DEFAULT_MMAP_THRESHOLD ((size_t)(256 * 1024U))
-#else
-#error Platform-specific settings for dlmalloc must be defined here.
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-void dl_malloc_init();
-void dl_malloc_finalize();
-void dlmalloc_ranges_np(uintptr_t *start1, uintptr_t *end1,
- uintptr_t *start2, uintptr_t *end2,
- uintptr_t *start3, uintptr_t *end3);
-#if !defined(COBALT_BUILD_TYPE_GOLD)
-void lbshell_inspect_mmap_heap(void(*handler)(void*, void *, size_t, void*),
- void* arg);
-void dldump_heap();
-#endif
-int dlmalloc_stats_np(size_t *system_size, size_t *in_use_size);
-
-static void* lbshell_morecore(ssize_t size);
-static void* lbshell_mmap(size_t size);
-static int lbshell_munmap(void* addr, size_t size);
-void oom_fprintf(int fd, const char *fmt, ...);
-#ifdef __cplusplus
-} /* end of extern "C" */
-#endif /* __cplusplus */
-
-#endif /* ifndef _DLMALLOC_CONFIG_H_ */
diff --git a/src/third_party/skia/include/private/SkVx.h b/src/third_party/skia/include/private/SkVx.h
index 7e71da6..2897644 100644
--- a/src/third_party/skia/include/private/SkVx.h
+++ b/src/third_party/skia/include/private/SkVx.h
@@ -78,6 +78,11 @@
T operator[](int i) const { return i < N/2 ? lo[i] : hi[i-N/2]; }
T& operator[](int i) { return i < N/2 ? lo[i] : hi[i-N/2]; }
+ Vec<N,T>& operator=(const Vec<N,T>& other) {
+ lo = other.lo;
+ hi = other.hi;
+ return *this;
+ }
static Vec Load(const void* ptr) {
Vec v;
@@ -103,6 +108,10 @@
T operator[](int) const { return val; }
T& operator[](int) { return val; }
+ Vec<1,T>& operator=(const Vec<1,T>& other) {
+ val = other.val;
+ return *this;
+ }
static Vec Load(const void* ptr) {
Vec v;
diff --git a/src/third_party/skia/infra/bots/android_compile/trigger_wait_ac_task.py b/src/third_party/skia/infra/bots/android_compile/trigger_wait_ac_task.py
deleted file mode 100644
index 538b4f2..0000000
--- a/src/third_party/skia/infra/bots/android_compile/trigger_wait_ac_task.py
+++ /dev/null
@@ -1,221 +0,0 @@
-#!/usr/bin/env python
-# Copyright (c) 2018 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Script that triggers and waits for tasks on android-compile.skia.org"""
-
-import base64
-import hashlib
-import json
-import math
-import optparse
-import os
-import requests
-import subprocess
-import sys
-import time
-
-INFRA_BOTS_DIR = os.path.abspath(os.path.realpath(os.path.join(
- os.path.dirname(os.path.abspath(__file__)), os.pardir)))
-sys.path.insert(0, INFRA_BOTS_DIR)
-import utils
-
-
-ANDROID_COMPILE_BUCKET = 'android-compile-tasks'
-
-GS_RETRIES = 5
-GS_RETRY_WAIT_BASE = 15
-
-POLLING_FREQUENCY_SECS = 10
-DEADLINE_SECS = 2* 60 * 60 # 2 hours.
-
-INFRA_FAILURE_ERROR_MSG = (
- '\n\n'
- 'Your run failed due to unknown infrastructure failures.\n'
- 'Please contact rmistry@ or the trooper from '
- 'http://skia-tree-status.appspot.com/trooper\n'
- 'Sorry for the inconvenience!\n'
-)
-
-
-class AndroidCompileException(Exception):
- pass
-
-
-def _create_task_dict(options):
- """Creates a dict representation of the requested task."""
- params = {}
- params['lunch_target'] = options.lunch_target
- params['mmma_targets'] = options.mmma_targets
- params['issue'] = options.issue
- params['patchset'] = options.patchset
- params['hash'] = options.hash
- return params
-
-
-def _get_gs_bucket():
- """Returns the Google storage bucket with the gs:// prefix."""
- return 'gs://%s' % ANDROID_COMPILE_BUCKET
-
-
-def _write_to_storage(task):
- """Writes the specified compile task to Google storage."""
- with utils.tmp_dir():
- json_file = os.path.join(os.getcwd(), _get_task_file_name(task))
- with open(json_file, 'w') as f:
- json.dump(task, f)
- subprocess.check_call(['gsutil', 'cp', json_file, '%s/' % _get_gs_bucket()])
- print 'Created %s/%s' % (_get_gs_bucket(), os.path.basename(json_file))
-
-
-def _get_task_file_name(task):
- """Returns the file name of the compile task. Eg: ${issue}-${patchset}.json"""
- return '%s-%s-%s.json' % (task['lunch_target'], task['issue'],
- task['patchset'])
-
-
-# Checks to see if task already exists in Google storage.
-# If the task has completed then the Google storage file is deleted.
-def _does_task_exist_in_storage(task):
- """Checks to see if the corresponding file of the task exists in storage.
-
- If the file exists and the task has already completed then the storage file is
- deleted and False is returned.
- """
- gs_file = '%s/%s' % (_get_gs_bucket(), _get_task_file_name(task))
- try:
- output = subprocess.check_output(['gsutil', 'cat', gs_file])
- except subprocess.CalledProcessError:
- print 'Task does not exist in Google storage'
- return False
- taskJSON = json.loads(output)
- if taskJSON.get('done'):
- print 'Task exists in Google storage and has completed.'
- print 'Deleting it so that a new run can be scheduled.'
- subprocess.check_call(['gsutil', 'rm', gs_file])
- return False
- else:
- print 'Tasks exists in Google storage and is still running.'
- return True
-
-
-def _trigger_task(options):
- """Triggers a task on the compile server by creating a file in storage."""
- task = _create_task_dict(options)
- # Check to see if file already exists in Google Storage.
- if not _does_task_exist_in_storage(task):
- _write_to_storage(task)
- return task
-
-
-def trigger_and_wait(options):
- """Triggers a task on the compile server and waits for it to complete."""
- task = _trigger_task(options)
- print 'Android Compile Task for %d/%d has been successfully added to %s.' % (
- options.issue, options.patchset, ANDROID_COMPILE_BUCKET)
- print '%s will be polled every %d seconds.' % (ANDROID_COMPILE_BUCKET,
- POLLING_FREQUENCY_SECS)
-
- # Now poll the Google storage file till the task completes or till deadline
- # is hit.
- time_started_polling = time.time()
- while True:
- if (time.time() - time_started_polling) > DEADLINE_SECS:
- raise AndroidCompileException(
- 'Task did not complete in the deadline of %s seconds.' % (
- DEADLINE_SECS))
-
- # Get the status of the task.
- gs_file = '%s/%s' % (_get_gs_bucket(), _get_task_file_name(task))
-
- for retry in range(GS_RETRIES):
- try:
- output = subprocess.check_output(['gsutil', 'cat', gs_file])
- except subprocess.CalledProcessError:
- raise AndroidCompileException('The %s file no longer exists.' % gs_file)
- try:
- ret = json.loads(output)
- break
- except ValueError, e:
- print 'Received output that could not be converted to json: %s' % output
- print e
- if retry == (GS_RETRIES-1):
- print '%d retries did not help' % GS_RETRIES
- raise
- waittime = GS_RETRY_WAIT_BASE * math.pow(2, retry)
- print 'Retry in %d seconds.' % waittime
- time.sleep(waittime)
-
- if ret.get('infra_failure'):
- if ret.get('error'):
- raise AndroidCompileException('Run failed with:\n\n%s\n' % ret['error'])
- else:
- # Use a general purpose error message.
- raise AndroidCompileException(INFRA_FAILURE_ERROR_MSG)
-
- if ret.get('done'):
- if not ret.get('is_master_branch', True):
- print 'The Android Framework Compile bot only works for patches and'
- print 'hashes from the master branch.'
- return 0
- elif ret['withpatch_success']:
- print 'Your run was successfully completed.'
- print 'With patch logs are here: %s' % ret['withpatch_log']
- return 0
- elif ret['nopatch_success']:
- raise AndroidCompileException('The build with the patch failed and the '
- 'build without the patch succeeded. This means that the patch '
- 'causes Android to fail compilation.\n\n'
- 'With patch logs are here: %s\n\n'
- 'No patch logs are here: %s\n\n'
- 'You can force sync of the checkout if needed here: %s\n\n' % (
- ret['withpatch_log'], ret['nopatch_log'],
- 'https://skia-android-compile.corp.goog/'))
- else:
- print ('Both with patch and no patch builds failed. This means that the'
- ' Android tree is currently broken. Marking this bot as '
- 'successful')
- print 'With patch logs are here: %s' % ret['withpatch_log']
- print 'No patch logs are here: %s' % ret['nopatch_log']
- return 0
-
- # Print status of the task.
- print 'Task: %s\n' % pretty_task_str(ret)
- time.sleep(POLLING_FREQUENCY_SECS)
-
-
-def pretty_task_str(task):
- status = 'Not picked up by server yet'
- if task.get('task_id'):
- status = 'Running withpatch compilation'
- if task.get('withpatch_log'):
- status = 'Running nopatch compilation'
- return '[id: %s, checkout: %s, status: %s]' % (
- task.get('task_id'), task.get('checkout'), status)
-
-
-def main():
- option_parser = optparse.OptionParser()
- option_parser.add_option(
- '', '--lunch_target', type=str, default='',
- help='The lunch target the android compile bot should build with.')
- option_parser.add_option(
- '', '--mmma_targets', type=str, default='',
- help='The comma-separated mmma targets the android compile bot should '
- 'build.')
- option_parser.add_option(
- '', '--issue', type=int, default=0,
- help='The Gerrit change number to get the patch from.')
- option_parser.add_option(
- '', '--patchset', type=int, default=0,
- help='The Gerrit change patchset to use.')
- option_parser.add_option(
- '', '--hash', type=str, default='',
- help='The Skia repo hash to compile against.')
- options, _ = option_parser.parse_args()
- sys.exit(trigger_and_wait(options))
-
-
-if __name__ == '__main__':
- main()
diff --git a/src/third_party/skia/infra/bots/recipes/android_compile.expected/android_compile_nontrybot.json b/src/third_party/skia/infra/bots/recipes/android_compile.expected/android_compile_nontrybot.json
deleted file mode 100644
index 9301649..0000000
--- a/src/third_party/skia/infra/bots/recipes/android_compile.expected/android_compile_nontrybot.json
+++ /dev/null
@@ -1,29 +0,0 @@
-[
- {
- "cmd": [],
- "name": "RECIPE CRASH (Uncaught exception)",
- "~followup_annotations": [
- "@@@STEP_EXCEPTION@@@",
- "The recipe has crashed at point 'Uncaught exception'!",
- "",
- "Traceback (most recent call last):",
- " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/engine.py\", in run_steps",
- " raw_result = recipe_obj.run_steps(api, engine)",
- " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/recipe_deps.py\", in run_steps",
- " properties_def, api=api)",
- " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/property_invoker.py\", in invoke_with_properties",
- " arg_names, **additional_args)",
- " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/property_invoker.py\", in _invoke_with_properties",
- " return callable_obj(*props, **additional_args)",
- " File \"RECIPE_REPO[skia]/infra/bots/recipes/android_compile.py\", line 36, in RunSteps",
- " raise Exception('%s can only be run as a trybot.' % api.vars.builder_name)",
- "Exception: Build-Debian9-Clang-cf_x86_phone-eng-Android_Framework can only be run as a trybot."
- ]
- },
- {
- "failure": {
- "humanReason": "Uncaught Exception: Exception('Build-Debian9-Clang-cf_x86_phone-eng-Android_Framework can only be run as a trybot.',)"
- },
- "name": "$result"
- }
-]
\ No newline at end of file
diff --git a/src/third_party/skia/infra/bots/recipes/android_compile.expected/android_compile_sdk_trybot.json b/src/third_party/skia/infra/bots/recipes/android_compile.expected/android_compile_sdk_trybot.json
deleted file mode 100644
index c77f008..0000000
--- a/src/third_party/skia/infra/bots/recipes/android_compile.expected/android_compile_sdk_trybot.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[
- {
- "cmd": [
- "python",
- "[START_DIR]/skia/infra/bots/android_compile/trigger_wait_ac_task.py",
- "--lunch_target",
- "sdk",
- "--mmma_targets",
- "external/skia",
- "--issue",
- "456789",
- "--patchset",
- "12"
- ],
- "name": "Trigger and wait for task on android compile server"
- },
- {
- "name": "$result"
- }
-]
\ No newline at end of file
diff --git a/src/third_party/skia/infra/bots/recipes/android_compile.expected/android_compile_trybot.json b/src/third_party/skia/infra/bots/recipes/android_compile.expected/android_compile_trybot.json
deleted file mode 100644
index 90f43ef..0000000
--- a/src/third_party/skia/infra/bots/recipes/android_compile.expected/android_compile_trybot.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[
- {
- "cmd": [
- "python",
- "[START_DIR]/skia/infra/bots/android_compile/trigger_wait_ac_task.py",
- "--lunch_target",
- "cf_x86_phone-eng",
- "--mmma_targets",
- "frameworks/base/core/jni,frameworks/base/libs/hwui,external/skia",
- "--issue",
- "456789",
- "--patchset",
- "12"
- ],
- "name": "Trigger and wait for task on android compile server"
- },
- {
- "name": "$result"
- }
-]
\ No newline at end of file
diff --git a/src/third_party/skia/infra/bots/recipes/android_compile.expected/android_compile_trybot_failure.json b/src/third_party/skia/infra/bots/recipes/android_compile.expected/android_compile_trybot_failure.json
deleted file mode 100644
index 7425844..0000000
--- a/src/third_party/skia/infra/bots/recipes/android_compile.expected/android_compile_trybot_failure.json
+++ /dev/null
@@ -1,45 +0,0 @@
-[
- {
- "cmd": [
- "python",
- "[START_DIR]/skia/infra/bots/android_compile/trigger_wait_ac_task.py",
- "--lunch_target",
- "cf_x86_phone-eng",
- "--mmma_targets",
- "frameworks/base/core/jni,frameworks/base/libs/hwui,external/skia",
- "--issue",
- "456789",
- "--patchset",
- "12"
- ],
- "name": "Trigger and wait for task on android compile server",
- "~followup_annotations": [
- "@@@STEP_FAILURE@@@"
- ]
- },
- {
- "cmd": [
- "gsutil",
- "cat",
- "gs://android-compile-tasks/cf_x86_phone-eng-456789-12.json"
- ],
- "name": "Get task log links",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"nopatch_log\": \"link2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"withpatch_log\": \"link1\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@STEP_LINK@withpatch compilation log link@link1@@@",
- "@@@STEP_LINK@nopatch compilation log link@link2@@@",
- "@@@STEP_LINK@force sync link@https://skia-android-compile.corp.goog/@@@"
- ]
- },
- {
- "failure": {
- "failure": {},
- "humanReason": "Step('Trigger and wait for task on android compile server') (retcode: 1)"
- },
- "name": "$result"
- }
-]
\ No newline at end of file
diff --git a/src/third_party/skia/infra/bots/recipes/android_compile.expected/android_compile_unrecognized_target.json b/src/third_party/skia/infra/bots/recipes/android_compile.expected/android_compile_unrecognized_target.json
deleted file mode 100644
index 4b71020..0000000
--- a/src/third_party/skia/infra/bots/recipes/android_compile.expected/android_compile_unrecognized_target.json
+++ /dev/null
@@ -1,29 +0,0 @@
-[
- {
- "cmd": [],
- "name": "RECIPE CRASH (Uncaught exception)",
- "~followup_annotations": [
- "@@@STEP_EXCEPTION@@@",
- "The recipe has crashed at point 'Uncaught exception'!",
- "",
- "Traceback (most recent call last):",
- " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/engine.py\", in run_steps",
- " raw_result = recipe_obj.run_steps(api, engine)",
- " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/recipe_deps.py\", in run_steps",
- " properties_def, api=api)",
- " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/property_invoker.py\", in invoke_with_properties",
- " arg_names, **additional_args)",
- " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/property_invoker.py\", in _invoke_with_properties",
- " return callable_obj(*props, **additional_args)",
- " File \"RECIPE_REPO[skia]/infra/bots/recipes/android_compile.py\", line 46, in RunSteps",
- " api.vars.builder_name)",
- "Exception: Lunch target in Build-Debian9-Clang-unrecognized-Android_Framework is not recognized."
- ]
- },
- {
- "failure": {
- "humanReason": "Uncaught Exception: Exception('Lunch target in Build-Debian9-Clang-unrecognized-Android_Framework is not recognized.',)"
- },
- "name": "$result"
- }
-]
\ No newline at end of file
diff --git a/src/third_party/skia/infra/bots/recipes/android_compile.py b/src/third_party/skia/infra/bots/recipes/android_compile.py
deleted file mode 100644
index fc982b9..0000000
--- a/src/third_party/skia/infra/bots/recipes/android_compile.py
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 2018 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-
-import math
-
-
-DEPS = [
- 'recipe_engine/context',
- 'recipe_engine/json',
- 'recipe_engine/path',
- 'recipe_engine/properties',
- 'recipe_engine/raw_io',
- 'recipe_engine/step',
- 'vars',
-]
-
-CF_X86_PHONE_ENG_LUNCH_TARGET = 'cf_x86_phone-eng'
-SDK_LUNCH_TARGET = 'sdk'
-
-LUNCH_TARGET_TO_MMMA_TARGETS = {
- CF_X86_PHONE_ENG_LUNCH_TARGET: (
- 'frameworks/base/core/jni,frameworks/base/libs/hwui,external/skia'),
- SDK_LUNCH_TARGET: 'external/skia',
-}
-
-
-def RunSteps(api):
- api.vars.setup()
- if not api.vars.is_trybot:
- # This bot currently only supports trybot runs because:
- # Non-trybot runs could fail if the Android tree is red. We mitigate this
- # for trybot runs by verifying that runs without the patch succeed. We do
- # not currently have a way to do the same for non-trybot runs.
- raise Exception('%s can only be run as a trybot.' % api.vars.builder_name)
-
- if CF_X86_PHONE_ENG_LUNCH_TARGET in api.vars.builder_name:
- lunch_target = CF_X86_PHONE_ENG_LUNCH_TARGET
- mmma_targets = LUNCH_TARGET_TO_MMMA_TARGETS[lunch_target]
- elif SDK_LUNCH_TARGET in api.vars.builder_name:
- lunch_target = SDK_LUNCH_TARGET
- mmma_targets = LUNCH_TARGET_TO_MMMA_TARGETS[SDK_LUNCH_TARGET]
- else:
- raise Exception('Lunch target in %s is not recognized.' %
- api.vars.builder_name)
-
- infrabots_dir = api.path['start_dir'].join('skia', 'infra', 'bots')
- trigger_wait_ac_script = infrabots_dir.join('android_compile',
- 'trigger_wait_ac_task.py')
-
- # Trigger a compile task on the android compile server and wait for it to
- # complete.
- cmd = ['python', trigger_wait_ac_script,
- '--lunch_target', lunch_target,
- '--mmma_targets', mmma_targets,
- '--issue', api.vars.issue,
- '--patchset', api.vars.patchset,
- ]
- try:
- api.step('Trigger and wait for task on android compile server', cmd=cmd)
- except api.step.StepFailure as e:
- # Add withpatch and nopatch logs as links (if they exist).
- gs_file = 'gs://android-compile-tasks/%s-%s-%s.json' % (
- lunch_target, api.vars.issue, api.vars.patchset)
- step_result = api.step('Get task log links',
- ['gsutil', 'cat', gs_file],
- stdout=api.json.output())
- task_json = step_result.stdout
- if task_json.get('withpatch_log'):
- api.step.active_result.presentation.links[
- 'withpatch compilation log link'] = task_json['withpatch_log']
- if task_json.get('nopatch_log'):
- api.step.active_result.presentation.links[
- 'nopatch compilation log link'] = task_json['nopatch_log']
- # Add link to force sync of the Android checkout.
- api.step.active_result.presentation.links['force sync link'] = (
- 'https://skia-android-compile.corp.goog/')
- raise e
-
-
-def GenTests(api):
- yield(
- api.test('android_compile_trybot') +
- api.properties.tryserver(
- gerrit_project='skia',
- gerrit_url='https://skia-review.googlesource.com/',
- ) +
- api.properties(
- buildername='Build-Debian9-Clang-cf_x86_phone-eng-Android_Framework',
- path_config='kitchen',
- swarm_out_dir='[SWARM_OUT_DIR]',
- repository='https://skia.googlesource.com/skia.git',
- )
- )
-
- yield(
- api.test('android_compile_sdk_trybot') +
- api.properties.tryserver(
- gerrit_project='skia',
- gerrit_url='https://skia-review.googlesource.com/',
- ) +
- api.properties(
- buildername='Build-Debian9-Clang-host-sdk-Android_Framework',
- path_config='kitchen',
- swarm_out_dir='[SWARM_OUT_DIR]',
- repository='https://skia.googlesource.com/skia.git',
- )
- )
-
- yield(
- api.test('android_compile_unrecognized_target') +
- api.properties.tryserver(
- gerrit_project='skia',
- gerrit_url='https://skia-review.googlesource.com/',
- ) +
- api.properties(
- buildername='Build-Debian9-Clang-unrecognized-Android_Framework',
- path_config='kitchen',
- swarm_out_dir='[SWARM_OUT_DIR]',
- repository='https://skia.googlesource.com/skia.git',
- ) +
- api.expect_exception('Exception')
- )
-
- yield(
- api.test('android_compile_trybot_failure') +
- api.properties.tryserver(
- gerrit_project='skia',
- gerrit_url='https://skia-review.googlesource.com/',
- ) +
- api.properties(
- buildername='Build-Debian9-Clang-cf_x86_phone-eng-Android_Framework',
- path_config='kitchen',
- swarm_out_dir='[SWARM_OUT_DIR]',
- repository='https://skia.googlesource.com/skia.git',
- ) +
- api.step_data('Trigger and wait for task on android compile server',
- retcode=1) +
- api.step_data('Get task log links',
- stdout=api.raw_io.output(
- '{"withpatch_log":"link1", "nopatch_log":"link2"}'))
- )
-
- yield(
- api.test('android_compile_nontrybot') +
- api.properties(
- buildername='Build-Debian9-Clang-cf_x86_phone-eng-Android_Framework',
- path_config='kitchen',
- swarm_out_dir='[SWARM_OUT_DIR]',
- repository='https://skia.googlesource.com/skia.git',
- revision='abc123',
- ) +
- api.expect_exception('Exception')
- )
diff --git a/src/third_party/skia/src/gpu/text/GrTextBlob.h b/src/third_party/skia/src/gpu/text/GrTextBlob.h
index 9ae688a..ddea88d 100644
--- a/src/third_party/skia/src/gpu/text/GrTextBlob.h
+++ b/src/third_party/skia/src/gpu/text/GrTextBlob.h
@@ -278,15 +278,7 @@
SubRun(Run* run, const SkStrikeSpec& strikeSpec, GrColor color)
: fColor{color}
, fRun{run}
-#if defined(STARBOARD)
-// Our raspi devices still use gcc 4.8, which has many bugs regarding
-// initialization syntax (for example:
-// http://gcc.gnu.org/bugzilla/show_bug.cgi?id=56976).
- , fStrikeSpec(strikeSpec)
-#else
- , fStrikeSpec{strikeSpec}
-#endif
- {}
+ , fStrikeSpec{strikeSpec} {}
// When used with emplace_back, this constructs a SubRun from the last SubRun in an array.
//SubRun(SkSTArray<1, SubRun>* subRunList)
diff --git a/src/tools/raspi_image/README.md b/src/tools/raspi_image/README.md
new file mode 100644
index 0000000..abbb2aa
--- /dev/null
+++ b/src/tools/raspi_image/README.md
@@ -0,0 +1,19 @@
+### Raspi-2 image tool
+
+This script customizes standard Raspbian Lite release image for running
+Cobalt.
+
+There are a few standard Linux tools expected to be available on the host,
+and QEMU version 5.1 or newer is needed for native Raspberry emulation.
+
+On Debian based systems, QEMU should be available via:
+
+ `apt install qemu-system-arm`
+
+Additionally, `dcfldd` disk image tool is required, install via:
+
+ `apt install dcfldd`
+
+Caution: The script requires multiple commands to be run with `sudo` under
+superuser privileges. Please use caution when running and verify the commands
+executed step by step, as necessary.
diff --git a/src/tools/raspi_image/auto-resize-partition.sh b/src/tools/raspi_image/auto-resize-partition.sh
new file mode 100644
index 0000000..e90f119
--- /dev/null
+++ b/src/tools/raspi_image/auto-resize-partition.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+if [ -e /boot/1stboot.txt ]; then
+ export PATH=$PATH:/usr/sbin:/sbin
+ raspi-config --expand-rootfs
+ rm /boot/1stboot.txt
+ reboot
+fi
diff --git a/src/tools/raspi_image/crontab.txt b/src/tools/raspi_image/crontab.txt
new file mode 100644
index 0000000..2558957
--- /dev/null
+++ b/src/tools/raspi_image/crontab.txt
@@ -0,0 +1 @@
+@reboot /boot/auto-resize-partition.sh
diff --git a/src/tools/raspi_image/make_image.sh b/src/tools/raspi_image/make_image.sh
new file mode 100755
index 0000000..a679ee2
--- /dev/null
+++ b/src/tools/raspi_image/make_image.sh
@@ -0,0 +1,263 @@
+#!/bin/bash
+#
+# Copyright 2021 The Cobalt Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the 'License');
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an 'AS IS' BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This script downloads and customizes a Raspbian image for running
+# Cobalt. Qemu is used for running on-target customization steps.
+# Please see README for full description
+
+# Image versions to use
+BASEDIR=raspbian_lite-2020-02-14
+BASENAME=2020-02-13-raspbian-buster-lite
+
+# Image and script sources
+IMAGE_URL=http://downloads.raspberrypi.org/raspbian_lite/images
+SHRINK_SCRIPT="https://raw.githubusercontent.com/aoakley/cotswoldjam/\
+master/raspbian-shrink/raspbian-shrink"
+
+# Set up locations for temporary files
+STAGING_DIR=/tmp/pi2_image
+IMG_FILE=${STAGING_DIR}/${BASENAME}.img
+SHRUNK_IMG_FILE=${STAGING_DIR}/${BASENAME}_shrunk_$(date +"%Y%m%d").img
+BOOT_MOUNT=${STAGING_DIR}/boot
+ROOT_MOUNT=${STAGING_DIR}/rootfs
+
+# Reuse some command args
+RUN_ON_PI="ssh -o StrictHostKeyChecking=no -p 8022 pi@localhost sudo"
+WGET="wget --show-progress -nc"
+
+# Check expected tools are available
+function tools_check() {
+ if ! command -v qemu-system-arm --version &> /dev/null ; then
+ echo Couldnt find QEMU, see README for instructions
+ return
+ fi
+ if ! command -v dcfldd --version &> /dev/null ; then
+ echo Couldnt find dcfldd, see README for instructions
+ fi
+}
+
+function fetch_image() {
+ mkdir -p ${STAGING_DIR}
+ ${WGET} ${IMAGE_URL}/${BASEDIR}/${BASENAME}.zip \
+ -O ${STAGING_DIR}/${BASENAME}.zip
+ if [[ ! -f ${IMG_FILE} ]]; then
+ unzip ${STAGING_DIR}/${BASENAME}.zip -d ${STAGING_DIR}
+ fi
+}
+
+# Mount the image file boot partition
+function mount_boot() {
+ BOOT_LOCATION=$(fdisk -l ${IMG_FILE}| egrep img1| tr -s ' '| cut -f 2 -d " ")
+ MOUNT_OFFSET=$(bc <<< "$BOOT_LOCATION * 512")
+ mkdir -p ${BOOT_MOUNT}
+ sudo mount -v -o offset=${MOUNT_OFFSET} ${IMG_FILE} ${BOOT_MOUNT}
+}
+
+# Mount the image file root partition
+function mount_root() {
+ BOOT_LOCATION=$(fdisk -l ${IMG_FILE}| egrep img2| tr -s ' '| cut -f 2 -d " ")
+ MOUNT_OFFSET=$(bc <<< "$BOOT_LOCATION * 512")
+ mkdir -p ${ROOT_MOUNT}
+ sudo mount -v -o offset=${MOUNT_OFFSET} -t ext4 ${IMG_FILE} ${ROOT_MOUNT}
+}
+
+function unmount_root() {
+ sudo umount ${ROOT_MOUNT}
+}
+function unmount_boot() {
+ sudo umount ${BOOT_MOUNT}
+}
+
+function modify_boot() {
+ # Set GPU/main memory split
+ sudo sh -c "echo gpu_mem=512 >> ${BOOT_MOUNT}/config.txt"
+ # Ensure 1st boot image resize runs
+ sudo touch ${BOOT_MOUNT}/1stboot.txt
+ # Drop auto-resize script in place, crontab entry will be added later
+ sudo cp -v auto-resize-partition.sh ${BOOT_MOUNT}/
+ sudo cp -v crontab.txt ${BOOT_MOUNT}/
+ sudo chmod +x ${BOOT_MOUNT}/auto-resize-partition.sh
+}
+
+function modify_root() {
+ # Enable SSH by default
+ sudo rm ${ROOT_MOUNT}/etc/{rc2.d,rc3.d,rc4.d,rc5.d}/K01ssh
+ for i in 2 3 4 5 ; do
+ sudo ln -s ../init.d/ssh ${ROOT_MOUNT}/etc/rc${i}.d/S02ssh
+ done
+ sudo ln -s /lib/systemd/system/ssh.service \
+ ${ROOT_MOUNT}/etc/systemd/system/multi-user.target.wants/ssh.service
+ sudo ln -s /lib/systemd/system/ssh.service \
+ ${ROOT_MOUNT}/etc/systemd/system/sshd.service
+}
+
+function get_kernel() {
+ # Get matching kernel and DTB files from boot partition
+ cp ${BOOT_MOUNT}/kernel7.img ${STAGING_DIR}
+ cp ${BOOT_MOUNT}/bcm2709-rpi-2-b.dtb ${STAGING_DIR}
+}
+
+function run_qemu() {
+ tools_check
+ # Ensure image is in usable size for Qemu
+ qemu-img resize ${IMG_FILE} 4G
+ # Boot qemu in background
+ qemu-system-arm $@ \
+ -machine raspi2 \
+ -drive file=${IMG_FILE},format=raw,if=sd \
+ -dtb ${STAGING_DIR}/bcm2709-rpi-2-b.dtb \
+ -kernel ${STAGING_DIR}/kernel7.img \
+ -append 'rw earlycon=pl011,0x3f201000 console=ttyAMA0 \
+ loglevel=8 root=/dev/mmcblk0p2 fsck.repair=yes \
+ net.ifnames=0 rootwait memtest=1 \
+ dwc_otg.fiq_fsm_enable=0' \
+ -m 1G -smp 4 \
+ -no-reboot \
+ -netdev user,id=net0,hostfwd=tcp::8022-:22 \
+ -usb -device usb-kbd -device usb-tablet \
+ -device usb-net,netdev=net0
+}
+
+function run_qemu_backgrounded() {
+ run_qemu -daemonize
+}
+
+# Useful for local image testing
+function run_qemu_console() {
+ run_qemu -serial stdio
+}
+
+function kill_qemu() {
+ pkill -9 qemu-system-arm
+}
+
+function deploy_key() {
+ echo Copying SSH key to target, please use password \'raspberry\' at \
+ the login prompt.
+ ssh-copy-id -p 8022 -o StrictHostKeyChecking=no pi@localhost
+ ${RUN_ON_PI} echo ssh connection works
+}
+
+function wait_for_qemu() {
+ # Loop until SSH connection attmpt responds with permission denied
+ while :; do
+ echo "waiting for SSH to be up"
+ cmd=$(ssh -o StrictHostKeyChecking=no -o ConnectTimeout=3 -o BatchMode=yes \
+ localhost -p 8022 echo up 2>&1)
+ OUTPUT=$?
+ if [ $OUTPUT -eq 255 ]; then
+ if [[ $cmd == *"Permission"* ]] ; then
+ echo "SSH seems up"
+ break
+ fi
+ fi
+ echo $cmd_out
+ sleep 2
+ done
+}
+
+function get_shrink_script() {
+ wget -nc ${SHRINK_SCRIPT} -O ${STAGING_DIR}/raspbian-shrink
+ chmod +x ${STAGING_DIR}/raspbian-shrink
+}
+
+# Resize root partition to fill image size
+function first_run_expand() {
+ ${RUN_ON_PI} raspi-config --expand-rootfs
+ ${RUN_ON_PI} reboot; sleep 1
+ kill_qemu
+}
+
+# Turn off swapfile
+function disable_swap() {
+ ${RUN_ON_PI} dphys-swapfile swapoff
+ ${RUN_ON_PI} dphys-swapfile uninstall
+ ${RUN_ON_PI} systemctl disable dphys-swapfile.service
+}
+
+# Clean up large footprint packages
+function clean_unnecessary_packages() {
+ ${RUN_ON_PI} apt-get purge -qy \
+ libraspberrypi-doc \
+ avahi-daemon
+}
+
+# Update APT sources and install required libraries
+function run_apt_updates() {
+ ${RUN_ON_PI} apt-get -qy update
+ ${RUN_ON_PI} apt-get install -y --auto-remove libpulse-dev libasound2-dev \
+ libavformat-dev libavresample-dev
+ # We are pulling in new deps from above, so lets fully upgrade.
+ ${RUN_ON_PI} apt-get -qy upgrade
+}
+
+function install_cron_entry() {
+ # Fully replaces crontab, which has no other entries anyway
+ ${RUN_ON_PI} crontab /boot/crontab.txt
+}
+
+function pre_shrink_cleanup() {
+ ${RUN_ON_PI} rm -rf /var/cache
+ ${RUN_ON_PI} sync
+}
+
+# Run the shrink script
+function shrink_image() {
+ tools_check
+ sudo ${STAGING_DIR}/raspbian-shrink ${IMG_FILE} \
+ ${SHRUNK_IMG_FILE}
+ echo =====
+ echo Final shrunk image available at: ${SHRUNK_IMG_FILE}
+}
+
+function customize_on_qemu() {
+ run_qemu_backgrounded
+ wait_for_qemu
+ deploy_key
+ first_run_expand
+ run_qemu_backgrounded
+ wait_for_qemu
+ disable_swap
+ clean_unnecessary_packages
+ run_apt_updates
+ install_cron_entry
+ pre_shrink_cleanup
+ kill_qemu
+}
+
+function prepare_raspi_image() {
+ tools_check
+ fetch_image
+ mount_root
+ modify_root
+ unmount_root
+ mount_boot
+ modify_boot
+ get_kernel
+ unmount_boot
+ customize_on_qemu
+ get_shrink_script
+ shrink_image
+}
+
+# If script is executed in the subshell, launch the full
+# customization script.
+if [[ "${BASH_SOURCE[0]}" == "${0}" ]] ; then
+ echo "Running full image preparation script."
+ prepare_raspi_image
+else
+ echo "Script is sourced in current shell, ready to execute individual steps."
+fi
