summaryrefslogtreecommitdiff
path: root/usr/src/lib/libc/port/rt
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/lib/libc/port/rt')
-rw-r--r--usr/src/lib/libc/port/rt/clock_timer.c29
-rw-r--r--usr/src/lib/libc/port/rt/fallocate.c4
-rw-r--r--usr/src/lib/libc/port/rt/mqueue.c43
-rw-r--r--usr/src/lib/libc/port/rt/pos4obj.c2
-rw-r--r--usr/src/lib/libc/port/rt/sched.c14
-rw-r--r--usr/src/lib/libc/port/rt/sem.c42
-rw-r--r--usr/src/lib/libc/port/rt/shm.c4
-rw-r--r--usr/src/lib/libc/port/rt/sigev_thread.c10
-rw-r--r--usr/src/lib/libc/port/rt/sigev_thread.h6
9 files changed, 60 insertions, 94 deletions
diff --git a/usr/src/lib/libc/port/rt/clock_timer.c b/usr/src/lib/libc/port/rt/clock_timer.c
index 8dfb35be91..2fbcc1a831 100644
--- a/usr/src/lib/libc/port/rt/clock_timer.c
+++ b/usr/src/lib/libc/port/rt/clock_timer.c
@@ -20,22 +20,13 @@
*/
/*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
#pragma ident "%Z%%M% %I% %E% SMI"
-#pragma weak clock_getres = _clock_getres
-#pragma weak clock_gettime = _clock_gettime
-#pragma weak clock_settime = _clock_settime
-#pragma weak timer_create = _timer_create
-#pragma weak timer_delete = _timer_delete
-#pragma weak timer_getoverrun = _timer_getoverrun
-#pragma weak timer_gettime = _timer_gettime
-#pragma weak timer_settime = _timer_settime
-
-#include "synonyms.h"
+#include "lint.h"
#include <time.h>
#include <sys/types.h>
#include <stdlib.h>
@@ -72,25 +63,25 @@ timer_init(void)
}
int
-_clock_getres(clockid_t clock_id, timespec_t *res)
+clock_getres(clockid_t clock_id, timespec_t *res)
{
return (__clock_getres(clock_id, res));
}
int
-_clock_gettime(clockid_t clock_id, timespec_t *tp)
+clock_gettime(clockid_t clock_id, timespec_t *tp)
{
return (__clock_gettime(clock_id, tp));
}
int
-_clock_settime(clockid_t clock_id, const timespec_t *tp)
+clock_settime(clockid_t clock_id, const timespec_t *tp)
{
return (__clock_settime(clock_id, tp));
}
int
-_timer_create(clockid_t clock_id, struct sigevent *sigevp, timer_t *timerid)
+timer_create(clockid_t clock_id, struct sigevent *sigevp, timer_t *timerid)
{
struct sigevent sigevent;
port_notify_t port_notify;
@@ -132,7 +123,7 @@ _timer_create(clockid_t clock_id, struct sigevent *sigevp, timer_t *timerid)
}
int
-_timer_delete(timer_t timerid)
+timer_delete(timer_t timerid)
{
int rc;
@@ -143,19 +134,19 @@ _timer_delete(timer_t timerid)
}
int
-_timer_getoverrun(timer_t timerid)
+timer_getoverrun(timer_t timerid)
{
return (__timer_getoverrun(timerid) + sigev_timer_getoverrun(timerid));
}
int
-_timer_gettime(timer_t timerid, itimerspec_t *value)
+timer_gettime(timer_t timerid, itimerspec_t *value)
{
return (__timer_gettime(timerid, value));
}
int
-_timer_settime(timer_t timerid, int flags, const itimerspec_t *value,
+timer_settime(timer_t timerid, int flags, const itimerspec_t *value,
itimerspec_t *ovalue)
{
return (__timer_settime(timerid, flags, value, ovalue));
diff --git a/usr/src/lib/libc/port/rt/fallocate.c b/usr/src/lib/libc/port/rt/fallocate.c
index 17b9088052..1f7a627fd9 100644
--- a/usr/src/lib/libc/port/rt/fallocate.c
+++ b/usr/src/lib/libc/port/rt/fallocate.c
@@ -20,13 +20,13 @@
*/
/*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
#pragma ident "%Z%%M% %I% %E% SMI"
-#include "synonyms.h"
+#include "lint.h"
#include <errno.h>
#include <fcntl.h>
#include <sys/types.h>
diff --git a/usr/src/lib/libc/port/rt/mqueue.c b/usr/src/lib/libc/port/rt/mqueue.c
index 1b1ea65deb..1f9d6bc770 100644
--- a/usr/src/lib/libc/port/rt/mqueue.c
+++ b/usr/src/lib/libc/port/rt/mqueue.c
@@ -26,20 +26,7 @@
#pragma ident "%Z%%M% %I% %E% SMI"
-#pragma weak mq_open = _mq_open
-#pragma weak mq_close = _mq_close
-#pragma weak mq_unlink = _mq_unlink
-#pragma weak mq_send = _mq_send
-#pragma weak mq_timedsend = _mq_timedsend
-#pragma weak mq_reltimedsend_np = _mq_reltimedsend_np
-#pragma weak mq_receive = _mq_receive
-#pragma weak mq_timedreceive = _mq_timedreceive
-#pragma weak mq_reltimedreceive_np = _mq_reltimedreceive_np
-#pragma weak mq_notify = _mq_notify
-#pragma weak mq_setattr = _mq_setattr
-#pragma weak mq_getattr = _mq_getattr
-
-#include "synonyms.h"
+#include "lint.h"
#include "mtlib.h"
#define _KMEMUSER
#include <sys/param.h> /* _MQ_OPEN_MAX, _MQ_PRIO_MAX, _SEM_VALUE_MAX */
@@ -349,7 +336,7 @@ mq_putmsg(mqhdr_t *mqhp, const char *msgp, ssize_t len, uint_t prio)
}
mqd_t
-_mq_open(const char *path, int oflag, /* mode_t mode, mq_attr *attr */ ...)
+mq_open(const char *path, int oflag, /* mode_t mode, mq_attr *attr */ ...)
{
va_list ap;
mode_t mode;
@@ -568,7 +555,7 @@ mq_close_cleanup(mqdes_t *mqdp)
}
int
-_mq_close(mqd_t mqdes)
+mq_close(mqd_t mqdes)
{
mqdes_t *mqdp = (mqdes_t *)mqdes;
mqhdr_t *mqhp;
@@ -601,7 +588,7 @@ _mq_close(mqd_t mqdes)
}
int
-_mq_unlink(const char *path)
+mq_unlink(const char *path)
{
int err;
@@ -731,14 +718,14 @@ __mq_timedsend(mqd_t mqdes, const char *msg_ptr, size_t msg_len,
}
int
-_mq_send(mqd_t mqdes, const char *msg_ptr, size_t msg_len, uint_t msg_prio)
+mq_send(mqd_t mqdes, const char *msg_ptr, size_t msg_len, uint_t msg_prio)
{
return (__mq_timedsend(mqdes, msg_ptr, msg_len, msg_prio,
NULL, ABS_TIME));
}
int
-_mq_timedsend(mqd_t mqdes, const char *msg_ptr, size_t msg_len,
+mq_timedsend(mqd_t mqdes, const char *msg_ptr, size_t msg_len,
uint_t msg_prio, const timespec_t *abs_timeout)
{
return (__mq_timedsend(mqdes, msg_ptr, msg_len, msg_prio,
@@ -746,7 +733,7 @@ _mq_timedsend(mqd_t mqdes, const char *msg_ptr, size_t msg_len,
}
int
-_mq_reltimedsend_np(mqd_t mqdes, const char *msg_ptr, size_t msg_len,
+mq_reltimedsend_np(mqd_t mqdes, const char *msg_ptr, size_t msg_len,
uint_t msg_prio, const timespec_t *rel_timeout)
{
return (__mq_timedsend(mqdes, msg_ptr, msg_len, msg_prio,
@@ -843,14 +830,14 @@ __mq_timedreceive(mqd_t mqdes, char *msg_ptr, size_t msg_len,
}
ssize_t
-_mq_receive(mqd_t mqdes, char *msg_ptr, size_t msg_len, uint_t *msg_prio)
+mq_receive(mqd_t mqdes, char *msg_ptr, size_t msg_len, uint_t *msg_prio)
{
return (__mq_timedreceive(mqdes, msg_ptr, msg_len, msg_prio,
NULL, ABS_TIME));
}
ssize_t
-_mq_timedreceive(mqd_t mqdes, char *msg_ptr, size_t msg_len,
+mq_timedreceive(mqd_t mqdes, char *msg_ptr, size_t msg_len,
uint_t *msg_prio, const timespec_t *abs_timeout)
{
return (__mq_timedreceive(mqdes, msg_ptr, msg_len, msg_prio,
@@ -858,7 +845,7 @@ _mq_timedreceive(mqd_t mqdes, char *msg_ptr, size_t msg_len,
}
ssize_t
-_mq_reltimedreceive_np(mqd_t mqdes, char *msg_ptr, size_t msg_len,
+mq_reltimedreceive_np(mqd_t mqdes, char *msg_ptr, size_t msg_len,
uint_t *msg_prio, const timespec_t *rel_timeout)
{
return (__mq_timedreceive(mqdes, msg_ptr, msg_len, msg_prio,
@@ -866,7 +853,7 @@ _mq_reltimedreceive_np(mqd_t mqdes, char *msg_ptr, size_t msg_len,
}
/*
- * Only used below, in _mq_notify().
+ * Only used below, in mq_notify().
* We already have a spawner thread.
* Verify that the attributes match; cancel it if necessary.
*/
@@ -874,7 +861,7 @@ static int
cancel_if_necessary(thread_communication_data_t *tcdp,
const struct sigevent *sigevp)
{
- int do_cancel = !_pthread_attr_equal(tcdp->tcd_attrp,
+ int do_cancel = !pthread_attr_equal(tcdp->tcd_attrp,
sigevp->sigev_notify_attributes);
if (do_cancel) {
@@ -898,7 +885,7 @@ cancel_if_necessary(thread_communication_data_t *tcdp,
}
int
-_mq_notify(mqd_t mqdes, const struct sigevent *sigevp)
+mq_notify(mqd_t mqdes, const struct sigevent *sigevp)
{
mqdes_t *mqdp = (mqdes_t *)mqdes;
mqhdr_t *mqhp;
@@ -1030,7 +1017,7 @@ bad:
}
int
-_mq_setattr(mqd_t mqdes, const struct mq_attr *mqstat, struct mq_attr *omqstat)
+mq_setattr(mqd_t mqdes, const struct mq_attr *mqstat, struct mq_attr *omqstat)
{
mqdes_t *mqdp = (mqdes_t *)mqdes;
mqhdr_t *mqhp;
@@ -1062,7 +1049,7 @@ _mq_setattr(mqd_t mqdes, const struct mq_attr *mqstat, struct mq_attr *omqstat)
}
int
-_mq_getattr(mqd_t mqdes, struct mq_attr *mqstat)
+mq_getattr(mqd_t mqdes, struct mq_attr *mqstat)
{
mqdes_t *mqdp = (mqdes_t *)mqdes;
mqhdr_t *mqhp;
diff --git a/usr/src/lib/libc/port/rt/pos4obj.c b/usr/src/lib/libc/port/rt/pos4obj.c
index 3dc20cb761..29b8565eae 100644
--- a/usr/src/lib/libc/port/rt/pos4obj.c
+++ b/usr/src/lib/libc/port/rt/pos4obj.c
@@ -26,7 +26,7 @@
#pragma ident "%Z%%M% %I% %E% SMI"
-#include "synonyms.h"
+#include "lint.h"
#include "mtlib.h"
#include <sys/types.h>
#include <errno.h>
diff --git a/usr/src/lib/libc/port/rt/sched.c b/usr/src/lib/libc/port/rt/sched.c
index df1be0e7ad..31da819017 100644
--- a/usr/src/lib/libc/port/rt/sched.c
+++ b/usr/src/lib/libc/port/rt/sched.c
@@ -26,7 +26,7 @@
#pragma ident "%Z%%M% %I% %E% SMI"
-#include "synonyms.h"
+#include "lint.h"
#include "thr_uberdata.h"
#include <sched.h>
#include <sys/tspriocntl.h>
@@ -128,7 +128,7 @@ get_info_by_policy(int policy)
* dynamic loading of scheduling classes.
*/
if (base) {
- _membar_producer();
+ membar_producer();
pccp->pcc_state = -1;
}
errno = EINVAL;
@@ -138,7 +138,7 @@ get_info_by_policy(int policy)
pccp->pcc_policy = policy;
} else if (policy != SCHED_SYS &&
priocntl(0, 0, PC_GETCID, &pccp->pcc_info) == -1) {
- _membar_producer();
+ membar_producer();
pccp->pcc_state = -1;
errno = EINVAL;
lmutex_unlock(&class_lock);
@@ -170,7 +170,7 @@ get_info_by_policy(int policy)
break;
}
- _membar_producer();
+ membar_producer();
pccp->pcc_state = 1;
lmutex_unlock(&class_lock);
return (pccp);
@@ -577,7 +577,7 @@ update_sched(ulwp_t *self)
if (self->ul_policy < 0) {
self->ul_cid = 0;
self->ul_pri = 0;
- _membar_producer();
+ membar_producer();
self->ul_policy = SCHED_OTHER;
}
exit_critical(self);
@@ -596,7 +596,7 @@ update_sched(ulwp_t *self)
if (pccp == NULL) { /* can't happen? */
self->ul_cid = scp->sc_cid;
self->ul_pri = scp->sc_cpri;
- _membar_producer();
+ membar_producer();
self->ul_policy = SCHED_OTHER;
exit_critical(self);
return;
@@ -629,7 +629,7 @@ update_sched(ulwp_t *self)
self->ul_cid = pcparm.pc_cid;
self->ul_pri = priority;
- _membar_producer();
+ membar_producer();
self->ul_policy = policy;
exit_critical(self);
diff --git a/usr/src/lib/libc/port/rt/sem.c b/usr/src/lib/libc/port/rt/sem.c
index af3bdcc06a..f378c93d27 100644
--- a/usr/src/lib/libc/port/rt/sem.c
+++ b/usr/src/lib/libc/port/rt/sem.c
@@ -20,25 +20,13 @@
*/
/*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
#pragma ident "%Z%%M% %I% %E% SMI"
-#pragma weak sem_open = _sem_open
-#pragma weak sem_close = _sem_close
-#pragma weak sem_unlink = _sem_unlink
-#pragma weak sem_init = _sem_init
-#pragma weak sem_destroy = _sem_destroy
-#pragma weak sem_wait = _sem_wait
-#pragma weak sem_timedwait = _sem_timedwait
-#pragma weak sem_reltimedwait_np = _sem_reltimedwait_np
-#pragma weak sem_trywait = _sem_trywait
-#pragma weak sem_post = _sem_post
-#pragma weak sem_getvalue = _sem_getvalue
-
-#include "synonyms.h"
+#include "lint.h"
#include "mtlib.h"
#include <sys/types.h>
#include <semaphore.h>
@@ -66,7 +54,7 @@ static semaddr_t *semheadp = NULL;
static mutex_t semlock = DEFAULTMUTEX;
sem_t *
-_sem_open(const char *path, int oflag, /* mode_t mode, int value */ ...)
+sem_open(const char *path, int oflag, /* mode_t mode, int value */ ...)
{
va_list ap;
mode_t crmode = 0;
@@ -106,7 +94,7 @@ _sem_open(const char *path, int oflag, /* mode_t mode, int value */ ...)
errno = 0;
if ((fd = __pos4obj_open(path, SEM_DATA_TYPE,
- oflag, crmode, &cr_flag)) < 0)
+ oflag, crmode, &cr_flag)) < 0)
goto out;
if (cr_flag)
@@ -150,7 +138,7 @@ _sem_open(const char *path, int oflag, /* mode_t mode, int value */ ...)
/* LINTED */
sem = (sem_t *)mmap64(NULL, sizeof (sem_t), PROT_READ|PROT_WRITE,
- MAP_SHARED, fd, (off64_t)0);
+ MAP_SHARED, fd, (off64_t)0);
(void) __close_nc(fd);
cr_flag &= ~DFILE_OPEN;
if (sem == MAP_FAILED)
@@ -194,7 +182,7 @@ out:
}
int
-_sem_close(sem_t *sem)
+sem_close(sem_t *sem)
{
semaddr_t **next;
semaddr_t *freeit;
@@ -215,7 +203,7 @@ _sem_close(sem_t *sem)
}
int
-_sem_unlink(const char *path)
+sem_unlink(const char *path)
{
int error;
int oerrno;
@@ -255,7 +243,7 @@ sem_invalid(sem_t *sem)
}
int
-_sem_init(sem_t *sem, int pshared, uint_t value)
+sem_init(sem_t *sem, int pshared, uint_t value)
{
int error;
@@ -268,7 +256,7 @@ _sem_init(sem_t *sem, int pshared, uint_t value)
}
int
-_sem_destroy(sem_t *sem)
+sem_destroy(sem_t *sem)
{
int error;
@@ -282,7 +270,7 @@ _sem_destroy(sem_t *sem)
}
int
-_sem_post(sem_t *sem)
+sem_post(sem_t *sem)
{
int error;
@@ -296,7 +284,7 @@ _sem_post(sem_t *sem)
}
int
-_sem_wait(sem_t *sem)
+sem_wait(sem_t *sem)
{
int error;
@@ -310,7 +298,7 @@ _sem_wait(sem_t *sem)
}
int
-_sem_timedwait(sem_t *sem, const timespec_t *abstime)
+sem_timedwait(sem_t *sem, const timespec_t *abstime)
{
int error;
@@ -326,7 +314,7 @@ _sem_timedwait(sem_t *sem, const timespec_t *abstime)
}
int
-_sem_reltimedwait_np(sem_t *sem, const timespec_t *reltime)
+sem_reltimedwait_np(sem_t *sem, const timespec_t *reltime)
{
int error;
@@ -342,7 +330,7 @@ _sem_reltimedwait_np(sem_t *sem, const timespec_t *reltime)
}
int
-_sem_trywait(sem_t *sem)
+sem_trywait(sem_t *sem)
{
int error;
@@ -358,7 +346,7 @@ _sem_trywait(sem_t *sem)
}
int
-_sem_getvalue(sem_t *sem, int *sval)
+sem_getvalue(sem_t *sem, int *sval)
{
if (sem_invalid(sem))
return (-1);
diff --git a/usr/src/lib/libc/port/rt/shm.c b/usr/src/lib/libc/port/rt/shm.c
index 53c59d9424..87f2cfae44 100644
--- a/usr/src/lib/libc/port/rt/shm.c
+++ b/usr/src/lib/libc/port/rt/shm.c
@@ -20,13 +20,13 @@
*/
/*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
#pragma ident "%Z%%M% %I% %E% SMI"
-#include "synonyms.h"
+#include "lint.h"
#include <sys/types.h>
#include <sys/mman.h>
#include <fcntl.h>
diff --git a/usr/src/lib/libc/port/rt/sigev_thread.c b/usr/src/lib/libc/port/rt/sigev_thread.c
index e048fc5196..05f3785c25 100644
--- a/usr/src/lib/libc/port/rt/sigev_thread.c
+++ b/usr/src/lib/libc/port/rt/sigev_thread.c
@@ -26,7 +26,7 @@
#pragma ident "%Z%%M% %I% %E% SMI"
-#include "synonyms.h"
+#include "lint.h"
#include "thr_uberdata.h"
#include <sys/types.h>
#include <pthread.h>
@@ -345,7 +345,7 @@ aio_spawner(void *arg)
if (function == NULL)
error = EINVAL;
- else if (_pthread_attr_equal(attrp, tcdp->tcd_attrp))
+ else if (pthread_attr_equal(attrp, tcdp->tcd_attrp))
error = sigev_add_work(tcdp, function, argument);
else {
/*
@@ -358,12 +358,12 @@ aio_spawner(void *arg)
if ((stdp = lmalloc(sizeof (*stdp))) == NULL)
error = ENOMEM;
else
- error = _pthread_attr_clone(&local_attr, attrp);
+ error = pthread_attr_clone(&local_attr, attrp);
if (error == 0) {
(void) pthread_attr_setdetachstate(
&local_attr, PTHREAD_CREATE_DETACHED);
- (void) _pthread_attr_setdaemonstate_np(
+ (void) pthread_attr_setdaemonstate_np(
&local_attr, PTHREAD_CREATE_DAEMON_NP);
stdp->std_func = function;
stdp->std_arg = argument;
@@ -472,7 +472,7 @@ setup_sigev_handler(const struct sigevent *sigevp, subsystem_t caller)
* pthread_attr_t.
*/
tcdp->tcd_attrp = &tcdp->tcd_user_attr;
- error = _pthread_attr_clone(tcdp->tcd_attrp,
+ error = pthread_attr_clone(tcdp->tcd_attrp,
sigevp->sigev_notify_attributes);
if (error) {
tcdp->tcd_attrp = NULL;
diff --git a/usr/src/lib/libc/port/rt/sigev_thread.h b/usr/src/lib/libc/port/rt/sigev_thread.h
index 943cb8ab23..0a0e6b0010 100644
--- a/usr/src/lib/libc/port/rt/sigev_thread.h
+++ b/usr/src/lib/libc/port/rt/sigev_thread.h
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -101,8 +101,8 @@ extern void del_sigev_mq(thread_communication_data_t *);
extern void *aio_spawner(void *);
/* Private interfaces elsewhere in libc */
-extern int _pthread_attr_clone(pthread_attr_t *, const pthread_attr_t *);
-extern int _pthread_attr_equal(const pthread_attr_t *, const pthread_attr_t *);
+extern int pthread_attr_clone(pthread_attr_t *, const pthread_attr_t *);
+extern int pthread_attr_equal(const pthread_attr_t *, const pthread_attr_t *);
extern int _port_dispatch(int, int, int, int, uintptr_t, void *);
extern thread_communication_data_t *sigev_aio_tcd;