[uClibc-cvs] uClibc/libc/misc/dirent closedir.c, 1.5, 1.6 opendir.c, 1.6, 1.7 readdir.c, 1.8, 1.9 readdir64.c, 1.9, 1.10 readdir64_r.c, 1.3, 1.4 readdir_r.c, 1.3, 1.4 rewinddir.c, 1.5, 1.6 seekdir.c, 1.5, 1.6
Manuel Novoa III
mjn3 at uclibc.org
Sat Dec 27 23:30:34 UTC 2003
Update of /var/cvs/uClibc/libc/misc/dirent
In directory nail:/tmp/cvs-serv11655/libc/misc/dirent
Modified Files:
closedir.c opendir.c readdir.c readdir64.c readdir64_r.c
readdir_r.c rewinddir.c seekdir.c
Log Message:
Fix a long-standing bug with pthreads. A couple of linuxthreads files
were including libc-lock.h which had a bunch of weak pragmas. Also,
uClibc supplied a number of no-op weak thread functions even though
many weren't needed. This combined result was that sometimes the
functional versions of thread functions in pthread would not override
the weaks in libc.
While fixing this, I also prepended double-underscore to all necessary
weak thread funcs in uClibc, and removed all unused weaks.
I did a test build, but haven't tested this since these changes are
a backport from my working tree. I did test the changes there and
no longer need to explicitly add -lpthread in the perl build for
perl to pass its thread self tests.
Index: readdir64_r.c
===================================================================
RCS file: /var/cvs/uClibc/libc/misc/dirent/readdir64_r.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- readdir64_r.c 28 Jan 2003 11:06:03 -0000 1.3
+++ readdir64_r.c 27 Dec 2003 23:30:32 -0000 1.4
@@ -33,7 +33,7 @@
de = NULL;
#ifdef __UCLIBC_HAS_THREADS__
- pthread_mutex_lock(&(dir->dd_lock));
+ __pthread_mutex_lock(&(dir->dd_lock));
#endif
do {
@@ -69,7 +69,7 @@
all_done:
#ifdef __UCLIBC_HAS_THREADS__
- pthread_mutex_unlock(&(dir->dd_lock));
+ __pthread_mutex_unlock(&(dir->dd_lock));
#endif
return((de != NULL)? 0 : ret);
}
Index: closedir.c
===================================================================
RCS file: /var/cvs/uClibc/libc/misc/dirent/closedir.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- closedir.c 30 May 2002 13:17:44 -0000 1.5
+++ closedir.c 27 Dec 2003 23:30:32 -0000 1.6
@@ -20,12 +20,12 @@
return -1;
}
#ifdef __UCLIBC_HAS_THREADS__
- pthread_mutex_lock(&(dir->dd_lock));
+ __pthread_mutex_lock(&(dir->dd_lock));
#endif
fd = dir->dd_fd;
dir->dd_fd = -1;
#ifdef __UCLIBC_HAS_THREADS__
- pthread_mutex_unlock(&(dir->dd_lock));
+ __pthread_mutex_unlock(&(dir->dd_lock));
#endif
free(dir->dd_buf);
free(dir);
Index: rewinddir.c
===================================================================
RCS file: /var/cvs/uClibc/libc/misc/dirent/rewinddir.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- rewinddir.c 30 May 2002 13:17:44 -0000 1.5
+++ rewinddir.c 27 Dec 2003 23:30:32 -0000 1.6
@@ -12,11 +12,11 @@
return;
}
#ifdef __UCLIBC_HAS_THREADS__
- pthread_mutex_lock(&(dir->dd_lock));
+ __pthread_mutex_lock(&(dir->dd_lock));
#endif
lseek(dir->dd_fd, 0, SEEK_SET);
dir->dd_nextoff = dir->dd_nextloc = dir->dd_size = 0;
#ifdef __UCLIBC_HAS_THREADS__
- pthread_mutex_unlock(&(dir->dd_lock));
+ __pthread_mutex_unlock(&(dir->dd_lock));
#endif
}
Index: readdir64.c
===================================================================
RCS file: /var/cvs/uClibc/libc/misc/dirent/readdir64.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- readdir64.c 28 Jan 2003 11:06:03 -0000 1.9
+++ readdir64.c 27 Dec 2003 23:30:32 -0000 1.10
@@ -32,7 +32,7 @@
}
#ifdef __UCLIBC_HAS_THREADS__
- pthread_mutex_lock(&(dir->dd_lock));
+ __pthread_mutex_lock(&(dir->dd_lock));
#endif
do {
@@ -60,7 +60,7 @@
all_done:
#ifdef __UCLIBC_HAS_THREADS__
- pthread_mutex_unlock(&(dir->dd_lock));
+ __pthread_mutex_unlock(&(dir->dd_lock));
#endif
return de;
Index: readdir_r.c
===================================================================
RCS file: /var/cvs/uClibc/libc/misc/dirent/readdir_r.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- readdir_r.c 28 Jan 2003 11:06:03 -0000 1.3
+++ readdir_r.c 27 Dec 2003 23:30:32 -0000 1.4
@@ -19,7 +19,7 @@
de = NULL;
#ifdef __UCLIBC_HAS_THREADS__
- pthread_mutex_lock(&(dir->dd_lock));
+ __pthread_mutex_lock(&(dir->dd_lock));
#endif
do {
@@ -55,7 +55,7 @@
all_done:
#ifdef __UCLIBC_HAS_THREADS__
- pthread_mutex_unlock(&(dir->dd_lock));
+ __pthread_mutex_unlock(&(dir->dd_lock));
#endif
return((de != NULL)? 0 : ret);
}
Index: readdir.c
===================================================================
RCS file: /var/cvs/uClibc/libc/misc/dirent/readdir.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- readdir.c 28 Jan 2003 11:06:03 -0000 1.8
+++ readdir.c 27 Dec 2003 23:30:32 -0000 1.9
@@ -17,7 +17,7 @@
}
#ifdef __UCLIBC_HAS_THREADS__
- pthread_mutex_lock(&(dir->dd_lock));
+ __pthread_mutex_lock(&(dir->dd_lock));
#endif
do {
@@ -45,7 +45,7 @@
all_done:
#ifdef __UCLIBC_HAS_THREADS__
- pthread_mutex_unlock(&(dir->dd_lock));
+ __pthread_mutex_unlock(&(dir->dd_lock));
#endif
return de;
}
Index: opendir.c
===================================================================
RCS file: /var/cvs/uClibc/libc/misc/dirent/opendir.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- opendir.c 30 May 2002 13:17:44 -0000 1.6
+++ opendir.c 27 Dec 2003 23:30:32 -0000 1.7
@@ -52,7 +52,7 @@
}
ptr->dd_buf = buf;
#ifdef __UCLIBC_HAS_THREADS__
- pthread_mutex_init(&(ptr->dd_lock), NULL);
+ __pthread_mutex_init(&(ptr->dd_lock), NULL);
#endif
return ptr;
}
Index: seekdir.c
===================================================================
RCS file: /var/cvs/uClibc/libc/misc/dirent/seekdir.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- seekdir.c 30 May 2002 13:17:44 -0000 1.5
+++ seekdir.c 27 Dec 2003 23:30:32 -0000 1.6
@@ -11,11 +11,11 @@
return;
}
#ifdef __UCLIBC_HAS_THREADS__
- pthread_mutex_lock(&(dir->dd_lock));
+ __pthread_mutex_lock(&(dir->dd_lock));
#endif
dir->dd_nextoff = lseek(dir->dd_fd, offset, SEEK_SET);
dir->dd_size = dir->dd_nextloc = 0;
#ifdef __UCLIBC_HAS_THREADS__
- pthread_mutex_unlock(&(dir->dd_lock));
+ __pthread_mutex_unlock(&(dir->dd_lock));
#endif
}
More information about the uClibc-cvs
mailing list