Skip to content

Minor last minute cleanups before new version #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
struct merged 1 commit into from
Sep 25, 2022
Merged

Minor last minute cleanups before new version #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions include/iso_alloc_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,13 +240,11 @@ assert(sizeof(size_t) >= 64)
#define BIG_ZONE_USER_PAGE_COUNT 2
#define BIG_ZONE_USER_PAGE_COUNT_SHIFT 1

#if MEMORY_TAGGING
#define TAGGED_PTR_MASK 0x00ffffffffffffff
#define IS_TAGGED_PTR_MASK 0xff00000000000000
#define UNTAGGED_BITS 56

/* A uint64_t of bitslots below this value will
* have at least 1 single free bit slot */
#define ALLOCATED_BITSLOTS 0x5555555555555555
#endif

#define MEGABYTE_SIZE 1048576
#define KILOBYTE_SIZE 1024
Expand Down
8 changes: 8 additions & 0 deletions src/iso_alloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1007,6 +1007,14 @@ INTERNAL_HIDDEN ASSUME_ALIGNED void *_iso_calloc(size_t nmemb, size_t size) {

void *p = _iso_alloc(NULL, sz);

#if NO_ZERO_ALLOCATIONS
/* Without this check we would immediately segfault in
* the call to __iso_memset() to zeroize the chunk */
if(UNLIKELY(sz == 0)) {
return p;
}
#endif

__iso_memset(p, 0x0, sz);
return p;
}
Expand Down