aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-03-22 00:40:55 +0100
committerMihai Moldovan <ionic@ionic.de>2017-03-22 00:40:55 +0100
commitf5e7d555ad58368cb550b4516b75a1ac3765fda2 (patch)
tree000ba384ea14d1c4ba4b8023b37ec57f95c88f58 /nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
parentb7c389b9a0fa366a40ab272a9429a52ecee7365d (diff)
parent565421ba18a09d20620e01fc877915a8b09a3735 (diff)
downloadnx-libs-f5e7d555ad58368cb550b4516b75a1ac3765fda2.tar.gz
nx-libs-f5e7d555ad58368cb550b4516b75a1ac3765fda2.tar.bz2
nx-libs-f5e7d555ad58368cb550b4516b75a1ac3765fda2.zip
Merge branch 'sunweaver-pr/various-os-backports' into 3.6.x
Attributes GH PR #376: https://github.com/ArcticaProject/nx-libs/pull/376
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
index 652d54479..5792a41c5 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
@@ -387,7 +387,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio
#endif
- if (nready && !SmartScheduleDisable)
+ if (nready)
{
clientReady[0] = SmartScheduleClient (clientReady, nready);
nready = 1;
@@ -422,8 +422,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio
ProcessInputEvents();
FlushIfCriticalOutputPending();
}
- if (!SmartScheduleDisable &&
- (SmartScheduleTime - start_tick) >= SmartScheduleSlice)
+ if ((SmartScheduleTime - start_tick) >= SmartScheduleSlice)
{
/* Penalize clients which consume ticks */
if (client->smart_priority > SMART_MIN_PRIORITY)
@@ -512,6 +511,10 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio
result = (* client->requestVector[MAJOROP])(client);
#endif
+
+ if (!SmartScheduleSignalEnable)
+ SmartScheduleTime = GetTimeInMillis();
+
if (result != Success)
{
if (client->noClientException != Success)