From 58d3d46d6cc0d7a81db6bad61d158f3b9af8af71 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Thu, 1 Sep 2011 16:48:37 -0700 Subject: [PATCH 1/5] Assign ids to more tags in Xserver-Dtrace.xml Keeps xsltproc from adding random-number id tags to html output so that it's easier to see real changes vs. different random numbers. Signed-off-by: Alan Coopersmith Reviewed-by: Matt Dew --- doc/dtrace/Xserver-DTrace.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/dtrace/Xserver-DTrace.xml b/doc/dtrace/Xserver-DTrace.xml index 69cd30eb0..cd8a81204 100644 --- a/doc/dtrace/Xserver-DTrace.xml +++ b/doc/dtrace/Xserver-DTrace.xml @@ -15,7 +15,7 @@ X.Org Xserver version &xserver.version; - + Copyright (c) 2005, 2006, 2007, 2010, Oracle and/or its affiliates. All rights reserved. @@ -79,7 +79,7 @@ DEALINGS IN THE SOFTWARE. arg2, etc. These tables should help you determine what the real data is for each of the probe arguments. - +
Probes and their arguments @@ -195,7 +195,7 @@ DEALINGS IN THE SOFTWARE. To access data buffers referenced via uintptr_t's, you will need to use copyin(). -
+
Probe Arguments @@ -313,7 +313,7 @@ DEALINGS IN THE SOFTWARE. Examples - + Counting requests by request name @@ -370,7 +370,7 @@ Xserver*:::request-start - + Get average CPU time per request This script records the CPU time used between the probes at @@ -419,7 +419,7 @@ Xserver*:::request-done - + Monitoring clients that connect and disconnect @@ -476,7 +476,7 @@ CPU ID FUNCTION:NAME - + Monitoring clients creating Pixmaps From 6cae6224994e3252b3b7c7608f983ce73e0206fc Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Fri, 23 Sep 2011 09:38:24 -0400 Subject: [PATCH 2/5] dtrace: use docbook copyright markup for copyright holder No content change to copyright text. Reviewed-by: Alan Coopersmith Signed-off-by: Gaetan Nadon Signed-off-by: Alan Coopersmith --- doc/dtrace/Xserver-DTrace.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/dtrace/Xserver-DTrace.xml b/doc/dtrace/Xserver-DTrace.xml index cd8a81204..2427202c6 100644 --- a/doc/dtrace/Xserver-DTrace.xml +++ b/doc/dtrace/Xserver-DTrace.xml @@ -15,11 +15,11 @@ X.Org Xserver version &xserver.version; + 2005200620072010 + Oracle and/or its affiliates. All rights reserved. + -Copyright (c) 2005, 2006, 2007, 2010, Oracle and/or its affiliates. -All rights reserved. - Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation From 46d5ae5b551cc926331324073f2686b47e8aea07 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Fri, 23 Sep 2011 09:38:25 -0400 Subject: [PATCH 3/5] dtrace: fix typo in title The word provider should be capitalized. Reviewed-by: Alan Coopersmith Signed-off-by: Gaetan Nadon Signed-off-by: Alan Coopersmith --- doc/dtrace/Xserver-DTrace.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/dtrace/Xserver-DTrace.xml b/doc/dtrace/Xserver-DTrace.xml index 2427202c6..fa8bc809a 100644 --- a/doc/dtrace/Xserver-DTrace.xml +++ b/doc/dtrace/Xserver-DTrace.xml @@ -6,7 +6,7 @@
- Xserver provider for DTrace + Xserver Provider for DTrace AlanCoopersmith From 3d41939d0349569dcfd2aef9b846c739d0ba0060 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Thu, 22 Sep 2011 17:41:38 -0700 Subject: [PATCH 4/5] Unconditionally #include The more recent inclusions of this file haven't been checking for HAVE_STDINT_H, so might as well make the older ones consistent. Signed-off-by: Alan Coopersmith Reviewed-by: Jeremy Huddleston Reviewed-by: Jamey Sharp --- Xext/xcmisc.c | 5 ----- dbe/dbe.c | 5 ----- include/dix-config.h.in | 3 --- render/render.c | 4 ---- 4 files changed, 17 deletions(-) diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c index 8e3c9cd80..745135ed5 100644 --- a/Xext/xcmisc.c +++ b/Xext/xcmisc.c @@ -40,12 +40,7 @@ from The Open Group. #include #include "modinit.h" -#if HAVE_STDINT_H #include -#elif !defined(UINT32_MAX) -#define UINT32_MAX 0xffffffffU -#endif - static int ProcXCMiscGetVersion(ClientPtr client) diff --git a/dbe/dbe.c b/dbe/dbe.c index 86d8220b8..a46867676 100644 --- a/dbe/dbe.c +++ b/dbe/dbe.c @@ -38,12 +38,7 @@ #endif #include -#if HAVE_STDINT_H #include -#elif !defined(UINT32_MAX) -#define UINT32_MAX 0xffffffffU -#endif - #include #include #include "scrnintstr.h" diff --git a/include/dix-config.h.in b/include/dix-config.h.in index 5facb1106..aa7de60bd 100644 --- a/include/dix-config.h.in +++ b/include/dix-config.h.in @@ -178,9 +178,6 @@ /* Define to 1 if you have the `shmctl64' function. */ #undef HAVE_SHMCTL64 -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H diff --git a/render/render.c b/render/render.c index cc13dbc2a..ff75409cb 100644 --- a/render/render.c +++ b/render/render.c @@ -52,11 +52,7 @@ #include "panoramiXsrv.h" #endif -#if HAVE_STDINT_H #include -#elif !defined(UINT32_MAX) -#define UINT32_MAX 0xffffffffU -#endif static int ProcRenderQueryVersion (ClientPtr pClient); static int ProcRenderQueryPictFormats (ClientPtr pClient); From 84bb0207f6db433a8d387d933393357da87ca23e Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Fri, 23 Sep 2011 20:03:03 -0400 Subject: [PATCH 5/5] dix and os: gitignore dix.O and os.O Reviewed-by: Alan Coopersmith Signed-off-by: Gaetan Nadon Signed-off-by: Alan Coopersmith --- dix/.gitignore | 1 + os/.gitignore | 1 + 2 files changed, 2 insertions(+) create mode 100644 os/.gitignore diff --git a/dix/.gitignore b/dix/.gitignore index c1b4f206b..65f2f8c62 100644 --- a/dix/.gitignore +++ b/dix/.gitignore @@ -1,2 +1,3 @@ # Add & Override for this directory and it's subdirectories Xserver-dtrace.h +dix.O diff --git a/os/.gitignore b/os/.gitignore new file mode 100644 index 000000000..bba633b88 --- /dev/null +++ b/os/.gitignore @@ -0,0 +1 @@ +os.O