kiper220/mimalloc
1
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2025-05-05 23:19:31 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
daan 2019-07-22 10:10:45 -07:00
parent 7555260759
commit e90938fb4b
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/alloc-posix.c
View file

@ -19,6 +19,7 @@ terms of the MIT license. A copy of the license can be found in the file
#include <errno.h> #include <errno.h>
#include <string.h> // memcpy #include <string.h> // memcpy
#include <stdlib.h> // getenv
#ifndef EINVAL #ifndef EINVAL
#define EINVAL 22 #define EINVAL 22
@ -115,7 +116,7 @@ int mi_dupenv_s(char** buf, size_t* size, const char* name) mi_attr_noexcept {
#pragma warning(suppress:4996) #pragma warning(suppress:4996)
char* p = getenv(name); char* p = getenv(name);
if (p==NULL) { if (p==NULL) {
*buf = NULL; *buf = NULL;
} }
else { else {
*buf = mi_strdup(p); *buf = mi_strdup(p);
@ -146,4 +147,3 @@ int mi_wdupenv_s(unsigned short** buf, size_t* size, const unsigned short* name)
return 0; return 0;
#endif #endif
} }

2
test/test-stress.c
View file

@ -180,7 +180,7 @@ static DWORD WINAPI thread_entry(LPVOID param) {
static void run_os_threads(size_t nthreads) { static void run_os_threads(size_t nthreads) {
DWORD* tids = (DWORD*)malloc(nthreads * sizeof(DWORD)); DWORD* tids = (DWORD*)malloc(nthreads * sizeof(DWORD));
HANDLE* thandles = (HANDLE*)malloc(nthreads * sizeof(HANDLE)); HANDLE* thandles = (HANDLE*)malloc(nthreads * sizeof(HANDLE));
for (intptr_t i = 0; i < nthreads; i++) { for (uintptr_t i = 0; i < nthreads; i++) {
thandles[i] = CreateThread(0, 4096, &thread_entry, (void*)(i), 0, &tids[i]); thandles[i] = CreateThread(0, 4096, &thread_entry, (void*)(i), 0, &tids[i]);
} }
for (int i = 0; i < nthreads; i++) { for (int i = 0; i < nthreads; i++) {