ditch the priority inheritance locks; use malloc's version of lock
i did some testing trying to switch malloc to use the new internal lock with priority inheritance, and my malloc contention test got 20-100 times slower. if priority inheritance futexes are this slow, it's simply too high a price to pay for avoiding priority inversion. maybe we can consider them somewhere down the road once the kernel folks get their act together on this (and perferably don't link it to glibc's inefficient lock API)... as such, i've switch __lock to use malloc's implementation of lightweight locks, and updated all the users of the code to use an array with a waiter count for their locks. this should give optimal performance in the vast majority of cases, and it's simple. malloc is still using its own internal copy of the lock code because it seems to yield measurably better performance with -O3 when it's inlined (20% or more difference in the contention stress test).
This commit is contained in:
parent
e7655ed37b
commit
4750cf4202
15 changed files with 54 additions and 77 deletions
|
|
@ -1,9 +1,9 @@
|
|||
struct __DIR_s
|
||||
{
|
||||
int lock;
|
||||
int fd;
|
||||
off_t tell;
|
||||
int buf_pos;
|
||||
int buf_end;
|
||||
int lock[2];
|
||||
char buf[2048];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -16,10 +16,7 @@ struct dirent *readdir(DIR *dir)
|
|||
|
||||
if (dir->buf_pos >= dir->buf_end) {
|
||||
int len = __getdents(dir->fd, (void *)dir->buf, sizeof dir->buf);
|
||||
if (len < 0) {
|
||||
dir->lock = 0;
|
||||
return NULL;
|
||||
} else if (len == 0) return 0;
|
||||
if (len <= 0) return 0;
|
||||
dir->buf_end = len;
|
||||
dir->buf_pos = 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,18 +11,18 @@ int readdir_r(DIR *dir, struct dirent *buf, struct dirent **result)
|
|||
int errno_save = errno;
|
||||
int ret;
|
||||
|
||||
LOCK(&dir->lock);
|
||||
LOCK(dir->lock);
|
||||
errno = 0;
|
||||
de = readdir(dir);
|
||||
if ((ret = errno)) {
|
||||
UNLOCK(&dir->lock);
|
||||
UNLOCK(dir->lock);
|
||||
return ret;
|
||||
}
|
||||
errno = errno_save;
|
||||
if (de) memcpy(buf, de, de->d_reclen);
|
||||
else buf = NULL;
|
||||
|
||||
UNLOCK(&dir->lock);
|
||||
UNLOCK(dir->lock);
|
||||
*result = buf;
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@
|
|||
|
||||
void rewinddir(DIR *dir)
|
||||
{
|
||||
LOCK(&dir->lock);
|
||||
LOCK(dir->lock);
|
||||
lseek(dir->fd, 0, SEEK_SET);
|
||||
dir->buf_pos = dir->buf_end = 0;
|
||||
dir->tell = 0;
|
||||
UNLOCK(&dir->lock);
|
||||
UNLOCK(dir->lock);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
|
||||
void seekdir(DIR *dir, long off)
|
||||
{
|
||||
LOCK(&dir->lock);
|
||||
LOCK(dir->lock);
|
||||
dir->tell = lseek(dir->fd, off, SEEK_SET);
|
||||
dir->buf_pos = dir->buf_end = 0;
|
||||
UNLOCK(&dir->lock);
|
||||
UNLOCK(dir->lock);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue