ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.204 by root, Fri Feb 2 19:59:22 2007 UTC vs.
Revision 1.226 by root, Wed Mar 14 04:12:29 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Storable; 8use Storable;
9use Event;
9use Opcode; 10use Opcode;
10use Safe; 11use Safe;
11use Safe::Hole; 12use Safe::Hole;
12 13
13use Coro 3.5 (); 14use Coro 3.52 ();
15use Coro::State;
14use Coro::Event; 16use Coro::Event;
15use Coro::Timer; 17use Coro::Timer;
16use Coro::Signal; 18use Coro::Signal;
17use Coro::Semaphore; 19use Coro::Semaphore;
18use Coro::AIO; 20use Coro::AIO;
19 21
22use BDB ();
20use Data::Dumper; 23use Data::Dumper;
21use Digest::MD5; 24use Digest::MD5;
22use Fcntl; 25use Fcntl;
23use IO::AIO 2.32 (); 26use IO::AIO 2.32 ();
24use YAML::Syck (); 27use YAML::Syck ();
25use Time::HiRes; 28use Time::HiRes;
29use Compress::LZF;
26 30
31Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
32Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 33$Event::Eval = 1; # no idea why this is required, but it is
28 34
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 35sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 36
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 37# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 38$YAML::Syck::ImplicitUnicode = 1;
… …
39our @EXTS = (); # list of extension package names 45our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 46our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 47our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 48our %EXT_MAP = (); # pluggable maps
43 49
50our $RELOAD; # number of reloads so far
44our @EVENT; 51our @EVENT;
45our $LIBDIR = datadir . "/ext"; 52our $LIBDIR = datadir . "/ext";
46 53
47our $TICK = MAX_TIME * 1e-6; 54our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 55our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 56our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 57our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 58our $NEXT_TICK;
52our $NOW; 59our $NOW;
53our $USE_FSYNC; # use fsync to write maps - default off 60our $USE_FSYNC = 1; # use fsync to write maps - default off
61
62our $BDB_POLL_WATCHER;
63our $DB_ENV;
54 64
55our %CFG; 65our %CFG;
56 66
57our $UPTIME; $UPTIME ||= time; 67our $UPTIME; $UPTIME ||= time;
58our $RUNTIME; 68our $RUNTIME;
59 69
60our %PLAYER; # all users 70our %PLAYER; # all users
61our %MAP; # all maps 71our %MAP; # all maps
62our $LINK_MAP; # the special {link} map, which is always available 72our $LINK_MAP; # the special {link} map, which is always available
63our $RANDOM_MAPS = cf::localdir . "/random"; 73our $RANDOM_MAPS = cf::localdir . "/random";
74our $BDB_ENV_DIR = cf::localdir . "/db";
64 75
65our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 76our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
66our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 77our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
67 78
68# used to convert map paths into valid unix filenames by replacing / by ∕ 79# used to convert map paths into valid unix filenames by replacing / by ∕
… …
81mkdir cf::localdir; 92mkdir cf::localdir;
82mkdir cf::localdir . "/" . cf::playerdir; 93mkdir cf::localdir . "/" . cf::playerdir;
83mkdir cf::localdir . "/" . cf::tmpdir; 94mkdir cf::localdir . "/" . cf::tmpdir;
84mkdir cf::localdir . "/" . cf::uniquedir; 95mkdir cf::localdir . "/" . cf::uniquedir;
85mkdir $RANDOM_MAPS; 96mkdir $RANDOM_MAPS;
97mkdir $BDB_ENV_DIR;
86 98
87our $EMERGENCY_POSITION; 99our $EMERGENCY_POSITION;
88 100
89sub cf::map::normalise; 101sub cf::map::normalise;
90 102
… …
264sub freeze_mainloop { 276sub freeze_mainloop {
265 return unless $TICK_WATCHER->is_active; 277 return unless $TICK_WATCHER->is_active;
266 278
267 my $guard = Coro::guard { 279 my $guard = Coro::guard {
268 $TICK_WATCHER->start; 280 $TICK_WATCHER->start;
269 $WRITE_RUNTIME_WATCHER->start;
270 }; 281 };
271 $WRITE_RUNTIME_WATCHER->stop;
272 $TICK_WATCHER->stop; 282 $TICK_WATCHER->stop;
273 $guard 283 $guard
274} 284}
275 285
276=item cf::async { BLOCK } 286=item cf::async { BLOCK }
… …
347 357
348 $coro 358 $coro
349} 359}
350 360
351sub write_runtime { 361sub write_runtime {
362 my $guard = cf::lock_acquire "write_runtime";
363
352 my $runtime = cf::localdir . "/runtime"; 364 my $runtime = cf::localdir . "/runtime";
353 365
354 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 366 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
355 or return; 367 or return;
356 368
… …
778 } 790 }
779 } else { 791 } else {
780 aio_unlink $filename; 792 aio_unlink $filename;
781 aio_unlink "$filename.pst"; 793 aio_unlink "$filename.pst";
782 } 794 }
783
784 #d##TODO# nuke non .map-files if exist
785 if ($filename =~ s/\.map$//) {
786 aio_unlink $filename;
787 aio_unlink "$filename.pst";
788 }
789 } 795 }
790} 796}
791 797
792sub object_freezer_as_string { 798sub object_freezer_as_string {
793 my ($rdata, $objs) = @_; 799 my ($rdata, $objs) = @_;
… …
799 805
800sub object_thawer_load { 806sub object_thawer_load {
801 my ($filename) = @_; 807 my ($filename) = @_;
802 808
803 my ($data, $av); 809 my ($data, $av);
804
805 #d#TODO remove .map if file does not exist
806 aio_stat $filename and $filename =~ s/\.map$//;
807 810
808 (aio_load $filename, $data) >= 0 811 (aio_load $filename, $data) >= 0
809 or return; 812 or return;
810 813
811 unless (aio_stat "$filename.pst") { 814 unless (aio_stat "$filename.pst") {
… …
1030=cut 1033=cut
1031 1034
1032sub quit_character { 1035sub quit_character {
1033 my ($pl) = @_; 1036 my ($pl) = @_;
1034 1037
1038 my $name = $pl->ob->name;
1039
1035 $pl->{deny_save} = 1; 1040 $pl->{deny_save} = 1;
1036 $pl->password ("*"); # this should lock out the player until we nuked the dir 1041 $pl->password ("*"); # this should lock out the player until we nuked the dir
1037 1042
1038 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1043 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1039 $pl->deactivate; 1044 $pl->deactivate;
… …
1043 my $path = playerdir $pl; 1048 my $path = playerdir $pl;
1044 my $temp = "$path~$cf::RUNTIME~deleting~"; 1049 my $temp = "$path~$cf::RUNTIME~deleting~";
1045 aio_rename $path, $temp; 1050 aio_rename $path, $temp;
1046 delete $cf::PLAYER{$pl->ob->name}; 1051 delete $cf::PLAYER{$pl->ob->name};
1047 $pl->destroy; 1052 $pl->destroy;
1053
1054 my $prefix = qr<^~\Q$name\E/>;
1055
1056 # nuke player maps
1057 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1058
1048 IO::AIO::aio_rmtree $temp; 1059 IO::AIO::aio_rmtree $temp;
1060}
1061
1062=item $pl->kick
1063
1064Kicks a player out of the game. This destroys the connection.
1065
1066=cut
1067
1068sub kick {
1069 my ($pl, $kicker) = @_;
1070
1071 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1072 $pl->killer ("kicked");
1073 $pl->ns->destroy;
1049} 1074}
1050 1075
1051=item cf::player::list_logins 1076=item cf::player::list_logins
1052 1077
1053Returns am arrayref of all valid playernames in the system, can take a 1078Returns am arrayref of all valid playernames in the system, can take a
… …
1298 my ($self) = @_; 1323 my ($self) = @_;
1299 1324
1300 utf8::encode (my $save = $self->save_path); 1325 utf8::encode (my $save = $self->save_path);
1301 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1326 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1302 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1327 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1303
1304 #d#TODO remove .map and also nuke
1305 $save =~ s/\.map// or return;#d#
1306 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1307 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1308} 1328}
1309 1329
1310sub load_header_from($) { 1330sub load_header_from($) {
1311 my ($self, $path) = @_; 1331 my ($self, $path) = @_;
1312 1332
… …
1600 return if $self->players; 1620 return if $self->players;
1601 return if $self->isa ("ext::map_per_player");#d# 1621 return if $self->isa ("ext::map_per_player");#d#
1602 1622
1603 warn "resetting map ", $self->path;#d# 1623 warn "resetting map ", $self->path;#d#
1604 1624
1625 $self->in_memory (cf::MAP_SWAPPED);
1626
1627 # need to save uniques path
1628 unless ($self->{deny_save}) {
1629 my $uniq = $self->uniq_path; utf8::encode $uniq;
1630
1631 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1632 if $uniq;
1633 }
1634
1605 delete $cf::MAP{$self->path}; 1635 delete $cf::MAP{$self->path};
1606 1636
1607 $self->in_memory (cf::MAP_SWAPPED);
1608 $self->clear; 1637 $self->clear;
1609 1638
1610 $_->clear_links_to ($self) for values %cf::MAP; 1639 $_->clear_links_to ($self) for values %cf::MAP;
1611 1640
1612 $self->unlink_save; 1641 $self->unlink_save;
… …
1802 $map->load; 1831 $map->load;
1803 $map->load_diag; 1832 $map->load_diag;
1804 1833
1805 return unless $self->contr->active; 1834 return unless $self->contr->active;
1806 $self->activate_recursive; 1835 $self->activate_recursive;
1836
1837 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1807 $self->enter_map ($map, $x, $y); 1838 $self->enter_map ($map, $x, $y);
1808} 1839}
1809 1840
1810cf::player->attach ( 1841cf::player->attach (
1811 on_logout => sub { 1842 on_logout => sub {
… …
1824 # try to abort aborted map switching on player login :) 1855 # try to abort aborted map switching on player login :)
1825 # should happen only on crashes 1856 # should happen only on crashes
1826 if ($pl->ob->{_link_pos}) { 1857 if ($pl->ob->{_link_pos}) {
1827 $pl->ob->enter_link; 1858 $pl->ob->enter_link;
1828 (async { 1859 (async {
1829 # we need this sleep as the login has a concurrent enter_exit running
1830 # and this sleep increases chances of the player not ending up in scorn
1831 $pl->ob->reply (undef, 1860 $pl->ob->reply (undef,
1832 "There was an internal problem at your last logout, " 1861 "There was an internal problem at your last logout, "
1833 . "the server will try to bring you to your intended destination in a second.", 1862 . "the server will try to bring you to your intended destination in a second.",
1834 cf::NDI_RED); 1863 cf::NDI_RED);
1864 # we need this sleep as the login has a concurrent enter_exit running
1865 # and this sleep increases chances of the player not ending up in scorn
1835 Coro::Timer::sleep 1; 1866 Coro::Timer::sleep 1;
1836 $pl->ob->leave_link; 1867 $pl->ob->leave_link;
1837 })->prio (2); 1868 })->prio (2);
1838 } 1869 }
1839 }, 1870 },
… …
1964 1995
1965sub cf::client::send_drawinfo { 1996sub cf::client::send_drawinfo {
1966 my ($self, $text, $flags) = @_; 1997 my ($self, $text, $flags) = @_;
1967 1998
1968 utf8::encode $text; 1999 utf8::encode $text;
1969 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2000 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1970} 2001}
1971 2002
1972 2003
1973=item $success = $client->query ($flags, "text", \&cb) 2004=item $success = $client->query ($flags, "text", \&cb)
1974 2005
… …
2176The parameter C<$family> should best start with the name of the extension 2207The parameter C<$family> should best start with the name of the extension
2177using it, it should be unique. 2208using it, it should be unique.
2178 2209
2179=over 4 2210=over 4
2180 2211
2181=item $hashref = cf::db_get $family
2182
2183Return a hashref for use by the extension C<$family>, which can be
2184modified. After modifications, you have to call C<cf::db_dirty> or
2185C<cf::db_sync>.
2186
2187=item $value = cf::db_get $family => $key 2212=item $value = cf::db_get $family => $key
2188 2213
2189Returns a single value from the database 2214Returns a single value from the database.
2190
2191=item cf::db_put $family => $hashref
2192
2193Stores the given family hashref into the database. Updates are delayed, if
2194you want the data to be synced to disk immediately, use C<cf::db_sync>.
2195 2215
2196=item cf::db_put $family => $key => $value 2216=item cf::db_put $family => $key => $value
2197 2217
2198Stores the given C<$value> in the family hash. Updates are delayed, if you 2218Stores the given C<$value> in the family.
2199want the data to be synced to disk immediately, use C<cf::db_sync>.
2200
2201=item cf::db_dirty
2202
2203Marks the database as dirty, to be updated at a later time.
2204
2205=item cf::db_sync
2206
2207Immediately write the database to disk I<if it is dirty>.
2208 2219
2209=cut 2220=cut
2210 2221
2211our $DB; 2222our $DB;
2212 2223
2213{ 2224sub db_init {
2225 unless ($DB) {
2226 $DB = BDB::db_create $DB_ENV;
2227
2228 cf::sync_job {
2229 eval {
2230 $DB->set_flags (BDB::CHKSUM);
2231
2232 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2233 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2234 cf::cleanup "db_open(db): $!" if $!;
2235 };
2236 cf::cleanup "db_open(db): $@" if $@;
2237 };
2238
2214 my $path = cf::localdir . "/database.pst"; 2239 my $path = cf::localdir . "/database.pst";
2240 if (stat $path) {
2241 cf::sync_job {
2242 my $pst = Storable::retrieve $path;
2215 2243
2216 sub db_load() { 2244 cf::db_put (board => data => $pst->{board});
2217 $DB = stat $path ? Storable::retrieve $path : { }; 2245 cf::db_put (guildrules => data => $pst->{guildrules});
2218 } 2246 cf::db_put (rent => balance => $pst->{rent}{balance});
2247 BDB::db_env_txn_checkpoint $DB_ENV;
2219 2248
2220 my $pid; 2249 unlink $path;
2221
2222 sub db_save() {
2223 waitpid $pid, 0 if $pid;
2224 if (0 == ($pid = fork)) {
2225 $DB->{_meta}{version} = 1;
2226 Storable::nstore $DB, "$path~";
2227 rename "$path~", $path;
2228 cf::_exit 0 if defined $pid;
2229 } 2250 };
2230 }
2231
2232 my $dirty;
2233
2234 sub db_sync() {
2235 db_save if $dirty;
2236 undef $dirty;
2237 }
2238
2239 my $idle = Event->idle (
2240 reentrant => 0,
2241 min => 10,
2242 max => 20,
2243 repeat => 0,
2244 data => WF_AUTOCANCEL,
2245 cb => \&db_sync,
2246 );
2247
2248 sub db_dirty() {
2249 $dirty = 1;
2250 $idle->start;
2251 }
2252
2253 sub db_get($;$) {
2254 @_ >= 2
2255 ? $DB->{$_[0]}{$_[1]}
2256 : ($DB->{$_[0]} ||= { })
2257 }
2258
2259 sub db_put($$;$) {
2260 if (@_ >= 3) {
2261 $DB->{$_[0]}{$_[1]} = $_[2];
2262 } else {
2263 $DB->{$_[0]} = $_[1];
2264 }
2265 db_dirty;
2266 }
2267
2268 cf::global->attach (
2269 prio => 10000,
2270 on_cleanup => sub {
2271 db_sync;
2272 }, 2251 }
2273 ); 2252 }
2253}
2254
2255sub db_get($$) {
2256 my $key = "$_[0]/$_[1]";
2257
2258 cf::sync_job {
2259 BDB::db_get $DB, undef, $key, my $data;
2260
2261 $! ? ()
2262 : Compress::LZF::sthaw $data
2263 }
2264}
2265
2266sub db_put($$$) {
2267 BDB::dbreq_pri 4;
2268 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2274} 2269}
2275 2270
2276############################################################################# 2271#############################################################################
2277# the server's init and main functions 2272# the server's init and main functions
2278 2273
2274sub load_faces {
2275 my $path = sprintf "%s/faces", cf::datadir;
2276
2277 warn "loading faces from $path\n";
2278
2279 my $faces;
2280 0 < aio_load $path, $faces
2281 or die "$path: $!";
2282
2283 Coro::cede;
2284 $faces = Storable::thaw $faces;
2285 Coro::cede;
2286
2287 my $meta = delete $faces->{""};
2288 $meta->{version} == 1
2289 or cf::cleanup "$path: version mismatch, cannot proceed.";
2290
2291 while (my ($face, $info) = each %$faces) {
2292 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2293 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2294 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2295 Coro::cede;
2296 }
2297
2298 while (my ($face, $info) = each %$faces) {
2299 next unless $info->{smooth};
2300 my $idx = cf::face::find $face
2301 or next;
2302 if (my $smooth = cf::face::find $info->{smooth}) {
2303 cf::face::set_smooth $idx, $smooth;
2304 } else {
2305 warn "smooth face '$info->{smooth}' not found for face '$face'";
2306 }
2307 Coro::cede;
2308 }
2309
2310 1
2311}
2312
2279sub load_resources { 2313sub reload_resources {
2280 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2314 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2281 or die "unable to load regions file\n";#d# 2315 or die "unable to load regions file\n";#d#
2316 load_faces
2317 or die "unable to load faces\n";#d#
2318}
2319
2320sub init {
2321 reload_resources;
2282} 2322}
2283 2323
2284sub cfg_load { 2324sub cfg_load {
2285 open my $fh, "<:utf8", cf::confdir . "/config" 2325 open my $fh, "<:utf8", cf::confdir . "/config"
2286 or return; 2326 or return;
… …
2298 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2338 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2299 and die "WARNING: m(un)lockall failed: $!\n"; 2339 and die "WARNING: m(un)lockall failed: $!\n";
2300 }; 2340 };
2301 warn $@ if $@; 2341 warn $@ if $@;
2302 } 2342 }
2303}
2304
2305sub init {
2306 load_resources;
2307} 2343}
2308 2344
2309sub main { 2345sub main {
2310 # we must not ever block the main coroutine 2346 # we must not ever block the main coroutine
2311 local $Coro::idle = sub { 2347 local $Coro::idle = sub {
… …
2314 Event::one_event; 2350 Event::one_event;
2315 })->prio (Coro::PRIO_MAX); 2351 })->prio (Coro::PRIO_MAX);
2316 }; 2352 };
2317 2353
2318 cfg_load; 2354 cfg_load;
2319 db_load; 2355 db_init;
2320 load_extensions; 2356 load_extensions;
2321 2357
2322 $TICK_WATCHER->start; 2358 $TICK_WATCHER->start;
2323 Event::loop; 2359 Event::loop;
2324} 2360}
… …
2363 my $map = $cf::MAP{$path} or next; 2399 my $map = $cf::MAP{$path} or next;
2364 $map->valid or next; 2400 $map->valid or next;
2365 $map->save; 2401 $map->save;
2366 } 2402 }
2367 warn "end emergency map save\n"; 2403 warn "end emergency map save\n";
2404
2405 warn "begin emergency database checkpoint\n";
2406 BDB::db_env_txn_checkpoint $DB_ENV;
2407 warn "end emergency database checkpoint\n";
2368 }; 2408 };
2369 2409
2370 warn "leave emergency perl save\n"; 2410 warn "leave emergency perl save\n";
2411}
2412
2413sub post_cleanup {
2414 my ($make_core) = @_;
2415
2416 warn Carp::longmess "post_cleanup backtrace"
2417 if $make_core;
2371} 2418}
2372 2419
2373sub reload() { 2420sub reload() {
2374 # can/must only be called in main 2421 # can/must only be called in main
2375 if ($Coro::current != $Coro::main) { 2422 if ($Coro::current != $Coro::main) {
… …
2377 return; 2424 return;
2378 } 2425 }
2379 2426
2380 warn "reloading..."; 2427 warn "reloading...";
2381 2428
2382 warn "cancelling server ticker"; 2429 warn "entering sync_job";
2383 $TICK_WATCHER->cancel;
2384 2430
2431 cf::sync_job {
2432 cf::write_runtime; # external watchdog should not bark
2385 cf::emergency_save; 2433 cf::emergency_save;
2434 cf::write_runtime; # external watchdog should not bark
2386 2435
2387 eval { 2436 warn "syncing database to disk";
2437 BDB::db_env_txn_checkpoint $DB_ENV;
2438
2388 # if anything goes wrong in here, we should simply crash as we already saved 2439 # if anything goes wrong in here, we should simply crash as we already saved
2389
2390 warn "syncing database to disk";
2391 cf::db_sync;
2392 2440
2393 warn "cancelling all WF_AUTOCANCEL watchers"; 2441 warn "cancelling all WF_AUTOCANCEL watchers";
2394 for (Event::all_watchers) { 2442 for (Event::all_watchers) {
2395 $_->cancel if $_->data & WF_AUTOCANCEL; 2443 $_->cancel if $_->data & WF_AUTOCANCEL;
2396 } 2444 }
2397 2445
2398 warn "flushing outstanding aio requests"; 2446 warn "flushing outstanding aio requests";
2399 for (;;) { 2447 for (;;) {
2448 BDB::flush;
2400 IO::AIO::flush; 2449 IO::AIO::flush;
2401 Coro::cede; 2450 Coro::cede;
2402 last unless IO::AIO::nreqs; 2451 last unless IO::AIO::nreqs || BDB::nreqs;
2403 warn "iterate..."; 2452 warn "iterate...";
2404 } 2453 }
2454
2455 ++$RELOAD;
2405 2456
2406 warn "cancelling all extension coros"; 2457 warn "cancelling all extension coros";
2407 $_->cancel for values %EXT_CORO; 2458 $_->cancel for values %EXT_CORO;
2408 %EXT_CORO = (); 2459 %EXT_CORO = ();
2409 2460
… …
2462 require cf; 2513 require cf;
2463 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2514 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2464 2515
2465 warn "loading config and database again"; 2516 warn "loading config and database again";
2466 cf::cfg_load; 2517 cf::cfg_load;
2467 cf::db_load;
2468 2518
2469 warn "loading extensions"; 2519 warn "loading extensions";
2470 cf::load_extensions; 2520 cf::load_extensions;
2471 2521
2472 warn "reattaching attachments to objects/players"; 2522 warn "reattaching attachments to objects/players";
2473 _global_reattach; 2523 _global_reattach; # objects, sockets
2474 warn "reattaching attachments to maps"; 2524 warn "reattaching attachments to maps";
2475 reattach $_ for values %MAP; 2525 reattach $_ for values %MAP;
2526 warn "reattaching attachments to players";
2527 reattach $_ for values %PLAYER;
2476 2528
2477 warn "loading reloadable resources"; 2529 warn "loading reloadable resources";
2478 load_resources; 2530 reload_resources;
2479 2531
2480 warn "restarting server ticker"; 2532 warn "leaving sync_job";
2481 2533
2482 $TICK_WATCHER->start; 2534 1
2483 }; 2535 } or do {
2484
2485 if ($@) {
2486 warn $@; 2536 warn $@;
2487 warn "error while reloading, exiting."; 2537 warn "error while reloading, exiting.";
2488 exit 1; 2538 exit 1;
2489 } 2539 };
2490 2540
2491 warn "reloaded"; 2541 warn "reloaded";
2492}; 2542};
2493 2543
2494our $RELOAD_WATCHER; # used only during reload 2544our $RELOAD_WATCHER; # used only during reload
… …
2535 2585
2536 cf::server_tick; # one server iteration 2586 cf::server_tick; # one server iteration
2537 $RUNTIME += $TICK; 2587 $RUNTIME += $TICK;
2538 $NEXT_TICK += $TICK; 2588 $NEXT_TICK += $TICK;
2539 2589
2590 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2591 $NEXT_RUNTIME_WRITE = $NOW + 10;
2592 Coro::async_pool {
2593 write_runtime
2594 or warn "ERROR: unable to write runtime file: $!";
2595 };
2596 }
2597
2540 $WAIT_FOR_TICK->broadcast; 2598 $WAIT_FOR_TICK->broadcast;
2541 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2599 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2542 2600
2543 Event::sweep;
2544 Coro::cede_notself;
2545
2546# my $AFTER = Event::time; 2601# my $AFTER = Event::time;
2547# warn $AFTER - $NOW;#d# 2602# warn $AFTER - $NOW;#d#
2548 2603
2549 # if we are delayed by four ticks or more, skip them all 2604 # if we are delayed by four ticks or more, skip them all
2550 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2605 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
… …
2552 $TICK_WATCHER->at ($NEXT_TICK); 2607 $TICK_WATCHER->at ($NEXT_TICK);
2553 $TICK_WATCHER->start; 2608 $TICK_WATCHER->start;
2554 }, 2609 },
2555); 2610);
2556 2611
2612{
2613 BDB::max_poll_time $TICK * 0.1;
2614 $BDB_POLL_WATCHER = Event->io (
2615 reentrant => 0,
2616 fd => BDB::poll_fileno,
2617 poll => 'r',
2618 prio => 0,
2619 data => WF_AUTOCANCEL,
2620 cb => \&BDB::poll_cb,
2621 );
2622 BDB::min_parallel 8;
2623
2624 BDB::set_sync_prepare {
2625 my $status;
2626 my $current = $Coro::current;
2627 (
2628 sub {
2629 $status = $!;
2630 $current->ready; undef $current;
2631 },
2632 sub {
2633 Coro::schedule while defined $current;
2634 $! = $status;
2635 },
2636 )
2637 };
2638
2639 unless ($DB_ENV) {
2640 $DB_ENV = BDB::db_env_create;
2641
2642 cf::sync_job {
2643 eval {
2644 BDB::db_env_open
2645 $DB_ENV,
2646 $BDB_ENV_DIR,
2647 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2648 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2649 0666;
2650
2651 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2652
2653 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2654 $DB_ENV->set_lk_detect;
2655 };
2656
2657 cf::cleanup "db_env_open(db): $@" if $@;
2658 };
2659 }
2660}
2661
2662{
2663 IO::AIO::min_parallel 8;
2664
2665 undef $Coro::AIO::WATCHER;
2557IO::AIO::max_poll_time $TICK * 0.1; 2666 IO::AIO::max_poll_time $TICK * 0.1;
2558
2559undef $Coro::AIO::WATCHER;
2560$AIO_POLL_WATCHER = Event->io ( 2667 $AIO_POLL_WATCHER = Event->io (
2561 reentrant => 0, 2668 reentrant => 0,
2669 data => WF_AUTOCANCEL,
2562 fd => IO::AIO::poll_fileno, 2670 fd => IO::AIO::poll_fileno,
2563 poll => 'r', 2671 poll => 'r',
2564 prio => 6, 2672 prio => 6,
2565 data => WF_AUTOCANCEL,
2566 cb => \&IO::AIO::poll_cb, 2673 cb => \&IO::AIO::poll_cb,
2567); 2674 );
2568 2675}
2569$WRITE_RUNTIME_WATCHER = Event->timer (
2570 reentrant => 0,
2571 data => WF_AUTOCANCEL,
2572 after => 1,
2573 interval => 10,
2574 prio => 6, # keep it lowest so it acts like a watchdog
2575 cb => Coro::unblock_sub {
2576 write_runtime
2577 or warn "ERROR: unable to write runtime file: $!";
2578 },
2579);
2580 2676
2581END { cf::emergency_save } 2677END { cf::emergency_save }
2582 2678
25831 26791
2584 2680

Diff Legend

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