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.198 by root, Sun Jan 28 01:58:37 2007 UTC vs.
Revision 1.224 by root, Mon Mar 12 21:42:12 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;
60our $USE_FSYNC = 1; # use fsync to write maps - default off
61
62our $BDB_POLL_WATCHER;
63our $DB_ENV;
53 64
54our %CFG; 65our %CFG;
55 66
56our $UPTIME; $UPTIME ||= time; 67our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 68our $RUNTIME;
58 69
59our %PLAYER; # all users 70our %PLAYER; # all users
60our %MAP; # all maps 71our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 72our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random"; 73our $RANDOM_MAPS = cf::localdir . "/random";
74our $BDB_ENV_DIR = cf::localdir . "/db";
63 75
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 76our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 77our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 78
67# 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 ∕
… …
80mkdir cf::localdir; 92mkdir cf::localdir;
81mkdir cf::localdir . "/" . cf::playerdir; 93mkdir cf::localdir . "/" . cf::playerdir;
82mkdir cf::localdir . "/" . cf::tmpdir; 94mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 95mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 96mkdir $RANDOM_MAPS;
97mkdir $BDB_ENV_DIR;
85 98
86our $EMERGENCY_POSITION; 99our $EMERGENCY_POSITION;
100
101sub cf::map::normalise;
87 102
88############################################################################# 103#############################################################################
89 104
90=head2 GLOBAL VARIABLES 105=head2 GLOBAL VARIABLES
91 106
… …
261sub freeze_mainloop { 276sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 277 return unless $TICK_WATCHER->is_active;
263 278
264 my $guard = Coro::guard { 279 my $guard = Coro::guard {
265 $TICK_WATCHER->start; 280 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 }; 281 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop; 282 $TICK_WATCHER->stop;
270 $guard 283 $guard
271} 284}
272 285
273=item cf::async { BLOCK } 286=item cf::async { BLOCK }
… …
344 357
345 $coro 358 $coro
346} 359}
347 360
348sub write_runtime { 361sub write_runtime {
362 my $guard = cf::lock_acquire "write_runtime";
363
349 my $runtime = cf::localdir . "/runtime"; 364 my $runtime = cf::localdir . "/runtime";
350 365
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 366 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 367 or return;
353 368
… …
356 # 60 allows for the watchdog to kill the server. 371 # 60 allows for the watchdog to kill the server.
357 372
358 (aio_write $fh, 0, (length $value), $value, 0) <= 0 373 (aio_write $fh, 0, (length $value), $value, 0) <= 0
359 and return; 374 and return;
360 375
376 # always fsync - this file is important
361 aio_fsync $fh 377 aio_fsync $fh
362 and return; 378 and return;
363 379
364 close $fh 380 close $fh
365 or return; 381 or return;
… …
750 $filename, length $$rdata, scalar @$objs; 766 $filename, length $$rdata, scalar @$objs;
751 767
752 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 768 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
753 chmod SAVE_MODE, $fh; 769 chmod SAVE_MODE, $fh;
754 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 770 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
755 aio_fsync $fh; 771 aio_fsync $fh if $cf::USE_FSYNC;
756 close $fh; 772 close $fh;
757 773
758 if (@$objs) { 774 if (@$objs) {
759 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 775 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
760 chmod SAVE_MODE, $fh; 776 chmod SAVE_MODE, $fh;
761 my $data = Storable::nfreeze { version => 1, objs => $objs }; 777 my $data = Storable::nfreeze { version => 1, objs => $objs };
762 aio_write $fh, 0, (length $data), $data, 0; 778 aio_write $fh, 0, (length $data), $data, 0;
763 aio_fsync $fh; 779 aio_fsync $fh if $cf::USE_FSYNC;
764 close $fh; 780 close $fh;
765 aio_rename "$filename.pst~", "$filename.pst"; 781 aio_rename "$filename.pst~", "$filename.pst";
766 } 782 }
767 } else { 783 } else {
768 aio_unlink "$filename.pst"; 784 aio_unlink "$filename.pst";
… …
1017=cut 1033=cut
1018 1034
1019sub quit_character { 1035sub quit_character {
1020 my ($pl) = @_; 1036 my ($pl) = @_;
1021 1037
1038 my $name = $pl->ob->name;
1039
1022 $pl->{deny_save} = 1; 1040 $pl->{deny_save} = 1;
1023 $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
1024 1042
1025 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1043 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1026 $pl->deactivate; 1044 $pl->deactivate;
… …
1030 my $path = playerdir $pl; 1048 my $path = playerdir $pl;
1031 my $temp = "$path~$cf::RUNTIME~deleting~"; 1049 my $temp = "$path~$cf::RUNTIME~deleting~";
1032 aio_rename $path, $temp; 1050 aio_rename $path, $temp;
1033 delete $cf::PLAYER{$pl->ob->name}; 1051 delete $cf::PLAYER{$pl->ob->name};
1034 $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
1035 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;
1036} 1074}
1037 1075
1038=item cf::player::list_logins 1076=item cf::player::list_logins
1039 1077
1040Returns 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
… …
1068=cut 1106=cut
1069 1107
1070sub maps($) { 1108sub maps($) {
1071 my ($pl) = @_; 1109 my ($pl) = @_;
1072 1110
1111 $pl = ref $pl ? $pl->ob->name : $pl;
1112
1073 my $files = aio_readdir playerdir $pl 1113 my $files = aio_readdir playerdir $pl
1074 or return; 1114 or return;
1075 1115
1076 my @paths; 1116 my @paths;
1077 1117
1078 for (@$files) { 1118 for (@$files) {
1079 utf8::decode $_; 1119 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1120 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1121 next unless /^$PATH_SEP/o;
1082 1122
1083 s/\.map$//; 1123 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1124 }
1086 1125
1087 \@paths 1126 \@paths
1088} 1127}
1089 1128
… …
1178sub normalise { 1217sub normalise {
1179 my ($path, $base) = @_; 1218 my ($path, $base) = @_;
1180 1219
1181 $path = "$path"; # make sure its a string 1220 $path = "$path"; # make sure its a string
1182 1221
1222 $path =~ s/\.map$//;
1223
1183 # map plan: 1224 # map plan:
1184 # 1225 #
1185 # /! non-realised random map exit (special hack!) 1226 # /! non-realised random map exit (special hack!)
1186 # {... are special paths that are not being touched 1227 # {... are special paths that are not being touched
1187 # ?xxx/... are special absolute paths 1228 # ?xxx/... are special absolute paths
… …
1248 1289
1249# the original (read-only) location 1290# the original (read-only) location
1250sub load_path { 1291sub load_path {
1251 my ($self) = @_; 1292 my ($self) = @_;
1252 1293
1253 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1294 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1254} 1295}
1255 1296
1256# the temporary/swap location 1297# the temporary/swap location
1257sub save_path { 1298sub save_path {
1258 my ($self) = @_; 1299 my ($self) = @_;
1259 1300
1260 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1301 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1261 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1302 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1262} 1303}
1263 1304
1264# the unique path, undef == no special unique path 1305# the unique path, undef == no special unique path
1265sub uniq_path { 1306sub uniq_path {
1266 my ($self) = @_; 1307 my ($self) = @_;
… …
1288 1329
1289sub load_header_from($) { 1330sub load_header_from($) {
1290 my ($self, $path) = @_; 1331 my ($self, $path) = @_;
1291 1332
1292 utf8::encode $path; 1333 utf8::encode $path;
1293 aio_open $path, O_RDONLY, 0 1334 #aio_open $path, O_RDONLY, 0
1294 or return; 1335 # or return;
1295 1336
1296 $self->_load_header ($path) 1337 $self->_load_header ($path)
1297 or return; 1338 or return;
1298 1339
1299 $self->{load_path} = $path; 1340 $self->{load_path} = $path;
… …
1579 return if $self->players; 1620 return if $self->players;
1580 return if $self->isa ("ext::map_per_player");#d# 1621 return if $self->isa ("ext::map_per_player");#d#
1581 1622
1582 warn "resetting map ", $self->path;#d# 1623 warn "resetting map ", $self->path;#d#
1583 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
1584 delete $cf::MAP{$self->path}; 1635 delete $cf::MAP{$self->path};
1585 1636
1586 $self->in_memory (cf::MAP_SWAPPED);
1587 $self->clear; 1637 $self->clear;
1588 1638
1589 $_->clear_links_to ($self) for values %cf::MAP; 1639 $_->clear_links_to ($self) for values %cf::MAP;
1590 1640
1591 $self->unlink_save; 1641 $self->unlink_save;
… …
1628 for (@$files) { 1678 for (@$files) {
1629 utf8::decode $_; 1679 utf8::decode $_;
1630 next if /\.pst$/; 1680 next if /\.pst$/;
1631 next unless /^$PATH_SEP/o; 1681 next unless /^$PATH_SEP/o;
1632 1682
1633 s/\.map$//; 1683 push @paths, cf::map::normalise $_;
1634 push @paths, $_;
1635 } 1684 }
1636 1685
1637 \@paths 1686 \@paths
1638} 1687}
1639 1688
… …
1782 $map->load; 1831 $map->load;
1783 $map->load_diag; 1832 $map->load_diag;
1784 1833
1785 return unless $self->contr->active; 1834 return unless $self->contr->active;
1786 $self->activate_recursive; 1835 $self->activate_recursive;
1836
1837 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1787 $self->enter_map ($map, $x, $y); 1838 $self->enter_map ($map, $x, $y);
1788} 1839}
1789 1840
1790cf::player->attach ( 1841cf::player->attach (
1791 on_logout => sub { 1842 on_logout => sub {
… …
1804 # try to abort aborted map switching on player login :) 1855 # try to abort aborted map switching on player login :)
1805 # should happen only on crashes 1856 # should happen only on crashes
1806 if ($pl->ob->{_link_pos}) { 1857 if ($pl->ob->{_link_pos}) {
1807 $pl->ob->enter_link; 1858 $pl->ob->enter_link;
1808 (async { 1859 (async {
1809 # we need this sleep as the login has a concurrent enter_exit running
1810 # and this sleep increases chances of the player not ending up in scorn
1811 $pl->ob->reply (undef, 1860 $pl->ob->reply (undef,
1812 "There was an internal problem at your last logout, " 1861 "There was an internal problem at your last logout, "
1813 . "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.",
1814 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
1815 Coro::Timer::sleep 1; 1866 Coro::Timer::sleep 1;
1816 $pl->ob->leave_link; 1867 $pl->ob->leave_link;
1817 })->prio (2); 1868 })->prio (2);
1818 } 1869 }
1819 }, 1870 },
… …
1985 # get handled first 2036 # get handled first
1986 my $queue = delete $ns->{query_queue} 2037 my $queue = delete $ns->{query_queue}
1987 or return; # be conservative, not sure how that can happen, but we saw a crash here 2038 or return; # be conservative, not sure how that can happen, but we saw a crash here
1988 2039
1989 (shift @$queue)->[1]->($msg); 2040 (shift @$queue)->[1]->($msg);
2041 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1990 2042
1991 push @{ $ns->{query_queue} }, @$queue; 2043 push @{ $ns->{query_queue} }, @$queue;
1992 2044
1993 if (@{ $ns->{query_queue} } == @$queue) { 2045 if (@{ $ns->{query_queue} } == @$queue) {
1994 if (@$queue) { 2046 if (@$queue) {
… …
2155The 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
2156using it, it should be unique. 2208using it, it should be unique.
2157 2209
2158=over 4 2210=over 4
2159 2211
2160=item $hashref = cf::db_get $family
2161
2162Return a hashref for use by the extension C<$family>, which can be
2163modified. After modifications, you have to call C<cf::db_dirty> or
2164C<cf::db_sync>.
2165
2166=item $value = cf::db_get $family => $key 2212=item $value = cf::db_get $family => $key
2167 2213
2168Returns a single value from the database 2214Returns a single value from the database.
2169
2170=item cf::db_put $family => $hashref
2171
2172Stores the given family hashref into the database. Updates are delayed, if
2173you want the data to be synced to disk immediately, use C<cf::db_sync>.
2174 2215
2175=item cf::db_put $family => $key => $value 2216=item cf::db_put $family => $key => $value
2176 2217
2177Stores the given C<$value> in the family hash. Updates are delayed, if you 2218Stores the given C<$value> in the family.
2178want the data to be synced to disk immediately, use C<cf::db_sync>.
2179
2180=item cf::db_dirty
2181
2182Marks the database as dirty, to be updated at a later time.
2183
2184=item cf::db_sync
2185
2186Immediately write the database to disk I<if it is dirty>.
2187 2219
2188=cut 2220=cut
2189 2221
2190our $DB; 2222our $DB;
2191 2223
2192{ 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
2193 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;
2194 2243
2195 sub db_load() { 2244 cf::db_put (board => data => $pst->{board});
2196 $DB = stat $path ? Storable::retrieve $path : { }; 2245 cf::db_put (guildrules => data => $pst->{guildrules});
2197 } 2246 cf::db_put (rent => balance => $pst->{rent}{balance});
2247 BDB::db_env_txn_checkpoint $DB_ENV;
2198 2248
2199 my $pid; 2249 unlink $path;
2200
2201 sub db_save() {
2202 waitpid $pid, 0 if $pid;
2203 if (0 == ($pid = fork)) {
2204 $DB->{_meta}{version} = 1;
2205 Storable::nstore $DB, "$path~";
2206 rename "$path~", $path;
2207 cf::_exit 0 if defined $pid;
2208 } 2250 };
2209 }
2210
2211 my $dirty;
2212
2213 sub db_sync() {
2214 db_save if $dirty;
2215 undef $dirty;
2216 }
2217
2218 my $idle = Event->idle (
2219 reentrant => 0,
2220 min => 10,
2221 max => 20,
2222 repeat => 0,
2223 data => WF_AUTOCANCEL,
2224 cb => \&db_sync,
2225 );
2226
2227 sub db_dirty() {
2228 $dirty = 1;
2229 $idle->start;
2230 }
2231
2232 sub db_get($;$) {
2233 @_ >= 2
2234 ? $DB->{$_[0]}{$_[1]}
2235 : ($DB->{$_[0]} ||= { })
2236 }
2237
2238 sub db_put($$;$) {
2239 if (@_ >= 3) {
2240 $DB->{$_[0]}{$_[1]} = $_[2];
2241 } else {
2242 $DB->{$_[0]} = $_[1];
2243 }
2244 db_dirty;
2245 }
2246
2247 cf::global->attach (
2248 prio => 10000,
2249 on_cleanup => sub {
2250 db_sync;
2251 }, 2251 }
2252 ); 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 { };
2253} 2269}
2254 2270
2255############################################################################# 2271#############################################################################
2256# the server's main() 2272# the server's init and main functions
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 while (my ($face, $info) = each %$faces) {
2288 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2289 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2290 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2291 Coro::cede;
2292 }
2293
2294 1
2295}
2296
2297sub reload_resources {
2298 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2299 or die "unable to load regions file\n";#d#
2300 load_faces
2301 or die "unable to load faces\n";#d#
2302}
2303
2304sub init {
2305 reload_resources;
2306}
2257 2307
2258sub cfg_load { 2308sub cfg_load {
2259 open my $fh, "<:utf8", cf::confdir . "/config" 2309 open my $fh, "<:utf8", cf::confdir . "/config"
2260 or return; 2310 or return;
2261 2311
… …
2284 Event::one_event; 2334 Event::one_event;
2285 })->prio (Coro::PRIO_MAX); 2335 })->prio (Coro::PRIO_MAX);
2286 }; 2336 };
2287 2337
2288 cfg_load; 2338 cfg_load;
2289 db_load; 2339 db_init;
2290 load_extensions; 2340 load_extensions;
2291 2341
2292 $TICK_WATCHER->start; 2342 $TICK_WATCHER->start;
2293 Event::loop; 2343 Event::loop;
2294} 2344}
… …
2333 my $map = $cf::MAP{$path} or next; 2383 my $map = $cf::MAP{$path} or next;
2334 $map->valid or next; 2384 $map->valid or next;
2335 $map->save; 2385 $map->save;
2336 } 2386 }
2337 warn "end emergency map save\n"; 2387 warn "end emergency map save\n";
2388
2389 warn "begin emergency database checkpoint\n";
2390 BDB::db_env_txn_checkpoint $DB_ENV;
2391 warn "end emergency database checkpoint\n";
2338 }; 2392 };
2339 2393
2340 warn "leave emergency perl save\n"; 2394 warn "leave emergency perl save\n";
2395}
2396
2397sub post_cleanup {
2398 my ($make_core) = @_;
2399
2400 warn Carp::longmess "post_cleanup backtrace"
2401 if $make_core;
2341} 2402}
2342 2403
2343sub reload() { 2404sub reload() {
2344 # can/must only be called in main 2405 # can/must only be called in main
2345 if ($Coro::current != $Coro::main) { 2406 if ($Coro::current != $Coro::main) {
… …
2347 return; 2408 return;
2348 } 2409 }
2349 2410
2350 warn "reloading..."; 2411 warn "reloading...";
2351 2412
2352 warn "cancelling server ticker"; 2413 warn "entering sync_job";
2353 $TICK_WATCHER->cancel;
2354 2414
2415 cf::sync_job {
2416 cf::write_runtime; # external watchdog should not bark
2355 cf::emergency_save; 2417 cf::emergency_save;
2418 cf::write_runtime; # external watchdog should not bark
2356 2419
2357 eval { 2420 warn "syncing database to disk";
2421 BDB::db_env_txn_checkpoint $DB_ENV;
2422
2358 # if anything goes wrong in here, we should simply crash as we already saved 2423 # if anything goes wrong in here, we should simply crash as we already saved
2359
2360 warn "syncing database to disk";
2361 cf::db_sync;
2362 2424
2363 warn "cancelling all WF_AUTOCANCEL watchers"; 2425 warn "cancelling all WF_AUTOCANCEL watchers";
2364 for (Event::all_watchers) { 2426 for (Event::all_watchers) {
2365 $_->cancel if $_->data & WF_AUTOCANCEL; 2427 $_->cancel if $_->data & WF_AUTOCANCEL;
2366 } 2428 }
2367 2429
2368 warn "flushing outstanding aio requests"; 2430 warn "flushing outstanding aio requests";
2369 for (;;) { 2431 for (;;) {
2432 BDB::flush;
2370 IO::AIO::flush; 2433 IO::AIO::flush;
2371 Coro::cede; 2434 Coro::cede;
2372 last unless IO::AIO::nreqs; 2435 last unless IO::AIO::nreqs || BDB::nreqs;
2373 warn "iterate..."; 2436 warn "iterate...";
2374 } 2437 }
2438
2439 ++$RELOAD;
2375 2440
2376 warn "cancelling all extension coros"; 2441 warn "cancelling all extension coros";
2377 $_->cancel for values %EXT_CORO; 2442 $_->cancel for values %EXT_CORO;
2378 %EXT_CORO = (); 2443 %EXT_CORO = ();
2379 2444
… …
2432 require cf; 2497 require cf;
2433 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2498 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2434 2499
2435 warn "loading config and database again"; 2500 warn "loading config and database again";
2436 cf::cfg_load; 2501 cf::cfg_load;
2437 cf::db_load;
2438 2502
2439 warn "loading extensions"; 2503 warn "loading extensions";
2440 cf::load_extensions; 2504 cf::load_extensions;
2441 2505
2442 warn "reattaching attachments to objects/players"; 2506 warn "reattaching attachments to objects/players";
2443 _global_reattach; 2507 _global_reattach; # objects, sockets
2444 warn "reattaching attachments to maps"; 2508 warn "reattaching attachments to maps";
2445 reattach $_ for values %MAP; 2509 reattach $_ for values %MAP;
2510 warn "reattaching attachments to players";
2511 reattach $_ for values %PLAYER;
2446 2512
2447 warn "restarting server ticker"; 2513 warn "loading reloadable resources";
2514 reload_resources;
2448 2515
2449 $TICK_WATCHER->start; 2516 warn "leaving sync_job";
2450 };
2451 2517
2452 if ($@) { 2518 1
2519 } or do {
2453 warn $@; 2520 warn $@;
2454 warn "error while reloading, exiting."; 2521 warn "error while reloading, exiting.";
2455 exit 1; 2522 exit 1;
2456 } 2523 };
2457 2524
2458 warn "reloaded"; 2525 warn "reloaded";
2459}; 2526};
2460 2527
2461our $RELOAD_WATCHER; # used only during reload 2528our $RELOAD_WATCHER; # used only during reload
… …
2502 2569
2503 cf::server_tick; # one server iteration 2570 cf::server_tick; # one server iteration
2504 $RUNTIME += $TICK; 2571 $RUNTIME += $TICK;
2505 $NEXT_TICK += $TICK; 2572 $NEXT_TICK += $TICK;
2506 2573
2574 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2575 $NEXT_RUNTIME_WRITE = $NOW + 10;
2576 Coro::async_pool {
2577 write_runtime
2578 or warn "ERROR: unable to write runtime file: $!";
2579 };
2580 }
2581
2507 $WAIT_FOR_TICK->broadcast; 2582 $WAIT_FOR_TICK->broadcast;
2508 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2583 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2509 2584
2510 Event::sweep;
2511 Coro::cede_notself;
2512
2513# my $AFTER = Event::time; 2585# my $AFTER = Event::time;
2514# warn $AFTER - $NOW;#d# 2586# warn $AFTER - $NOW;#d#
2515 2587
2516 # if we are delayed by four ticks or more, skip them all 2588 # if we are delayed by four ticks or more, skip them all
2517 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2589 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
… …
2519 $TICK_WATCHER->at ($NEXT_TICK); 2591 $TICK_WATCHER->at ($NEXT_TICK);
2520 $TICK_WATCHER->start; 2592 $TICK_WATCHER->start;
2521 }, 2593 },
2522); 2594);
2523 2595
2596{
2597 BDB::max_poll_time $TICK * 0.1;
2598 $BDB_POLL_WATCHER = Event->io (
2599 reentrant => 0,
2600 fd => BDB::poll_fileno,
2601 poll => 'r',
2602 prio => 0,
2603 data => WF_AUTOCANCEL,
2604 cb => \&BDB::poll_cb,
2605 );
2606 BDB::min_parallel 8;
2607
2608 BDB::set_sync_prepare {
2609 my $status;
2610 my $current = $Coro::current;
2611 (
2612 sub {
2613 $status = $!;
2614 $current->ready; undef $current;
2615 },
2616 sub {
2617 Coro::schedule while defined $current;
2618 $! = $status;
2619 },
2620 )
2621 };
2622
2623 unless ($DB_ENV) {
2624 $DB_ENV = BDB::db_env_create;
2625
2626 cf::sync_job {
2627 eval {
2628 BDB::db_env_open
2629 $DB_ENV,
2630 $BDB_ENV_DIR,
2631 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2632 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2633 0666;
2634
2635 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2636
2637 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2638 $DB_ENV->set_lk_detect;
2639 };
2640
2641 cf::cleanup "db_env_open(db): $@" if $@;
2642 };
2643 }
2644}
2645
2646{
2647 IO::AIO::min_parallel 8;
2648
2649 undef $Coro::AIO::WATCHER;
2524IO::AIO::max_poll_time $TICK * 0.1; 2650 IO::AIO::max_poll_time $TICK * 0.1;
2525
2526undef $Coro::AIO::WATCHER;
2527$AIO_POLL_WATCHER = Event->io ( 2651 $AIO_POLL_WATCHER = Event->io (
2528 reentrant => 0, 2652 reentrant => 0,
2653 data => WF_AUTOCANCEL,
2529 fd => IO::AIO::poll_fileno, 2654 fd => IO::AIO::poll_fileno,
2530 poll => 'r', 2655 poll => 'r',
2531 prio => 6, 2656 prio => 6,
2532 data => WF_AUTOCANCEL,
2533 cb => \&IO::AIO::poll_cb, 2657 cb => \&IO::AIO::poll_cb,
2534); 2658 );
2535 2659}
2536$WRITE_RUNTIME_WATCHER = Event->timer (
2537 reentrant => 0,
2538 data => WF_AUTOCANCEL,
2539 after => 1,
2540 interval => 10,
2541 prio => 6, # keep it lowest so it acts like a watchdog
2542 cb => Coro::unblock_sub {
2543 write_runtime
2544 or warn "ERROR: unable to write runtime file: $!";
2545 },
2546);
2547 2660
2548END { cf::emergency_save } 2661END { cf::emergency_save }
2549 2662
25501 26631
2551 2664

Diff Legend

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