Remove unused code disabled by define APC_MEMPROTECT

Author: madmajestro

apc_mmap.c

@@ -57,9 +57,6 @@ apc_segment_t apc_mmap(char *file_mask, size_t size)
 
 	int fd = -1;
 	int flags = MAP_SHARED | MAP_NOSYNC;
-#ifdef APC_MEMPROTECT
-	int remap = 1;
-#endif
 
 	/* If no filename was provided, do an anonymous mmap */
 	if(!file_mask || (file_mask && !strlen(file_mask))) {
@@ -68,18 +65,12 @@ apc_segment_t apc_mmap(char *file_mask, size_t size)
 #else
 		fd = -1;
 		flags = MAP_SHARED | MAP_ANON;
-#ifdef APC_MEMPROTECT
-		remap = 0;
-#endif
 #endif
 	} else if(!strcmp(file_mask,"/dev/zero")) {
 		fd = open("/dev/zero", O_RDWR, S_IRUSR | S_IWUSR);
 		if(fd == -1) {
 			zend_error_noreturn(E_CORE_ERROR, "apc_mmap: open on /dev/zero failed");
 		}
-#ifdef APC_MEMPROTECT
-		remap = 0; /* cannot remap */
-#endif
 	} else {
 		/*
 		 * Otherwise we do a normal filesystem mmap
@@ -99,14 +90,6 @@ apc_segment_t apc_mmap(char *file_mask, size_t size)
 	segment.shmaddr = (void *)mmap(NULL, size, PROT_READ | PROT_WRITE, flags, fd, 0);
 	segment.size = size;
 
-#ifdef APC_MEMPROTECT
-	if(remap) {
-		segment.roaddr = (void *)mmap(NULL, size, PROT_READ, flags, fd, 0);
-	} else {
-		segment.roaddr = NULL;
-	}
-#endif
-
 	if ((long)segment.shmaddr == -1) {
 		zend_error_noreturn(E_CORE_ERROR, "apc_mmap: Failed to mmap %zu bytes. Is your apc.shm_size too large?", size);
 	}
@@ -127,13 +110,6 @@ void apc_unmap(apc_segment_t *segment)
 	if (munmap(segment->shmaddr, segment->size) < 0) {
 		apc_warning("apc_unmap: munmap failed");
 	}
-
-#ifdef APC_MEMPROTECT
-	if (segment->roaddr && munmap(segment->roaddr, segment->size) < 0) {
-		apc_warning("apc_unmap: munmap failed");
-	}
-#endif
-
 }
 
 #endif

apc_shm.c

@@ -73,14 +73,6 @@ apc_segment_t apc_shm_attach(int shmid, size_t size)
 		zend_error_noreturn(E_CORE_ERROR, "apc_shm_attach: shmat failed:");
 	}
 
-#ifdef APC_MEMPROTECT
-
-	if ((zend_long)(segment.roaddr = shmat(shmid, 0, SHM_RDONLY)) == -1) {
-		segment.roaddr = NULL;
-	}
-
-#endif
-
 	segment.size = size;
 
 	/*
@@ -96,12 +88,6 @@ void apc_shm_detach(apc_segment_t* segment)
 	if (shmdt(segment->shmaddr) < 0) {
 		apc_warning("apc_shm_detach: shmdt failed:");
 	}
-
-#ifdef APC_MEMPROTECT
-	if (segment->roaddr && shmdt(segment->roaddr) < 0) {
-		apc_warning("apc_shm_detach: shmdt failed:");
-	}
-#endif
 }
 
 /*

apc_sma.c

@@ -492,63 +492,6 @@ PHP_APCU_API void apc_sma_free(apc_sma_t* sma, void* p) {
 	apc_error("apc_sma_free: could not locate address %p", p);
 }
 
-#ifdef APC_MEMPROTECT
-PHP_APCU_API void* apc_sma_protect(apc_sma_t* sma, void* p) {
-	unsigned int i = 0;
-	size_t offset;
-
-	if (p == NULL) {
-		return NULL;
-	}
-
-	if(SMA_RO(sma, sma->last) == NULL) return p;
-
-	offset = (size_t)((char *)p - SMA_ADDR(sma, sma->last));
-
-	if(p >= (void*)SMA_ADDR(sma, sma->last) && offset < sma->size) {
-		return SMA_RO(sma, sma->last) + offset;
-	}
-
-	for (i = 0; i < sma->num; i++) {
-		offset = (size_t)((char *)p - SMA_ADDR(sma, i));
-		if (p >= (void*)SMA_ADDR(sma, i) && offset < sma->size) {
-			return SMA_RO(sma, i) + offset;
-		}
-	}
-
-	return NULL;
-}
-
-PHP_APCU_API void* apc_sma_unprotect(apc_sma_t* sma, void* p){
-	unsigned int i = 0;
-	size_t offset;
-
-	if (p == NULL) {
-		return NULL;
-	}
-
-	if(SMA_RO(sma, sma->last) == NULL) return p;
-
-	offset = (size_t)((char *)p - SMA_RO(sma, sma->last));
-
-	if(p >= (void*)SMA_RO(sma, sma->last) && offset < sma->size) {
-		return SMA_ADDR(sma, sma->last) + offset;
-	}
-
-	for (i = 0; i < sma->num; i++) {
-		offset = (size_t)((char *)p - SMA_RO(sma, i));
-		if (p >= (void*)SMA_RO(sma, i) && offset < sma->size) {
-			return SMA_ADDR(sma, i) + offset;
-		}
-	}
-
-	return NULL;
-}
-#else
-PHP_APCU_API void* apc_sma_protect(apc_sma_t* sma, void *p) { return p; }
-PHP_APCU_API void* apc_sma_unprotect(apc_sma_t* sma, void *p) { return p; }
-#endif
-
 PHP_APCU_API apc_sma_info_t *apc_sma_info(apc_sma_t* sma, zend_bool limited) {
 	apc_sma_info_t *info;
 	apc_sma_link_t **link;

apc_sma.h

@@ -39,9 +39,6 @@
 typedef struct _apc_segment_t {
 	size_t size;            /* size of this segment */
 	void* shmaddr;          /* address of shared memory */
-#ifdef APC_MEMPROTECT
-	void* roaddr;           /* read only (mprotect'd) address */
-#endif
 } apc_segment_t; /* }}} */
 
 /* {{{ struct definition: apc_sma_link_t */
@@ -113,16 +110,6 @@ PHP_APCU_API void *apc_sma_malloc_ex(
 */
 PHP_APCU_API void apc_sma_free(apc_sma_t* sma, void* p);
 
-/*
-* apc_sma_api_protect will protect p (which should be a pointer to a block allocated from sma)
-*/
-PHP_APCU_API void* apc_sma_protect(apc_sma_t* sma, void* p);
-
-/*
-* apc_sma_api_protect will uprotect p (which should be a pointer to a block allocated from sma)
-*/
-PHP_APCU_API void* apc_sma_unprotect(apc_sma_t* sma, void *p);
-
 /*
 * apc_sma_api_info returns information about the allocator
 */