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.203 by root, Thu Feb 1 19:40:42 2007 UTC vs.
Revision 1.227 by root, Fri Mar 23 18:32:48 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;
26use YAML::Syck ();
23use IO::AIO 2.32 (); 27use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 28use Time::HiRes;
29use Compress::LZF;
26 30
31# configure various modules to our taste
32#
33Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
34Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
35
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 36$Event::Eval = 1; # no idea why this is required, but it is
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 37
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 38# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 39$YAML::Syck::ImplicitUnicode = 1;
33 40
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 41$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
42
43sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
35 44
36our %COMMAND = (); 45our %COMMAND = ();
37our %COMMAND_TIME = (); 46our %COMMAND_TIME = ();
38 47
39our @EXTS = (); # list of extension package names 48our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 49our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 50our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 51our %EXT_MAP = (); # pluggable maps
43 52
53our $RELOAD; # number of reloads so far
44our @EVENT; 54our @EVENT;
45our $LIBDIR = datadir . "/ext"; 55our $LIBDIR = datadir . "/ext";
46 56
47our $TICK = MAX_TIME * 1e-6; 57our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 58our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 59our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 60our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 61our $NEXT_TICK;
52our $NOW; 62our $NOW;
63our $USE_FSYNC = 1; # use fsync to write maps - default off
64
65our $BDB_POLL_WATCHER;
66our $DB_ENV;
53 67
54our %CFG; 68our %CFG;
55 69
56our $UPTIME; $UPTIME ||= time; 70our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 71our $RUNTIME;
58 72
59our %PLAYER; # all users 73our %PLAYER; # all users
60our %MAP; # all maps 74our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 75our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random"; 76our $RANDOM_MAPS = cf::localdir . "/random";
77our $BDB_ENV_DIR = cf::localdir . "/db";
63 78
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 79our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 80our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 81
67# used to convert map paths into valid unix filenames by replacing / by ∕ 82# used to convert map paths into valid unix filenames by replacing / by ∕
… …
80mkdir cf::localdir; 95mkdir cf::localdir;
81mkdir cf::localdir . "/" . cf::playerdir; 96mkdir cf::localdir . "/" . cf::playerdir;
82mkdir cf::localdir . "/" . cf::tmpdir; 97mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 98mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 99mkdir $RANDOM_MAPS;
100mkdir $BDB_ENV_DIR;
85 101
86our $EMERGENCY_POSITION; 102our $EMERGENCY_POSITION;
87 103
88sub cf::map::normalise; 104sub cf::map::normalise;
89 105
… …
192 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 208 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
193 $d 209 $d
194 } || "[unable to dump $_[0]: '$@']"; 210 } || "[unable to dump $_[0]: '$@']";
195} 211}
196 212
197use JSON::Syck (); # TODO# replace by JSON::PC once working 213use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
198 214
199=item $ref = cf::from_json $json 215=item $ref = cf::from_json $json
200 216
201Converts a JSON string into the corresponding perl data structure. 217Converts a JSON string into the corresponding perl data structure.
202 218
203=cut
204
205sub from_json($) {
206 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
207 JSON::Syck::Load $_[0]
208}
209
210=item $json = cf::to_json $ref 219=item $json = cf::to_json $ref
211 220
212Converts a perl data structure into its JSON representation. 221Converts a perl data structure into its JSON representation.
213
214=cut
215
216sub to_json($) {
217 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
218 JSON::Syck::Dump $_[0]
219}
220 222
221=item cf::lock_wait $string 223=item cf::lock_wait $string
222 224
223Wait until the given lock is available. See cf::lock_acquire. 225Wait until the given lock is available. See cf::lock_acquire.
224 226
… …
263sub freeze_mainloop { 265sub freeze_mainloop {
264 return unless $TICK_WATCHER->is_active; 266 return unless $TICK_WATCHER->is_active;
265 267
266 my $guard = Coro::guard { 268 my $guard = Coro::guard {
267 $TICK_WATCHER->start; 269 $TICK_WATCHER->start;
268 $WRITE_RUNTIME_WATCHER->start;
269 }; 270 };
270 $WRITE_RUNTIME_WATCHER->stop;
271 $TICK_WATCHER->stop; 271 $TICK_WATCHER->stop;
272 $guard 272 $guard
273} 273}
274 274
275=item cf::async { BLOCK } 275=item cf::async { BLOCK }
… …
346 346
347 $coro 347 $coro
348} 348}
349 349
350sub write_runtime { 350sub write_runtime {
351 my $guard = cf::lock_acquire "write_runtime";
352
351 my $runtime = cf::localdir . "/runtime"; 353 my $runtime = cf::localdir . "/runtime";
352 354
353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 355 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
354 or return; 356 or return;
355 357
… …
358 # 60 allows for the watchdog to kill the server. 360 # 60 allows for the watchdog to kill the server.
359 361
360 (aio_write $fh, 0, (length $value), $value, 0) <= 0 362 (aio_write $fh, 0, (length $value), $value, 0) <= 0
361 and return; 363 and return;
362 364
365 # always fsync - this file is important
363 aio_fsync $fh 366 aio_fsync $fh
364 and return; 367 and return;
365 368
366 close $fh 369 close $fh
367 or return; 370 or return;
… …
752 $filename, length $$rdata, scalar @$objs; 755 $filename, length $$rdata, scalar @$objs;
753 756
754 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 757 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
755 chmod SAVE_MODE, $fh; 758 chmod SAVE_MODE, $fh;
756 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 759 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
757 aio_fsync $fh; 760 aio_fsync $fh if $cf::USE_FSYNC;
758 close $fh; 761 close $fh;
759 762
760 if (@$objs) { 763 if (@$objs) {
761 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 764 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
762 chmod SAVE_MODE, $fh; 765 chmod SAVE_MODE, $fh;
763 my $data = Storable::nfreeze { version => 1, objs => $objs }; 766 my $data = Storable::nfreeze { version => 1, objs => $objs };
764 aio_write $fh, 0, (length $data), $data, 0; 767 aio_write $fh, 0, (length $data), $data, 0;
765 aio_fsync $fh; 768 aio_fsync $fh if $cf::USE_FSYNC;
766 close $fh; 769 close $fh;
767 aio_rename "$filename.pst~", "$filename.pst"; 770 aio_rename "$filename.pst~", "$filename.pst";
768 } 771 }
769 } else { 772 } else {
770 aio_unlink "$filename.pst"; 773 aio_unlink "$filename.pst";
… …
776 } 779 }
777 } else { 780 } else {
778 aio_unlink $filename; 781 aio_unlink $filename;
779 aio_unlink "$filename.pst"; 782 aio_unlink "$filename.pst";
780 } 783 }
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 } 784 }
788} 785}
789 786
790sub object_freezer_as_string { 787sub object_freezer_as_string {
791 my ($rdata, $objs) = @_; 788 my ($rdata, $objs) = @_;
… …
797 794
798sub object_thawer_load { 795sub object_thawer_load {
799 my ($filename) = @_; 796 my ($filename) = @_;
800 797
801 my ($data, $av); 798 my ($data, $av);
802
803 #d#TODO remove .map if file does not exist
804 aio_stat $filename and $filename =~ s/\.map$//;
805 799
806 (aio_load $filename, $data) >= 0 800 (aio_load $filename, $data) >= 0
807 or return; 801 or return;
808 802
809 unless (aio_stat "$filename.pst") { 803 unless (aio_stat "$filename.pst") {
… …
1028=cut 1022=cut
1029 1023
1030sub quit_character { 1024sub quit_character {
1031 my ($pl) = @_; 1025 my ($pl) = @_;
1032 1026
1027 my $name = $pl->ob->name;
1028
1033 $pl->{deny_save} = 1; 1029 $pl->{deny_save} = 1;
1034 $pl->password ("*"); # this should lock out the player until we nuked the dir 1030 $pl->password ("*"); # this should lock out the player until we nuked the dir
1035 1031
1036 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1032 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1037 $pl->deactivate; 1033 $pl->deactivate;
… …
1041 my $path = playerdir $pl; 1037 my $path = playerdir $pl;
1042 my $temp = "$path~$cf::RUNTIME~deleting~"; 1038 my $temp = "$path~$cf::RUNTIME~deleting~";
1043 aio_rename $path, $temp; 1039 aio_rename $path, $temp;
1044 delete $cf::PLAYER{$pl->ob->name}; 1040 delete $cf::PLAYER{$pl->ob->name};
1045 $pl->destroy; 1041 $pl->destroy;
1042
1043 my $prefix = qr<^~\Q$name\E/>;
1044
1045 # nuke player maps
1046 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1047
1046 IO::AIO::aio_rmtree $temp; 1048 IO::AIO::aio_rmtree $temp;
1049}
1050
1051=item $pl->kick
1052
1053Kicks a player out of the game. This destroys the connection.
1054
1055=cut
1056
1057sub kick {
1058 my ($pl, $kicker) = @_;
1059
1060 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1061 $pl->killer ("kicked");
1062 $pl->ns->destroy;
1047} 1063}
1048 1064
1049=item cf::player::list_logins 1065=item cf::player::list_logins
1050 1066
1051Returns am arrayref of all valid playernames in the system, can take a 1067Returns am arrayref of all valid playernames in the system, can take a
… …
1296 my ($self) = @_; 1312 my ($self) = @_;
1297 1313
1298 utf8::encode (my $save = $self->save_path); 1314 utf8::encode (my $save = $self->save_path);
1299 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1315 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1300 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1316 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1301
1302 #d#TODO remove .map and also nuke
1303 $save =~ s/\.map// or return;#d#
1304 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1305 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1306} 1317}
1307 1318
1308sub load_header_from($) { 1319sub load_header_from($) {
1309 my ($self, $path) = @_; 1320 my ($self, $path) = @_;
1310 1321
… …
1598 return if $self->players; 1609 return if $self->players;
1599 return if $self->isa ("ext::map_per_player");#d# 1610 return if $self->isa ("ext::map_per_player");#d#
1600 1611
1601 warn "resetting map ", $self->path;#d# 1612 warn "resetting map ", $self->path;#d#
1602 1613
1614 $self->in_memory (cf::MAP_SWAPPED);
1615
1616 # need to save uniques path
1617 unless ($self->{deny_save}) {
1618 my $uniq = $self->uniq_path; utf8::encode $uniq;
1619
1620 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1621 if $uniq;
1622 }
1623
1603 delete $cf::MAP{$self->path}; 1624 delete $cf::MAP{$self->path};
1604 1625
1605 $self->in_memory (cf::MAP_SWAPPED);
1606 $self->clear; 1626 $self->clear;
1607 1627
1608 $_->clear_links_to ($self) for values %cf::MAP; 1628 $_->clear_links_to ($self) for values %cf::MAP;
1609 1629
1610 $self->unlink_save; 1630 $self->unlink_save;
… …
1800 $map->load; 1820 $map->load;
1801 $map->load_diag; 1821 $map->load_diag;
1802 1822
1803 return unless $self->contr->active; 1823 return unless $self->contr->active;
1804 $self->activate_recursive; 1824 $self->activate_recursive;
1825
1826 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1805 $self->enter_map ($map, $x, $y); 1827 $self->enter_map ($map, $x, $y);
1806} 1828}
1807 1829
1808cf::player->attach ( 1830cf::player->attach (
1809 on_logout => sub { 1831 on_logout => sub {
… …
1822 # try to abort aborted map switching on player login :) 1844 # try to abort aborted map switching on player login :)
1823 # should happen only on crashes 1845 # should happen only on crashes
1824 if ($pl->ob->{_link_pos}) { 1846 if ($pl->ob->{_link_pos}) {
1825 $pl->ob->enter_link; 1847 $pl->ob->enter_link;
1826 (async { 1848 (async {
1827 # we need this sleep as the login has a concurrent enter_exit running
1828 # and this sleep increases chances of the player not ending up in scorn
1829 $pl->ob->reply (undef, 1849 $pl->ob->reply (undef,
1830 "There was an internal problem at your last logout, " 1850 "There was an internal problem at your last logout, "
1831 . "the server will try to bring you to your intended destination in a second.", 1851 . "the server will try to bring you to your intended destination in a second.",
1832 cf::NDI_RED); 1852 cf::NDI_RED);
1853 # we need this sleep as the login has a concurrent enter_exit running
1854 # and this sleep increases chances of the player not ending up in scorn
1833 Coro::Timer::sleep 1; 1855 Coro::Timer::sleep 1;
1834 $pl->ob->leave_link; 1856 $pl->ob->leave_link;
1835 })->prio (2); 1857 })->prio (2);
1836 } 1858 }
1837 }, 1859 },
… …
1962 1984
1963sub cf::client::send_drawinfo { 1985sub cf::client::send_drawinfo {
1964 my ($self, $text, $flags) = @_; 1986 my ($self, $text, $flags) = @_;
1965 1987
1966 utf8::encode $text; 1988 utf8::encode $text;
1967 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 1989 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1968} 1990}
1969 1991
1970 1992
1971=item $success = $client->query ($flags, "text", \&cb) 1993=item $success = $client->query ($flags, "text", \&cb)
1972 1994
… …
2174The parameter C<$family> should best start with the name of the extension 2196The parameter C<$family> should best start with the name of the extension
2175using it, it should be unique. 2197using it, it should be unique.
2176 2198
2177=over 4 2199=over 4
2178 2200
2179=item $hashref = cf::db_get $family
2180
2181Return a hashref for use by the extension C<$family>, which can be
2182modified. After modifications, you have to call C<cf::db_dirty> or
2183C<cf::db_sync>.
2184
2185=item $value = cf::db_get $family => $key 2201=item $value = cf::db_get $family => $key
2186 2202
2187Returns a single value from the database 2203Returns a single value from the database.
2188
2189=item cf::db_put $family => $hashref
2190
2191Stores the given family hashref into the database. Updates are delayed, if
2192you want the data to be synced to disk immediately, use C<cf::db_sync>.
2193 2204
2194=item cf::db_put $family => $key => $value 2205=item cf::db_put $family => $key => $value
2195 2206
2196Stores the given C<$value> in the family hash. Updates are delayed, if you 2207Stores the given C<$value> in the family.
2197want the data to be synced to disk immediately, use C<cf::db_sync>.
2198
2199=item cf::db_dirty
2200
2201Marks the database as dirty, to be updated at a later time.
2202
2203=item cf::db_sync
2204
2205Immediately write the database to disk I<if it is dirty>.
2206 2208
2207=cut 2209=cut
2208 2210
2209our $DB; 2211our $DB;
2210 2212
2211{ 2213sub db_init {
2214 unless ($DB) {
2215 $DB = BDB::db_create $DB_ENV;
2216
2217 cf::sync_job {
2218 eval {
2219 $DB->set_flags (BDB::CHKSUM);
2220
2221 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2222 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2223 cf::cleanup "db_open(db): $!" if $!;
2224 };
2225 cf::cleanup "db_open(db): $@" if $@;
2226 };
2227
2212 my $path = cf::localdir . "/database.pst"; 2228 my $path = cf::localdir . "/database.pst";
2229 if (stat $path) {
2230 cf::sync_job {
2231 my $pst = Storable::retrieve $path;
2213 2232
2214 sub db_load() { 2233 cf::db_put (board => data => $pst->{board});
2215 $DB = stat $path ? Storable::retrieve $path : { }; 2234 cf::db_put (guildrules => data => $pst->{guildrules});
2216 } 2235 cf::db_put (rent => balance => $pst->{rent}{balance});
2236 BDB::db_env_txn_checkpoint $DB_ENV;
2217 2237
2218 my $pid; 2238 unlink $path;
2219
2220 sub db_save() {
2221 waitpid $pid, 0 if $pid;
2222 if (0 == ($pid = fork)) {
2223 $DB->{_meta}{version} = 1;
2224 Storable::nstore $DB, "$path~";
2225 rename "$path~", $path;
2226 cf::_exit 0 if defined $pid;
2227 } 2239 };
2228 }
2229
2230 my $dirty;
2231
2232 sub db_sync() {
2233 db_save if $dirty;
2234 undef $dirty;
2235 }
2236
2237 my $idle = Event->idle (
2238 reentrant => 0,
2239 min => 10,
2240 max => 20,
2241 repeat => 0,
2242 data => WF_AUTOCANCEL,
2243 cb => \&db_sync,
2244 );
2245
2246 sub db_dirty() {
2247 $dirty = 1;
2248 $idle->start;
2249 }
2250
2251 sub db_get($;$) {
2252 @_ >= 2
2253 ? $DB->{$_[0]}{$_[1]}
2254 : ($DB->{$_[0]} ||= { })
2255 }
2256
2257 sub db_put($$;$) {
2258 if (@_ >= 3) {
2259 $DB->{$_[0]}{$_[1]} = $_[2];
2260 } else {
2261 $DB->{$_[0]} = $_[1];
2262 }
2263 db_dirty;
2264 }
2265
2266 cf::global->attach (
2267 prio => 10000,
2268 on_cleanup => sub {
2269 db_sync;
2270 }, 2240 }
2271 ); 2241 }
2242}
2243
2244sub db_get($$) {
2245 my $key = "$_[0]/$_[1]";
2246
2247 cf::sync_job {
2248 BDB::db_get $DB, undef, $key, my $data;
2249
2250 $! ? ()
2251 : Compress::LZF::sthaw $data
2252 }
2253}
2254
2255sub db_put($$$) {
2256 BDB::dbreq_pri 4;
2257 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2272} 2258}
2273 2259
2274############################################################################# 2260#############################################################################
2275# the server's init and main functions 2261# the server's init and main functions
2276 2262
2263sub load_faces {
2264 my $path = sprintf "%s/faces", cf::datadir;
2265
2266 warn "loading faces from $path\n";
2267
2268 my $faces;
2269 0 < aio_load $path, $faces
2270 or die "$path: $!";
2271
2272 Coro::cede;
2273 $faces = Storable::thaw $faces;
2274 Coro::cede;
2275
2276 my $meta = delete $faces->{""};
2277 $meta->{version} == 1
2278 or cf::cleanup "$path: version mismatch, cannot proceed.";
2279
2280 while (my ($face, $info) = each %$faces) {
2281 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2282 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2283 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2284 Coro::cede;
2285 }
2286
2287 while (my ($face, $info) = each %$faces) {
2288 next unless $info->{smooth};
2289 my $idx = cf::face::find $face
2290 or next;
2291 if (my $smooth = cf::face::find $info->{smooth}) {
2292 cf::face::set_smooth $idx, $smooth;
2293 } else {
2294 warn "smooth face '$info->{smooth}' not found for face '$face'";
2295 }
2296 Coro::cede;
2297 }
2298
2299 1
2300}
2301
2277sub load_resources { 2302sub reload_resources {
2278 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2303 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2279 or die "unable to load regions file\n";#d# 2304 or die "unable to load regions file\n";#d#
2305 load_faces
2306 or die "unable to load faces\n";#d#
2307}
2308
2309sub init {
2310 reload_resources;
2280} 2311}
2281 2312
2282sub cfg_load { 2313sub cfg_load {
2283 open my $fh, "<:utf8", cf::confdir . "/config" 2314 open my $fh, "<:utf8", cf::confdir . "/config"
2284 or return; 2315 or return;
… …
2296 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2327 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2297 and die "WARNING: m(un)lockall failed: $!\n"; 2328 and die "WARNING: m(un)lockall failed: $!\n";
2298 }; 2329 };
2299 warn $@ if $@; 2330 warn $@ if $@;
2300 } 2331 }
2301}
2302
2303sub init {
2304 load_resources;
2305} 2332}
2306 2333
2307sub main { 2334sub main {
2308 # we must not ever block the main coroutine 2335 # we must not ever block the main coroutine
2309 local $Coro::idle = sub { 2336 local $Coro::idle = sub {
… …
2312 Event::one_event; 2339 Event::one_event;
2313 })->prio (Coro::PRIO_MAX); 2340 })->prio (Coro::PRIO_MAX);
2314 }; 2341 };
2315 2342
2316 cfg_load; 2343 cfg_load;
2317 db_load; 2344 db_init;
2318 load_extensions; 2345 load_extensions;
2319 2346
2320 $TICK_WATCHER->start; 2347 $TICK_WATCHER->start;
2321 Event::loop; 2348 Event::loop;
2322} 2349}
… …
2361 my $map = $cf::MAP{$path} or next; 2388 my $map = $cf::MAP{$path} or next;
2362 $map->valid or next; 2389 $map->valid or next;
2363 $map->save; 2390 $map->save;
2364 } 2391 }
2365 warn "end emergency map save\n"; 2392 warn "end emergency map save\n";
2393
2394 warn "begin emergency database checkpoint\n";
2395 BDB::db_env_txn_checkpoint $DB_ENV;
2396 warn "end emergency database checkpoint\n";
2366 }; 2397 };
2367 2398
2368 warn "leave emergency perl save\n"; 2399 warn "leave emergency perl save\n";
2400}
2401
2402sub post_cleanup {
2403 my ($make_core) = @_;
2404
2405 warn Carp::longmess "post_cleanup backtrace"
2406 if $make_core;
2369} 2407}
2370 2408
2371sub reload() { 2409sub reload() {
2372 # can/must only be called in main 2410 # can/must only be called in main
2373 if ($Coro::current != $Coro::main) { 2411 if ($Coro::current != $Coro::main) {
… …
2375 return; 2413 return;
2376 } 2414 }
2377 2415
2378 warn "reloading..."; 2416 warn "reloading...";
2379 2417
2380 warn "cancelling server ticker"; 2418 warn "entering sync_job";
2381 $TICK_WATCHER->cancel;
2382 2419
2420 cf::sync_job {
2421 cf::write_runtime; # external watchdog should not bark
2383 cf::emergency_save; 2422 cf::emergency_save;
2423 cf::write_runtime; # external watchdog should not bark
2384 2424
2385 eval { 2425 warn "syncing database to disk";
2426 BDB::db_env_txn_checkpoint $DB_ENV;
2427
2386 # if anything goes wrong in here, we should simply crash as we already saved 2428 # if anything goes wrong in here, we should simply crash as we already saved
2387
2388 warn "syncing database to disk";
2389 cf::db_sync;
2390 2429
2391 warn "cancelling all WF_AUTOCANCEL watchers"; 2430 warn "cancelling all WF_AUTOCANCEL watchers";
2392 for (Event::all_watchers) { 2431 for (Event::all_watchers) {
2393 $_->cancel if $_->data & WF_AUTOCANCEL; 2432 $_->cancel if $_->data & WF_AUTOCANCEL;
2394 } 2433 }
2395 2434
2396 warn "flushing outstanding aio requests"; 2435 warn "flushing outstanding aio requests";
2397 for (;;) { 2436 for (;;) {
2437 BDB::flush;
2398 IO::AIO::flush; 2438 IO::AIO::flush;
2399 Coro::cede; 2439 Coro::cede;
2400 last unless IO::AIO::nreqs; 2440 last unless IO::AIO::nreqs || BDB::nreqs;
2401 warn "iterate..."; 2441 warn "iterate...";
2402 } 2442 }
2443
2444 ++$RELOAD;
2403 2445
2404 warn "cancelling all extension coros"; 2446 warn "cancelling all extension coros";
2405 $_->cancel for values %EXT_CORO; 2447 $_->cancel for values %EXT_CORO;
2406 %EXT_CORO = (); 2448 %EXT_CORO = ();
2407 2449
… …
2460 require cf; 2502 require cf;
2461 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2503 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2462 2504
2463 warn "loading config and database again"; 2505 warn "loading config and database again";
2464 cf::cfg_load; 2506 cf::cfg_load;
2465 cf::db_load;
2466 2507
2467 warn "loading extensions"; 2508 warn "loading extensions";
2468 cf::load_extensions; 2509 cf::load_extensions;
2469 2510
2470 warn "reattaching attachments to objects/players"; 2511 warn "reattaching attachments to objects/players";
2471 _global_reattach; 2512 _global_reattach; # objects, sockets
2472 warn "reattaching attachments to maps"; 2513 warn "reattaching attachments to maps";
2473 reattach $_ for values %MAP; 2514 reattach $_ for values %MAP;
2515 warn "reattaching attachments to players";
2516 reattach $_ for values %PLAYER;
2474 2517
2475 warn "loading reloadable resources"; 2518 warn "loading reloadable resources";
2476 load_resources; 2519 reload_resources;
2477 2520
2478 warn "restarting server ticker"; 2521 warn "leaving sync_job";
2479 2522
2480 $TICK_WATCHER->start; 2523 1
2481 }; 2524 } or do {
2482
2483 if ($@) {
2484 warn $@; 2525 warn $@;
2485 warn "error while reloading, exiting."; 2526 warn "error while reloading, exiting.";
2486 exit 1; 2527 exit 1;
2487 } 2528 };
2488 2529
2489 warn "reloaded"; 2530 warn "reloaded";
2490}; 2531};
2491 2532
2492our $RELOAD_WATCHER; # used only during reload 2533our $RELOAD_WATCHER; # used only during reload
… …
2533 2574
2534 cf::server_tick; # one server iteration 2575 cf::server_tick; # one server iteration
2535 $RUNTIME += $TICK; 2576 $RUNTIME += $TICK;
2536 $NEXT_TICK += $TICK; 2577 $NEXT_TICK += $TICK;
2537 2578
2579 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2580 $NEXT_RUNTIME_WRITE = $NOW + 10;
2581 Coro::async_pool {
2582 write_runtime
2583 or warn "ERROR: unable to write runtime file: $!";
2584 };
2585 }
2586
2538 $WAIT_FOR_TICK->broadcast; 2587 $WAIT_FOR_TICK->broadcast;
2539 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2588 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2540 2589
2541 Event::sweep;
2542 Coro::cede_notself;
2543
2544# my $AFTER = Event::time; 2590# my $AFTER = Event::time;
2545# warn $AFTER - $NOW;#d# 2591# warn $AFTER - $NOW;#d#
2546 2592
2547 # if we are delayed by four ticks or more, skip them all 2593 # if we are delayed by four ticks or more, skip them all
2548 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2594 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
… …
2550 $TICK_WATCHER->at ($NEXT_TICK); 2596 $TICK_WATCHER->at ($NEXT_TICK);
2551 $TICK_WATCHER->start; 2597 $TICK_WATCHER->start;
2552 }, 2598 },
2553); 2599);
2554 2600
2601{
2602 BDB::max_poll_time $TICK * 0.1;
2603 $BDB_POLL_WATCHER = Event->io (
2604 reentrant => 0,
2605 fd => BDB::poll_fileno,
2606 poll => 'r',
2607 prio => 0,
2608 data => WF_AUTOCANCEL,
2609 cb => \&BDB::poll_cb,
2610 );
2611 BDB::min_parallel 8;
2612
2613 BDB::set_sync_prepare {
2614 my $status;
2615 my $current = $Coro::current;
2616 (
2617 sub {
2618 $status = $!;
2619 $current->ready; undef $current;
2620 },
2621 sub {
2622 Coro::schedule while defined $current;
2623 $! = $status;
2624 },
2625 )
2626 };
2627
2628 unless ($DB_ENV) {
2629 $DB_ENV = BDB::db_env_create;
2630
2631 cf::sync_job {
2632 eval {
2633 BDB::db_env_open
2634 $DB_ENV,
2635 $BDB_ENV_DIR,
2636 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2637 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2638 0666;
2639
2640 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2641
2642 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2643 $DB_ENV->set_lk_detect;
2644 };
2645
2646 cf::cleanup "db_env_open(db): $@" if $@;
2647 };
2648 }
2649}
2650
2651{
2652 IO::AIO::min_parallel 8;
2653
2654 undef $Coro::AIO::WATCHER;
2555IO::AIO::max_poll_time $TICK * 0.1; 2655 IO::AIO::max_poll_time $TICK * 0.1;
2556
2557undef $Coro::AIO::WATCHER;
2558$AIO_POLL_WATCHER = Event->io ( 2656 $AIO_POLL_WATCHER = Event->io (
2559 reentrant => 0, 2657 reentrant => 0,
2658 data => WF_AUTOCANCEL,
2560 fd => IO::AIO::poll_fileno, 2659 fd => IO::AIO::poll_fileno,
2561 poll => 'r', 2660 poll => 'r',
2562 prio => 6, 2661 prio => 6,
2563 data => WF_AUTOCANCEL,
2564 cb => \&IO::AIO::poll_cb, 2662 cb => \&IO::AIO::poll_cb,
2565); 2663 );
2566 2664}
2567$WRITE_RUNTIME_WATCHER = Event->timer (
2568 reentrant => 0,
2569 data => WF_AUTOCANCEL,
2570 after => 1,
2571 interval => 10,
2572 prio => 6, # keep it lowest so it acts like a watchdog
2573 cb => Coro::unblock_sub {
2574 write_runtime
2575 or warn "ERROR: unable to write runtime file: $!";
2576 },
2577);
2578 2665
2579END { cf::emergency_save } 2666END { cf::emergency_save }
2580 2667
25811 26681
2582 2669

Diff Legend

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