Skip to content

Commit 256c9e9

Browse files
committed
Skip profiling of mem functions
1 parent 45b5331 commit 256c9e9

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

Zend/zend_alloc.c

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@
8080
#include <fcntl.h>
8181
#include <errno.h>
8282

83+
#ifdef HAVE_VALGRIND
84+
# include "valgrind/callgrind.h"
85+
#endif
86+
8387
#ifndef _WIN32
8488
# include <sys/mman.h>
8589
# ifndef MAP_ANON
@@ -3182,15 +3186,18 @@ size_t zend_mm_globals_size(void)
31823186

31833187
void *memcpy(void *restrict dest, const void *restrict src, size_t n)
31843188
{
3189+
CALLGRIND_TOGGLE_COLLECT;
31853190
const char *csrc = src;
31863191
char *cdest = dest;
31873192
for (int i = 0; i < n; i++) {
31883193
cdest[i] = csrc[i];
31893194
}
3195+
CALLGRIND_TOGGLE_COLLECT;
31903196
return dest;
31913197
}
31923198
void *memmove(void *dest, const void *src, size_t n)
31933199
{
3200+
CALLGRIND_TOGGLE_COLLECT;
31943201
char *csrc = (char *)src;
31953202
char *cdest = (char *)dest;
31963203

@@ -3203,17 +3210,18 @@ void *memmove(void *dest, const void *src, size_t n)
32033210
cdest[n] = csrc[n];
32043211
}
32053212
}
3206-
3213+
CALLGRIND_TOGGLE_COLLECT;
32073214
return dest;
32083215
}
32093216
void *memset(void *s, int c, size_t n)
32103217
{
3218+
CALLGRIND_TOGGLE_COLLECT;
32113219
unsigned char *cs = (unsigned char *)s;
32123220

32133221
for (int i = 0; i < n; i++) {
32143222
cs[i] = (unsigned char)c;
32153223
}
3216-
3224+
CALLGRIND_TOGGLE_COLLECT;
32173225
return s;
32183226
}
32193227
int memcmp(const void *s1, const void *s2, size_t n)
@@ -3222,15 +3230,18 @@ int memcmp(const void *s1, const void *s2, size_t n)
32223230
return 0;
32233231
}
32243232

3233+
CALLGRIND_TOGGLE_COLLECT;
32253234
unsigned char *p = (unsigned char *)s1;
32263235
unsigned char *q = (unsigned char *)s2;
32273236
while (n-- != 0) {
32283237
if (*p != *q) {
3238+
CALLGRIND_TOGGLE_COLLECT;
32293239
return (*p > *q) ? 1 : -1;
32303240
}
32313241
p++;
32323242
q++;
32333243
}
3244+
CALLGRIND_TOGGLE_COLLECT;
32343245
return 0;
32353246
}
32363247
# if defined(__GNUC__) && !defined(__clang__)

0 commit comments

Comments
 (0)