debian/changelog | 4 ++
debian/patches/160_log_timestamping.patch | 44 ++++++++++++------------------
debian/patches/series | 2 -
3 files changed, 23 insertions(+), 27 deletions(-)
New commits:
commit 4e969d6248684ec62c6f33c8d86d1ffa34ec1b26
Author: Bryce Harrington <br...@bryceharrington.org>
Date: Thu Dec 3 14:57:47 2009 -0800
Refresh 160 for 1.7 codebase and re-enable it to provide timings
during Lucid development.
diff --git a/debian/changelog b/debian/changelog
index 842b062..d3e32cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -62,6 +62,8 @@ xorg-server (2:1.7.2-2ubuntu1) UNRELEASED; urgency=low
* 189_xserver_1.5.0_bg_none_root.patch: Fetched a new version.
* 135_rethrow_signals.patch, 168_glibc_trace_to_stderr.patch: Updated.
Still relevant for hooking in apport.
+ * 160_log_timestamping.patch: Updated and re-enabled for boot speed
+ testing in Lucid. This patch should be disabled by beta2.
* 169_mipointer_nullptr_checks.patch: Updated. MIPOINTER() still
can return NULL under some circumstances, and its return values
are still being dereferenced without checking for NULL.
@@ -71,7 +73,7 @@ xorg-server (2:1.7.2-2ubuntu1) UNRELEASED; urgency=low
* control, local/64-xorg-xkb.rules: Don't depend on keyboard-configuration
until we have it.
- -- Bryce Harrington <br...@ubuntu.com> Thu, 03 Dec 2009 14:53:18 -0800
+ -- Bryce Harrington <br...@ubuntu.com> Thu, 03 Dec 2009 14:56:35 -0800
xorg-server (2:1.7.2-2) experimental; urgency=low
diff --git a/debian/patches/160_log_timestamping.patch
b/debian/patches/160_log_timestamping.patch
index 5540e63..a40052b 100644
--- a/debian/patches/160_log_timestamping.patch
+++ b/debian/patches/160_log_timestamping.patch
@@ -1,11 +1,11 @@
-Index: xorg-server-1.5.99.902/os/log.c
-===================================================================
---- xorg-server-1.5.99.902.orig/os/log.c 2009-01-31 06:12:17.000000000
+0100
-+++ xorg-server-1.5.99.902/os/log.c 2009-02-06 23:32:18.000000000 +0100
-@@ -313,6 +313,28 @@
- {
+Binary files xorg-server-ubuntu-git-patched/.git/index and
xorg-server-ubuntu-git-working/.git/index differ
+diff -Nurp xorg-server-ubuntu-git-patched/os/log.c
xorg-server-ubuntu-git-working/os/log.c
+--- xorg-server-ubuntu-git-patched/os/log.c 2009-12-01 18:49:34.000000000
-0800
++++ xorg-server-ubuntu-git-working/os/log.c 2009-12-01 20:29:19.000000000
-0800
+@@ -314,6 +314,29 @@ LogVMessageVerb(MessageType type, int ve
const char *s = X_UNKNOWN_STRING;
- char *tmpBuf = NULL;
+ char tmpBuf[1024];
+
+ struct timeval time;
+ time_t tv_sec;
+ suseconds_t tv_usec;
@@ -28,23 +28,17 @@ Index: xorg-server-1.5.99.902/os/log.c
+ diff_sec--;
+ diff_usec += 1000000;
+ }
-
++
/* Ignore verbosity for X_ERROR */
if (logVerbosity >= verb || logFileVerbosity >= verb || type == X_ERROR) {
-@@ -357,13 +379,14 @@
- /*
- * Prefix the format string with the message type. We do it this way
- * so that LogVWrite() is only called once per message.
-+ * Prefix the whole with timestamp.
- */
- if (s) {
-- tmpBuf = malloc(strlen(format) + strlen(s) + 1 + 1);
-+ tmpBuf = malloc(strlen(format) + strlen(s) + 1 + 1 + 15);
- /* Silently return if malloc fails here. */
- if (!tmpBuf)
- return;
-- sprintf(tmpBuf, "%s ", s);
-+ sprintf(tmpBuf, "[%5d.%06d] %s ", diff_sec, diff_usec, s);
- strcat(tmpBuf, format);
- LogVWrite(verb, tmpBuf, args);
- free(tmpBuf);
+ switch (type) {
+@@ -355,7 +378,8 @@ LogVMessageVerb(MessageType type, int ve
+ }
+
+ /* if s is not NULL we need a space before format */
+- snprintf(tmpBuf, sizeof(tmpBuf), "%s%s%s", s ? s : "",
++ snprintf(tmpBuf, sizeof(tmpBuf), "[%5d.%06d] %s%s%s", diff_sec,
diff_usec,
++ s ? s : "",
+ s ? " " : "",
+ format);
+ LogVWrite(verb, tmpBuf, args);
diff --git a/debian/patches/series b/debian/patches/series
index d51dc55..f86876e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,7 +15,7 @@
#143_default_to_vesa.patch
#156_exevents_copykeyclass_nullptrcheck.patch
157_check_null_modes.patch
-#160_log_timestamping.patch
+160_log_timestamping.patch
162_null_crtc_in_rotation.patch
164_trap-aspect-ratios.patch
165_man_xorg_conf_no_device_ident.patch
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
