JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* mmap.cc (class list): Add member `hash'.

Browse Source 
(list::list): Initialize `hash'.
        (list::get_list_by_fd): Use filepath hash value to get the correct
        mapping list if it's not an anonymous mapping.
        (map::add_list): Initialize `hash' with filepath hash value.
        (mmap): Check for reusing a mapping only on MAP_SHARED.
This commit is contained in:
Corinna Vinschen 2001-02-08 21:02:36 +00:00
parent df7e8957fd
commit db49d0b530
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,12 @@
Thu Feb 8 21:57:00 2001 Corinna Vinschen <corinna@vinschen.de>
* mmap.cc (class list): Add member `hash'.
(list::list): Initialize `hash'.
(list::get_list_by_fd): Use filepath hash value to get the correct
mapping list if it's not an anonymous mapping.
(map::add_list): Initialize `hash' with filepath hash value.
(mmap): Check for reusing a mapping only on MAP_SHARED.
Wed Feb 7 18:47:36 2001 Christopher Faylor <cgf@cygnus.com>
* signal.cc (killpg): Correct first argument.

24
winsup/cygwin/mmap.cc
View File

@ -204,6 +204,7 @@ public:
mmap_record *recs;
int nrecs, maxrecs;
int fd;
DWORD hash;
list ();
~list ();
mmap_record *add_record (mmap_record r);
@ -213,11 +214,9 @@ public:
};
list::list ()
: nrecs (0), maxrecs (10), fd (0), hash (0)
{
recs = (mmap_record *) malloc (10 * sizeof(mmap_record));
nrecs = 0;
maxrecs = 10;
fd = 0;
}
list::~list ()
@ -309,7 +308,13 @@ map::get_list_by_fd (int fd)
{
int i;
for (i=0; i<nlists; i++)
if (lists[i]->fd == fd)
#if 0 /* The fd isn't sufficient since it could already be another file. */
if (lists[i]->fd == fd
#else /* so we use the name hash value to identify the file unless
it's not an anonymous mapping. */
if ((fd == -1 && lists[i]->fd == -1)
|| lists[i]->hash == fdtab[fd]->get_namehash ())
#endif
return lists[i];
return 0;
}
@ -318,6 +323,8 @@ list *
map::add_list (list *l, int fd)
{
l->fd = fd;
if (fd != -1)
l->hash = fdtab[fd]->get_namehash ();
if (nlists == maxlists)
{
maxlists += 5;
@ -445,14 +452,15 @@ mmap (caddr_t addr, size_t len, int prot, int flags, int fd, off_t off)
fh = &fh_paging_file;
}
/* First check if this mapping matches into the chunk of another
already performed mapping. */
list *l = mmapped_areas->get_list_by_fd (fd);
if (l)
/* First check if this mapping matches into the chunk of another
already performed mapping. Only for MAP_SHARED mapping. */
if (l && (flags & MAP_SHARED))
{
mmap_record *rec;
if ((rec = l->match (off, len)) != NULL)
{
{
off = rec->map_map (off, len);
caddr_t ret = rec->get_address () + off;
syscall_printf ("%x = mmap() succeeded", ret);