return ALLOC_FAILURE;
}
return ALLOC_FAIL_MAPPING;
+ } else {
+ DWORD old;
+
+ if (!VirtualProtect(mapping_base, requested_size, PAGE_READWRITE, &old)) {
+ err = GetLastError();
+ zend_win_error_message(ACCEL_LOG_FATAL, "VirtualProtect() failed", err);
+ return ALLOC_FAIL_MAPPING;
+ }
}
- smm_shared_globals = (zend_smm_shared_globals *) mapping_base;
+
+ smm_shared_globals = (zend_smm_shared_globals *) ((char*)mapping_base + ACCEL_BASE_POINTER_SIZE);
return SUCCESSFULLY_REATTACHED;
}
*error_in = "MapViewOfFile";
return ALLOC_FAILURE;
} else {
- char *mmap_base_file;
- void *execute_ex_base = (void *)execute_ex;
- FILE *fp;
+ DWORD old;
+
+ if (!VirtualProtect(mapping_base, requested_size, PAGE_READWRITE, &old)) {
+ err = GetLastError();
+ zend_win_error_message(ACCEL_LOG_FATAL, "VirtualProtect() failed", err);
+ return ALLOC_FAILURE;
+ }
- mmap_base_file = get_mmap_base_file();
- fp = fopen(mmap_base_file, "w");
- if (!fp) {
- err = GetLastError();
- zend_shared_alloc_unlock_win32();
- zend_win_error_message(ACCEL_LOG_WARNING, mmap_base_file, err);
- zend_win_error_message(ACCEL_LOG_FATAL, "Unable to write base address", err);
- return ALLOC_FAILURE;
- }
- fprintf(fp, "%p\n", mapping_base);
- fprintf(fp, "%p\n", execute_ex_base);
- fclose(fp);
++
+ ((void**)mapping_base)[0] = mapping_base;
+ ((void**)mapping_base)[1] = (void*)execute_ex;
}
- shared_segment->pos = 0;
- shared_segment->size = requested_size;
+ shared_segment->pos = ACCEL_BASE_POINTER_SIZE;
+ shared_segment->size = requested_size - ACCEL_BASE_POINTER_SIZE;
zend_shared_alloc_unlock_win32();