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.208 by root, Mon Feb 12 00:27:20 2007 UTC vs.
Revision 1.237 by root, Fri Apr 13 05:08:51 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;
21use Coro::Storable;
19 22
20use BDB (); 23use BDB ();
21use Data::Dumper; 24use Data::Dumper;
22use Digest::MD5; 25use Digest::MD5;
23use Fcntl; 26use Fcntl;
27use YAML::Syck ();
24use IO::AIO 2.32 (); 28use IO::AIO 2.32 ();
25use YAML::Syck ();
26use Time::HiRes; 29use Time::HiRes;
27use Compress::LZF; 30use Compress::LZF;
28 31
32# configure various modules to our taste
33#
34$Storable::canonical = 1; # reduce rsync transfers
35Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
29Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 36Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
30 37
31use Event; $Event::Eval = 1; # no idea why this is required, but it is 38$Event::Eval = 1; # no idea why this is required, but it is
32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 39
35# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 40# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
36$YAML::Syck::ImplicitUnicode = 1; 41$YAML::Syck::ImplicitUnicode = 1;
37 42
38$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 43$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
44
45sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
39 46
40our %COMMAND = (); 47our %COMMAND = ();
41our %COMMAND_TIME = (); 48our %COMMAND_TIME = ();
42 49
43our @EXTS = (); # list of extension package names 50our @EXTS = (); # list of extension package names
44our %EXTCMD = (); 51our %EXTCMD = ();
45our %EXT_CORO = (); # coroutines bound to extensions 52our %EXT_CORO = (); # coroutines bound to extensions
46our %EXT_MAP = (); # pluggable maps 53our %EXT_MAP = (); # pluggable maps
47 54
55our $RELOAD; # number of reloads so far
48our @EVENT; 56our @EVENT;
49our $LIBDIR = datadir . "/ext"; 57our $LIBDIR = datadir . "/ext";
50 58
51our $TICK = MAX_TIME * 1e-6; 59our $TICK = MAX_TIME * 1e-6;
52our $TICK_WATCHER; 60our $TICK_WATCHER;
53our $AIO_POLL_WATCHER; 61our $AIO_POLL_WATCHER;
54our $WRITE_RUNTIME_WATCHER; 62our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
55our $NEXT_TICK; 63our $NEXT_TICK;
56our $NOW; 64our $NOW;
57our $USE_FSYNC = 1; # use fsync to write maps - default off 65our $USE_FSYNC = 1; # use fsync to write maps - default off
58 66
59our $BDB_POLL_WATCHER; 67our $BDB_POLL_WATCHER;
… …
202 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 210 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
203 $d 211 $d
204 } || "[unable to dump $_[0]: '$@']"; 212 } || "[unable to dump $_[0]: '$@']";
205} 213}
206 214
207use JSON::Syck (); # TODO# replace by JSON::PC once working 215use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
208 216
209=item $ref = cf::from_json $json 217=item $ref = cf::from_json $json
210 218
211Converts a JSON string into the corresponding perl data structure. 219Converts a JSON string into the corresponding perl data structure.
212 220
213=cut
214
215sub from_json($) {
216 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
217 JSON::Syck::Load $_[0]
218}
219
220=item $json = cf::to_json $ref 221=item $json = cf::to_json $ref
221 222
222Converts a perl data structure into its JSON representation. 223Converts a perl data structure into its JSON representation.
223
224=cut
225
226sub to_json($) {
227 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
228 JSON::Syck::Dump $_[0]
229}
230 224
231=item cf::lock_wait $string 225=item cf::lock_wait $string
232 226
233Wait until the given lock is available. See cf::lock_acquire. 227Wait until the given lock is available. See cf::lock_acquire.
234 228
… …
273sub freeze_mainloop { 267sub freeze_mainloop {
274 return unless $TICK_WATCHER->is_active; 268 return unless $TICK_WATCHER->is_active;
275 269
276 my $guard = Coro::guard { 270 my $guard = Coro::guard {
277 $TICK_WATCHER->start; 271 $TICK_WATCHER->start;
278 $WRITE_RUNTIME_WATCHER->start;
279 }; 272 };
280 $WRITE_RUNTIME_WATCHER->stop;
281 $TICK_WATCHER->stop; 273 $TICK_WATCHER->stop;
282 $guard 274 $guard
283} 275}
284 276
285=item cf::async { BLOCK } 277=item cf::async { BLOCK }
… …
356 348
357 $coro 349 $coro
358} 350}
359 351
360sub write_runtime { 352sub write_runtime {
353 my $guard = cf::lock_acquire "write_runtime";
354
361 my $runtime = cf::localdir . "/runtime"; 355 my $runtime = cf::localdir . "/runtime";
362 356
363 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 357 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
364 or return; 358 or return;
365 359
… …
379 373
380 aio_rename "$runtime~", $runtime 374 aio_rename "$runtime~", $runtime
381 and return; 375 and return;
382 376
383 1 377 1
378}
379
380=item cf::datalog type => key => value, ...
381
382Log a datalog packet of the given type with the given key-value pairs.
383
384=cut
385
386sub datalog($@) {
387 my ($type, %kv) = @_;
388 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
384} 389}
385 390
386=back 391=back
387 392
388=cut 393=cut
… …
787 } 792 }
788 } else { 793 } else {
789 aio_unlink $filename; 794 aio_unlink $filename;
790 aio_unlink "$filename.pst"; 795 aio_unlink "$filename.pst";
791 } 796 }
792
793 #d##TODO# nuke non .map-files if exist
794 if ($filename =~ s/\.map$//) {
795 aio_unlink $filename;
796 aio_unlink "$filename.pst";
797 }
798 } 797 }
799} 798}
800 799
801sub object_freezer_as_string { 800sub object_freezer_as_string {
802 my ($rdata, $objs) = @_; 801 my ($rdata, $objs) = @_;
… …
808 807
809sub object_thawer_load { 808sub object_thawer_load {
810 my ($filename) = @_; 809 my ($filename) = @_;
811 810
812 my ($data, $av); 811 my ($data, $av);
813
814 #d#TODO remove .map if file does not exist
815 aio_stat $filename and $filename =~ s/\.map$//;
816 812
817 (aio_load $filename, $data) >= 0 813 (aio_load $filename, $data) >= 0
818 or return; 814 or return;
819 815
820 unless (aio_stat "$filename.pst") { 816 unless (aio_stat "$filename.pst") {
… …
969} 965}
970 966
971sub path($) { 967sub path($) {
972 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 968 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
973 969
974 (playerdir $login) . "/$login.pl" 970 (playerdir $login) . "/playerdata"
975} 971}
976 972
977sub find_active($) { 973sub find_active($) {
978 $cf::PLAYER{$_[0]} 974 $cf::PLAYER{$_[0]}
979 and $cf::PLAYER{$_[0]}->active 975 and $cf::PLAYER{$_[0]}->active
… …
992 my $login = $_[0]; 988 my $login = $_[0];
993 989
994 my $guard = cf::lock_acquire "user_find:$login"; 990 my $guard = cf::lock_acquire "user_find:$login";
995 991
996 $cf::PLAYER{$_[0]} || do { 992 $cf::PLAYER{$_[0]} || do {
993 # rename old playerfiles to new ones
994 #TODO: remove when no longer required
995 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
996 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
997 aio_unlink +(playerdir $login) . "/$login.pl.pst";
998 aio_unlink +(playerdir $login) . "/$login.pl";
999
997 my $pl = load_pl path $login 1000 my $pl = load_pl path $login
998 or return; 1001 or return;
999 $cf::PLAYER{$login} = $pl 1002 $cf::PLAYER{$login} = $pl
1000 } 1003 }
1001 } 1004 }
… …
1038 1041
1039=cut 1042=cut
1040 1043
1041sub quit_character { 1044sub quit_character {
1042 my ($pl) = @_; 1045 my ($pl) = @_;
1046
1047 my $name = $pl->ob->name;
1043 1048
1044 $pl->{deny_save} = 1; 1049 $pl->{deny_save} = 1;
1045 $pl->password ("*"); # this should lock out the player until we nuked the dir 1050 $pl->password ("*"); # this should lock out the player until we nuked the dir
1046 1051
1047 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1052 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
… …
1052 my $path = playerdir $pl; 1057 my $path = playerdir $pl;
1053 my $temp = "$path~$cf::RUNTIME~deleting~"; 1058 my $temp = "$path~$cf::RUNTIME~deleting~";
1054 aio_rename $path, $temp; 1059 aio_rename $path, $temp;
1055 delete $cf::PLAYER{$pl->ob->name}; 1060 delete $cf::PLAYER{$pl->ob->name};
1056 $pl->destroy; 1061 $pl->destroy;
1062
1063 my $prefix = qr<^~\Q$name\E/>;
1064
1065 # nuke player maps
1066 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1067
1057 IO::AIO::aio_rmtree $temp; 1068 IO::AIO::aio_rmtree $temp;
1069}
1070
1071=item $pl->kick
1072
1073Kicks a player out of the game. This destroys the connection.
1074
1075=cut
1076
1077sub kick {
1078 my ($pl, $kicker) = @_;
1079
1080 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1081 $pl->killer ("kicked");
1082 $pl->ns->destroy;
1058} 1083}
1059 1084
1060=item cf::player::list_logins 1085=item cf::player::list_logins
1061 1086
1062Returns am arrayref of all valid playernames in the system, can take a 1087Returns am arrayref of all valid playernames in the system, can take a
… …
1108 } 1133 }
1109 1134
1110 \@paths 1135 \@paths
1111} 1136}
1112 1137
1113=item $player->ext_reply ($msgid, $msgtype, %msg) 1138=item $player->ext_reply ($msgid, %msg)
1114 1139
1115Sends an ext reply to the player. 1140Sends an ext reply to the player.
1116 1141
1117=cut 1142=cut
1118 1143
1119sub ext_reply($$$%) { 1144sub ext_reply($$%) {
1120 my ($self, $id, %msg) = @_; 1145 my ($self, $id, %msg) = @_;
1121 1146
1122 $msg{msgid} = $id; 1147 $msg{msgid} = $id;
1123 1148
1124 $self->send ("ext " . cf::to_json \%msg); 1149 $self->send ("ext " . cf::to_json \%msg);
1150}
1151
1152=item $player->ext_event ($type, %msg)
1153
1154Sends an ext event to the client.
1155
1156=cut
1157
1158sub ext_event($$%) {
1159 my ($self, $type, %msg) = @_;
1160
1161 $self->ns->ext_event ($type, %msg);
1125} 1162}
1126 1163
1127package cf; 1164package cf;
1128 1165
1129=back 1166=back
… …
1307 my ($self) = @_; 1344 my ($self) = @_;
1308 1345
1309 utf8::encode (my $save = $self->save_path); 1346 utf8::encode (my $save = $self->save_path);
1310 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1347 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1311 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1348 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1312
1313 #d#TODO remove .map and also nuke
1314 $save =~ s/\.map// or return;#d#
1315 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1316 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1317} 1349}
1318 1350
1319sub load_header_from($) { 1351sub load_header_from($) {
1320 my ($self, $path) = @_; 1352 my ($self, $path) = @_;
1321 1353
… …
1609 return if $self->players; 1641 return if $self->players;
1610 return if $self->isa ("ext::map_per_player");#d# 1642 return if $self->isa ("ext::map_per_player");#d#
1611 1643
1612 warn "resetting map ", $self->path;#d# 1644 warn "resetting map ", $self->path;#d#
1613 1645
1646 $self->in_memory (cf::MAP_SWAPPED);
1647
1648 # need to save uniques path
1649 unless ($self->{deny_save}) {
1650 my $uniq = $self->uniq_path; utf8::encode $uniq;
1651
1652 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1653 if $uniq;
1654 }
1655
1614 delete $cf::MAP{$self->path}; 1656 delete $cf::MAP{$self->path};
1615 1657
1616 $self->in_memory (cf::MAP_SWAPPED);
1617 $self->clear; 1658 $self->clear;
1618 1659
1619 $_->clear_links_to ($self) for values %cf::MAP; 1660 $_->clear_links_to ($self) for values %cf::MAP;
1620 1661
1621 $self->unlink_save; 1662 $self->unlink_save;
… …
1811 $map->load; 1852 $map->load;
1812 $map->load_diag; 1853 $map->load_diag;
1813 1854
1814 return unless $self->contr->active; 1855 return unless $self->contr->active;
1815 $self->activate_recursive; 1856 $self->activate_recursive;
1857
1858 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1816 $self->enter_map ($map, $x, $y); 1859 $self->enter_map ($map, $x, $y);
1817} 1860}
1818 1861
1819cf::player->attach ( 1862cf::player->attach (
1820 on_logout => sub { 1863 on_logout => sub {
… …
1833 # try to abort aborted map switching on player login :) 1876 # try to abort aborted map switching on player login :)
1834 # should happen only on crashes 1877 # should happen only on crashes
1835 if ($pl->ob->{_link_pos}) { 1878 if ($pl->ob->{_link_pos}) {
1836 $pl->ob->enter_link; 1879 $pl->ob->enter_link;
1837 (async { 1880 (async {
1838 # we need this sleep as the login has a concurrent enter_exit running
1839 # and this sleep increases chances of the player not ending up in scorn
1840 $pl->ob->reply (undef, 1881 $pl->ob->reply (undef,
1841 "There was an internal problem at your last logout, " 1882 "There was an internal problem at your last logout, "
1842 . "the server will try to bring you to your intended destination in a second.", 1883 . "the server will try to bring you to your intended destination in a second.",
1843 cf::NDI_RED); 1884 cf::NDI_RED);
1885 # we need this sleep as the login has a concurrent enter_exit running
1886 # and this sleep increases chances of the player not ending up in scorn
1844 Coro::Timer::sleep 1; 1887 Coro::Timer::sleep 1;
1845 $pl->ob->leave_link; 1888 $pl->ob->leave_link;
1846 })->prio (2); 1889 })->prio (2);
1847 } 1890 }
1848 }, 1891 },
… …
1931 1974
1932 return unless $self->type == cf::PLAYER; 1975 return unless $self->type == cf::PLAYER;
1933 1976
1934 if ($exit->slaying eq "/!") { 1977 if ($exit->slaying eq "/!") {
1935 #TODO: this should de-fi-ni-te-ly not be a sync-job 1978 #TODO: this should de-fi-ni-te-ly not be a sync-job
1979 # the problem is that $exit might not survive long enough
1980 # so it needs to be done right now, right here
1936 cf::sync_job { prepare_random_map $exit }; 1981 cf::sync_job { prepare_random_map $exit };
1937 } 1982 }
1938 1983
1939 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 1984 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1940 my $hp = $exit->stats->hp; 1985 my $hp = $exit->stats->hp;
… …
1948 $self->goto ($slaying, $hp, $sp); 1993 $self->goto ($slaying, $hp, $sp);
1949 1994
1950 1; 1995 1;
1951 }) { 1996 }) {
1952 $self->message ("Something went wrong deep within the crossfire server. " 1997 $self->message ("Something went wrong deep within the crossfire server. "
1953 . "I'll try to bring you back to the map you were before. " 1998 . "I'll try to bring you back to the map you were before. "
1954 . "Please report this to the dungeon master!", 1999 . "Please report this to the dungeon master!",
1955 cf::NDI_UNIQUE | cf::NDI_RED); 2000 cf::NDI_UNIQUE | cf::NDI_RED);
1956 2001
1957 warn "ERROR in enter_exit: $@"; 2002 warn "ERROR in enter_exit: $@";
1958 $self->leave_link; 2003 $self->leave_link;
1959 } 2004 }
1960 })->prio (1); 2005 })->prio (1);
… …
1973 2018
1974sub cf::client::send_drawinfo { 2019sub cf::client::send_drawinfo {
1975 my ($self, $text, $flags) = @_; 2020 my ($self, $text, $flags) = @_;
1976 2021
1977 utf8::encode $text; 2022 utf8::encode $text;
1978 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2023 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1979} 2024}
1980 2025
2026=item $client->ext_event ($type, %msg)
2027
2028Sends an exti event to the client.
2029
2030=cut
2031
2032sub cf::client::ext_event($$%) {
2033 my ($self, $type, %msg) = @_;
2034
2035 $msg{msgtype} = "event_$type";
2036 $self->send_packet ("ext " . cf::to_json \%msg);
2037}
1981 2038
1982=item $success = $client->query ($flags, "text", \&cb) 2039=item $success = $client->query ($flags, "text", \&cb)
1983 2040
1984Queues a query to the client, calling the given callback with 2041Queues a query to the client, calling the given callback with
1985the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2042the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
… …
2082 2139
2083# here we export the classes and methods available to script code 2140# here we export the classes and methods available to script code
2084 2141
2085=pod 2142=pod
2086 2143
2087The following fucntions and emthods are available within a safe environment: 2144The following functions and methods are available within a safe environment:
2088 2145
2089 cf::object contr pay_amount pay_player map 2146 cf::object contr pay_amount pay_player map
2090 cf::object::player player 2147 cf::object::player player
2091 cf::player peaceful 2148 cf::player peaceful
2092 cf::map trigger 2149 cf::map trigger
… …
2197 2254
2198=cut 2255=cut
2199 2256
2200our $DB; 2257our $DB;
2201 2258
2202sub db_load() { 2259sub db_init {
2203 unless ($DB) { 2260 unless ($DB) {
2204 $DB = BDB::db_create $DB_ENV; 2261 $DB = BDB::db_create $DB_ENV;
2205 2262
2206 cf::sync_job { 2263 cf::sync_job {
2207 eval { 2264 eval {
… …
2247} 2304}
2248 2305
2249############################################################################# 2306#############################################################################
2250# the server's init and main functions 2307# the server's init and main functions
2251 2308
2309sub load_facedata {
2310 my $path = sprintf "%s/facedata", cf::datadir;
2311
2312 warn "loading facedata from $path\n";
2313
2314 my $facedata;
2315 0 < aio_load $path, $facedata
2316 or die "$path: $!";
2317
2318 $facedata = Coro::Storable::thaw $facedata;
2319
2320 $facedata->{version} == 2
2321 or cf::cleanup "$path: version mismatch, cannot proceed.";
2322
2323 {
2324 my $faces = $facedata->{faceinfo};
2325
2326 while (my ($face, $info) = each %$faces) {
2327 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2328 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2329 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2330 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2331 Coro::cede;
2332 }
2333
2334 while (my ($face, $info) = each %$faces) {
2335 next unless $info->{smooth};
2336 my $idx = cf::face::find $face
2337 or next;
2338 if (my $smooth = cf::face::find $info->{smooth}) {
2339 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2340 } else {
2341 warn "smooth face '$info->{smooth}' not found for face '$face'";
2342 }
2343 Coro::cede;
2344 }
2345 }
2346
2347 {
2348 my $anims = $facedata->{animinfo};
2349
2350 while (my ($anim, $info) = each %$anims) {
2351 cf::anim::set $anim, $info->{frames}, $info->{facings};
2352 Coro::cede;
2353 }
2354
2355 cf::anim::invalidate_all; # d'oh
2356 }
2357
2358 1
2359}
2360
2252sub load_resources { 2361sub reload_resources {
2253 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2362 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2254 or die "unable to load regions file\n";#d# 2363 or die "unable to load regions file\n";#d#
2364 load_facedata
2365 or die "unable to load facedata\n";#d#
2366}
2367
2368sub init {
2369 reload_resources;
2255} 2370}
2256 2371
2257sub cfg_load { 2372sub cfg_load {
2258 open my $fh, "<:utf8", cf::confdir . "/config" 2373 open my $fh, "<:utf8", cf::confdir . "/config"
2259 or return; 2374 or return;
… …
2271 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2386 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2272 and die "WARNING: m(un)lockall failed: $!\n"; 2387 and die "WARNING: m(un)lockall failed: $!\n";
2273 }; 2388 };
2274 warn $@ if $@; 2389 warn $@ if $@;
2275 } 2390 }
2276}
2277
2278sub init {
2279 load_resources;
2280} 2391}
2281 2392
2282sub main { 2393sub main {
2283 # we must not ever block the main coroutine 2394 # we must not ever block the main coroutine
2284 local $Coro::idle = sub { 2395 local $Coro::idle = sub {
… …
2287 Event::one_event; 2398 Event::one_event;
2288 })->prio (Coro::PRIO_MAX); 2399 })->prio (Coro::PRIO_MAX);
2289 }; 2400 };
2290 2401
2291 cfg_load; 2402 cfg_load;
2292 db_load; 2403 db_init;
2293 load_extensions; 2404 load_extensions;
2294 2405
2295 $TICK_WATCHER->start; 2406 $TICK_WATCHER->start;
2296 Event::loop; 2407 Event::loop;
2297} 2408}
… …
2345 }; 2456 };
2346 2457
2347 warn "leave emergency perl save\n"; 2458 warn "leave emergency perl save\n";
2348} 2459}
2349 2460
2461sub post_cleanup {
2462 my ($make_core) = @_;
2463
2464 warn Carp::longmess "post_cleanup backtrace"
2465 if $make_core;
2466}
2467
2350sub reload() { 2468sub reload() {
2351 # can/must only be called in main 2469 # can/must only be called in main
2352 if ($Coro::current != $Coro::main) { 2470 if ($Coro::current != $Coro::main) {
2353 warn "can only reload from main coroutine"; 2471 warn "can only reload from main coroutine";
2354 return; 2472 return;
2355 } 2473 }
2356 2474
2357 warn "reloading..."; 2475 warn "reloading...";
2358 2476
2359 warn "cancelling server ticker"; 2477 warn "entering sync_job";
2360 $TICK_WATCHER->cancel;
2361 2478
2479 cf::sync_job {
2480 cf::write_runtime; # external watchdog should not bark
2362 cf::emergency_save; 2481 cf::emergency_save;
2482 cf::write_runtime; # external watchdog should not bark
2363 2483
2364 eval { 2484 warn "syncing database to disk";
2485 BDB::db_env_txn_checkpoint $DB_ENV;
2486
2365 # if anything goes wrong in here, we should simply crash as we already saved 2487 # if anything goes wrong in here, we should simply crash as we already saved
2366 2488
2367 warn "cancelling all WF_AUTOCANCEL watchers"; 2489 warn "cancelling all WF_AUTOCANCEL watchers";
2368 for (Event::all_watchers) { 2490 for (Event::all_watchers) {
2369 $_->cancel if $_->data & WF_AUTOCANCEL; 2491 $_->cancel if $_->data & WF_AUTOCANCEL;
2370 } 2492 }
2371
2372 warn "syncing database to disk";
2373 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
2374 2493
2375 warn "flushing outstanding aio requests"; 2494 warn "flushing outstanding aio requests";
2376 for (;;) { 2495 for (;;) {
2377 BDB::flush; 2496 BDB::flush;
2378 IO::AIO::flush; 2497 IO::AIO::flush;
2379 Coro::cede; 2498 Coro::cede;
2380 last unless IO::AIO::nreqs || BDB::nreqs; 2499 last unless IO::AIO::nreqs || BDB::nreqs;
2381 warn "iterate..."; 2500 warn "iterate...";
2382 } 2501 }
2383 2502
2503 ++$RELOAD;
2504
2384 warn "cancelling all extension coros"; 2505 warn "cancelling all extension coros";
2385 $_->cancel for values %EXT_CORO; 2506 $_->cancel for values %EXT_CORO;
2386 %EXT_CORO = (); 2507 %EXT_CORO = ();
2387 2508
2388 warn "removing commands"; 2509 warn "removing commands";
… …
2440 require cf; 2561 require cf;
2441 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2562 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2442 2563
2443 warn "loading config and database again"; 2564 warn "loading config and database again";
2444 cf::cfg_load; 2565 cf::cfg_load;
2445 cf::db_load;
2446 2566
2447 warn "loading extensions"; 2567 warn "loading extensions";
2448 cf::load_extensions; 2568 cf::load_extensions;
2449 2569
2450 warn "reattaching attachments to objects/players"; 2570 warn "reattaching attachments to objects/players";
2451 _global_reattach; 2571 _global_reattach; # objects, sockets
2452 warn "reattaching attachments to maps"; 2572 warn "reattaching attachments to maps";
2453 reattach $_ for values %MAP; 2573 reattach $_ for values %MAP;
2574 warn "reattaching attachments to players";
2575 reattach $_ for values %PLAYER;
2454 2576
2455 warn "loading reloadable resources"; 2577 warn "loading reloadable resources";
2456 load_resources; 2578 reload_resources;
2457 2579
2458 warn "restarting server ticker"; 2580 warn "leaving sync_job";
2459 2581
2460 $TICK_WATCHER->start; 2582 1
2461 }; 2583 } or do {
2462
2463 if ($@) {
2464 warn $@; 2584 warn $@;
2465 warn "error while reloading, exiting."; 2585 warn "error while reloading, exiting.";
2466 exit 1; 2586 exit 1;
2467 } 2587 };
2468 2588
2469 warn "reloaded"; 2589 warn "reloaded";
2470}; 2590};
2471 2591
2472our $RELOAD_WATCHER; # used only during reload 2592our $RELOAD_WATCHER; # used only during reload
… …
2513 2633
2514 cf::server_tick; # one server iteration 2634 cf::server_tick; # one server iteration
2515 $RUNTIME += $TICK; 2635 $RUNTIME += $TICK;
2516 $NEXT_TICK += $TICK; 2636 $NEXT_TICK += $TICK;
2517 2637
2638 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2639 $NEXT_RUNTIME_WRITE = $NOW + 10;
2640 Coro::async_pool {
2641 write_runtime
2642 or warn "ERROR: unable to write runtime file: $!";
2643 };
2644 }
2645
2518 $WAIT_FOR_TICK->broadcast; 2646 $WAIT_FOR_TICK->broadcast;
2519 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2647 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2520 2648
2521 Event::sweep;
2522 Coro::cede_notself;
2523
2524# my $AFTER = Event::time; 2649# my $AFTER = Event::time;
2525# warn $AFTER - $NOW;#d# 2650# warn $AFTER - $NOW;#d#
2526 2651
2527 # if we are delayed by four ticks or more, skip them all 2652 # if we are delayed by four ticks or more, skip them all
2528 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2653 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
… …
2587 2712
2588 undef $Coro::AIO::WATCHER; 2713 undef $Coro::AIO::WATCHER;
2589 IO::AIO::max_poll_time $TICK * 0.1; 2714 IO::AIO::max_poll_time $TICK * 0.1;
2590 $AIO_POLL_WATCHER = Event->io ( 2715 $AIO_POLL_WATCHER = Event->io (
2591 reentrant => 0, 2716 reentrant => 0,
2717 data => WF_AUTOCANCEL,
2592 fd => IO::AIO::poll_fileno, 2718 fd => IO::AIO::poll_fileno,
2593 poll => 'r', 2719 poll => 'r',
2594 prio => 6, 2720 prio => 6,
2595 data => WF_AUTOCANCEL,
2596 cb => \&IO::AIO::poll_cb, 2721 cb => \&IO::AIO::poll_cb,
2597 ); 2722 );
2598} 2723}
2599 2724
2600$WRITE_RUNTIME_WATCHER = Event->timer (
2601 reentrant => 0,
2602 data => WF_AUTOCANCEL,
2603 after => 1,
2604 interval => 10,
2605 prio => 6, # keep it lowest so it acts like a watchdog
2606 cb => Coro::unblock_sub {
2607 write_runtime
2608 or warn "ERROR: unable to write runtime file: $!";
2609 },
2610);
2611
2612END { cf::emergency_save } 2725END { cf::emergency_save }
2613 2726
26141 27271
2615 2728

Diff Legend

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