ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/ext/map-scheduler.ext
(Generate patch)

Comparing deliantra/server/ext/map-scheduler.ext (file contents):
Revision 1.22 by root, Sat Jan 13 23:06:13 2007 UTC vs.
Revision 1.31 by root, Sat Feb 17 01:58:55 2007 UTC

… …
2 2
3# this extension swaps out maps and resets them, in essence managing 3# this extension swaps out maps and resets them, in essence managing
4# the reset/swap policy of the server. 4# the reset/swap policy of the server.
5# it also contains the map prefetching logic 5# it also contains the map prefetching logic
6 6
7our $DEACTIVATE_TIMEOUT = 20; # number of seconds after which maps get deactivated to save cpu 7#our $DEACTIVATE_TIMEOUT = 20; # number of seconds after which maps get deactivated to save cpu
8our $SWAP_TIMEOUT = 35; # number of seconds after which maps inactive get swapped out 8our $SWAP_TIMEOUT = $cf::CFG{swap_timeout} || 40; # number of seconds after which maps inactive get swapped out
9our $SCHEDULE_INTERVAL = 2; # time the map scheduler sleeps between runs 9our $SCHEDULE_INTERVAL = $cf::CFG{schedule_interval} || 5; # time the map scheduler sleeps between runs
10our $SAVE_TIMEOUT = 20; # save maps every n seconds 10our $SAVE_TIMEOUT = $cf::CFG{save_timeout} || 20; # save maps every n seconds
11our $MAX_ACTIVES = $cf::CFG{max_actives} || 200000; # swap aggressively when > this many objects are active
11 12
12cf::async_ext { 13cf::async_ext {
13 $Coro::current->prio (Coro::PRIO_MIN); 14 $Coro::current->prio (Coro::PRIO_MIN);
14 # load the header of swapped-out maps. 15 # load the header of swapped-out maps.
15 # this is not a correctness issue, it simply saves diskspace 16 # this is not a correctness issue, it simply saves diskspace
… …
19 my $files = Coro::AIO::aio_readdir cf::localdir . "/" . cf::tmpdir; 20 my $files = Coro::AIO::aio_readdir cf::localdir . "/" . cf::tmpdir;
20 21
21 for my $map (@$files) { 22 for my $map (@$files) {
22 utf8::decode $map; 23 utf8::decode $map;
23 next if $map =~ /\.(?:pst|meta)$/; 24 next if $map =~ /\.(?:pst|meta)$/;
24 $map =~ s/∕/\//g;
25 cf::map::find $map; 25 cf::map::find $map;
26 $cf::WAIT_FOR_TICK_ONE->wait; 26 $cf::WAIT_FOR_TICK->wait;
27 $cf::WAIT_FOR_TICK->wait;
28 $cf::WAIT_FOR_TICK->wait;
27 } 29 }
28 30
29 #TODO: should also preload random maps... 31 #TODO: should also preload random maps...
30}; 32};
31 33
32our $SCHEDULER = cf::async_ext { 34our $SCHEDULER = cf::async_ext {
33 while () { 35 while () {
34 Coro::Timer::sleep $SCHEDULE_INTERVAL; 36 Coro::Event::do_timer (after => $SCHEDULE_INTERVAL);
35 37
36 # this weird form of iteration over values is used because 38 # this weird form of iteration over values is used because
37 # the hash changes underneath us frequently, and for 39 # the hash changes underneath us frequently, and for
38 # keeps a direct reference to the value without (in 5.8 perls) 40 # keeps a direct reference to the value without (in 5.8 perls)
39 # keeping a reference, so this is prone to crashes or worse. 41 # keeping a reference, so this is prone to crashes or worse.
… …
51# delete $map->{active}; 53# delete $map->{active};
52# } 54# }
53 if ($map->should_reset) { 55 if ($map->should_reset) {
54 $map->reset; 56 $map->reset;
55 } elsif ($map->in_memory == cf::MAP_IN_MEMORY) { 57 } elsif ($map->in_memory == cf::MAP_IN_MEMORY) {
58 my $max_idle = cf::object::actives_size > $MAX_ACTIVES ? 1 : $SWAP_TIMEOUT;
56 if ($map->last_access + $SWAP_TIMEOUT <= $cf::RUNTIME && !$map->players) { 59 if ($map->last_access + $max_idle <= $cf::RUNTIME && !$map->players) {
57 $cf::WAIT_FOR_TICK_ONE->wait;
58 $map->swap_out; 60 $map->swap_out;
61 $cf::WAIT_FOR_TICK_ONE->wait unless $max_idle == 1;
59 } elsif ($map->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 62 } elsif ($map->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
60 $cf::WAIT_FOR_TICK_ONE->wait;
61 $map->save; 63 $map->save;
64 $cf::WAIT_FOR_TICK_ONE->wait unless $max_idle == 1;
62 } 65 }
63 } 66 }
64 }; 67 };
65 warn $@ if $@; 68 warn $@ if $@;
66 Coro::cede; 69 Coro::cede;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines