Add member fd to map.
(rk_test_mem_alloc, rk_test_mem_free): Use it. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15061 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -54,6 +54,7 @@ struct {
|
|||||||
void *data_start;
|
void *data_start;
|
||||||
size_t data_size;
|
size_t data_size;
|
||||||
enum rk_test_mem_type type;
|
enum rk_test_mem_type type;
|
||||||
|
int fd;
|
||||||
} map;
|
} map;
|
||||||
|
|
||||||
struct sigaction sa, osa;
|
struct sigaction sa, osa;
|
||||||
@@ -120,6 +121,7 @@ rk_test_mem_alloc(enum rk_test_mem_type type, const char *name,
|
|||||||
if(fd < 0)
|
if(fd < 0)
|
||||||
err (1, "open /dev/zero");
|
err (1, "open /dev/zero");
|
||||||
#endif
|
#endif
|
||||||
|
map.fd = fd;
|
||||||
flags |= MAP_PRIVATE;
|
flags |= MAP_PRIVATE;
|
||||||
|
|
||||||
map.size = size + pagesize - (size % pagesize) + pagesize * 2;
|
map.size = size + pagesize - (size % pagesize) + pagesize * 2;
|
||||||
@@ -187,6 +189,8 @@ rk_test_mem_free(const char *map_name)
|
|||||||
ret = munmap (map.start, map.size);
|
ret = munmap (map.start, map.size);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
err (1, "munmap");
|
err (1, "munmap");
|
||||||
|
if (map.fd > 0)
|
||||||
|
close(map.fd);
|
||||||
#endif
|
#endif
|
||||||
free(testname);
|
free(testname);
|
||||||
testname = NULL;
|
testname = NULL;
|
||||||
|
Reference in New Issue
Block a user