aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/os
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/os')
-rw-r--r--xorg-server/os/backtrace.c5
-rw-r--r--xorg-server/os/connection.c2
-rw-r--r--xorg-server/os/io.c29
-rw-r--r--xorg-server/os/utils.c27
-rwxr-xr-x[-rw-r--r--]xorg-server/os/xstrans.c6
5 files changed, 64 insertions, 5 deletions
diff --git a/xorg-server/os/backtrace.c b/xorg-server/os/backtrace.c
index 426f9b15b..3d1195b86 100644
--- a/xorg-server/os/backtrace.c
+++ b/xorg-server/os/backtrace.c
@@ -114,14 +114,15 @@ xorg_backtrace(void)
void
xorg_backtrace(void)
{
- void *array[64];
+ const int BT_SIZE = 64;
+ void *array[BT_SIZE];
const char *mod;
int size, i;
Dl_info info;
ErrorFSigSafe("\n");
ErrorFSigSafe("Backtrace:\n");
- size = backtrace(array, 64);
+ size = backtrace(array, BT_SIZE);
for (i = 0; i < size; i++) {
int rc = dladdr(array[i], &info);
diff --git a/xorg-server/os/connection.c b/xorg-server/os/connection.c
index d073c2f91..99f0da06c 100644
--- a/xorg-server/os/connection.c
+++ b/xorg-server/os/connection.c
@@ -960,7 +960,7 @@ ErrorConnMax(XtransConnInfo trans_conn)
iov[0].iov_len = sz_xConnSetupPrefix;
iov[0].iov_base = (char *) &csp;
iov[1].iov_len = csp.lengthReason;
- iov[1].iov_base = NOROOM;
+ iov[1].iov_base = (void *) NOROOM;
iov[2].iov_len = (4 - (csp.lengthReason & 3)) & 3;
iov[2].iov_base = pad;
(void) _XSERVTransWritev(trans_conn, iov, 3);
diff --git a/xorg-server/os/io.c b/xorg-server/os/io.c
index 2c8b05a76..c0bd68d97 100644
--- a/xorg-server/os/io.c
+++ b/xorg-server/os/io.c
@@ -259,6 +259,12 @@ ReadRequestFromClient(ClientPtr client)
oc->input = oci;
}
+ /* Discard any unused file descriptors */
+ while (client->req_fds > 0) {
+ int req_fd = ReadFdFromClient(client);
+ if (req_fd >= 0)
+ close(req_fd);
+ }
/* advance to start of next request */
oci->bufptr += oci->lenLastReq;
@@ -485,6 +491,29 @@ ReadRequestFromClient(ClientPtr client)
return needed;
}
+int
+ReadFdFromClient(ClientPtr client)
+{
+ int fd = -1;
+
+ if (client->req_fds > 0) {
+ OsCommPtr oc = (OsCommPtr) client->osPrivate;
+
+ --client->req_fds;
+ fd = _XSERVTransRecvFd(oc->trans_conn);
+ } else
+ LogMessage(X_ERROR, "Request asks for FD without setting req_fds\n");
+ return fd;
+}
+
+int
+WriteFdToClient(ClientPtr client, int fd, Bool do_close)
+{
+ OsCommPtr oc = (OsCommPtr) client->osPrivate;
+
+ return _XSERVTransSendFd(oc->trans_conn, fd, do_close);
+}
+
/*****************************************************************
* InsertFakeRequest
* Splice a consed up (possibly partial) request in as the next request.
diff --git a/xorg-server/os/utils.c b/xorg-server/os/utils.c
index ddd3c0c7d..202e5da06 100644
--- a/xorg-server/os/utils.c
+++ b/xorg-server/os/utils.c
@@ -451,6 +451,11 @@ GetTimeInMillis(void)
{
return GetTickCount();
}
+CARD64
+GetTimeInMicros(void)
+{
+ return (CARD64) GetTickCount() * 1000;
+}
#else
CARD32
GetTimeInMillis(void)
@@ -481,6 +486,28 @@ GetTimeInMillis(void)
X_GETTIMEOFDAY(&tv);
return (tv.tv_sec * 1000) + (tv.tv_usec / 1000);
}
+
+CARD64
+GetTimeInMicros(void)
+{
+ struct timeval tv;
+#ifdef MONOTONIC_CLOCK
+ struct timespec tp;
+ static clockid_t clockid;
+
+ if (!clockid) {
+ if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0)
+ clockid = CLOCK_MONOTONIC;
+ else
+ clockid = ~0L;
+ }
+ if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0)
+ return (CARD64) tp.tv_sec * (CARD64)1000000 + tp.tv_nsec / 1000;
+#endif
+
+ X_GETTIMEOFDAY(&tv);
+ return (CARD64) tv.tv_sec * (CARD64)1000000000 + (CARD64) tv.tv_usec * 1000;
+}
#endif
void
diff --git a/xorg-server/os/xstrans.c b/xorg-server/os/xstrans.c
index cdc8f8eec..30de32b1e 100644..100755
--- a/xorg-server/os/xstrans.c
+++ b/xorg-server/os/xstrans.c
@@ -5,9 +5,11 @@
#include <X11/Xfuncproto.h>
/* ErrorF is used by xtrans */
-/*extern _X_EXPORT void
+/*#ifndef HAVE_DIX_CONFIG_H
+extern _X_EXPORT void
ErrorF(const char *f, ...)
-_X_ATTRIBUTE_PRINTF(1, 2);*/
+_X_ATTRIBUTE_PRINTF(1, 2);
+#endif*/
#define TRANS_REOPEN
#define TRANS_SERVER