Revert "debug printf"review/xsync-transition-bug-59644

This reverts commit 7a272472af03ab19c19f3a453edc2161b5e5f3d9.

3 files changed, 5 insertions, 81 deletions

diff --git a/Xext/sync.c b/Xext/sync.c
index 72c56877b..ff670b164 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -272,7 +272,6 @@ static Bool
 SyncCheckTriggerPositiveTransition(SyncTrigger * pTrigger, CARD64 oldval)
 {
     SyncCounter *pCounter;
-    int rc;
 
     /* Non-counter sync objects should never get here because they
      * never trigger this comparison. */
@@ -281,20 +280,15 @@ SyncCheckTriggerPositiveTransition(SyncTrigger * pTrigger, CARD64 oldval)
 
     pCounter = (SyncCounter *) pTrigger->pSync;
 
-    rc = (pCounter == NULL ||
+    return (pCounter == NULL ||
             (XSyncValueLessThan(oldval, pTrigger->test_value) &&
              XSyncValueGreaterOrEqual(pCounter->value, pTrigger->test_value)));
-    ErrorF("Positive transition trigger checked: oldval %d testval %d counter %d result %d\n",
-            XSyncValueLow32(oldval),
-            XSyncValueLow32(pTrigger->test_value), XSyncValueLow32(pCounter->value), rc);
-    return rc;
 }
 
 static Bool
 SyncCheckTriggerNegativeTransition(SyncTrigger * pTrigger, CARD64 oldval)
 {
     SyncCounter *pCounter;
-    int rc;
 
     /* Non-counter sync objects should never get here because they
      * never trigger this comparison. */
@@ -303,13 +297,9 @@ SyncCheckTriggerNegativeTransition(SyncTrigger * pTrigger, CARD64 oldval)
 
     pCounter = (SyncCounter *) pTrigger->pSync;
 
-    rc = (pCounter == NULL ||
+    return (pCounter == NULL ||
             (XSyncValueGreaterThan(oldval, pTrigger->test_value) &&
              XSyncValueLessOrEqual(pCounter->value, pTrigger->test_value)));
-    ErrorF("Negative transition trigger checked: oldval %d testval %d counter %d result %d\n",
-            XSyncValueLow32(oldval),
-            XSyncValueLow32(pTrigger->test_value), XSyncValueLow32(pCounter->value), rc);
-    return rc;
 }
 
 static Bool
@@ -467,11 +457,8 @@ SyncSendAlarmNotifyEvents(SyncAlarm * pAlarm)
     }
 
     /* send to owner */
-    if (pAlarm->events) {
-        ErrorF("Event!\n");
+    if (pAlarm->events)
         WriteEventsToClient(pAlarm->client, 1, (xEvent *) &ane);
-    } else
-        ErrorF("no event mask!\n");
 
     /* send to other interested clients */
     for (pcl = pAlarm->pEventClients; pcl; pcl = pcl->next)
@@ -548,8 +535,6 @@ SyncAlarmTriggerFired(SyncTrigger * pTrigger)
     if (!SyncCheckWarnIsCounter(pTrigger->pSync, WARN_INVALID_COUNTER_ALARM))
         return;
 
-    ErrorF("alarm trigger fired for %d\n", pTrigger->test_type);
-
     pCounter = (SyncCounter *) pTrigger->pSync;
 
     /* no need to check alarm unless it's active */
@@ -580,7 +565,6 @@ SyncAlarmTriggerFired(SyncTrigger * pTrigger)
                                     WARN_INVALID_COUNTER_ALARM))
             return;
 
-        ErrorF("alarm active, adding delta\n");
         paCounter = (SyncCounter *) pTrigger->pSync;
 
         /* "The alarm is updated by repeatedly adding delta to the
@@ -733,7 +717,6 @@ SyncChangeCounter(SyncCounter * pCounter, CARD64 newval)
     CARD64 oldval;
 
     oldval = SyncUpdateCounter(pCounter, newval);
-    ErrorF("%s: oldval %d newval %d\n", __func__, XSyncValueLow32(oldval), XSyncValueLow32(newval));
 
     /* run through triggers to see if any become true */
     for (ptl = pCounter->sync.pTriglist; ptl; ptl = pnext) {
@@ -1029,8 +1012,6 @@ SyncComputeBracketValues(SyncCounter * pCounter)
     if (ct == XSyncCounterNeverChanges)
         return;
 
-
-    ErrorF("%s: recomputing brackets\n", __func__);
     XSyncMaxValue(&psci->bracket_greater);
     XSyncMinValue(&psci->bracket_less);
 
@@ -1067,18 +1048,8 @@ SyncComputeBracketValues(SyncCounter * pCounter)
         }
         else if (pTrigger->test_type == XSyncNegativeTransition &&
                  ct != XSyncCounterNeverIncreases) {
-            ErrorF("We have a negative transition counter\n");
-
-            ErrorF("	value is %d.%d, trigger is %d.%d\n",
-                    XSyncValueHigh32(pCounter->value),
-                    XSyncValueLow32(pCounter->value),
-                    XSyncValueHigh32(pTrigger->test_value),
-                    XSyncValueLow32(pTrigger->test_value));
-
             if (XSyncValueGreaterOrEqual(pCounter->value, pTrigger->test_value) &&
                 XSyncValueGreaterThan(pTrigger->test_value, psci->bracket_less)) {
-                ErrorF("	setting bracket less to %d\n",
-                XSyncValueLow32(pTrigger->test_value));
                     /*
                      * If the value is exactly equal to our threshold, we want one
                      * more event in the negative direction to ensure we pick up
@@ -1089,23 +1060,14 @@ SyncComputeBracketValues(SyncCounter * pCounter)
             }
             else if (XSyncValueLessThan(pCounter->value, pTrigger->test_value) &&
                      XSyncValueLessThan(pTrigger->test_value, psci->bracket_greater)) {
-                ErrorF("	setting bracket greater to %d\n", XSyncValueLow32(pTrigger->test_value));
                     psci->bracket_greater = pTrigger->test_value;
                     pnewgtval = &psci->bracket_greater;
             }
         }
         else if (pTrigger->test_type == XSyncPositiveTransition &&
                  ct != XSyncCounterNeverDecreases) {
-            ErrorF("We have a positive transition counter\n");
-            ErrorF("	value is %d.%d, trigger is %d.%d\n",
-                    XSyncValueHigh32(pCounter->value),
-                    XSyncValueLow32(pCounter->value),
-                    XSyncValueHigh32(pTrigger->test_value),
-                    XSyncValueLow32(pTrigger->test_value));
             if (XSyncValueLessOrEqual(pCounter->value, pTrigger->test_value) &&
                 XSyncValueLessThan(pTrigger->test_value, psci->bracket_greater)) {
-                ErrorF("	setting bracket greater to %d\n",
-                XSyncValueLow32(pTrigger->test_value));
                     /*
                      * If the value is exactly equal to our threshold, we
                      * want one more event in the positive direction to
@@ -1117,8 +1079,6 @@ SyncComputeBracketValues(SyncCounter * pCounter)
             }
             else if (XSyncValueGreaterThan(pCounter->value, pTrigger->test_value) &&
                      XSyncValueGreaterThan(pTrigger->test_value, psci->bracket_less)) {
-                ErrorF("	setting bracket less to %d\n",
-                XSyncValueLow32(pTrigger->test_value));
                     psci->bracket_less = pTrigger->test_value;
                     pnewltval = &psci->bracket_less;
             }
@@ -1127,11 +1087,6 @@ SyncComputeBracketValues(SyncCounter * pCounter)
 
     (*psci->BracketValues) ((pointer) pCounter, pnewltval, pnewgtval);
 
-    if (pnewltval)
-            ErrorF("%s: less is %d.%d\n",
-                    __func__,
-                    XSyncValueHigh32(*pnewltval),
-                    XSyncValueLow32(*pnewltval));
 }
 
 /*
@@ -2699,8 +2654,6 @@ IdleTimeBlockHandler(pointer pCounter, struct timeval **wt, pointer LastSelectMa
     IdleTimeQueryValue(counter, &idle);
     counter->value = idle;      /* push, so CheckTrigger works */
 
-    ErrorF("%s: idle %d old idle %d\n", __func__, XSyncValueLow32(idle), XSyncValueLow32(old_idle));
-
     if (less && XSyncValueLessOrEqual(idle, *less)) {
         /*
          * We've been idle for less than the threshold value, and someone
@@ -2709,7 +2662,6 @@ IdleTimeBlockHandler(pointer pCounter, struct timeval **wt, pointer LastSelectMa
          * current idle time, and if any succeed, bomb out of select()
          * immediately so we can reschedule.
          */
-        ErrorF("%s:	 less matched, bomb out of select\n", __func__);
 
         for (list = counter->sync.pTriglist; list; list = list->next) {
             trig = list->pTrigger;
@@ -2754,8 +2706,6 @@ IdleTimeBlockHandler(pointer pCounter, struct timeval **wt, pointer LastSelectMa
             }
         }
 
-        ErrorF("%s: 	timeout adjusted to %ld\n", __func__, timeout);
-
         AdjustWaitForDelay(wt, timeout);
     }
 
@@ -2767,13 +2717,10 @@ IdleTimeCheckBrackets(SyncCounter *counter, XSyncValue idle, XSyncValue *less, X
 {
     if ((greater && XSyncValueGreaterOrEqual(idle, *greater)) ||
         (less && XSyncValueLessOrEqual(idle, *less))) {
-        ErrorF("%s: SyncChangeCounter\n", __func__);
         SyncChangeCounter(counter, idle);
     }
-    else {
-        ErrorF("%s: not changing system counter\n", __func__);
+    else
         SyncUpdateCounter(counter, idle);
-    }
 }
 
 static void
@@ -2788,15 +2735,8 @@ IdleTimeWakeupHandler(pointer pCounter, int rc, pointer LastSelectMask)
     if (!less && !greater)
         return;
 
-    ErrorF("%s: counter: %s\n", __func__, counter->pSysCounterInfo->name);
-
     IdleTimeQueryValue(pCounter, &idle);
 
-    ErrorF("%s: for %d.%d\n", __func__,
-                    XSyncValueHigh32(idle),
-                    XSyncValueLow32(idle));
-
-
     /*
       There is no guarantee for the WakeupHandler to be called within a specific
       timeframe. Idletime may go to 0, but by the time we get here, it may be
@@ -2809,21 +2749,11 @@ IdleTimeWakeupHandler(pointer pCounter, int rc, pointer LastSelectMask)
             XSyncValue zero;
             XSyncIntsToValue(&zero, 0, 0);
             IdleTimeCheckBrackets(counter, zero, less, greater);
-            ErrorF("%s: ------------------- reset forced\n", __func__);
             less = priv->value_less;
             greater = priv->value_greater;
         }
     }
-    if (greater)
-            ErrorF("%s:	 greater is %d.%d\n",
-                    __func__,
-                    XSyncValueHigh32(*greater),
-                    XSyncValueLow32(*greater));
-    if (less)
-            ErrorF("%s: less is %d.%d\n",
-                    __func__,
-                    XSyncValueHigh32(*less),
-                    XSyncValueLow32(*less));
+
     IdleTimeCheckBrackets(counter, idle, less, greater);
 }
 
diff --git a/Xi/exevents.c b/Xi/exevents.c
index 55324c308..fd4b80c48 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -1680,9 +1680,6 @@ ProcessDeviceEvent(InternalEvent *ev, DeviceIntPtr device)
     DeviceIntPtr mouse = NULL, kbd = NULL;
     DeviceEvent *event = &ev->device_event;
 
-    UpdateCurrentTime();
-    ErrorF("%s: %s %d\n", __func__, device->name, ev->any.type);
-
     if (IsPointerDevice(device)) {
         kbd = GetMaster(device, KEYBOARD_OR_FLOAT);
         mouse = device;
diff --git a/dix/events.c b/dix/events.c
index f7610f7ff..ca0c085d9 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -1068,7 +1068,6 @@ NoticeTime(const DeviceIntPtr dev, TimeStamp time)
 
     LastEventTimeToggleResetFlag(dev->id, 1);
     LastEventTimeToggleResetFlag(XIAllDevices, 1);
-    ErrorF("---------------------------------- event time noticed %d ------------------------------\n", currentTime.milliseconds);
 }
 
 static void
@@ -5930,10 +5929,8 @@ WriteEventsToClient(ClientPtr pClient, int count, xEvent *events)
     xEvent *eventTo, *eventFrom;
     int i, eventlength = sizeof(xEvent);
 
-    ErrorF("blah\n");
     if (!pClient || pClient == serverClient || pClient->clientGone)
         return;
-    ErrorF("blah 1\n");
 
     for (i = 0; i < count; i++)
         if ((events[i].u.u.type & 0x7f) != KeymapNotify)