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.213 by root, Tue Feb 13 20:01:04 2007 UTC vs.
Revision 1.236 by root, Thu Apr 12 14:18:05 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
20use BDB (); 22use BDB ();
21use Data::Dumper; 23use Data::Dumper;
22use Digest::MD5; 24use Digest::MD5;
23use Fcntl; 25use Fcntl;
26use YAML::Syck ();
24use IO::AIO 2.32 (); 27use IO::AIO 2.32 ();
25use YAML::Syck ();
26use Time::HiRes; 28use Time::HiRes;
27use Compress::LZF; 29use Compress::LZF;
28 30
31# configure various modules to our taste
32#
33Coro::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 34Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
30 35
31use 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
32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 37
35# 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?
36$YAML::Syck::ImplicitUnicode = 1; 39$YAML::Syck::ImplicitUnicode = 1;
37 40
38$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
39 44
40our %COMMAND = (); 45our %COMMAND = ();
41our %COMMAND_TIME = (); 46our %COMMAND_TIME = ();
42 47
43our @EXTS = (); # list of extension package names 48our @EXTS = (); # list of extension package names
44our %EXTCMD = (); 49our %EXTCMD = ();
45our %EXT_CORO = (); # coroutines bound to extensions 50our %EXT_CORO = (); # coroutines bound to extensions
46our %EXT_MAP = (); # pluggable maps 51our %EXT_MAP = (); # pluggable maps
47 52
53our $RELOAD; # number of reloads so far
48our @EVENT; 54our @EVENT;
49our $LIBDIR = datadir . "/ext"; 55our $LIBDIR = datadir . "/ext";
50 56
51our $TICK = MAX_TIME * 1e-6; 57our $TICK = MAX_TIME * 1e-6;
52our $TICK_WATCHER; 58our $TICK_WATCHER;
53our $AIO_POLL_WATCHER; 59our $AIO_POLL_WATCHER;
54our $WRITE_RUNTIME_WATCHER; 60our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
55our $NEXT_TICK; 61our $NEXT_TICK;
56our $NOW; 62our $NOW;
57our $USE_FSYNC = 1; # use fsync to write maps - default off 63our $USE_FSYNC = 1; # use fsync to write maps - default off
58 64
59our $BDB_POLL_WATCHER; 65our $BDB_POLL_WATCHER;
… …
202 $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;
203 $d 209 $d
204 } || "[unable to dump $_[0]: '$@']"; 210 } || "[unable to dump $_[0]: '$@']";
205} 211}
206 212
207use JSON::Syck (); # TODO# replace by JSON::PC once working 213use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
208 214
209=item $ref = cf::from_json $json 215=item $ref = cf::from_json $json
210 216
211Converts a JSON string into the corresponding perl data structure. 217Converts a JSON string into the corresponding perl data structure.
212 218
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 219=item $json = cf::to_json $ref
221 220
222Converts a perl data structure into its JSON representation. 221Converts 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 222
231=item cf::lock_wait $string 223=item cf::lock_wait $string
232 224
233Wait until the given lock is available. See cf::lock_acquire. 225Wait until the given lock is available. See cf::lock_acquire.
234 226
… …
273sub freeze_mainloop { 265sub freeze_mainloop {
274 return unless $TICK_WATCHER->is_active; 266 return unless $TICK_WATCHER->is_active;
275 267
276 my $guard = Coro::guard { 268 my $guard = Coro::guard {
277 $TICK_WATCHER->start; 269 $TICK_WATCHER->start;
278 $WRITE_RUNTIME_WATCHER->start;
279 }; 270 };
280 $WRITE_RUNTIME_WATCHER->stop;
281 $TICK_WATCHER->stop; 271 $TICK_WATCHER->stop;
282 $guard 272 $guard
283} 273}
284 274
285=item cf::async { BLOCK } 275=item cf::async { BLOCK }
… …
356 346
357 $coro 347 $coro
358} 348}
359 349
360sub write_runtime { 350sub write_runtime {
351 my $guard = cf::lock_acquire "write_runtime";
352
361 my $runtime = cf::localdir . "/runtime"; 353 my $runtime = cf::localdir . "/runtime";
362 354
363 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 355 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
364 or return; 356 or return;
365 357
… …
379 371
380 aio_rename "$runtime~", $runtime 372 aio_rename "$runtime~", $runtime
381 and return; 373 and return;
382 374
383 1 375 1
376}
377
378=item cf::datalog type => key => value, ...
379
380Log a datalog packet of the given type with the given key-value pairs.
381
382=cut
383
384sub datalog($@) {
385 my ($type, %kv) = @_;
386 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
384} 387}
385 388
386=back 389=back
387 390
388=cut 391=cut
… …
787 } 790 }
788 } else { 791 } else {
789 aio_unlink $filename; 792 aio_unlink $filename;
790 aio_unlink "$filename.pst"; 793 aio_unlink "$filename.pst";
791 } 794 }
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 } 795 }
799} 796}
800 797
801sub object_freezer_as_string { 798sub object_freezer_as_string {
802 my ($rdata, $objs) = @_; 799 my ($rdata, $objs) = @_;
… …
808 805
809sub object_thawer_load { 806sub object_thawer_load {
810 my ($filename) = @_; 807 my ($filename) = @_;
811 808
812 my ($data, $av); 809 my ($data, $av);
813
814 #d#TODO remove .map if file does not exist
815 aio_stat $filename and $filename =~ s/\.map$//;
816 810
817 (aio_load $filename, $data) >= 0 811 (aio_load $filename, $data) >= 0
818 or return; 812 or return;
819 813
820 unless (aio_stat "$filename.pst") { 814 unless (aio_stat "$filename.pst") {
… …
969} 963}
970 964
971sub path($) { 965sub path($) {
972 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 966 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
973 967
974 (playerdir $login) . "/$login.pl" 968 (playerdir $login) . "/playerdata"
975} 969}
976 970
977sub find_active($) { 971sub find_active($) {
978 $cf::PLAYER{$_[0]} 972 $cf::PLAYER{$_[0]}
979 and $cf::PLAYER{$_[0]}->active 973 and $cf::PLAYER{$_[0]}->active
… …
992 my $login = $_[0]; 986 my $login = $_[0];
993 987
994 my $guard = cf::lock_acquire "user_find:$login"; 988 my $guard = cf::lock_acquire "user_find:$login";
995 989
996 $cf::PLAYER{$_[0]} || do { 990 $cf::PLAYER{$_[0]} || do {
991 # rename old playerfiles to new ones
992 #TODO: remove when no longer required
993 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
994 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
995 aio_unlink +(playerdir $login) . "/$login.pl.pst";
996 aio_unlink +(playerdir $login) . "/$login.pl";
997
997 my $pl = load_pl path $login 998 my $pl = load_pl path $login
998 or return; 999 or return;
999 $cf::PLAYER{$login} = $pl 1000 $cf::PLAYER{$login} = $pl
1000 } 1001 }
1001 } 1002 }
… …
1038 1039
1039=cut 1040=cut
1040 1041
1041sub quit_character { 1042sub quit_character {
1042 my ($pl) = @_; 1043 my ($pl) = @_;
1044
1045 my $name = $pl->ob->name;
1043 1046
1044 $pl->{deny_save} = 1; 1047 $pl->{deny_save} = 1;
1045 $pl->password ("*"); # this should lock out the player until we nuked the dir 1048 $pl->password ("*"); # this should lock out the player until we nuked the dir
1046 1049
1047 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1050 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
… …
1052 my $path = playerdir $pl; 1055 my $path = playerdir $pl;
1053 my $temp = "$path~$cf::RUNTIME~deleting~"; 1056 my $temp = "$path~$cf::RUNTIME~deleting~";
1054 aio_rename $path, $temp; 1057 aio_rename $path, $temp;
1055 delete $cf::PLAYER{$pl->ob->name}; 1058 delete $cf::PLAYER{$pl->ob->name};
1056 $pl->destroy; 1059 $pl->destroy;
1060
1061 my $prefix = qr<^~\Q$name\E/>;
1062
1063 # nuke player maps
1064 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1065
1057 IO::AIO::aio_rmtree $temp; 1066 IO::AIO::aio_rmtree $temp;
1067}
1068
1069=item $pl->kick
1070
1071Kicks a player out of the game. This destroys the connection.
1072
1073=cut
1074
1075sub kick {
1076 my ($pl, $kicker) = @_;
1077
1078 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1079 $pl->killer ("kicked");
1080 $pl->ns->destroy;
1058} 1081}
1059 1082
1060=item cf::player::list_logins 1083=item cf::player::list_logins
1061 1084
1062Returns am arrayref of all valid playernames in the system, can take a 1085Returns am arrayref of all valid playernames in the system, can take a
… …
1108 } 1131 }
1109 1132
1110 \@paths 1133 \@paths
1111} 1134}
1112 1135
1113=item $player->ext_reply ($msgid, $msgtype, %msg) 1136=item $player->ext_reply ($msgid, %msg)
1114 1137
1115Sends an ext reply to the player. 1138Sends an ext reply to the player.
1116 1139
1117=cut 1140=cut
1118 1141
1119sub ext_reply($$$%) { 1142sub ext_reply($$%) {
1120 my ($self, $id, %msg) = @_; 1143 my ($self, $id, %msg) = @_;
1121 1144
1122 $msg{msgid} = $id; 1145 $msg{msgid} = $id;
1123 1146
1124 $self->send ("ext " . cf::to_json \%msg); 1147 $self->send ("ext " . cf::to_json \%msg);
1148}
1149
1150=item $player->ext_event ($type, %msg)
1151
1152Sends an ext event to the client.
1153
1154=cut
1155
1156sub ext_event($$%) {
1157 my ($self, $type, %msg) = @_;
1158
1159 $self->ns->ext_event ($type, %msg);
1125} 1160}
1126 1161
1127package cf; 1162package cf;
1128 1163
1129=back 1164=back
… …
1307 my ($self) = @_; 1342 my ($self) = @_;
1308 1343
1309 utf8::encode (my $save = $self->save_path); 1344 utf8::encode (my $save = $self->save_path);
1310 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1345 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1311 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1346 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} 1347}
1318 1348
1319sub load_header_from($) { 1349sub load_header_from($) {
1320 my ($self, $path) = @_; 1350 my ($self, $path) = @_;
1321 1351
… …
1820 $map->load; 1850 $map->load;
1821 $map->load_diag; 1851 $map->load_diag;
1822 1852
1823 return unless $self->contr->active; 1853 return unless $self->contr->active;
1824 $self->activate_recursive; 1854 $self->activate_recursive;
1855
1856 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1825 $self->enter_map ($map, $x, $y); 1857 $self->enter_map ($map, $x, $y);
1826} 1858}
1827 1859
1828cf::player->attach ( 1860cf::player->attach (
1829 on_logout => sub { 1861 on_logout => sub {
… …
1842 # try to abort aborted map switching on player login :) 1874 # try to abort aborted map switching on player login :)
1843 # should happen only on crashes 1875 # should happen only on crashes
1844 if ($pl->ob->{_link_pos}) { 1876 if ($pl->ob->{_link_pos}) {
1845 $pl->ob->enter_link; 1877 $pl->ob->enter_link;
1846 (async { 1878 (async {
1847 # we need this sleep as the login has a concurrent enter_exit running
1848 # and this sleep increases chances of the player not ending up in scorn
1849 $pl->ob->reply (undef, 1879 $pl->ob->reply (undef,
1850 "There was an internal problem at your last logout, " 1880 "There was an internal problem at your last logout, "
1851 . "the server will try to bring you to your intended destination in a second.", 1881 . "the server will try to bring you to your intended destination in a second.",
1852 cf::NDI_RED); 1882 cf::NDI_RED);
1883 # we need this sleep as the login has a concurrent enter_exit running
1884 # and this sleep increases chances of the player not ending up in scorn
1853 Coro::Timer::sleep 1; 1885 Coro::Timer::sleep 1;
1854 $pl->ob->leave_link; 1886 $pl->ob->leave_link;
1855 })->prio (2); 1887 })->prio (2);
1856 } 1888 }
1857 }, 1889 },
… …
1940 1972
1941 return unless $self->type == cf::PLAYER; 1973 return unless $self->type == cf::PLAYER;
1942 1974
1943 if ($exit->slaying eq "/!") { 1975 if ($exit->slaying eq "/!") {
1944 #TODO: this should de-fi-ni-te-ly not be a sync-job 1976 #TODO: this should de-fi-ni-te-ly not be a sync-job
1977 # the problem is that $exit might not survive long enough
1978 # so it needs to be done right now, right here
1945 cf::sync_job { prepare_random_map $exit }; 1979 cf::sync_job { prepare_random_map $exit };
1946 } 1980 }
1947 1981
1948 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 1982 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1949 my $hp = $exit->stats->hp; 1983 my $hp = $exit->stats->hp;
… …
1957 $self->goto ($slaying, $hp, $sp); 1991 $self->goto ($slaying, $hp, $sp);
1958 1992
1959 1; 1993 1;
1960 }) { 1994 }) {
1961 $self->message ("Something went wrong deep within the crossfire server. " 1995 $self->message ("Something went wrong deep within the crossfire server. "
1962 . "I'll try to bring you back to the map you were before. " 1996 . "I'll try to bring you back to the map you were before. "
1963 . "Please report this to the dungeon master!", 1997 . "Please report this to the dungeon master!",
1964 cf::NDI_UNIQUE | cf::NDI_RED); 1998 cf::NDI_UNIQUE | cf::NDI_RED);
1965 1999
1966 warn "ERROR in enter_exit: $@"; 2000 warn "ERROR in enter_exit: $@";
1967 $self->leave_link; 2001 $self->leave_link;
1968 } 2002 }
1969 })->prio (1); 2003 })->prio (1);
… …
1982 2016
1983sub cf::client::send_drawinfo { 2017sub cf::client::send_drawinfo {
1984 my ($self, $text, $flags) = @_; 2018 my ($self, $text, $flags) = @_;
1985 2019
1986 utf8::encode $text; 2020 utf8::encode $text;
1987 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2021 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1988} 2022}
1989 2023
2024=item $client->ext_event ($type, %msg)
2025
2026Sends an exti event to the client.
2027
2028=cut
2029
2030sub cf::client::ext_event($$%) {
2031 my ($self, $type, %msg) = @_;
2032
2033 $msg{msgtype} = "event_$type";
2034 $self->send_packet ("ext " . cf::to_json \%msg);
2035}
1990 2036
1991=item $success = $client->query ($flags, "text", \&cb) 2037=item $success = $client->query ($flags, "text", \&cb)
1992 2038
1993Queues a query to the client, calling the given callback with 2039Queues a query to the client, calling the given callback with
1994the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2040the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
… …
2091 2137
2092# here we export the classes and methods available to script code 2138# here we export the classes and methods available to script code
2093 2139
2094=pod 2140=pod
2095 2141
2096The following fucntions and emthods are available within a safe environment: 2142The following functions and methods are available within a safe environment:
2097 2143
2098 cf::object contr pay_amount pay_player map 2144 cf::object contr pay_amount pay_player map
2099 cf::object::player player 2145 cf::object::player player
2100 cf::player peaceful 2146 cf::player peaceful
2101 cf::map trigger 2147 cf::map trigger
… …
2256} 2302}
2257 2303
2258############################################################################# 2304#############################################################################
2259# the server's init and main functions 2305# the server's init and main functions
2260 2306
2307sub load_facedata {
2308 my $path = sprintf "%s/facedata", cf::datadir;
2309
2310 warn "loading facedata from $path\n";
2311
2312 my $facedata;
2313 0 < aio_load $path, $facedata
2314 or die "$path: $!";
2315
2316 Coro::cede;
2317 $facedata = Storable::thaw $facedata;
2318 Coro::cede;
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
2261sub load_resources { 2361sub reload_resources {
2262 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2362 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2263 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;
2264} 2370}
2265 2371
2266sub cfg_load { 2372sub cfg_load {
2267 open my $fh, "<:utf8", cf::confdir . "/config" 2373 open my $fh, "<:utf8", cf::confdir . "/config"
2268 or return; 2374 or return;
… …
2280 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2386 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2281 and die "WARNING: m(un)lockall failed: $!\n"; 2387 and die "WARNING: m(un)lockall failed: $!\n";
2282 }; 2388 };
2283 warn $@ if $@; 2389 warn $@ if $@;
2284 } 2390 }
2285}
2286
2287sub init {
2288 load_resources;
2289} 2391}
2290 2392
2291sub main { 2393sub main {
2292 # we must not ever block the main coroutine 2394 # we must not ever block the main coroutine
2293 local $Coro::idle = sub { 2395 local $Coro::idle = sub {
… …
2300 cfg_load; 2402 cfg_load;
2301 db_init; 2403 db_init;
2302 load_extensions; 2404 load_extensions;
2303 2405
2304 $TICK_WATCHER->start; 2406 $TICK_WATCHER->start;
2305 $WRITE_RUNTIME_WATCHER->start;
2306 Event::loop; 2407 Event::loop;
2307} 2408}
2308 2409
2309############################################################################# 2410#############################################################################
2310# initialisation and cleanup 2411# initialisation and cleanup
… …
2374 warn "reloading..."; 2475 warn "reloading...";
2375 2476
2376 warn "entering sync_job"; 2477 warn "entering sync_job";
2377 2478
2378 cf::sync_job { 2479 cf::sync_job {
2379 cf::write_runtime; 2480 cf::write_runtime; # external watchdog should not bark
2380 cf::emergency_save; 2481 cf::emergency_save;
2381 cf::write_runtime; 2482 cf::write_runtime; # external watchdog should not bark
2382 2483
2383 warn "syncing database to disk"; 2484 warn "syncing database to disk";
2384 BDB::db_env_txn_checkpoint $DB_ENV; 2485 BDB::db_env_txn_checkpoint $DB_ENV;
2385 2486
2386 # 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
… …
2397 Coro::cede; 2498 Coro::cede;
2398 last unless IO::AIO::nreqs || BDB::nreqs; 2499 last unless IO::AIO::nreqs || BDB::nreqs;
2399 warn "iterate..."; 2500 warn "iterate...";
2400 } 2501 }
2401 2502
2503 ++$RELOAD;
2504
2402 warn "cancelling all extension coros"; 2505 warn "cancelling all extension coros";
2403 $_->cancel for values %EXT_CORO; 2506 $_->cancel for values %EXT_CORO;
2404 %EXT_CORO = (); 2507 %EXT_CORO = ();
2405 2508
2406 warn "removing commands"; 2509 warn "removing commands";
… …
2463 2566
2464 warn "loading extensions"; 2567 warn "loading extensions";
2465 cf::load_extensions; 2568 cf::load_extensions;
2466 2569
2467 warn "reattaching attachments to objects/players"; 2570 warn "reattaching attachments to objects/players";
2468 _global_reattach; 2571 _global_reattach; # objects, sockets
2469 warn "reattaching attachments to maps"; 2572 warn "reattaching attachments to maps";
2470 reattach $_ for values %MAP; 2573 reattach $_ for values %MAP;
2574 warn "reattaching attachments to players";
2575 reattach $_ for values %PLAYER;
2471 2576
2472 warn "loading reloadable resources"; 2577 warn "loading reloadable resources";
2473 load_resources; 2578 reload_resources;
2474 2579
2475 warn "leaving sync_job"; 2580 warn "leaving sync_job";
2476 2581
2477 1 2582 1
2478 } or do { 2583 } or do {
… …
2527 $NOW = Event::time; 2632 $NOW = Event::time;
2528 2633
2529 cf::server_tick; # one server iteration 2634 cf::server_tick; # one server iteration
2530 $RUNTIME += $TICK; 2635 $RUNTIME += $TICK;
2531 $NEXT_TICK += $TICK; 2636 $NEXT_TICK += $TICK;
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 }
2532 2645
2533 $WAIT_FOR_TICK->broadcast; 2646 $WAIT_FOR_TICK->broadcast;
2534 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2647 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2535 2648
2536# my $AFTER = Event::time; 2649# my $AFTER = Event::time;
… …
2599 2712
2600 undef $Coro::AIO::WATCHER; 2713 undef $Coro::AIO::WATCHER;
2601 IO::AIO::max_poll_time $TICK * 0.1; 2714 IO::AIO::max_poll_time $TICK * 0.1;
2602 $AIO_POLL_WATCHER = Event->io ( 2715 $AIO_POLL_WATCHER = Event->io (
2603 reentrant => 0, 2716 reentrant => 0,
2717 data => WF_AUTOCANCEL,
2604 fd => IO::AIO::poll_fileno, 2718 fd => IO::AIO::poll_fileno,
2605 poll => 'r', 2719 poll => 'r',
2606 prio => 6, 2720 prio => 6,
2607 data => WF_AUTOCANCEL,
2608 cb => \&IO::AIO::poll_cb, 2721 cb => \&IO::AIO::poll_cb,
2609 ); 2722 );
2610} 2723}
2611 2724
2612$WRITE_RUNTIME_WATCHER = Event->timer (
2613 reentrant => 0,
2614 data => WF_AUTOCANCEL,
2615 parked => 1,
2616 after => 1,
2617 interval => 10,
2618 prio => 6, # keep it lowest so it acts like a watchdog
2619 cb => sub {
2620 $TICK_WATCHER->is_active or cf::cleanup "mainloop frozen but runtime active", 1;
2621
2622 Coro::async_pool {
2623 write_runtime
2624 or warn "ERROR: unable to write runtime file: $!";
2625 };
2626 },
2627);
2628
2629END { cf::emergency_save } 2725END { cf::emergency_save }
2630 2726
26311 27271
2632 2728

Diff Legend

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