diff options
| author | iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk> | 2003-02-20 12:01:18 +0000 |
|---|---|---|
| committer | iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk> | 2003-02-20 12:01:18 +0000 |
| commit | c4d5503df675daf4c18127a6696ba66e72011574 (patch) | |
| tree | 333cce46e308c42b379877f125b480449d69c0bc /xen-2.4.16/drivers | |
| parent | 6f688921d58f0afac49642d6eb9051431fbf6a19 (diff) | |
| download | xen-c4d5503df675daf4c18127a6696ba66e72011574.tar.gz xen-c4d5503df675daf4c18127a6696ba66e72011574.tar.bz2 xen-c4d5503df675daf4c18127a6696ba66e72011574.zip | |
bitkeeper revision 1.64.1.1 (3e54c38ebC53Nz1rWkbaiI8fc1aa6g)
Add performance counters.
Change keyboard handler keys
Hit 'p' to print performance counters
Hit 'R' to reboot rather than 'r'
Hit 'F1' to toggle keyboard echo
Diffstat (limited to 'xen-2.4.16/drivers')
| -rw-r--r-- | xen-2.4.16/drivers/block/xen_block.c | 4 | ||||
| -rw-r--r-- | xen-2.4.16/drivers/char/xen_kbd.c | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/xen-2.4.16/drivers/block/xen_block.c b/xen-2.4.16/drivers/block/xen_block.c index 449eefe6a7..2b37afdd5f 100644 --- a/xen-2.4.16/drivers/block/xen_block.c +++ b/xen-2.4.16/drivers/block/xen_block.c @@ -14,6 +14,7 @@ #include <hypervisor-ifs/hypervisor-if.h> #include <asm-i386/io.h> #include <asm/spinlock.h> +#include <xeno/perfc.h> /* performance counters */ #include <xeno/keyhandler.h> @@ -118,6 +119,8 @@ void flush_blk_queue(void) blk_request = list_entry(io_done_queue.next, blk_request_t, queue); list_del (&blk_request->queue); spin_unlock_irqrestore(&io_done_queue_lock, flags); + + perf_incr(blockio_rx); /* place on ring for guest os */ blk_ring = blk_request->domain->blk_ring_base; @@ -211,6 +214,7 @@ long do_block_io_op_domain (struct task_struct* task) loop != blk_ring->btx_prod; loop = BLK_TX_RING_INC(loop)) { + perf_incr(blockio_tx); status = 1; switch (blk_ring->btx_ring[loop].operation) { diff --git a/xen-2.4.16/drivers/char/xen_kbd.c b/xen-2.4.16/drivers/char/xen_kbd.c index ce8340e7bb..dc9379a06c 100644 --- a/xen-2.4.16/drivers/char/xen_kbd.c +++ b/xen-2.4.16/drivers/char/xen_kbd.c @@ -25,6 +25,7 @@ static int keyboard_shift = 0; static int keyboard_control = 0; +static int keyboard_echo = 0; /* the following is pretty gross... * stop reading if you don't want to throw up! @@ -107,6 +108,10 @@ static unsigned char convert_scancode (unsigned char scancode) switch (scancode) { + case 0xbb: /* F1 */ + keyboard_echo = !keyboard_echo; + break; + case 0xba: /* caps lock UP */ case 0x9d: /* ctrl (left) UP */ keyboard_control = 0; @@ -137,7 +142,7 @@ static unsigned char convert_scancode (unsigned char scancode) } - if (value) printk ("%c", value); + if (value && keyboard_echo) printk ("%c", value); return value; } |