diff options
| author | Nikita Slyusarev <nslus@yandex-team.com> | 2022-02-10 16:46:52 +0300 |
|---|---|---|
| committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:46:52 +0300 |
| commit | cd77cecfc03a3eaf87816af28a33067c4f0cdb59 (patch) | |
| tree | 1308e0bae862d52e0020d881fe758080437fe389 /contrib/libs/jemalloc | |
| parent | cdae02d225fb5b3afbb28990e79a7ac6c9125327 (diff) | |
| download | ydb-cd77cecfc03a3eaf87816af28a33067c4f0cdb59.tar.gz | |
Restoring authorship annotation for Nikita Slyusarev <nslus@yandex-team.com>. Commit 1 of 2.
Diffstat (limited to 'contrib/libs/jemalloc')
| -rw-r--r-- | contrib/libs/jemalloc/src/zone.c | 36 | ||||
| -rw-r--r-- | contrib/libs/jemalloc/ya.make | 2 |
2 files changed, 19 insertions, 19 deletions
diff --git a/contrib/libs/jemalloc/src/zone.c b/contrib/libs/jemalloc/src/zone.c index 23dfdd04a9..9caa125fc6 100644 --- a/contrib/libs/jemalloc/src/zone.c +++ b/contrib/libs/jemalloc/src/zone.c @@ -368,34 +368,34 @@ zone_init(void) { static malloc_zone_t * zone_default_get(void) { - malloc_zone_t **zones = NULL; - unsigned int num_zones = 0; - - /* - * On OSX 10.12, malloc_default_zone returns a special zone that is not - * present in the list of registered zones. That zone uses a "lite zone" - * if one is present (apparently enabled when malloc stack logging is - * enabled), or the first registered zone otherwise. In practice this - * means unless malloc stack logging is enabled, the first registered + malloc_zone_t **zones = NULL; + unsigned int num_zones = 0; + + /* + * On OSX 10.12, malloc_default_zone returns a special zone that is not + * present in the list of registered zones. That zone uses a "lite zone" + * if one is present (apparently enabled when malloc stack logging is + * enabled), or the first registered zone otherwise. In practice this + * means unless malloc stack logging is enabled, the first registered * zone is the default. So get the list of zones to get the first one, * instead of relying on malloc_default_zone. - */ + */ if (KERN_SUCCESS != malloc_get_all_zones(0, NULL, (vm_address_t**)&zones, &num_zones)) { /* * Reset the value in case the failure happened after it was * set. */ - num_zones = 0; - } - + num_zones = 0; + } + if (num_zones) { - return zones[0]; + return zones[0]; } - - return malloc_default_zone(); -} - + + return malloc_default_zone(); +} + /* As written, this function can only promote jemalloc_zone. */ static void zone_promote(void) { diff --git a/contrib/libs/jemalloc/ya.make b/contrib/libs/jemalloc/ya.make index 586de30ab0..f249f02c5e 100644 --- a/contrib/libs/jemalloc/ya.make +++ b/contrib/libs/jemalloc/ya.make @@ -15,7 +15,7 @@ LICENSE( BSD-2-Clause AND Public-Domain ) - + LICENSE_TEXTS(.yandex_meta/licenses.list.txt) ADDINCL( |