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.211 by root, Tue Feb 13 16:23:32 2007 UTC vs.
Revision 1.234 by root, Thu Apr 5 13:44:31 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 {
361 $TICK_WATCHER->is_active or cf::cleanup "mainloop frozen but runtime active", 1; 351 my $guard = cf::lock_acquire "write_runtime";
362 352
363 my $runtime = cf::localdir . "/runtime"; 353 my $runtime = cf::localdir . "/runtime";
364 354
365 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 355 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
366 or return; 356 or return;
… …
381 371
382 aio_rename "$runtime~", $runtime 372 aio_rename "$runtime~", $runtime
383 and return; 373 and return;
384 374
385 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 });
386} 387}
387 388
388=back 389=back
389 390
390=cut 391=cut
… …
789 } 790 }
790 } else { 791 } else {
791 aio_unlink $filename; 792 aio_unlink $filename;
792 aio_unlink "$filename.pst"; 793 aio_unlink "$filename.pst";
793 } 794 }
794
795 #d##TODO# nuke non .map-files if exist
796 if ($filename =~ s/\.map$//) {
797 aio_unlink $filename;
798 aio_unlink "$filename.pst";
799 }
800 } 795 }
801} 796}
802 797
803sub object_freezer_as_string { 798sub object_freezer_as_string {
804 my ($rdata, $objs) = @_; 799 my ($rdata, $objs) = @_;
… …
810 805
811sub object_thawer_load { 806sub object_thawer_load {
812 my ($filename) = @_; 807 my ($filename) = @_;
813 808
814 my ($data, $av); 809 my ($data, $av);
815
816 #d#TODO remove .map if file does not exist
817 aio_stat $filename and $filename =~ s/\.map$//;
818 810
819 (aio_load $filename, $data) >= 0 811 (aio_load $filename, $data) >= 0
820 or return; 812 or return;
821 813
822 unless (aio_stat "$filename.pst") { 814 unless (aio_stat "$filename.pst") {
… …
971} 963}
972 964
973sub path($) { 965sub path($) {
974 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 966 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
975 967
976 (playerdir $login) . "/$login.pl" 968 (playerdir $login) . "/playerdata"
977} 969}
978 970
979sub find_active($) { 971sub find_active($) {
980 $cf::PLAYER{$_[0]} 972 $cf::PLAYER{$_[0]}
981 and $cf::PLAYER{$_[0]}->active 973 and $cf::PLAYER{$_[0]}->active
… …
994 my $login = $_[0]; 986 my $login = $_[0];
995 987
996 my $guard = cf::lock_acquire "user_find:$login"; 988 my $guard = cf::lock_acquire "user_find:$login";
997 989
998 $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
999 my $pl = load_pl path $login 998 my $pl = load_pl path $login
1000 or return; 999 or return;
1001 $cf::PLAYER{$login} = $pl 1000 $cf::PLAYER{$login} = $pl
1002 } 1001 }
1003 } 1002 }
… …
1040 1039
1041=cut 1040=cut
1042 1041
1043sub quit_character { 1042sub quit_character {
1044 my ($pl) = @_; 1043 my ($pl) = @_;
1044
1045 my $name = $pl->ob->name;
1045 1046
1046 $pl->{deny_save} = 1; 1047 $pl->{deny_save} = 1;
1047 $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
1048 1049
1049 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1050 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
… …
1054 my $path = playerdir $pl; 1055 my $path = playerdir $pl;
1055 my $temp = "$path~$cf::RUNTIME~deleting~"; 1056 my $temp = "$path~$cf::RUNTIME~deleting~";
1056 aio_rename $path, $temp; 1057 aio_rename $path, $temp;
1057 delete $cf::PLAYER{$pl->ob->name}; 1058 delete $cf::PLAYER{$pl->ob->name};
1058 $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
1059 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;
1060} 1081}
1061 1082
1062=item cf::player::list_logins 1083=item cf::player::list_logins
1063 1084
1064Returns 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
… …
1110 } 1131 }
1111 1132
1112 \@paths 1133 \@paths
1113} 1134}
1114 1135
1115=item $player->ext_reply ($msgid, $msgtype, %msg) 1136=item $player->ext_reply ($msgid, %msg)
1116 1137
1117Sends an ext reply to the player. 1138Sends an ext reply to the player.
1118 1139
1119=cut 1140=cut
1120 1141
1121sub ext_reply($$$%) { 1142sub ext_reply($$%) {
1122 my ($self, $id, %msg) = @_; 1143 my ($self, $id, %msg) = @_;
1123 1144
1124 $msg{msgid} = $id; 1145 $msg{msgid} = $id;
1125 1146
1126 $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);
1127} 1160}
1128 1161
1129package cf; 1162package cf;
1130 1163
1131=back 1164=back
… …
1309 my ($self) = @_; 1342 my ($self) = @_;
1310 1343
1311 utf8::encode (my $save = $self->save_path); 1344 utf8::encode (my $save = $self->save_path);
1312 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1345 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1313 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1346 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1314
1315 #d#TODO remove .map and also nuke
1316 $save =~ s/\.map// or return;#d#
1317 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1318 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1319} 1347}
1320 1348
1321sub load_header_from($) { 1349sub load_header_from($) {
1322 my ($self, $path) = @_; 1350 my ($self, $path) = @_;
1323 1351
… …
1822 $map->load; 1850 $map->load;
1823 $map->load_diag; 1851 $map->load_diag;
1824 1852
1825 return unless $self->contr->active; 1853 return unless $self->contr->active;
1826 $self->activate_recursive; 1854 $self->activate_recursive;
1855
1856 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1827 $self->enter_map ($map, $x, $y); 1857 $self->enter_map ($map, $x, $y);
1828} 1858}
1829 1859
1830cf::player->attach ( 1860cf::player->attach (
1831 on_logout => sub { 1861 on_logout => sub {
… …
1844 # try to abort aborted map switching on player login :) 1874 # try to abort aborted map switching on player login :)
1845 # should happen only on crashes 1875 # should happen only on crashes
1846 if ($pl->ob->{_link_pos}) { 1876 if ($pl->ob->{_link_pos}) {
1847 $pl->ob->enter_link; 1877 $pl->ob->enter_link;
1848 (async { 1878 (async {
1849 # we need this sleep as the login has a concurrent enter_exit running
1850 # and this sleep increases chances of the player not ending up in scorn
1851 $pl->ob->reply (undef, 1879 $pl->ob->reply (undef,
1852 "There was an internal problem at your last logout, " 1880 "There was an internal problem at your last logout, "
1853 . "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.",
1854 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
1855 Coro::Timer::sleep 1; 1885 Coro::Timer::sleep 1;
1856 $pl->ob->leave_link; 1886 $pl->ob->leave_link;
1857 })->prio (2); 1887 })->prio (2);
1858 } 1888 }
1859 }, 1889 },
… …
1942 1972
1943 return unless $self->type == cf::PLAYER; 1973 return unless $self->type == cf::PLAYER;
1944 1974
1945 if ($exit->slaying eq "/!") { 1975 if ($exit->slaying eq "/!") {
1946 #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
1947 cf::sync_job { prepare_random_map $exit }; 1979 cf::sync_job { prepare_random_map $exit };
1948 } 1980 }
1949 1981
1950 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;
1951 my $hp = $exit->stats->hp; 1983 my $hp = $exit->stats->hp;
… …
1959 $self->goto ($slaying, $hp, $sp); 1991 $self->goto ($slaying, $hp, $sp);
1960 1992
1961 1; 1993 1;
1962 }) { 1994 }) {
1963 $self->message ("Something went wrong deep within the crossfire server. " 1995 $self->message ("Something went wrong deep within the crossfire server. "
1964 . "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. "
1965 . "Please report this to the dungeon master!", 1997 . "Please report this to the dungeon master!",
1966 cf::NDI_UNIQUE | cf::NDI_RED); 1998 cf::NDI_UNIQUE | cf::NDI_RED);
1967 1999
1968 warn "ERROR in enter_exit: $@"; 2000 warn "ERROR in enter_exit: $@";
1969 $self->leave_link; 2001 $self->leave_link;
1970 } 2002 }
1971 })->prio (1); 2003 })->prio (1);
… …
1984 2016
1985sub cf::client::send_drawinfo { 2017sub cf::client::send_drawinfo {
1986 my ($self, $text, $flags) = @_; 2018 my ($self, $text, $flags) = @_;
1987 2019
1988 utf8::encode $text; 2020 utf8::encode $text;
1989 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2021 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1990} 2022}
1991 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}
1992 2036
1993=item $success = $client->query ($flags, "text", \&cb) 2037=item $success = $client->query ($flags, "text", \&cb)
1994 2038
1995Queues a query to the client, calling the given callback with 2039Queues a query to the client, calling the given callback with
1996the 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>,
… …
2093 2137
2094# here we export the classes and methods available to script code 2138# here we export the classes and methods available to script code
2095 2139
2096=pod 2140=pod
2097 2141
2098The following fucntions and emthods are available within a safe environment: 2142The following functions and methods are available within a safe environment:
2099 2143
2100 cf::object contr pay_amount pay_player map 2144 cf::object contr pay_amount pay_player map
2101 cf::object::player player 2145 cf::object::player player
2102 cf::player peaceful 2146 cf::player peaceful
2103 cf::map trigger 2147 cf::map trigger
… …
2258} 2302}
2259 2303
2260############################################################################# 2304#############################################################################
2261# the server's init and main functions 2305# the server's init and main functions
2262 2306
2307sub load_facedata {
2308 my $path = sprintf "%s/facedata", cf::datadir;
2309
2310 warn "loading facedata from $path\n";
2311
2312 my $faces;
2313 0 < aio_load $path, $faces
2314 or die "$path: $!";
2315
2316 Coro::cede;
2317 $faces = Storable::thaw $faces;
2318 Coro::cede;
2319
2320 my $meta = delete $faces->{""};
2321 $meta->{version} == 1
2322 or cf::cleanup "$path: version mismatch, cannot proceed.";
2323
2324 while (my ($face, $info) = each %$faces) {
2325 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2326 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2327 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2328 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2329 Coro::cede;
2330 }
2331
2332 while (my ($face, $info) = each %$faces) {
2333 next unless $info->{smooth};
2334 my $idx = cf::face::find $face
2335 or next;
2336 if (my $smooth = cf::face::find $info->{smooth}) {
2337 cf::face::set_smooth $idx, $smooth;
2338 } else {
2339 warn "smooth face '$info->{smooth}' not found for face '$face'";
2340 }
2341 Coro::cede;
2342 }
2343
2344 1
2345}
2346
2263sub load_resources { 2347sub reload_resources {
2264 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2348 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2265 or die "unable to load regions file\n";#d# 2349 or die "unable to load regions file\n";#d#
2350 load_facedata
2351 or die "unable to load facedata\n";#d#
2352}
2353
2354sub init {
2355 reload_resources;
2266} 2356}
2267 2357
2268sub cfg_load { 2358sub cfg_load {
2269 open my $fh, "<:utf8", cf::confdir . "/config" 2359 open my $fh, "<:utf8", cf::confdir . "/config"
2270 or return; 2360 or return;
… …
2282 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2372 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2283 and die "WARNING: m(un)lockall failed: $!\n"; 2373 and die "WARNING: m(un)lockall failed: $!\n";
2284 }; 2374 };
2285 warn $@ if $@; 2375 warn $@ if $@;
2286 } 2376 }
2287}
2288
2289sub init {
2290 load_resources;
2291} 2377}
2292 2378
2293sub main { 2379sub main {
2294 # we must not ever block the main coroutine 2380 # we must not ever block the main coroutine
2295 local $Coro::idle = sub { 2381 local $Coro::idle = sub {
… …
2372 return; 2458 return;
2373 } 2459 }
2374 2460
2375 warn "reloading..."; 2461 warn "reloading...";
2376 2462
2377 warn "cancelling server ticker"; 2463 warn "entering sync_job";
2378 $TICK_WATCHER->cancel;
2379 2464
2465 cf::sync_job {
2466 cf::write_runtime; # external watchdog should not bark
2380 cf::emergency_save; 2467 cf::emergency_save;
2468 cf::write_runtime; # external watchdog should not bark
2381 2469
2382 eval { 2470 warn "syncing database to disk";
2471 BDB::db_env_txn_checkpoint $DB_ENV;
2472
2383 # if anything goes wrong in here, we should simply crash as we already saved 2473 # if anything goes wrong in here, we should simply crash as we already saved
2384 2474
2385 warn "cancelling all WF_AUTOCANCEL watchers"; 2475 warn "cancelling all WF_AUTOCANCEL watchers";
2386 for (Event::all_watchers) { 2476 for (Event::all_watchers) {
2387 $_->cancel if $_->data & WF_AUTOCANCEL; 2477 $_->cancel if $_->data & WF_AUTOCANCEL;
2388 } 2478 }
2389
2390 warn "syncing database to disk";
2391 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
2392 2479
2393 warn "flushing outstanding aio requests"; 2480 warn "flushing outstanding aio requests";
2394 for (;;) { 2481 for (;;) {
2395 BDB::flush; 2482 BDB::flush;
2396 IO::AIO::flush; 2483 IO::AIO::flush;
2397 Coro::cede; 2484 Coro::cede;
2398 last unless IO::AIO::nreqs || BDB::nreqs; 2485 last unless IO::AIO::nreqs || BDB::nreqs;
2399 warn "iterate..."; 2486 warn "iterate...";
2400 } 2487 }
2401 2488
2489 ++$RELOAD;
2490
2402 warn "cancelling all extension coros"; 2491 warn "cancelling all extension coros";
2403 $_->cancel for values %EXT_CORO; 2492 $_->cancel for values %EXT_CORO;
2404 %EXT_CORO = (); 2493 %EXT_CORO = ();
2405 2494
2406 warn "removing commands"; 2495 warn "removing commands";
… …
2463 2552
2464 warn "loading extensions"; 2553 warn "loading extensions";
2465 cf::load_extensions; 2554 cf::load_extensions;
2466 2555
2467 warn "reattaching attachments to objects/players"; 2556 warn "reattaching attachments to objects/players";
2468 _global_reattach; 2557 _global_reattach; # objects, sockets
2469 warn "reattaching attachments to maps"; 2558 warn "reattaching attachments to maps";
2470 reattach $_ for values %MAP; 2559 reattach $_ for values %MAP;
2560 warn "reattaching attachments to players";
2561 reattach $_ for values %PLAYER;
2471 2562
2472 warn "loading reloadable resources"; 2563 warn "loading reloadable resources";
2473 load_resources; 2564 reload_resources;
2474 2565
2475 warn "restarting server ticker"; 2566 warn "leaving sync_job";
2476 2567
2477 $TICK_WATCHER->start; 2568 1
2478 }; 2569 } or do {
2479
2480 if ($@) {
2481 warn $@; 2570 warn $@;
2482 warn "error while reloading, exiting."; 2571 warn "error while reloading, exiting.";
2483 exit 1; 2572 exit 1;
2484 } 2573 };
2485 2574
2486 warn "reloaded"; 2575 warn "reloaded";
2487}; 2576};
2488 2577
2489our $RELOAD_WATCHER; # used only during reload 2578our $RELOAD_WATCHER; # used only during reload
… …
2530 2619
2531 cf::server_tick; # one server iteration 2620 cf::server_tick; # one server iteration
2532 $RUNTIME += $TICK; 2621 $RUNTIME += $TICK;
2533 $NEXT_TICK += $TICK; 2622 $NEXT_TICK += $TICK;
2534 2623
2624 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2625 $NEXT_RUNTIME_WRITE = $NOW + 10;
2626 Coro::async_pool {
2627 write_runtime
2628 or warn "ERROR: unable to write runtime file: $!";
2629 };
2630 }
2631
2535 $WAIT_FOR_TICK->broadcast; 2632 $WAIT_FOR_TICK->broadcast;
2536 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2633 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2537 2634
2538 Event::sweep;
2539 Coro::cede_notself;
2540
2541# my $AFTER = Event::time; 2635# my $AFTER = Event::time;
2542# warn $AFTER - $NOW;#d# 2636# warn $AFTER - $NOW;#d#
2543 2637
2544 # if we are delayed by four ticks or more, skip them all 2638 # if we are delayed by four ticks or more, skip them all
2545 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2639 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
… …
2604 2698
2605 undef $Coro::AIO::WATCHER; 2699 undef $Coro::AIO::WATCHER;
2606 IO::AIO::max_poll_time $TICK * 0.1; 2700 IO::AIO::max_poll_time $TICK * 0.1;
2607 $AIO_POLL_WATCHER = Event->io ( 2701 $AIO_POLL_WATCHER = Event->io (
2608 reentrant => 0, 2702 reentrant => 0,
2703 data => WF_AUTOCANCEL,
2609 fd => IO::AIO::poll_fileno, 2704 fd => IO::AIO::poll_fileno,
2610 poll => 'r', 2705 poll => 'r',
2611 prio => 6, 2706 prio => 6,
2612 data => WF_AUTOCANCEL,
2613 cb => \&IO::AIO::poll_cb, 2707 cb => \&IO::AIO::poll_cb,
2614 ); 2708 );
2615} 2709}
2616 2710
2617$WRITE_RUNTIME_WATCHER = Event->timer (
2618 reentrant => 0,
2619 data => WF_AUTOCANCEL,
2620 after => 1,
2621 interval => 10,
2622 prio => 6, # keep it lowest so it acts like a watchdog
2623 cb => Coro::unblock_sub {
2624 write_runtime
2625 or warn "ERROR: unable to write runtime file: $!";
2626 },
2627);
2628
2629END { cf::emergency_save } 2711END { cf::emergency_save }
2630 2712
26311 27131
2632 2714

Diff Legend

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