Sun Mar 1 10:45:23 1998 Andreas Mohr <100.30936@germany.net> * [loader/ne_image.c] Fixed problem with weird DLLs (NE_FFLAGS_SINGLEDATA && DGROUP = 0). * [msdos/dosmem.c] Export address for __0000H, too. * [msdos/dpmi.c] Changed MemAlloc functions to return less fragmented addresses. Sat Feb 28 18:50:12 1998 Alexandre Julliard <julliard@lrc.epfl.ch> * [scheduler/process.c] [scheduler/sysdeps.c] Don't use %fs register before threading initialization. Sat Feb 28 14:04:56 1998 Kristian Nielsen <kristian.nielsen@risoe.dk> * [configure.in] [include/acconfig.h] Autoconf macro to check for non-reentrant X libraries. * [windows/winpos.c] In SetWindowPos32(), do not cause WM_SIZE messages when the SWP_NOSIZE flag is specified. This fixes the division-by-zero in Borland C++ 4.0 "Open Project" menu item. Sat Feb 28 13:11:26 1998 James Moody <013263m@dragon.acadiau.ca> * [ole/ole2nls.c] Changed "English" values from German to English. * [files/dos_fs.c] Fixed off-by-one month bug. Fri Feb 27 22:12:01 1998 Douglas Ridgway <ridgway@winehq.com> * [windows/win.c] Fix winelib class menu loading bug. * [include/module.h] [loader/module.c] LoadModule32 should be implemented in terms of CreateProcess. * [programs/view/*] Metafile viewer sample program. * [documentation/wine.texinfo] [documentation/Makefile.in] Improvements and additions, HTML target. Fri Feb 27 04:27:48 1998 Dimitrie O. Paun <dimi@cs.toronto.edu> * [*/*] Switched to the new debug messages interface. For more information please refer to documentation/debug-msgs. Because the new scheme introduces a new semantic level, I had to manually do through about 530 dprintf_xxx! The rest of about 2400 where transformed via a script. Because of the large number of changes that I had to do, some may have not come out as nicely as I wanted them. If this is the case, please let me know. There is a lot of work left to do: -- a few hundred printf's to be converted -- about 2300 fprintf's to be converted -- about 600 FIXME's to be transformed The problem is that in the above mentioned cases, a lot of manual intervention is required because a lot of the information is missing. There are also a lot of other things to be done to the interface and so forth. I have now ideas for a at least a month worth of full time work :) I will proceed with many changes in the next few releases, so please do not start modifing things because there will be a hell of a lot of conflicts. If you have ideas that you want to integrate or you want to work on different things, please coordinate with me. Thu Feb 26 13:04:29 1998 David Lee Lambert <lamber45@egr.msu.edu> * [ole/ole2nls.c] [include/windows.h] First try at OLE date- and time-formatting functions. Wed Feb 25 11:20:35 1998 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de> * [files/*.c] Changed dos device handling, added 'CON' devicehandling. * [graphics/ddraw.c] Bug fixes, some additions. * [if1632/builtin.c][loader/module.c][library/winestub.c] Small hack so we don't need a dummy BUILTIN_LoadModule in winestub.c. * [ole/*][relay32/ole32.spec][if1632/storage.spec] storage.dll started. winword loads documents (saving doesn't work yet, dunno why). Several ole additions, some cleanups and bugfixes. IMalloc16 implemented. * [loader/pe_image.c] Added some comments, fixed circular dll references, fixed modref ordering, fixed tls allocation. * [memory/global.c] Added validity checks before every GET_ARENA_PTR. (several functions rely on Global* return values on invalid handles, like IsTask). Implemented GlobalUnlockFree16. * [memory/virtual.c] Replaced dprintf_virtual by fprintf, so we can do 'info map' again in the debugger. Increase read linesize for Linux2.1 cases. * [misc/cpu.c][misc/registry.c] Moved cpu registry initialization to misc/cpu.c. * [multimedia/dsound.c] Enhanced, replaced GETOSPACE bufferingcheck by SETFRAGMENT. * [relay32/crtdll.spec][relay32/ntdll.spec] Replaced some ptr by respective 'str' and 'wstr' arguments for libc functions. * [scheduler/thread.c] Added some sanity checks to stackallocation, tlshandling fixed. * [tools/build.c] Fixed cdecl argumenttype order (was reversed). * [win32/ordinals.c] Implemented KERNEL_449. * [windows/dinput.c] Some fixes, needs much more work. Tomb Raider2 works with keyboard ;) Tue Feb 24 20:46:37 1998 James Juran <jrj120@psu.edu> * [windows/win.c] Fixed USER32 ordinal numbers in documentation. Sat Feb 21 12:30:38 1998 John Richardson <jrichard@zko.dec.com> * [files/file.c] [include/k32obj.h] [memory/virtual.c] [scheduler/critsection.c] [scheduler/event.c] [scheduler/handle.c] [scheduler/k32obj.c] [scheduler/mutex.c] [scheduler/process.c] [scheduler/semaphore.c] [scheduler/thread.c] Added generic k32obj read and write routines for k32objs that support I/O. * [documentation/console] Updated console docs. * [win32/console.c] Make console work like a k32obj that supports I/O. * [include/windows.h] Make WriteFile and ReadFile take HANDLE32 for handle. Sun Feb 15 14:07:07 1998 Dimitrie O. Paun <dimi@mail.cs.toronto.edu> * [controls/menu.c] [misc/ver.c] [multimedia/dsound.c] [multimedia/joystick.c] [windows/dialog.c] Modified some dprintf_xxx's to prepare them for a new dprintf_ scheme. Basically, I changed the dprintf's that outputed a line with many dprintf calls to do just one dprintf call.
195 lines
5.3 KiB
C
195 lines
5.3 KiB
C
/***************************************************************************
|
|
* Copyright 1995, Technion, Israel Institute of Technology
|
|
* Electrical Eng, Software Lab.
|
|
* Author: Michael Veksler.
|
|
***************************************************************************
|
|
* File: shm_block.c
|
|
* Purpose: Treat a shared memory block.
|
|
***************************************************************************
|
|
*/
|
|
#ifdef CONFIG_IPC
|
|
|
|
#define inline __inline__
|
|
#include <sys/types.h>
|
|
#include <sys/sem.h>
|
|
#include <stdio.h>
|
|
#include <assert.h>
|
|
#include <unistd.h>
|
|
#include <stdlib.h>
|
|
#include "debug.h"
|
|
#include "global.h"
|
|
#include "selectors.h"
|
|
#include "shm_fragment.h"
|
|
#include "shm_block.h"
|
|
#include "shm_semaph.h"
|
|
#include "dde_proc.h"
|
|
#include "xmalloc.h"
|
|
|
|
/* How each shmid is maped to local pointer */
|
|
/* Only attached shm blocks are in this construct */
|
|
struct local_shm_map *shm_map=NULL;
|
|
|
|
/* setup a new shm block (construct a shm block object).
|
|
* block: The pointer to the memory block (local mapping)
|
|
* first: The first data byte (excluding header stuff),
|
|
* if 0 (zero) Use the default.
|
|
* size: The size of the memory block.
|
|
*/
|
|
void shm_setup_block(struct shm_block *block, int first, int size)
|
|
{
|
|
dprintf_info(shm,"Setting up shm block at 0x%08x\n",(int )block);
|
|
/* setup block internal data structure */
|
|
if (first <= 0) {
|
|
first=sizeof(*block);
|
|
/* round up - so everything starts on cache line boundary
|
|
* (assume cache line=32 bytes, may be bigger/smaller for
|
|
* different processors and different L2 caches .)
|
|
*/
|
|
first=(first+0x1f) & ~0x1f;
|
|
}
|
|
block->free=size-first;
|
|
block->next_shm_id=-1; /* IPC shm ID (for initial linking) */
|
|
block->proc_idx= curr_proc_idx;
|
|
/* block->size is initialized in shm_FragmentInit */
|
|
shm_FragmentInit(block, first, size); /* first item in the free list */
|
|
|
|
dprintf_info(shm,
|
|
"block was set up at 0x%08x, size=0x%04xKB, 1st usable=%02x\n",
|
|
(int )block,size/1024,first);
|
|
}
|
|
|
|
/* shm_attach_block: attach existing shm block, setup selectors
|
|
* shm_id - id of the block to attach.
|
|
* proc_idx - if not -1, puts this data into local mapping
|
|
* map - localy mapped info about this block.
|
|
*/
|
|
/* NOTE: there is no check if this block is already attached.
|
|
* Attaching the same block more than once - is possible
|
|
* In case of doubt use shm_locate_block.
|
|
*/
|
|
struct shm_block *shm_attach_block(int shm_id, int proc_idx,
|
|
struct local_shm_map *map)
|
|
{
|
|
struct shm_block *block;
|
|
struct shmid_ds ds;
|
|
struct local_shm_map *this;
|
|
|
|
shmctl(shm_id, IPC_STAT, &ds );
|
|
|
|
block=(struct shm_block*)shmat(shm_id, NULL, 0);
|
|
if (block==NULL || block == (struct shm_block*) -1) return NULL;
|
|
|
|
this=(struct local_shm_map *)xmalloc(sizeof(*this));
|
|
this->next= shm_map;
|
|
shm_map = this;
|
|
this->shm_id= shm_id;
|
|
this->ptr = block;
|
|
|
|
if (proc_idx < 0)
|
|
this->proc_idx=block->proc_idx;
|
|
else
|
|
this->proc_idx=proc_idx;
|
|
|
|
if (map != NULL) {
|
|
memcpy(map, this, sizeof(map));
|
|
map->next= NULL; /* don't pass private info */
|
|
}
|
|
|
|
return block;
|
|
}
|
|
|
|
struct shm_block *shm_create_block(int first, int size, int *shm_id)
|
|
{
|
|
struct shm_block *block;
|
|
|
|
if (size==0)
|
|
size=SHM_MINBLOCK;
|
|
else
|
|
/* round up size to a multiple of SHM_MINBLOCK */
|
|
size= (size+SHM_MINBLOCK-1) & ~(SHM_MINBLOCK-1);
|
|
*shm_id= shmget ( IPC_PRIVATE, size ,0700);
|
|
if (*shm_id==-1)
|
|
return NULL;
|
|
block=shm_attach_block(*shm_id, curr_proc_idx, NULL);
|
|
if (block!=NULL)
|
|
shm_setup_block(block, first, size);
|
|
|
|
return block;
|
|
}
|
|
|
|
/*
|
|
** Locate attached block. (return it, or NULL on failure)
|
|
** shm_id is the block we look for.
|
|
** *map - will get all the info related to this local map + proc_idx
|
|
** (may be NULL)
|
|
** *seg - will get the segment this block is attached to.
|
|
*/
|
|
struct shm_block *shm_locate_attached_block(int shm_id,
|
|
struct local_shm_map *map)
|
|
{
|
|
struct local_shm_map *curr;
|
|
|
|
for (curr= shm_map ; curr != NULL ; curr= curr->next) {
|
|
if (curr->shm_id == shm_id) {
|
|
if (map) {
|
|
memcpy(map, curr, sizeof(*curr) );
|
|
map->next = NULL; /* this is private info ! */
|
|
}
|
|
return curr->ptr;
|
|
}
|
|
}
|
|
|
|
/* block not found ! */
|
|
return 0;
|
|
}
|
|
|
|
/* shm_locate_block: see shm_attach_block.
|
|
In addition to shm_attach_block, make sure this
|
|
block is not already attached.
|
|
*/
|
|
struct shm_block *shm_locate_block(int shm_id, struct local_shm_map *map)
|
|
{
|
|
|
|
struct shm_block *ret;
|
|
ret= shm_locate_attached_block(shm_id, map);
|
|
if (ret!=NULL)
|
|
return ret;
|
|
/* block not found ! , try to attach */
|
|
return shm_attach_block(shm_id, -1, map);
|
|
}
|
|
|
|
static void forget_attached(int shmid)
|
|
{
|
|
struct local_shm_map *curr, **point_to_curr;
|
|
|
|
for (curr= shm_map, point_to_curr= &shm_map ;
|
|
curr != NULL ;
|
|
curr= curr->next, point_to_curr= &curr->next ) {
|
|
if (curr->shm_id == shmid) {
|
|
*point_to_curr= curr->next;
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* delete chain of shm blocks (pointing to each other)
|
|
* Do it in reverse order. (This is what the recursion is for)
|
|
*/
|
|
void shm_delete_chain(int *shmid)
|
|
{
|
|
struct shm_block *block;
|
|
|
|
if (*shmid == -1)
|
|
return;
|
|
|
|
block= shm_locate_block(*shmid, NULL);
|
|
forget_attached( *shmid );
|
|
if (block == NULL)
|
|
return;
|
|
shm_delete_chain(&block->next_shm_id);
|
|
shmctl(*shmid, IPC_RMID, NULL);
|
|
*shmid=-1;
|
|
shmdt((char *)block);
|
|
}
|
|
|
|
#endif /* CONFIG_IPC */
|