ethonion10/v86
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Refactor using events

Browse source
This commit is contained in:
copy 2015-01-14 00:45:17 +01:00
parent 9af95c47f6
commit 081d0cdf03
3 changed files with 110 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
debug.html
View file

@ -161,20 +161,21 @@
Speed: <span id="speed">0</span>kIPS<br>
Avg speed: <span id="avg_speed">0</span>kIPS<br>
<br>
<div id="info_hda">
<b>HDA</b><br>
Sectors read: <span id="info_hda_sectors_read"></span><br>
Bytes read: <span id="info_hda_bytes_read"></span><br>
Sectors written: <span id="info_hda_sectors_written"></span><br>
Bytes written: <span id="info_hda_bytes_written"></span><br>
Status: <span id="info_hda_status"></span><br>
<div id="info_storage" style="display: none">
<b>Storage (HDA or CDROM)</b><br>
Sectors read: <span id="info_storage_sectors_read">0</span><br>
Bytes read: <span id="info_storage_bytes_read">0</span><br>
Sectors written: <span id="info_storage_sectors_written">0</span><br>
Bytes written: <span id="info_storage_bytes_written">0</span><br>
Status: <span id="info_storage_status"></span><br>
<br>
</div>
<div id="info_cdrom">
<b>CDROM</b><br>
Sectors read: <span id="info_cdrom_sectors_read"></span><br>
Bytes read: <span id="info_cdrom_bytes_read"></span><br>
Status: <span id="info_cdrom_status"></span><br>
<div id="info_filesystem" style="display: none">
<b>9p Filesystem</b><br>
Bytes read: <span id="info_filesystem_bytes_read">0</span><br>
Bytes written: <span id="info_filesystem_bytes_written">0</span><br>
Last file: <span id="info_filesystem_last_file" style="word-wrap: break-word"></span><br>
Status: <span id="info_filesystem_status"></span><br>
<br>
</div>
<b>VGA</b><br>
@ -182,7 +183,7 @@
Resolution: <span id="info_res">-</span><br>
BPP: <span id="info_bpp">-</span><br>
<br>
Mouse: <span id="info_mouse_enabled">-</span><br>
Mouse: <span id="info_mouse_enabled">No</span><br>
<!-- Keyboard: <span id="info_keyboard_enabled">-</span><br> -->
</div>

29
index.html
View file

@ -21,7 +21,7 @@
<input type="button" value="FreeDOS (0.7 MB)" id="start_freedos">
- With nasm, vim, debug.com, some games and demos, takes 1 second to boot<br>
<input type="button" value="OpenBSD (1.4 MB)" id="start_openbsd">
- Random boot floppy, takes very long to boot<br>
- Random boot floppy, takes about 60 seconds<br>
<input type="button" value="Solar OS (1.4 MB)" id="start_solos">
- Simple graphical OS
@ -137,20 +137,21 @@
Speed: <span id="speed">0</span>kIPS<br>
Avg speed: <span id="avg_speed">0</span>kIPS<br>
<br>
<div id="info_hda">
<b>HDA</b><br>
Sectors read: <span id="info_hda_sectors_read"></span><br>
Bytes read: <span id="info_hda_bytes_read"></span><br>
Sectors written: <span id="info_hda_sectors_written"></span><br>
Bytes written: <span id="info_hda_bytes_written"></span><br>
Status: <span id="info_hda_status"></span><br>
<div id="info_storage" style="display: none">
<b>Storage (HDA or CDROM)</b><br>
Sectors read: <span id="info_storage_sectors_read">0</span><br>
Bytes read: <span id="info_storage_bytes_read">0</span><br>
Sectors written: <span id="info_storage_sectors_written">0</span><br>
Bytes written: <span id="info_storage_bytes_written">0</span><br>
Status: <span id="info_storage_status"></span><br>
<br>
</div>
<div id="info_cdrom">
<b>CDROM</b><br>
Sectors read: <span id="info_cdrom_sectors_read"></span><br>
Bytes read: <span id="info_cdrom_bytes_read"></span><br>
Status: <span id="info_cdrom_status"></span><br>
<div id="info_filesystem" style="display: none">
<b>9p Filesystem</b><br>
Bytes read: <span id="info_filesystem_bytes_read">0</span><br>
Bytes written: <span id="info_filesystem_bytes_written">0</span><br>
Last file: <span id="info_filesystem_last_file" style="word-wrap: break-word"></span><br>
Status: <span id="info_filesystem_status"></span><br>
<br>
</div>
<b>VGA</b><br>
@ -158,7 +159,7 @@
Resolution: <span id="info_res">-</span><br>
BPP: <span id="info_bpp">-</span><br>
<br>
Mouse: <span id="info_mouse_enabled">-</span><br>
Mouse: <span id="info_mouse_enabled">No</span><br>
<!-- Keyboard: <span id="info_keyboard_enabled">-</span><br> -->
</div>

138
src/browser/main.js
View file

@ -545,69 +545,103 @@
};
var time = $("running_time"),
ips = $("speed"),
avg_ips = $("avg_speed"),
last_tick = Date.now(),
running_time = 0,
summed_ips = 0,
last_instr_counter = 0;
var last_tick = Date.now();
var running_time = 0;
var summed_ips = 0;
var last_instr_counter = 0;
function update_info()
{
if(!emulator.is_running())
{
setTimeout(update_info, 1000);
return;
}
var stats = emulator.get_statistics();
var now = Date.now();
var last_ips = stats.cpu.instruction_counter - last_instr_counter;
var instruction_counter = emulator.get_instruction_counter();
var last_ips = instruction_counter - last_instr_counter;
summed_ips += last_ips;
last_instr_counter = instruction_counter;
var now = Date.now();
running_time += now - last_tick;
last_tick = now;
ips.textContent = last_ips / 1000 | 0;
avg_ips.textContent = summed_ips / running_time | 0;
time.textContent = time2str(running_time / 1000 | 0);
$("speed").textContent = last_ips / 1000 | 0;
$("avg_speed").textContent = summed_ips / running_time | 0;
$("running_time").textContent = time2str(running_time / 1000 | 0);
}
last_instr_counter = stats.cpu.instruction_counter;
setInterval(update_info, 1000);
$("info_mouse_enabled").textContent = stats.mouse.enabled ? "Yes" : "No";
var stats_9p = {
read: 0,
write: 0,
};
if(stats.hda)
{
$("info_hda_sectors_read").textContent = stats.hda.sectors_read;
$("info_hda_bytes_read").textContent = stats.hda.bytes_read;
emulator.add_listener("9p-read-start", function()
{
$("info_filesystem").style.display = "block";
$("info_filesystem_status").textContent = "Loading ...";
});
emulator.add_listener("9p-read-end", function(args)
{
stats_9p.read += args[1];
$("info_hda_sectors_written").textContent = stats.hda.sectors_written;
$("info_hda_bytes_written").textContent = stats.hda.bytes_written;
$("info_hda_status").textContent = stats.hda.loading ? "Loading ..." : "Idle";
}
else
{
$("info_hda").style.display = "none";
}
$("info_filesystem_status").textContent = "Idle";
$("info_filesystem_last_file").textContent = args[0]
$("info_filesystem_bytes_read").textContent = stats_9p.read;
});
emulator.add_listener("9p-write-end", function(args)
{
stats_9p.write += args[1];
if(stats.cdrom)
{
$("info_cdrom_sectors_read").textContent = stats.cdrom.sectors_read;
$("info_cdrom_bytes_read").textContent = stats.cdrom.bytes_read;
$("info_cdrom_status").textContent = stats.cdrom.loading ? "Loading ..." : "Idle";
}
else
{
$("info_cdrom").style.display = "none";
}
$("info_filesystem_last_file").textContent = args[0]
$("info_filesystem_bytes_written").textContent = stats_9p.write;
});
if(stats.vga.is_graphical)
var stats_storage = {
read: 0,
read_sectors: 0,
write: 0,
write_sectors: 0,
};
emulator.add_listener("ide-read-start", function()
{
$("info_storage").style.display = "block";
$("info_storage_status").textContent = "Loading ...";
});
emulator.add_listener("ide-read-end", function(args)
{
stats_storage.read += args[1];
stats_storage.read_sectors += args[2];
$("info_storage_status").textContent = "Idle";
$("info_storage_bytes_read").textContent = stats_storage.read;
$("info_storage_sectors_read").textContent = stats_storage.read_sectors;
});
emulator.add_listener("ide-write-end", function(args)
{
stats_storage.write += args[1];
stats_storage.write_sectors += args[2];
$("info_storage_bytes_written").textContent = stats_storage.write;
$("info_storage_sectors_written").textContent = stats_storage.write_sectors;
});
emulator.add_listener("mouse-enable", function(is_enabled)
{
$("info_mouse_enabled").textContent = is_enabled ? "Yes" : "No";
});
emulator.add_listener("screen-set-mode", function(is_graphical)
{
if(is_graphical)
{
$("info_vga_mode").textContent = "Graphical";
$("info_res").textContent = stats.vga.res_x + "x" + stats.vga.res_y;
$("info_bpp").textContent = stats.vga.bpp;
}
else
{
@ -615,22 +649,12 @@
$("info_res").textContent = "-";
$("info_bpp").textContent = "-";
}
setTimeout(update_info, 1000);
}
setTimeout(update_info, 1000);
var stats = emulator.get_statistics();
if(!stats.cdrom)
});
emulator.add_listener("screen-set-size-graphical", function(args)
{
$("info_cdrom").style.display = "none";
}
if(!stats.hda)
{
$("info_hda").style.display = "none";
}
$("info_res").textContent = args[0] + "x" + args[1];
$("info_bpp").textContent = args[2];
});
$("reset").onclick = function()