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

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.200 by root, Mon Jan 29 17:57:22 2007 UTC vs.
Revision 1.223 by root, Sun Mar 11 02:12:44 2007 UTC

… …
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use BDB ();
20use Data::Dumper; 21use Data::Dumper;
21use Digest::MD5; 22use Digest::MD5;
22use Fcntl; 23use Fcntl;
23use IO::AIO 2.32 (); 24use IO::AIO 2.32 ();
24use YAML::Syck (); 25use YAML::Syck ();
25use Time::HiRes; 26use Time::HiRes;
27use Compress::LZF;
28
29Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
26 30
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 31use Event; $Event::Eval = 1; # no idea why this is required, but it is
28 32
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 34
… …
39our @EXTS = (); # list of extension package names 43our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 44our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 45our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 46our %EXT_MAP = (); # pluggable maps
43 47
48our $RELOAD; # number of reloads so far
44our @EVENT; 49our @EVENT;
45our $LIBDIR = datadir . "/ext"; 50our $LIBDIR = datadir . "/ext";
46 51
47our $TICK = MAX_TIME * 1e-6; 52our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 53our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 54our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 55our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 56our $NEXT_TICK;
52our $NOW; 57our $NOW;
58our $USE_FSYNC = 1; # use fsync to write maps - default off
59
60our $BDB_POLL_WATCHER;
61our $DB_ENV;
53 62
54our %CFG; 63our %CFG;
55 64
56our $UPTIME; $UPTIME ||= time; 65our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 66our $RUNTIME;
58 67
59our %PLAYER; # all users 68our %PLAYER; # all users
60our %MAP; # all maps 69our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 70our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random"; 71our $RANDOM_MAPS = cf::localdir . "/random";
72our $BDB_ENV_DIR = cf::localdir . "/db";
63 73
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 74our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 75our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 76
67# used to convert map paths into valid unix filenames by replacing / by ∕ 77# used to convert map paths into valid unix filenames by replacing / by ∕
… …
80mkdir cf::localdir; 90mkdir cf::localdir;
81mkdir cf::localdir . "/" . cf::playerdir; 91mkdir cf::localdir . "/" . cf::playerdir;
82mkdir cf::localdir . "/" . cf::tmpdir; 92mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 93mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 94mkdir $RANDOM_MAPS;
95mkdir $BDB_ENV_DIR;
85 96
86our $EMERGENCY_POSITION; 97our $EMERGENCY_POSITION;
87 98
88sub cf::map::normalise; 99sub cf::map::normalise;
89 100
… …
263sub freeze_mainloop { 274sub freeze_mainloop {
264 return unless $TICK_WATCHER->is_active; 275 return unless $TICK_WATCHER->is_active;
265 276
266 my $guard = Coro::guard { 277 my $guard = Coro::guard {
267 $TICK_WATCHER->start; 278 $TICK_WATCHER->start;
268 $WRITE_RUNTIME_WATCHER->start;
269 }; 279 };
270 $WRITE_RUNTIME_WATCHER->stop;
271 $TICK_WATCHER->stop; 280 $TICK_WATCHER->stop;
272 $guard 281 $guard
273} 282}
274 283
275=item cf::async { BLOCK } 284=item cf::async { BLOCK }
… …
346 355
347 $coro 356 $coro
348} 357}
349 358
350sub write_runtime { 359sub write_runtime {
360 my $guard = cf::lock_acquire "write_runtime";
361
351 my $runtime = cf::localdir . "/runtime"; 362 my $runtime = cf::localdir . "/runtime";
352 363
353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 364 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
354 or return; 365 or return;
355 366
… …
358 # 60 allows for the watchdog to kill the server. 369 # 60 allows for the watchdog to kill the server.
359 370
360 (aio_write $fh, 0, (length $value), $value, 0) <= 0 371 (aio_write $fh, 0, (length $value), $value, 0) <= 0
361 and return; 372 and return;
362 373
374 # always fsync - this file is important
363 aio_fsync $fh 375 aio_fsync $fh
364 and return; 376 and return;
365 377
366 close $fh 378 close $fh
367 or return; 379 or return;
… …
752 $filename, length $$rdata, scalar @$objs; 764 $filename, length $$rdata, scalar @$objs;
753 765
754 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 766 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
755 chmod SAVE_MODE, $fh; 767 chmod SAVE_MODE, $fh;
756 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 768 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
757 aio_fsync $fh; 769 aio_fsync $fh if $cf::USE_FSYNC;
758 close $fh; 770 close $fh;
759 771
760 if (@$objs) { 772 if (@$objs) {
761 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 773 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
762 chmod SAVE_MODE, $fh; 774 chmod SAVE_MODE, $fh;
763 my $data = Storable::nfreeze { version => 1, objs => $objs }; 775 my $data = Storable::nfreeze { version => 1, objs => $objs };
764 aio_write $fh, 0, (length $data), $data, 0; 776 aio_write $fh, 0, (length $data), $data, 0;
765 aio_fsync $fh; 777 aio_fsync $fh if $cf::USE_FSYNC;
766 close $fh; 778 close $fh;
767 aio_rename "$filename.pst~", "$filename.pst"; 779 aio_rename "$filename.pst~", "$filename.pst";
768 } 780 }
769 } else { 781 } else {
770 aio_unlink "$filename.pst"; 782 aio_unlink "$filename.pst";
… …
776 } 788 }
777 } else { 789 } else {
778 aio_unlink $filename; 790 aio_unlink $filename;
779 aio_unlink "$filename.pst"; 791 aio_unlink "$filename.pst";
780 } 792 }
781
782 #d##TODO# nuke non .map-files if exist
783 if ($filename =~ s/\.map$//) {
784 aio_unlink $filename;
785 aio_unlink "$filename.pst";
786 }
787 } 793 }
788} 794}
789 795
790sub object_freezer_as_string { 796sub object_freezer_as_string {
791 my ($rdata, $objs) = @_; 797 my ($rdata, $objs) = @_;
… …
797 803
798sub object_thawer_load { 804sub object_thawer_load {
799 my ($filename) = @_; 805 my ($filename) = @_;
800 806
801 my ($data, $av); 807 my ($data, $av);
802
803 #d#TODO remove .map if file does not exist
804 aio_stat $filename and $filename =~ s/\.map$//;
805 808
806 (aio_load $filename, $data) >= 0 809 (aio_load $filename, $data) >= 0
807 or return; 810 or return;
808 811
809 unless (aio_stat "$filename.pst") { 812 unless (aio_stat "$filename.pst") {
… …
1028=cut 1031=cut
1029 1032
1030sub quit_character { 1033sub quit_character {
1031 my ($pl) = @_; 1034 my ($pl) = @_;
1032 1035
1036 my $name = $pl->ob->name;
1037
1033 $pl->{deny_save} = 1; 1038 $pl->{deny_save} = 1;
1034 $pl->password ("*"); # this should lock out the player until we nuked the dir 1039 $pl->password ("*"); # this should lock out the player until we nuked the dir
1035 1040
1036 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1041 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1037 $pl->deactivate; 1042 $pl->deactivate;
… …
1041 my $path = playerdir $pl; 1046 my $path = playerdir $pl;
1042 my $temp = "$path~$cf::RUNTIME~deleting~"; 1047 my $temp = "$path~$cf::RUNTIME~deleting~";
1043 aio_rename $path, $temp; 1048 aio_rename $path, $temp;
1044 delete $cf::PLAYER{$pl->ob->name}; 1049 delete $cf::PLAYER{$pl->ob->name};
1045 $pl->destroy; 1050 $pl->destroy;
1051
1052 my $prefix = qr<^~\Q$name\E/>;
1053
1054 # nuke player maps
1055 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1056
1046 IO::AIO::aio_rmtree $temp; 1057 IO::AIO::aio_rmtree $temp;
1058}
1059
1060=item $pl->kick
1061
1062Kicks a player out of the game. This destroys the connection.
1063
1064=cut
1065
1066sub kick {
1067 my ($pl, $kicker) = @_;
1068
1069 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1070 $pl->killer ("kicked");
1071 $pl->ns->destroy;
1047} 1072}
1048 1073
1049=item cf::player::list_logins 1074=item cf::player::list_logins
1050 1075
1051Returns am arrayref of all valid playernames in the system, can take a 1076Returns am arrayref of all valid playernames in the system, can take a
… …
1079=cut 1104=cut
1080 1105
1081sub maps($) { 1106sub maps($) {
1082 my ($pl) = @_; 1107 my ($pl) = @_;
1083 1108
1109 $pl = ref $pl ? $pl->ob->name : $pl;
1110
1084 my $files = aio_readdir playerdir $pl 1111 my $files = aio_readdir playerdir $pl
1085 or return; 1112 or return;
1086 1113
1087 my @paths; 1114 my @paths;
1088 1115
1089 for (@$files) { 1116 for (@$files) {
1090 utf8::decode $_; 1117 utf8::decode $_;
1091 next if /\.(?:pl|pst)$/; 1118 next if /\.(?:pl|pst)$/;
1092 next unless /^$PATH_SEP/o; 1119 next unless /^$PATH_SEP/o;
1093 1120
1094 push @paths, cf::map::normalise "~" . $pl->ob->name . "/" . $_; 1121 push @paths, cf::map::normalise "~$pl/$_";
1095 } 1122 }
1096 1123
1097 \@paths 1124 \@paths
1098} 1125}
1099 1126
… …
1294 my ($self) = @_; 1321 my ($self) = @_;
1295 1322
1296 utf8::encode (my $save = $self->save_path); 1323 utf8::encode (my $save = $self->save_path);
1297 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1324 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1298 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1325 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1299
1300 #d#TODO remove .map and also nuke
1301 $save =~ s/\.map// or return;#d#
1302 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1303 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1304} 1326}
1305 1327
1306sub load_header_from($) { 1328sub load_header_from($) {
1307 my ($self, $path) = @_; 1329 my ($self, $path) = @_;
1308 1330
… …
1596 return if $self->players; 1618 return if $self->players;
1597 return if $self->isa ("ext::map_per_player");#d# 1619 return if $self->isa ("ext::map_per_player");#d#
1598 1620
1599 warn "resetting map ", $self->path;#d# 1621 warn "resetting map ", $self->path;#d#
1600 1622
1623 $self->in_memory (cf::MAP_SWAPPED);
1624
1625 # need to save uniques path
1626 unless ($self->{deny_save}) {
1627 my $uniq = $self->uniq_path; utf8::encode $uniq;
1628
1629 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1630 if $uniq;
1631 }
1632
1601 delete $cf::MAP{$self->path}; 1633 delete $cf::MAP{$self->path};
1602 1634
1603 $self->in_memory (cf::MAP_SWAPPED);
1604 $self->clear; 1635 $self->clear;
1605 1636
1606 $_->clear_links_to ($self) for values %cf::MAP; 1637 $_->clear_links_to ($self) for values %cf::MAP;
1607 1638
1608 $self->unlink_save; 1639 $self->unlink_save;
… …
1798 $map->load; 1829 $map->load;
1799 $map->load_diag; 1830 $map->load_diag;
1800 1831
1801 return unless $self->contr->active; 1832 return unless $self->contr->active;
1802 $self->activate_recursive; 1833 $self->activate_recursive;
1834
1835 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1803 $self->enter_map ($map, $x, $y); 1836 $self->enter_map ($map, $x, $y);
1804} 1837}
1805 1838
1806cf::player->attach ( 1839cf::player->attach (
1807 on_logout => sub { 1840 on_logout => sub {
… …
1820 # try to abort aborted map switching on player login :) 1853 # try to abort aborted map switching on player login :)
1821 # should happen only on crashes 1854 # should happen only on crashes
1822 if ($pl->ob->{_link_pos}) { 1855 if ($pl->ob->{_link_pos}) {
1823 $pl->ob->enter_link; 1856 $pl->ob->enter_link;
1824 (async { 1857 (async {
1825 # we need this sleep as the login has a concurrent enter_exit running
1826 # and this sleep increases chances of the player not ending up in scorn
1827 $pl->ob->reply (undef, 1858 $pl->ob->reply (undef,
1828 "There was an internal problem at your last logout, " 1859 "There was an internal problem at your last logout, "
1829 . "the server will try to bring you to your intended destination in a second.", 1860 . "the server will try to bring you to your intended destination in a second.",
1830 cf::NDI_RED); 1861 cf::NDI_RED);
1862 # we need this sleep as the login has a concurrent enter_exit running
1863 # and this sleep increases chances of the player not ending up in scorn
1831 Coro::Timer::sleep 1; 1864 Coro::Timer::sleep 1;
1832 $pl->ob->leave_link; 1865 $pl->ob->leave_link;
1833 })->prio (2); 1866 })->prio (2);
1834 } 1867 }
1835 }, 1868 },
… …
2001 # get handled first 2034 # get handled first
2002 my $queue = delete $ns->{query_queue} 2035 my $queue = delete $ns->{query_queue}
2003 or return; # be conservative, not sure how that can happen, but we saw a crash here 2036 or return; # be conservative, not sure how that can happen, but we saw a crash here
2004 2037
2005 (shift @$queue)->[1]->($msg); 2038 (shift @$queue)->[1]->($msg);
2039 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
2006 2040
2007 push @{ $ns->{query_queue} }, @$queue; 2041 push @{ $ns->{query_queue} }, @$queue;
2008 2042
2009 if (@{ $ns->{query_queue} } == @$queue) { 2043 if (@{ $ns->{query_queue} } == @$queue) {
2010 if (@$queue) { 2044 if (@$queue) {
… …
2171The parameter C<$family> should best start with the name of the extension 2205The parameter C<$family> should best start with the name of the extension
2172using it, it should be unique. 2206using it, it should be unique.
2173 2207
2174=over 4 2208=over 4
2175 2209
2176=item $hashref = cf::db_get $family
2177
2178Return a hashref for use by the extension C<$family>, which can be
2179modified. After modifications, you have to call C<cf::db_dirty> or
2180C<cf::db_sync>.
2181
2182=item $value = cf::db_get $family => $key 2210=item $value = cf::db_get $family => $key
2183 2211
2184Returns a single value from the database 2212Returns a single value from the database.
2185
2186=item cf::db_put $family => $hashref
2187
2188Stores the given family hashref into the database. Updates are delayed, if
2189you want the data to be synced to disk immediately, use C<cf::db_sync>.
2190 2213
2191=item cf::db_put $family => $key => $value 2214=item cf::db_put $family => $key => $value
2192 2215
2193Stores the given C<$value> in the family hash. Updates are delayed, if you 2216Stores the given C<$value> in the family.
2194want the data to be synced to disk immediately, use C<cf::db_sync>.
2195
2196=item cf::db_dirty
2197
2198Marks the database as dirty, to be updated at a later time.
2199
2200=item cf::db_sync
2201
2202Immediately write the database to disk I<if it is dirty>.
2203 2217
2204=cut 2218=cut
2205 2219
2206our $DB; 2220our $DB;
2207 2221
2208{ 2222sub db_init {
2223 unless ($DB) {
2224 $DB = BDB::db_create $DB_ENV;
2225
2226 cf::sync_job {
2227 eval {
2228 $DB->set_flags (BDB::CHKSUM);
2229
2230 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2231 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2232 cf::cleanup "db_open(db): $!" if $!;
2233 };
2234 cf::cleanup "db_open(db): $@" if $@;
2235 };
2236
2209 my $path = cf::localdir . "/database.pst"; 2237 my $path = cf::localdir . "/database.pst";
2238 if (stat $path) {
2239 cf::sync_job {
2240 my $pst = Storable::retrieve $path;
2210 2241
2211 sub db_load() { 2242 cf::db_put (board => data => $pst->{board});
2212 $DB = stat $path ? Storable::retrieve $path : { }; 2243 cf::db_put (guildrules => data => $pst->{guildrules});
2213 } 2244 cf::db_put (rent => balance => $pst->{rent}{balance});
2245 BDB::db_env_txn_checkpoint $DB_ENV;
2214 2246
2215 my $pid; 2247 unlink $path;
2216
2217 sub db_save() {
2218 waitpid $pid, 0 if $pid;
2219 if (0 == ($pid = fork)) {
2220 $DB->{_meta}{version} = 1;
2221 Storable::nstore $DB, "$path~";
2222 rename "$path~", $path;
2223 cf::_exit 0 if defined $pid;
2224 } 2248 };
2225 }
2226
2227 my $dirty;
2228
2229 sub db_sync() {
2230 db_save if $dirty;
2231 undef $dirty;
2232 }
2233
2234 my $idle = Event->idle (
2235 reentrant => 0,
2236 min => 10,
2237 max => 20,
2238 repeat => 0,
2239 data => WF_AUTOCANCEL,
2240 cb => \&db_sync,
2241 );
2242
2243 sub db_dirty() {
2244 $dirty = 1;
2245 $idle->start;
2246 }
2247
2248 sub db_get($;$) {
2249 @_ >= 2
2250 ? $DB->{$_[0]}{$_[1]}
2251 : ($DB->{$_[0]} ||= { })
2252 }
2253
2254 sub db_put($$;$) {
2255 if (@_ >= 3) {
2256 $DB->{$_[0]}{$_[1]} = $_[2];
2257 } else {
2258 $DB->{$_[0]} = $_[1];
2259 }
2260 db_dirty;
2261 }
2262
2263 cf::global->attach (
2264 prio => 10000,
2265 on_cleanup => sub {
2266 db_sync;
2267 }, 2249 }
2268 ); 2250 }
2251}
2252
2253sub db_get($$) {
2254 my $key = "$_[0]/$_[1]";
2255
2256 cf::sync_job {
2257 BDB::db_get $DB, undef, $key, my $data;
2258
2259 $! ? ()
2260 : Compress::LZF::sthaw $data
2261 }
2262}
2263
2264sub db_put($$$) {
2265 BDB::dbreq_pri 4;
2266 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2269} 2267}
2270 2268
2271############################################################################# 2269#############################################################################
2272# the server's main() 2270# the server's init and main functions
2271
2272sub load_faces {
2273 my $path = sprintf "%s/faces", cf::datadir;
2274
2275 warn "loading faces from $path\n";
2276
2277 my $faces;
2278 0 < aio_load $path, $faces
2279 or die "$path: $!";
2280
2281 Coro::cede;
2282 $faces = Storable::thaw $faces;
2283 Coro::cede;
2284
2285 while (my ($face, $info) = each %$faces) {
2286 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2287 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2288 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2289 Coro::cede;
2290 }
2291
2292 1
2293}
2294
2295sub reload_resources {
2296 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2297 or die "unable to load regions file\n";#d#
2298 load_faces
2299 or die "unable to load faces\n";#d#
2300}
2301
2302sub init {
2303 reload_resources;
2304}
2273 2305
2274sub cfg_load { 2306sub cfg_load {
2275 open my $fh, "<:utf8", cf::confdir . "/config" 2307 open my $fh, "<:utf8", cf::confdir . "/config"
2276 or return; 2308 or return;
2277 2309
… …
2300 Event::one_event; 2332 Event::one_event;
2301 })->prio (Coro::PRIO_MAX); 2333 })->prio (Coro::PRIO_MAX);
2302 }; 2334 };
2303 2335
2304 cfg_load; 2336 cfg_load;
2305 db_load; 2337 db_init;
2306 load_extensions; 2338 load_extensions;
2307 2339
2308 $TICK_WATCHER->start; 2340 $TICK_WATCHER->start;
2309 Event::loop; 2341 Event::loop;
2310} 2342}
… …
2349 my $map = $cf::MAP{$path} or next; 2381 my $map = $cf::MAP{$path} or next;
2350 $map->valid or next; 2382 $map->valid or next;
2351 $map->save; 2383 $map->save;
2352 } 2384 }
2353 warn "end emergency map save\n"; 2385 warn "end emergency map save\n";
2386
2387 warn "begin emergency database checkpoint\n";
2388 BDB::db_env_txn_checkpoint $DB_ENV;
2389 warn "end emergency database checkpoint\n";
2354 }; 2390 };
2355 2391
2356 warn "leave emergency perl save\n"; 2392 warn "leave emergency perl save\n";
2393}
2394
2395sub post_cleanup {
2396 my ($make_core) = @_;
2397
2398 warn Carp::longmess "post_cleanup backtrace"
2399 if $make_core;
2357} 2400}
2358 2401
2359sub reload() { 2402sub reload() {
2360 # can/must only be called in main 2403 # can/must only be called in main
2361 if ($Coro::current != $Coro::main) { 2404 if ($Coro::current != $Coro::main) {
… …
2363 return; 2406 return;
2364 } 2407 }
2365 2408
2366 warn "reloading..."; 2409 warn "reloading...";
2367 2410
2368 warn "cancelling server ticker"; 2411 warn "entering sync_job";
2369 $TICK_WATCHER->cancel;
2370 2412
2413 cf::sync_job {
2414 cf::write_runtime; # external watchdog should not bark
2371 cf::emergency_save; 2415 cf::emergency_save;
2416 cf::write_runtime; # external watchdog should not bark
2372 2417
2373 eval { 2418 warn "syncing database to disk";
2419 BDB::db_env_txn_checkpoint $DB_ENV;
2420
2374 # if anything goes wrong in here, we should simply crash as we already saved 2421 # if anything goes wrong in here, we should simply crash as we already saved
2375
2376 warn "syncing database to disk";
2377 cf::db_sync;
2378 2422
2379 warn "cancelling all WF_AUTOCANCEL watchers"; 2423 warn "cancelling all WF_AUTOCANCEL watchers";
2380 for (Event::all_watchers) { 2424 for (Event::all_watchers) {
2381 $_->cancel if $_->data & WF_AUTOCANCEL; 2425 $_->cancel if $_->data & WF_AUTOCANCEL;
2382 } 2426 }
2383 2427
2384 warn "flushing outstanding aio requests"; 2428 warn "flushing outstanding aio requests";
2385 for (;;) { 2429 for (;;) {
2430 BDB::flush;
2386 IO::AIO::flush; 2431 IO::AIO::flush;
2387 Coro::cede; 2432 Coro::cede;
2388 last unless IO::AIO::nreqs; 2433 last unless IO::AIO::nreqs || BDB::nreqs;
2389 warn "iterate..."; 2434 warn "iterate...";
2390 } 2435 }
2436
2437 ++$RELOAD;
2391 2438
2392 warn "cancelling all extension coros"; 2439 warn "cancelling all extension coros";
2393 $_->cancel for values %EXT_CORO; 2440 $_->cancel for values %EXT_CORO;
2394 %EXT_CORO = (); 2441 %EXT_CORO = ();
2395 2442
… …
2448 require cf; 2495 require cf;
2449 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2496 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2450 2497
2451 warn "loading config and database again"; 2498 warn "loading config and database again";
2452 cf::cfg_load; 2499 cf::cfg_load;
2453 cf::db_load;
2454 2500
2455 warn "loading extensions"; 2501 warn "loading extensions";
2456 cf::load_extensions; 2502 cf::load_extensions;
2457 2503
2458 warn "reattaching attachments to objects/players"; 2504 warn "reattaching attachments to objects/players";
2459 _global_reattach; 2505 _global_reattach; # objects, sockets
2460 warn "reattaching attachments to maps"; 2506 warn "reattaching attachments to maps";
2461 reattach $_ for values %MAP; 2507 reattach $_ for values %MAP;
2508 warn "reattaching attachments to players";
2509 reattach $_ for values %PLAYER;
2462 2510
2463 warn "restarting server ticker"; 2511 warn "loading reloadable resources";
2512 reload_resources;
2464 2513
2465 $TICK_WATCHER->start; 2514 warn "leaving sync_job";
2466 };
2467 2515
2468 if ($@) { 2516 1
2517 } or do {
2469 warn $@; 2518 warn $@;
2470 warn "error while reloading, exiting."; 2519 warn "error while reloading, exiting.";
2471 exit 1; 2520 exit 1;
2472 } 2521 };
2473 2522
2474 warn "reloaded"; 2523 warn "reloaded";
2475}; 2524};
2476 2525
2477our $RELOAD_WATCHER; # used only during reload 2526our $RELOAD_WATCHER; # used only during reload
… …
2518 2567
2519 cf::server_tick; # one server iteration 2568 cf::server_tick; # one server iteration
2520 $RUNTIME += $TICK; 2569 $RUNTIME += $TICK;
2521 $NEXT_TICK += $TICK; 2570 $NEXT_TICK += $TICK;
2522 2571
2572 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2573 $NEXT_RUNTIME_WRITE = $NOW + 10;
2574 Coro::async_pool {
2575 write_runtime
2576 or warn "ERROR: unable to write runtime file: $!";
2577 };
2578 }
2579
2523 $WAIT_FOR_TICK->broadcast; 2580 $WAIT_FOR_TICK->broadcast;
2524 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2581 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2525 2582
2526 Event::sweep;
2527 Coro::cede_notself;
2528
2529# my $AFTER = Event::time; 2583# my $AFTER = Event::time;
2530# warn $AFTER - $NOW;#d# 2584# warn $AFTER - $NOW;#d#
2531 2585
2532 # if we are delayed by four ticks or more, skip them all 2586 # if we are delayed by four ticks or more, skip them all
2533 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2587 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
… …
2535 $TICK_WATCHER->at ($NEXT_TICK); 2589 $TICK_WATCHER->at ($NEXT_TICK);
2536 $TICK_WATCHER->start; 2590 $TICK_WATCHER->start;
2537 }, 2591 },
2538); 2592);
2539 2593
2594{
2595 BDB::max_poll_time $TICK * 0.1;
2596 $BDB_POLL_WATCHER = Event->io (
2597 reentrant => 0,
2598 fd => BDB::poll_fileno,
2599 poll => 'r',
2600 prio => 0,
2601 data => WF_AUTOCANCEL,
2602 cb => \&BDB::poll_cb,
2603 );
2604 BDB::min_parallel 8;
2605
2606 BDB::set_sync_prepare {
2607 my $status;
2608 my $current = $Coro::current;
2609 (
2610 sub {
2611 $status = $!;
2612 $current->ready; undef $current;
2613 },
2614 sub {
2615 Coro::schedule while defined $current;
2616 $! = $status;
2617 },
2618 )
2619 };
2620
2621 unless ($DB_ENV) {
2622 $DB_ENV = BDB::db_env_create;
2623
2624 cf::sync_job {
2625 eval {
2626 BDB::db_env_open
2627 $DB_ENV,
2628 $BDB_ENV_DIR,
2629 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2630 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2631 0666;
2632
2633 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2634
2635 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2636 $DB_ENV->set_lk_detect;
2637 };
2638
2639 cf::cleanup "db_env_open(db): $@" if $@;
2640 };
2641 }
2642}
2643
2644{
2645 IO::AIO::min_parallel 8;
2646
2647 undef $Coro::AIO::WATCHER;
2540IO::AIO::max_poll_time $TICK * 0.1; 2648 IO::AIO::max_poll_time $TICK * 0.1;
2541
2542undef $Coro::AIO::WATCHER;
2543$AIO_POLL_WATCHER = Event->io ( 2649 $AIO_POLL_WATCHER = Event->io (
2544 reentrant => 0, 2650 reentrant => 0,
2651 data => WF_AUTOCANCEL,
2545 fd => IO::AIO::poll_fileno, 2652 fd => IO::AIO::poll_fileno,
2546 poll => 'r', 2653 poll => 'r',
2547 prio => 6, 2654 prio => 6,
2548 data => WF_AUTOCANCEL,
2549 cb => \&IO::AIO::poll_cb, 2655 cb => \&IO::AIO::poll_cb,
2550); 2656 );
2551 2657}
2552$WRITE_RUNTIME_WATCHER = Event->timer (
2553 reentrant => 0,
2554 data => WF_AUTOCANCEL,
2555 after => 1,
2556 interval => 10,
2557 prio => 6, # keep it lowest so it acts like a watchdog
2558 cb => Coro::unblock_sub {
2559 write_runtime
2560 or warn "ERROR: unable to write runtime file: $!";
2561 },
2562);
2563 2658
2564END { cf::emergency_save } 2659END { cf::emergency_save }
2565 2660
25661 26611
2567 2662

Diff Legend

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