diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-16 17:11:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-16 17:11:43 -0400 |
| commit | 2e57572a50a4de41c6cbc879a4866a312d4cd316 (patch) | |
| tree | c4f58ec96c06642c4b415b881d3f0a3b673d5b44 /Documentation/lguest/lguest.c | |
| parent | 9b2e43ae4e9609f80034dfe8de895045cac52d77 (diff) | |
| parent | f948cc6ab9e61a8e88d70ee9aafc690e6d26f92c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Conflicts:
arch/sparc64/kernel/pci_psycho.c
Diffstat (limited to 'Documentation/lguest/lguest.c')
| -rw-r--r-- | Documentation/lguest/lguest.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/lguest/lguest.c b/Documentation/lguest/lguest.c index 655414821edc..7228369d1014 100644 --- a/Documentation/lguest/lguest.c +++ b/Documentation/lguest/lguest.c | |||
| @@ -895,6 +895,9 @@ static void handle_console_output(int fd, struct virtqueue *vq, bool timeout) | |||
| 895 | } | 895 | } |
| 896 | } | 896 | } |
| 897 | 897 | ||
| 898 | /* This is called when we no longer want to hear about Guest changes to a | ||
| 899 | * virtqueue. This is more efficient in high-traffic cases, but it means we | ||
| 900 | * have to set a timer to check if any more changes have occurred. */ | ||
| 898 | static void block_vq(struct virtqueue *vq) | 901 | static void block_vq(struct virtqueue *vq) |
| 899 | { | 902 | { |
| 900 | struct itimerval itm; | 903 | struct itimerval itm; |
| @@ -939,6 +942,11 @@ static void handle_net_output(int fd, struct virtqueue *vq, bool timeout) | |||
| 939 | if (!timeout && num) | 942 | if (!timeout && num) |
| 940 | block_vq(vq); | 943 | block_vq(vq); |
| 941 | 944 | ||
| 945 | /* We never quite know how long should we wait before we check the | ||
| 946 | * queue again for more packets. We start at 500 microseconds, and if | ||
| 947 | * we get fewer packets than last time, we assume we made the timeout | ||
| 948 | * too small and increase it by 10 microseconds. Otherwise, we drop it | ||
| 949 | * by one microsecond every time. It seems to work well enough. */ | ||
| 942 | if (timeout) { | 950 | if (timeout) { |
| 943 | if (num < last_timeout_num) | 951 | if (num < last_timeout_num) |
| 944 | timeout_usec += 10; | 952 | timeout_usec += 10; |