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.386 by root, Mon Oct 15 17:50:27 2007 UTC vs.
Revision 1.441 by root, Sat Aug 30 05:19:03 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Event; 31use EV;
10use Opcode; 32use Opcode;
11use Safe; 33use Safe;
12use Safe::Hole; 34use Safe::Hole;
13use Storable (); 35use Storable ();
14 36
15use Coro 4.1 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
24use Coro::Util (); 49use Coro::Util ();
25 50
26use JSON::XS (); 51use JSON::XS 2.01 ();
27use BDB (); 52use BDB ();
28use Data::Dumper; 53use Data::Dumper;
29use Digest::MD5; 54use Digest::MD5;
30use Fcntl; 55use Fcntl;
31use YAML::Syck (); 56use YAML ();
32use IO::AIO 2.51 (); 57use IO::AIO ();
33use Time::HiRes; 58use Time::HiRes;
34use Compress::LZF; 59use Compress::LZF;
35use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
36 63
37# configure various modules to our taste 64# configure various modules to our taste
38# 65#
39$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47 69
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 71
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 73
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our %RESOURCE;
75 98
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 101our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
83 103
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 104our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 105our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 106our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 107our $DB_ENV;
89 108
90our %CFG; 109our %CFG;
91 110
92our $UPTIME; $UPTIME ||= time; 111our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 112our $RUNTIME;
113our $NOW;
94 114
95our (%PLAYER, %PLAYER_LOADING); # all users 115our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 116our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 117our $LINK_MAP; # the special {link} map, which is always available
98 118
99# used to convert map paths into valid unix filenames by replacing / by ∕ 119# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 121
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
105 126
106binmode STDOUT; 127binmode STDOUT;
107binmode STDERR; 128binmode STDERR;
108 129
109# read virtual server time, if available 130# read virtual server time, if available
162 183
163The raw value load value from the last tick. 184The raw value load value from the last tick.
164 185
165=item %cf::CFG 186=item %cf::CFG
166 187
167Configuration for the server, loaded from C</etc/crossfire/config>, or 188Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 189from wherever your confdir points to.
169 190
170=item cf::wait_for_tick, cf::wait_for_tick_begin 191=item cf::wait_for_tick, cf::wait_for_tick_begin
171 192
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 193These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 215
195 LOG llevError, $msg; 216 LOG llevError, $msg;
196 }; 217 };
197} 218}
219
220$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "=="
222
223 if ($Coro::current == $Coro::main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d#
226 }#d#
227
228 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate
231};
232
233$SIG{__DIE__} = sub { }; #d#?
198 234
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 245for my $pkg (qw(
210 cf::global cf::attachable 246 cf::global cf::attachable
211 cf::object cf::object::player 247 cf::object cf::object::player
212 cf::client cf::player 248 cf::client cf::player
213 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
214 cf::map cf::party cf::region 251 cf::party cf::region
215)) { 252)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 254}
219 255
220$Event::DIED = sub { 256$EV::DIED = sub {
221 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
222}; 258};
223 259
224############################################################################# 260#############################################################################
225 261
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 284 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 285 $d
250 } || "[unable to dump $_[0]: '$@']"; 286 } || "[unable to dump $_[0]: '$@']";
251} 287}
252 288
253=item $ref = cf::from_json $json 289=item $ref = cf::decode_json $json
254 290
255Converts a JSON string into the corresponding perl data structure. 291Converts a JSON string into the corresponding perl data structure.
256 292
257=item $json = cf::to_json $ref 293=item $json = cf::encode_json $ref
258 294
259Converts a perl data structure into its JSON representation. 295Converts a perl data structure into its JSON representation.
260 296
261=cut 297=cut
262 298
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 300
265sub to_json ($) { $json_coder->encode ($_[0]) } 301sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 302sub decode_json($) { $json_coder->decode ($_[0]) }
267 303
268=item cf::lock_wait $string 304=item cf::lock_wait $string
269 305
270Wait until the given lock is available. See cf::lock_acquire. 306Wait until the given lock is available. See cf::lock_acquire.
271 307
327 363
328 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
329} 365}
330 366
331sub freeze_mainloop { 367sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
333 369
334 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start; 371}
336 }; 372
337 $TICK_WATCHER->stop; 373=item cf::periodic $interval, $cb
338 $guard 374
375Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer.
377
378=cut
379
380sub periodic($$) {
381 my ($interval, $cb) = @_;
382
383 my $start = rand List::Util::min 180, $interval;
384
385 EV::periodic $start, $interval, 0, $cb
339} 386}
340 387
341=item cf::get_slot $time[, $priority[, $name]] 388=item cf::get_slot $time[, $priority[, $name]]
342 389
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 390Allocate $time seconds of blocking CPU time at priority C<$priority>:
383 } 430 }
384 } 431 }
385}; 432};
386 433
387sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
388 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
389 438
390 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
392 441
406 455
407BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
408 457
409=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
410 459
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 461is always able to handle events or runnable, as Deliantra is only
413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 462partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 463acceptable.
415 464
416If it must be done, put the blocking parts into C<sync_job>. This will run 465If it must be done, put the blocking parts into C<sync_job>. This will run
417the given BLOCK in another coroutine while waiting for the result. The 466the given BLOCK in another coroutine while waiting for the result. The
422 471
423sub sync_job(&) { 472sub sync_job(&) {
424 my ($job) = @_; 473 my ($job) = @_;
425 474
426 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 476 my $time = EV::time;
428 477
429 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
431 480
432 LOG llevError, Carp::longmess "sync job";#d# 481 LOG llevError, Carp::longmess "sync job";#d#
433 482
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
437 484
438 my $busy = 1; 485 my $busy = 1;
439 my @res; 486 my @res;
440 487
444 warn $@ if $@; 491 warn $@ if $@;
445 undef $busy; 492 undef $busy;
446 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
447 494
448 while ($busy) { 495 while ($busy) {
449 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
450 } 500 }
501 }
451 502
452 $time = Event::time - $time; 503 my $time = EV::time - $time;
453 504
454 LOG llevError | logBacktrace, Carp::longmess "long sync job"
455 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
456
457 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
458 506
459 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
460 } else { 508 } else {
461 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
462 510
487=item fork_call { }, $args 535=item fork_call { }, $args
488 536
489Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
490process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
491Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
492never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
493 541
494=cut 542=cut
495 543
496sub fork_call(&@) { 544sub fork_call(&@) {
497 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
504 reset_signals; 552 reset_signals;
505 &$cb 553 &$cb
506 }, @args; 554 }, @args;
507 555
508 wantarray ? @res : $res[-1] 556 wantarray ? @res : $res[-1]
557}
558
559=item $coin = coin_from_name $name
560
561=cut
562
563our %coin_alias = (
564 "silver" => "silvercoin",
565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
509} 584}
510 585
511=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
512 587
513Returns a single value from the environment database. 588Returns a single value from the environment database.
658attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
659to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
660 735
661In the following description, CLASS can be any of C<global>, C<object> 736In the following description, CLASS can be any of C<global>, C<object>
662C<player>, C<client> or C<map> (i.e. the attachable objects in 737C<player>, C<client> or C<map> (i.e. the attachable objects in
663Crossfire TRT). 738Deliantra).
664 739
665=over 4 740=over 4
666 741
667=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
668 743
950 } 1025 }
951 1026
952 0 1027 0
953} 1028}
954 1029
955=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
956 1031
957=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
958 1033
959Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
960 1035
1013 1088
1014sub reattach { 1089sub reattach {
1015 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
1016 my ($obj) = @_; 1091 my ($obj) = @_;
1017 1092
1093 # no longer needed after getting rid of delete_package?
1018 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1019 1095
1020 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
1021 1097
1022 @$registry = (); 1098 @$registry = ();
1023 1099
1038cf::attachable->attach ( 1114cf::attachable->attach (
1039 prio => -1000000, 1115 prio => -1000000,
1040 on_instantiate => sub { 1116 on_instantiate => sub {
1041 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
1042 1118
1043 $data = from_json $data; 1119 $data = decode_json $data;
1044 1120
1045 for (@$data) { 1121 for (@$data) {
1046 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
1047 1123
1048 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
1069 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1070 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1071 $decname, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1072 1148
1073 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1074 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1075 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1076 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1077 close $fh; 1153 aio_close $fh;
1078 1154
1079 if (@$objs) { 1155 if (@$objs) {
1080 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1081 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1082 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1083 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1084 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1085 close $fh; 1161 aio_close $fh;
1086 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1087 } 1163 }
1088 } else { 1164 } else {
1089 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1090 } 1166 }
1118 1194
1119 unless (aio_stat "$filename.pst") { 1195 unless (aio_stat "$filename.pst") {
1120 (aio_load "$filename.pst", $av) >= 0 1196 (aio_load "$filename.pst", $av) >= 0
1121 or return; 1197 or return;
1122 1198
1123 my $st = eval { Coro::Storable::thaw $av } 1199 my $st = eval { Coro::Storable::thaw $av };
1124 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1125 $av = $st->{objs}; 1200 $av = $st->{objs};
1126 } 1201 }
1127 1202
1128 utf8::decode (my $decname = $filename); 1203 utf8::decode (my $decname = $filename);
1129 warn sprintf "loading %s (%d,%d)\n", 1204 warn sprintf "loading %s (%d,%d)\n",
1260 1335
1261 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1262 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1263 1338
1264 $ext{source} = 1339 $ext{source} =
1265 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1266 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1267 . $source 1342 . $source
1268 . "\n};\n1"; 1343 . "\n};\n1";
1269 1344
1270 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
1286 my $msg = $@ ? "$v->{path}: $@\n" 1361 my $msg = $@ ? "$v->{path}: $@\n"
1287 : "$v->{base}: extension inactive.\n"; 1362 : "$v->{base}: extension inactive.\n";
1288 1363
1289 if (exists $v->{meta}{mandatory}) { 1364 if (exists $v->{meta}{mandatory}) {
1290 warn $msg; 1365 warn $msg;
1291 warn "mandatory extension failed to load, exiting.\n"; 1366 cf::cleanup "mandatory extension failed to load, exiting.";
1292 exit 1;
1293 } 1367 }
1294 1368
1295 warn $msg; 1369 warn $msg;
1296 } 1370 }
1297 1371
1386 my $f = new_from_file cf::object::thawer path $login 1460 my $f = new_from_file cf::object::thawer path $login
1387 or return; 1461 or return;
1388 1462
1389 my $pl = cf::player::load_pl $f 1463 my $pl = cf::player::load_pl $f
1390 or return; 1464 or return;
1465
1391 local $cf::PLAYER_LOADING{$login} = $pl; 1466 local $cf::PLAYER_LOADING{$login} = $pl;
1392 $f->resolve_delayed_derefs; 1467 $f->resolve_delayed_derefs;
1393 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1394 } 1469 }
1395 } 1470 }
1405 1480
1406 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1407 1482
1408 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1409 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1485
1486 cf::get_slot 0.01;
1410 1487
1411 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1412 cf::cede_to_tick; 1489 cf::cede_to_tick;
1413} 1490}
1414 1491
1450 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1451 $pl->password ("*"); # this should lock out the player until we nuked the dir 1528 $pl->password ("*"); # this should lock out the player until we nuked the dir
1452 1529
1453 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1454 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1455 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1456 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1457 1536
1458 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1459 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
1498 1577
1499 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1500 my $path = path $login; 1579 my $path = path $login;
1501 1580
1502 # a .pst is a dead give-away for a valid player 1581 # a .pst is a dead give-away for a valid player
1503 unless (-e "$path.pst") { 1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1504 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1505 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1506 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1507 } 1587 }
1508 1588
1545 1625
1546Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1547 1627
1548=cut 1628=cut
1549 1629
1630use re 'eval';
1631
1632my $group;
1633my $interior; $interior = qr{
1634 # match a pod interior sequence sans C<< >>
1635 (?:
1636 \ (.*?)\ (?{ $group = $^N })
1637 | < (??{$interior}) >
1638 )
1639}x;
1640
1550sub expand_cfpod { 1641sub expand_cfpod {
1551 ((my $self), (local $_)) = @_; 1642 my ($self, $pod) = @_;
1552 1643
1553 # escape & and < 1644 my $xml;
1554 s/&/&amp;/g;
1555 s/(?<![BIUGHT])</&lt;/g;
1556 1645
1557 # this is buggy, it needs to properly take care of nested <'s 1646 while () {
1647 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1648 $group = $1;
1558 1649
1559 1 while 1650 $group =~ s/&/&amp;/g;
1560 # replace B<>, I<>, U<> etc. 1651 $group =~ s/</&lt;/g;
1561 s/B<([^\>]*)>/<b>$1<\/b>/ 1652
1562 || s/I<([^\>]*)>/<i>$1<\/i>/ 1653 $xml .= $group;
1563 || s/U<([^\>]*)>/<u>$1<\/u>/ 1654 } elsif ($pod =~ m%\G
1564 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1655 ([BCGHITU])
1565 # replace G<male|female> tags 1656 <
1566 || s{G<([^>|]*)\|([^>]*)>}{ 1657 (?:
1567 $self->gender ? $2 : $1 1658 ([^<>]*) (?{ $group = $^N })
1568 }ge 1659 | < $interior >
1569 # replace H<hint text> 1660 )
1570 || s{H<([^\>]*)>} 1661 >
1662 %gcsx
1571 { 1663 ) {
1664 my ($code, $data) = ($1, $group);
1665
1666 if ($code eq "B") {
1667 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1668 } elsif ($code eq "I") {
1669 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1670 } elsif ($code eq "U") {
1671 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1672 } elsif ($code eq "C") {
1673 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1674 } elsif ($code eq "T") {
1675 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1676 } elsif ($code eq "G") {
1677 my ($male, $female) = split /\|/, $data;
1678 $data = $self->gender ? $female : $male;
1679 $xml .= expand_cfpod ($self, $data);
1680 } elsif ($code eq "H") {
1572 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1681 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1573 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1682 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1574 "") 1683 "")
1575 [$self->{hintmode}] 1684 [$self->{hintmode}];
1685 } else {
1686 $xml .= "error processing '$code($data)' directive";
1576 }ge; 1687 }
1688 } else {
1689 if ($pod =~ /\G(.+)/) {
1690 warn "parse error while expanding $pod (at $1)";
1691 }
1692 last;
1693 }
1694 }
1577 1695
1696 for ($xml) {
1578 # create single paragraphs (very hackish) 1697 # create single paragraphs (very hackish)
1579 s/(?<=\S)\n(?=\w)/ /g; 1698 s/(?<=\S)\n(?=\w)/ /g;
1580 1699
1581 # compress some whitespace 1700 # compress some whitespace
1582 s/\s+\n/\n/g; # ws line-ends 1701 s/\s+\n/\n/g; # ws line-ends
1583 s/\n\n+/\n/g; # double lines 1702 s/\n\n+/\n/g; # double lines
1584 s/^\n+//; # beginning lines 1703 s/^\n+//; # beginning lines
1585 s/\n+$//; # ending lines 1704 s/\n+$//; # ending lines
1705 }
1586 1706
1587 $_ 1707 $xml
1588} 1708}
1709
1710no re 'eval';
1589 1711
1590sub hintmode { 1712sub hintmode {
1591 $_[0]{hintmode} = $_[1] if @_ > 1; 1713 $_[0]{hintmode} = $_[1] if @_ > 1;
1592 $_[0]{hintmode} 1714 $_[0]{hintmode}
1593} 1715}
1665our $MAX_RESET = 3600; 1787our $MAX_RESET = 3600;
1666our $DEFAULT_RESET = 3000; 1788our $DEFAULT_RESET = 3000;
1667 1789
1668sub generate_random_map { 1790sub generate_random_map {
1669 my ($self, $rmp) = @_; 1791 my ($self, $rmp) = @_;
1792
1793 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1794
1670 # mit "rum" bekleckern, nicht 1795 # mit "rum" bekleckern, nicht
1671 $self->_create_random_map ( 1796 $self->_create_random_map (
1672 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1797 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1673 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1798 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1674 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1799 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1796 1921
1797# the temporary/swap location 1922# the temporary/swap location
1798sub save_path { 1923sub save_path {
1799 my ($self) = @_; 1924 my ($self) = @_;
1800 1925
1801 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1802 "$TMPDIR/$path.map" 1927 "$TMPDIR/$path.map"
1803} 1928}
1804 1929
1805# the unique path, undef == no special unique path 1930# the unique path, undef == no special unique path
1806sub uniq_path { 1931sub uniq_path {
1807 my ($self) = @_; 1932 my ($self) = @_;
1808 1933
1809 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1934 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1810 "$UNIQUEDIR/$path" 1935 "$UNIQUEDIR/$path"
1811} 1936}
1812 1937
1813# and all this just because we cannot iterate over 1938# and all this just because we cannot iterate over
1814# all maps in C++... 1939# all maps in C++...
1912 2037
1913 cf::lock_wait "map_data:$path";#d#remove 2038 cf::lock_wait "map_data:$path";#d#remove
1914 cf::lock_wait "map_find:$path"; 2039 cf::lock_wait "map_find:$path";
1915 2040
1916 $cf::MAP{$path} || do { 2041 $cf::MAP{$path} || do {
1917 my $guard1 = cf::lock_acquire "map_find:$path";
1918 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 2042 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2043 my $guard2 = cf::lock_acquire "map_find:$path";
1919 2044
1920 my $map = new_from_path cf::map $path 2045 my $map = new_from_path cf::map $path
1921 or return; 2046 or return;
1922 2047
1923 $map->{last_save} = $cf::RUNTIME; 2048 $map->{last_save} = $cf::RUNTIME;
1926 or return; 2051 or return;
1927 2052
1928 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2053 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1929 # doing this can freeze the server in a sync job, obviously 2054 # doing this can freeze the server in a sync job, obviously
1930 #$cf::WAIT_FOR_TICK->wait; 2055 #$cf::WAIT_FOR_TICK->wait;
2056 undef $guard2;
1931 undef $guard1; 2057 undef $guard1;
1932 undef $guard2;
1933 $map->reset; 2058 $map->reset;
1934 return find $path; 2059 return find $path;
1935 } 2060 }
1936 2061
1937 $cf::MAP{$path} = $map 2062 $cf::MAP{$path} = $map
1964 my $f = new_from_file cf::object::thawer $self->{load_path}; 2089 my $f = new_from_file cf::object::thawer $self->{load_path};
1965 $f->skip_block; 2090 $f->skip_block;
1966 $self->_load_objects ($f) 2091 $self->_load_objects ($f)
1967 or return; 2092 or return;
1968 2093
1969 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2094 $self->post_load_original
1970 if delete $self->{load_original}; 2095 if delete $self->{load_original};
1971 2096
1972 if (my $uniq = $self->uniq_path) { 2097 if (my $uniq = $self->uniq_path) {
1973 utf8::encode $uniq; 2098 utf8::encode $uniq;
1974 unless (aio_stat $uniq) { 2099 unless (aio_stat $uniq) {
2000 } 2125 }
2001 2126
2002 $self->{last_save} = $cf::RUNTIME; 2127 $self->{last_save} = $cf::RUNTIME;
2003 $self->last_access ($cf::RUNTIME); 2128 $self->last_access ($cf::RUNTIME);
2004 2129
2005 $self->in_memory (cf::MAP_IN_MEMORY); 2130 $self->in_memory (cf::MAP_ACTIVE);
2006 } 2131 }
2007 2132
2008 $self->post_load; 2133 $self->post_load;
2009} 2134}
2010 2135
2068 my ($path, $origin, $load) = @_; 2193 my ($path, $origin, $load) = @_;
2069 2194
2070 $path = normalise $path, $origin && $origin->{path}; 2195 $path = normalise $path, $origin && $origin->{path};
2071 2196
2072 if (my $map = $cf::MAP{$path}) { 2197 if (my $map = $cf::MAP{$path}) {
2073 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2198 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2074 } 2199 }
2075 2200
2076 $MAP_PREFETCH{$path} |= $load; 2201 $MAP_PREFETCH{$path} |= $load;
2077 2202
2078 $MAP_PREFETCHER ||= cf::async { 2203 $MAP_PREFETCHER ||= cf::async {
2115 cf::async { 2240 cf::async {
2116 $Coro::current->{desc} = "map player save"; 2241 $Coro::current->{desc} = "map player save";
2117 $_->contr->save for $self->players; 2242 $_->contr->save for $self->players;
2118 }; 2243 };
2119 2244
2245 cf::get_slot 0.02;
2246
2120 if ($uniq) { 2247 if ($uniq) {
2121 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2122 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2249 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2123 } else { 2250 } else {
2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2251 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2132 $self->save; 2259 $self->save;
2133 2260
2134 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2261 my $lock = cf::lock_acquire "map_data:$self->{path}";
2135 2262
2136 return if $self->players; 2263 return if $self->players;
2137 return if $self->in_memory != cf::MAP_IN_MEMORY; 2264 return if $self->in_memory != cf::MAP_ACTIVE;
2138 return if $self->{deny_save}; 2265 return if $self->{deny_save};
2139 2266
2140 $self->in_memory (cf::MAP_SWAPPED); 2267 $self->in_memory (cf::MAP_SWAPPED);
2141 2268
2142 $self->deactivate; 2269 $self->deactivate;
2260 2387
2261sub unique_maps() { 2388sub unique_maps() {
2262 [ 2389 [
2263 map { 2390 map {
2264 utf8::decode $_; 2391 utf8::decode $_;
2265 /\.map$/ 2392 s/\.map$//; # TODO future compatibility hack
2393 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2394 ? ()
2266 ? normalise $_ 2395 : normalise $_
2267 : ()
2268 } @{ aio_readdir $UNIQUEDIR or [] } 2396 } @{ aio_readdir $UNIQUEDIR or [] }
2269 ] 2397 ]
2270} 2398}
2271 2399
2272package cf;
2273
2274=back 2400=back
2275 2401
2276=head3 cf::object 2402=head3 cf::object
2277 2403
2278=cut 2404=cut
2281 2407
2282=over 4 2408=over 4
2283 2409
2284=item $ob->inv_recursive 2410=item $ob->inv_recursive
2285 2411
2286Returns the inventory of the object _and_ their inventories, recursively. 2412Returns the inventory of the object I<and> their inventories, recursively,
2413but I<not> the object itself.
2287 2414
2288=cut 2415=cut
2289 2416
2290sub inv_recursive_; 2417sub inv_recursive_;
2291sub inv_recursive_ { 2418sub inv_recursive_ {
2296 inv_recursive_ inv $_[0] 2423 inv_recursive_ inv $_[0]
2297} 2424}
2298 2425
2299=item $ref = $ob->ref 2426=item $ref = $ob->ref
2300 2427
2301creates and returns a persistent reference to an objetc that can be stored as a string. 2428Creates and returns a persistent reference to an object that can be stored as a string.
2302 2429
2303=item $ob = cf::object::deref ($refstring) 2430=item $ob = cf::object::deref ($refstring)
2304 2431
2305returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2432returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2306even if the object actually exists. May block. 2433even if the object actually exists. May block.
2338can be C<undef>. Does the right thing when the player is currently in a 2465can be C<undef>. Does the right thing when the player is currently in a
2339dialogue with the given NPC character. 2466dialogue with the given NPC character.
2340 2467
2341=cut 2468=cut
2342 2469
2470our $SAY_CHANNEL = {
2471 id => "say",
2472 title => "Map",
2473 reply => "say ",
2474 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2475};
2476
2477our $CHAT_CHANNEL = {
2478 id => "chat",
2479 title => "Chat",
2480 reply => "chat ",
2481 tooltip => "Player chat and shouts, global to the server.",
2482};
2483
2343# rough implementation of a future "reply" method that works 2484# rough implementation of a future "reply" method that works
2344# with dialog boxes. 2485# with dialog boxes.
2345#TODO: the first argument must go, split into a $npc->reply_to ( method 2486#TODO: the first argument must go, split into a $npc->reply_to ( method
2346sub cf::object::player::reply($$$;$) { 2487sub cf::object::player::reply($$$;$) {
2347 my ($self, $npc, $msg, $flags) = @_; 2488 my ($self, $npc, $msg, $flags) = @_;
2358 my $dialog = $pl->{npc_dialog}; 2499 my $dialog = $pl->{npc_dialog};
2359 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2500 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2360 2501
2361 } else { 2502 } else {
2362 $msg = $npc->name . " says: $msg" if $npc; 2503 $msg = $npc->name . " says: $msg" if $npc;
2363 $self->message ($msg, $flags); 2504 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2364 } 2505 }
2365 } 2506 }
2366} 2507}
2367 2508
2368=item $object->send_msg ($channel, $msg, $color, [extra...]) 2509=item $object->send_msg ($channel, $msg, $color, [extra...])
2475Moves the player to the given map-path and coordinates by first freezing 2616Moves the player to the given map-path and coordinates by first freezing
2476her, loading and preparing them map, calling the provided $check callback 2617her, loading and preparing them map, calling the provided $check callback
2477that has to return the map if sucecssful, and then unfreezes the player on 2618that has to return the map if sucecssful, and then unfreezes the player on
2478the new (success) or old (failed) map position. In either case, $done will 2619the new (success) or old (failed) map position. In either case, $done will
2479be called at the end of this process. 2620be called at the end of this process.
2621
2622Note that $check will be called with a potentially non-loaded map, so if
2623it needs a loaded map it has to call C<< ->load >>.
2480 2624
2481=cut 2625=cut
2482 2626
2483our $GOTOGEN; 2627our $GOTOGEN;
2484 2628
2563} 2707}
2564 2708
2565sub prepare_random_map { 2709sub prepare_random_map {
2566 my ($exit) = @_; 2710 my ($exit) = @_;
2567 2711
2568 my $guard = cf::lock_acquire "exit_prepare:$exit";
2569
2570 # all this does is basically replace the /! path by 2712 # all this does is basically replace the /! path by
2571 # a new random map path (?random/...) with a seed 2713 # a new random map path (?random/...) with a seed
2572 # that depends on the exit object 2714 # that depends on the exit object
2573 2715
2574 my $rmp = parse_random_map_params $exit->msg; 2716 my $rmp = parse_random_map_params $exit->msg;
2576 if ($exit->map) { 2718 if ($exit->map) {
2577 $rmp->{region} = $exit->region->name; 2719 $rmp->{region} = $exit->region->name;
2578 $rmp->{origin_map} = $exit->map->path; 2720 $rmp->{origin_map} = $exit->map->path;
2579 $rmp->{origin_x} = $exit->x; 2721 $rmp->{origin_x} = $exit->x;
2580 $rmp->{origin_y} = $exit->y; 2722 $rmp->{origin_y} = $exit->y;
2723
2724 $exit->map->touch;
2581 } 2725 }
2582 2726
2583 $rmp->{random_seed} ||= $exit->random_seed; 2727 $rmp->{random_seed} ||= $exit->random_seed;
2584 2728
2585 my $data = cf::to_json $rmp; 2729 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2586 my $md5 = Digest::MD5::md5_hex $data; 2730 my $md5 = Digest::MD5::md5_hex $data;
2587 my $meta = "$RANDOMDIR/$md5.meta"; 2731 my $meta = "$RANDOMDIR/$md5.meta";
2588 2732
2589 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2733 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2590 aio_write $fh, 0, (length $data), $data, 0; 2734 aio_write $fh, 0, (length $data), $data, 0;
2591 undef $fh; 2735 undef $fh;
2592 aio_rename "$meta~", $meta; 2736 aio_rename "$meta~", $meta;
2593 2737
2738 my $slaying = "?random/$md5";
2739
2740 if ($exit->valid) {
2594 $exit->slaying ("?random/$md5"); 2741 $exit->slaying ("?random/$md5");
2595 $exit->msg (undef); 2742 $exit->msg (undef);
2743 }
2596 } 2744 }
2597} 2745}
2598 2746
2599sub cf::object::player::enter_exit { 2747sub cf::object::player::enter_exit {
2600 my ($self, $exit) = @_; 2748 my ($self, $exit) = @_;
2601 2749
2602 return unless $self->type == cf::PLAYER; 2750 return unless $self->type == cf::PLAYER;
2603 2751
2604 if ($exit->slaying eq "/!") {
2605 #TODO: this should de-fi-ni-te-ly not be a sync-job
2606 # the problem is that $exit might not survive long enough
2607 # so it needs to be done right now, right here
2608 cf::sync_job { prepare_random_map $exit };
2609 }
2610
2611 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2612 my $hp = $exit->stats->hp;
2613 my $sp = $exit->stats->sp;
2614
2615 $self->enter_link; 2752 $self->enter_link;
2616 2753
2617 # if exit is damned, update players death & WoR home-position
2618 $self->contr->savebed ($slaying, $hp, $sp)
2619 if $exit->flag (FLAG_DAMNED);
2620
2621 (async { 2754 (async {
2622 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2755 $Coro::current->{desc} = "enter_exit";
2623 2756
2624 $self->deactivate_recursive; # just to be sure
2625 unless (eval { 2757 unless (eval {
2758 $self->deactivate_recursive; # just to be sure
2759
2760 # random map handling
2761 {
2762 my $guard = cf::lock_acquire "exit_prepare:$exit";
2763
2764 prepare_random_map $exit
2765 if $exit->slaying eq "/!";
2766 }
2767
2768 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2769 my $x = $exit->stats->hp;
2770 my $y = $exit->stats->sp;
2771
2626 $self->goto ($slaying, $hp, $sp); 2772 $self->goto ($map, $x, $y);
2627 2773
2774 # if exit is damned, update players death & WoR home-position
2775 $self->contr->savebed ($map, $x, $y)
2776 if $exit->flag (cf::FLAG_DAMNED);
2777
2628 1; 2778 1
2629 }) { 2779 }) {
2630 $self->message ("Something went wrong deep within the crossfire server. " 2780 $self->message ("Something went wrong deep within the crossfire server. "
2631 . "I'll try to bring you back to the map you were before. " 2781 . "I'll try to bring you back to the map you were before. "
2632 . "Please report this to the dungeon master!", 2782 . "Please report this to the dungeon master!",
2633 cf::NDI_UNIQUE | cf::NDI_RED); 2783 cf::NDI_UNIQUE | cf::NDI_RED);
2663the message, with C<log> being the default. If C<$color> is negative, suppress 2813the message, with C<log> being the default. If C<$color> is negative, suppress
2664the message unless the client supports the msg packet. 2814the message unless the client supports the msg packet.
2665 2815
2666=cut 2816=cut
2667 2817
2818# non-persistent channels (usually the info channel)
2668our %CHANNEL = ( 2819our %CHANNEL = (
2669 "c/identify" => { 2820 "c/identify" => {
2670 id => "infobox", 2821 id => "infobox",
2671 title => "Identify", 2822 title => "Identify",
2672 reply => undef, 2823 reply => undef,
2676 id => "infobox", 2827 id => "infobox",
2677 title => "Examine", 2828 title => "Examine",
2678 reply => undef, 2829 reply => undef,
2679 tooltip => "Signs and other items you examined", 2830 tooltip => "Signs and other items you examined",
2680 }, 2831 },
2832 "c/book" => {
2833 id => "infobox",
2834 title => "Book",
2835 reply => undef,
2836 tooltip => "The contents of a note or book",
2837 },
2681 "c/lookat" => { 2838 "c/lookat" => {
2682 id => "infobox", 2839 id => "infobox",
2683 title => "Look", 2840 title => "Look",
2684 reply => undef, 2841 reply => undef,
2685 tooltip => "What you saw there", 2842 tooltip => "What you saw there",
2843 },
2844 "c/who" => {
2845 id => "infobox",
2846 title => "Players",
2847 reply => undef,
2848 tooltip => "Shows players who are currently online",
2849 },
2850 "c/body" => {
2851 id => "infobox",
2852 title => "Body Parts",
2853 reply => undef,
2854 tooltip => "Shows which body parts you posess and are available",
2855 },
2856 "c/uptime" => {
2857 id => "infobox",
2858 title => "Uptime",
2859 reply => undef,
2860 tooltip => "How long the server has been running since last restart",
2861 },
2862 "c/mapinfo" => {
2863 id => "infobox",
2864 title => "Map Info",
2865 reply => undef,
2866 tooltip => "Information related to the maps",
2867 },
2868 "c/party" => {
2869 id => "party",
2870 title => "Party",
2871 reply => "gsay ",
2872 tooltip => "Messages and chat related to your party",
2686 }, 2873 },
2687); 2874);
2688 2875
2689sub cf::client::send_msg { 2876sub cf::client::send_msg {
2690 my ($self, $channel, $msg, $color, @extra) = @_; 2877 my ($self, $channel, $msg, $color, @extra) = @_;
2928 3115
2929The following functions and methods are available within a safe environment: 3116The following functions and methods are available within a safe environment:
2930 3117
2931 cf::object 3118 cf::object
2932 contr pay_amount pay_player map x y force_find force_add destroy 3119 contr pay_amount pay_player map x y force_find force_add destroy
2933 insert remove name archname title slaying race decrease_ob_nr 3120 insert remove name archname title slaying race decrease split
2934 3121
2935 cf::object::player 3122 cf::object::player
2936 player 3123 player
2937 3124
2938 cf::player 3125 cf::player
2943 3130
2944=cut 3131=cut
2945 3132
2946for ( 3133for (
2947 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3134 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2948 insert remove inv name archname title slaying race 3135 insert remove inv nrof name archname title slaying race
2949 decrease_ob_nr destroy)], 3136 decrease split destroy change_exp)],
2950 ["cf::object::player" => qw(player)], 3137 ["cf::object::player" => qw(player)],
2951 ["cf::player" => qw(peaceful)], 3138 ["cf::player" => qw(peaceful)],
2952 ["cf::map" => qw(trigger)], 3139 ["cf::map" => qw(trigger)],
2953) { 3140) {
2954 no strict 'refs'; 3141 no strict 'refs';
3059 { 3246 {
3060 my $faces = $facedata->{faceinfo}; 3247 my $faces = $facedata->{faceinfo};
3061 3248
3062 while (my ($face, $info) = each %$faces) { 3249 while (my ($face, $info) = each %$faces) {
3063 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3250 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3251
3064 cf::face::set_visibility $idx, $info->{visibility}; 3252 cf::face::set_visibility $idx, $info->{visibility};
3065 cf::face::set_magicmap $idx, $info->{magicmap}; 3253 cf::face::set_magicmap $idx, $info->{magicmap};
3066 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3254 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3067 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3255 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3068 3256
3069 cf::cede_to_tick; 3257 cf::cede_to_tick;
3070 } 3258 }
3071 3259
3072 while (my ($face, $info) = each %$faces) { 3260 while (my ($face, $info) = each %$faces) {
3073 next unless $info->{smooth}; 3261 next unless $info->{smooth};
3262
3074 my $idx = cf::face::find $face 3263 my $idx = cf::face::find $face
3075 or next; 3264 or next;
3265
3076 if (my $smooth = cf::face::find $info->{smooth}) { 3266 if (my $smooth = cf::face::find $info->{smooth}) {
3077 cf::face::set_smooth $idx, $smooth; 3267 cf::face::set_smooth $idx, $smooth;
3078 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3268 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3079 } else { 3269 } else {
3080 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3270 warn "smooth face '$info->{smooth}' not found for face '$face'";
3098 { 3288 {
3099 # TODO: for gcfclient pleasure, we should give resources 3289 # TODO: for gcfclient pleasure, we should give resources
3100 # that gcfclient doesn't grok a >10000 face index. 3290 # that gcfclient doesn't grok a >10000 face index.
3101 my $res = $facedata->{resource}; 3291 my $res = $facedata->{resource};
3102 3292
3103 my $soundconf = delete $res->{"res/sound.conf"};
3104
3105 while (my ($name, $info) = each %$res) { 3293 while (my ($name, $info) = each %$res) {
3294 if (defined $info->{type}) {
3106 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3295 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3107 my $data; 3296 my $data;
3108 3297
3109 if ($info->{type} & 1) { 3298 if ($info->{type} & 1) {
3110 # prepend meta info 3299 # prepend meta info
3111 3300
3112 my $meta = $enc->encode ({ 3301 my $meta = $enc->encode ({
3113 name => $name, 3302 name => $name,
3114 %{ $info->{meta} || {} }, 3303 %{ $info->{meta} || {} },
3115 }); 3304 });
3116 3305
3117 $data = pack "(w/a*)*", $meta, $info->{data}; 3306 $data = pack "(w/a*)*", $meta, $info->{data};
3307 } else {
3308 $data = $info->{data};
3309 }
3310
3311 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3312 cf::face::set_type $idx, $info->{type};
3118 } else { 3313 } else {
3119 $data = $info->{data}; 3314 $RESOURCE{$name} = $info;
3120 } 3315 }
3121 3316
3122 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3123 cf::face::set_type $idx, $info->{type};
3124
3125 cf::cede_to_tick; 3317 cf::cede_to_tick;
3126 } 3318 }
3127
3128 if ($soundconf) {
3129 $soundconf = $enc->decode (delete $soundconf->{data});
3130
3131 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3132 my $sound = $soundconf->{compat}[$_]
3133 or next;
3134
3135 my $face = cf::face::find "sound/$sound->[1]";
3136 cf::sound::set $sound->[0] => $face;
3137 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3138 }
3139
3140 while (my ($k, $v) = each %{$soundconf->{event}}) {
3141 my $face = cf::face::find "sound/$v";
3142 cf::sound::set $k => $face;
3143 }
3144 }
3145 } 3319 }
3320
3321 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3146 3322
3147 1 3323 1
3148} 3324}
3325
3326cf::global->attach (on_resource_update => sub {
3327 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3328 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3329
3330 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3331 my $sound = $soundconf->{compat}[$_]
3332 or next;
3333
3334 my $face = cf::face::find "sound/$sound->[1]";
3335 cf::sound::set $sound->[0] => $face;
3336 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3337 }
3338
3339 while (my ($k, $v) = each %{$soundconf->{event}}) {
3340 my $face = cf::face::find "sound/$v";
3341 cf::sound::set $k => $face;
3342 }
3343 }
3344});
3149 3345
3150register_exticmd fx_want => sub { 3346register_exticmd fx_want => sub {
3151 my ($ns, $want) = @_; 3347 my ($ns, $want) = @_;
3152 3348
3153 while (my ($k, $v) = each %$want) { 3349 while (my ($k, $v) = each %$want) {
3154 $ns->fx_want ($k, $v); 3350 $ns->fx_want ($k, $v);
3155 } 3351 }
3156}; 3352};
3353
3354sub load_resource_file($) {
3355 my $guard = lock_acquire "load_resource_file";
3356
3357 my $status = load_resource_file_ $_[0];
3358 get_slot 0.1, 100;
3359 cf::arch::commit_load;
3360
3361 $status
3362}
3157 3363
3158sub reload_regions { 3364sub reload_regions {
3159 # HACK to clear player env face cache, we need some signal framework 3365 # HACK to clear player env face cache, we need some signal framework
3160 # for this (global event?) 3366 # for this (global event?)
3161 %ext::player_env::MUSIC_FACE_CACHE = (); 3367 %ext::player_env::MUSIC_FACE_CACHE = ();
3175} 3381}
3176 3382
3177sub reload_archetypes { 3383sub reload_archetypes {
3178 load_resource_file "$DATADIR/archetypes" 3384 load_resource_file "$DATADIR/archetypes"
3179 or die "unable to load archetypes\n"; 3385 or die "unable to load archetypes\n";
3180 #d# NEED to laod twice to resolve forward references
3181 # this really needs to be done in an extra post-pass
3182 # (which needs to be synchronous, so solve it differently)
3183 load_resource_file "$DATADIR/archetypes"
3184 or die "unable to load archetypes\n";
3185} 3386}
3186 3387
3187sub reload_treasures { 3388sub reload_treasures {
3188 load_resource_file "$DATADIR/treasures" 3389 load_resource_file "$DATADIR/treasures"
3189 or die "unable to load treasurelists\n"; 3390 or die "unable to load treasurelists\n";
3190} 3391}
3191 3392
3192sub reload_resources { 3393sub reload_resources {
3193 warn "reloading resource files...\n"; 3394 warn "reloading resource files...\n";
3194 3395
3396 reload_facedata;
3397 reload_archetypes;
3195 reload_regions; 3398 reload_regions;
3196 reload_facedata;
3197 #reload_archetypes;#d#
3198 reload_archetypes;
3199 reload_treasures; 3399 reload_treasures;
3200 3400
3201 warn "finished reloading resource files\n"; 3401 warn "finished reloading resource files\n";
3202} 3402}
3203 3403
3204sub init { 3404sub init {
3405 my $guard = freeze_mainloop;
3406
3407 evthread_start IO::AIO::poll_fileno;
3408
3205 reload_resources; 3409 reload_resources;
3206} 3410}
3207 3411
3208sub reload_config { 3412sub reload_config {
3209 open my $fh, "<:utf8", "$CONFDIR/config" 3413 open my $fh, "<:utf8", "$CONFDIR/config"
3210 or return; 3414 or return;
3211 3415
3212 local $/; 3416 local $/;
3213 *CFG = YAML::Syck::Load <$fh>; 3417 *CFG = YAML::Load <$fh>;
3214 3418
3215 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3419 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3216 3420
3217 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3421 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3218 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3422 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3230 # we must not ever block the main coroutine 3434 # we must not ever block the main coroutine
3231 local $Coro::idle = sub { 3435 local $Coro::idle = sub {
3232 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3436 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3233 (async { 3437 (async {
3234 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3438 $Coro::current->{desc} = "IDLE BUG HANDLER";
3235 Event::one_event; 3439 EV::loop EV::LOOP_ONESHOT;
3236 })->prio (Coro::PRIO_MAX); 3440 })->prio (Coro::PRIO_MAX);
3237 }; 3441 };
3238 3442
3443 {
3444 my $guard = freeze_mainloop;
3239 reload_config; 3445 reload_config;
3240 db_init; 3446 db_init;
3241 load_extensions; 3447 load_extensions;
3242 3448
3243 $TICK_WATCHER->start; 3449 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3450 }
3451
3244 Event::loop; 3452 EV::loop;
3245} 3453}
3246 3454
3247############################################################################# 3455#############################################################################
3248# initialisation and cleanup 3456# initialisation and cleanup
3249 3457
3250# install some emergency cleanup handlers 3458# install some emergency cleanup handlers
3251BEGIN { 3459BEGIN {
3460 our %SIGWATCHER = ();
3252 for my $signal (qw(INT HUP TERM)) { 3461 for my $signal (qw(INT HUP TERM)) {
3253 Event->signal ( 3462 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3254 reentrant => 0,
3255 data => WF_AUTOCANCEL,
3256 signal => $signal,
3257 prio => 0,
3258 cb => sub {
3259 cf::cleanup "SIG$signal"; 3463 cf::cleanup "SIG$signal";
3260 },
3261 ); 3464 };
3262 } 3465 }
3263} 3466}
3264 3467
3265sub write_runtime { 3468sub write_runtime_sync {
3266 my $runtime = "$LOCALDIR/runtime"; 3469 my $runtime = "$LOCALDIR/runtime";
3267 3470
3268 # first touch the runtime file to show we are still running: 3471 # first touch the runtime file to show we are still running:
3269 # the fsync below can take a very very long time. 3472 # the fsync below can take a very very long time.
3270 3473
3296 and return; 3499 and return;
3297 3500
3298 warn "runtime file written.\n"; 3501 warn "runtime file written.\n";
3299 3502
3300 1 3503 1
3504}
3505
3506our $uuid_lock;
3507our $uuid_skip;
3508
3509sub write_uuid_sync($) {
3510 $uuid_skip ||= $_[0];
3511
3512 return if $uuid_lock;
3513 local $uuid_lock = 1;
3514
3515 my $uuid = "$LOCALDIR/uuid";
3516
3517 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3518 or return;
3519
3520 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3521 $uuid_skip = 0;
3522
3523 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3524 and return;
3525
3526 # always fsync - this file is important
3527 aio_fsync $fh
3528 and return;
3529
3530 close $fh
3531 or return;
3532
3533 aio_rename "$uuid~", $uuid
3534 and return;
3535
3536 warn "uuid file written ($value).\n";
3537
3538 1
3539
3540}
3541
3542sub write_uuid($$) {
3543 my ($skip, $sync) = @_;
3544
3545 $sync ? write_uuid_sync $skip
3546 : async { write_uuid_sync $skip };
3301} 3547}
3302 3548
3303sub emergency_save() { 3549sub emergency_save() {
3304 my $freeze_guard = cf::freeze_mainloop; 3550 my $freeze_guard = cf::freeze_mainloop;
3305 3551
3327 warn "end emergency map save\n"; 3573 warn "end emergency map save\n";
3328 3574
3329 warn "begin emergency database checkpoint\n"; 3575 warn "begin emergency database checkpoint\n";
3330 BDB::db_env_txn_checkpoint $DB_ENV; 3576 BDB::db_env_txn_checkpoint $DB_ENV;
3331 warn "end emergency database checkpoint\n"; 3577 warn "end emergency database checkpoint\n";
3578
3579 warn "begin write uuid\n";
3580 write_uuid_sync 1;
3581 warn "end write uuid\n";
3332 }; 3582 };
3333 3583
3334 warn "leave emergency perl save\n"; 3584 warn "leave emergency perl save\n";
3335} 3585}
3336 3586
3338 my ($make_core) = @_; 3588 my ($make_core) = @_;
3339 3589
3340 warn Carp::longmess "post_cleanup backtrace" 3590 warn Carp::longmess "post_cleanup backtrace"
3341 if $make_core; 3591 if $make_core;
3342} 3592}
3593
3594# a safer delete_package, copied from Symbol
3595sub clear_package($) {
3596 my $pkg = shift;
3597
3598 # expand to full symbol table name if needed
3599 unless ($pkg =~ /^main::.*::$/) {
3600 $pkg = "main$pkg" if $pkg =~ /^::/;
3601 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3602 $pkg .= '::' unless $pkg =~ /::$/;
3603 }
3604
3605 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3606 my $stem_symtab = *{$stem}{HASH};
3607
3608 defined $stem_symtab and exists $stem_symtab->{$leaf}
3609 or return;
3610
3611 # clear all symbols
3612 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3613 for my $name (keys %$leaf_symtab) {
3614 _gv_clear *{"$pkg$name"};
3615# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3616 }
3617 warn "cleared package #$pkg\n";#d#
3618}
3619
3620our $RELOAD; # how many times to reload
3343 3621
3344sub do_reload_perl() { 3622sub do_reload_perl() {
3345 # can/must only be called in main 3623 # can/must only be called in main
3346 if ($Coro::current != $Coro::main) { 3624 if ($Coro::current != $Coro::main) {
3347 warn "can only reload from main coroutine"; 3625 warn "can only reload from main coroutine";
3348 return; 3626 return;
3349 } 3627 }
3350 3628
3629 return if $RELOAD++;
3630
3631 while ($RELOAD) {
3351 warn "reloading..."; 3632 warn "reloading...";
3352 3633
3353 warn "entering sync_job"; 3634 warn "entering sync_job";
3354 3635
3355 cf::sync_job { 3636 cf::sync_job {
3356 cf::write_runtime; # external watchdog should not bark 3637 cf::write_runtime_sync; # external watchdog should not bark
3357 cf::emergency_save; 3638 cf::emergency_save;
3358 cf::write_runtime; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
3359 3640
3360 warn "syncing database to disk"; 3641 warn "syncing database to disk";
3361 BDB::db_env_txn_checkpoint $DB_ENV; 3642 BDB::db_env_txn_checkpoint $DB_ENV;
3362 3643
3363 # if anything goes wrong in here, we should simply crash as we already saved 3644 # if anything goes wrong in here, we should simply crash as we already saved
3364 3645
3365 warn "cancelling all WF_AUTOCANCEL watchers";
3366 for (Event::all_watchers) {
3367 $_->cancel if $_->data & WF_AUTOCANCEL;
3368 }
3369
3370 warn "flushing outstanding aio requests"; 3646 warn "flushing outstanding aio requests";
3371 for (;;) {
3372 BDB::flush;
3373 IO::AIO::flush;
3374 Coro::cede;
3375 last unless IO::AIO::nreqs || BDB::nreqs; 3647 while (IO::AIO::nreqs || BDB::nreqs) {
3376 warn "iterate..."; 3648 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3377 }
3378
3379 ++$RELOAD;
3380
3381 warn "cancelling all extension coros";
3382 $_->cancel for values %EXT_CORO;
3383 %EXT_CORO = ();
3384
3385 warn "removing commands";
3386 %COMMAND = ();
3387
3388 warn "removing ext/exti commands";
3389 %EXTCMD = ();
3390 %EXTICMD = ();
3391
3392 warn "unloading/nuking all extensions";
3393 for my $pkg (@EXTS) {
3394 warn "... unloading $pkg";
3395
3396 if (my $cb = $pkg->can ("unload")) {
3397 eval {
3398 $cb->($pkg);
3399 1
3400 } or warn "$pkg unloaded, but with errors: $@";
3401 } 3649 }
3402 3650
3403 warn "... nuking $pkg"; 3651 warn "cancelling all extension coros";
3404 Symbol::delete_package $pkg; 3652 $_->cancel for values %EXT_CORO;
3405 } 3653 %EXT_CORO = ();
3406 3654
3407 warn "unloading all perl modules loaded from $LIBDIR"; 3655 warn "removing commands";
3408 while (my ($k, $v) = each %INC) { 3656 %COMMAND = ();
3409 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3410 3657
3658 warn "removing ext/exti commands";
3659 %EXTCMD = ();
3660 %EXTICMD = ();
3661
3662 warn "unloading/nuking all extensions";
3663 for my $pkg (@EXTS) {
3411 warn "... unloading $k"; 3664 warn "... unloading $pkg";
3412 delete $INC{$k};
3413 3665
3414 $k =~ s/\.pm$//;
3415 $k =~ s/\//::/g;
3416
3417 if (my $cb = $k->can ("unload_module")) { 3666 if (my $cb = $pkg->can ("unload")) {
3667 eval {
3418 $cb->(); 3668 $cb->($pkg);
3669 1
3670 } or warn "$pkg unloaded, but with errors: $@";
3671 }
3672
3673 warn "... clearing $pkg";
3674 clear_package $pkg;
3419 } 3675 }
3420 3676
3421 Symbol::delete_package $k; 3677 warn "unloading all perl modules loaded from $LIBDIR";
3678 while (my ($k, $v) = each %INC) {
3679 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3680
3681 warn "... unloading $k";
3682 delete $INC{$k};
3683
3684 $k =~ s/\.pm$//;
3685 $k =~ s/\//::/g;
3686
3687 if (my $cb = $k->can ("unload_module")) {
3688 $cb->();
3689 }
3690
3691 clear_package $k;
3422 } 3692 }
3423 3693
3424 warn "getting rid of safe::, as good as possible"; 3694 warn "getting rid of safe::, as good as possible";
3425 Symbol::delete_package "safe::$_" 3695 clear_package "safe::$_"
3426 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3696 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3427 3697
3428 warn "unloading cf.pm \"a bit\""; 3698 warn "unloading cf.pm \"a bit\"";
3429 delete $INC{"cf.pm"}; 3699 delete $INC{"cf.pm"};
3430 delete $INC{"cf/pod.pm"}; 3700 delete $INC{"cf/pod.pm"};
3431 3701
3432 # don't, removes xs symbols, too, 3702 # don't, removes xs symbols, too,
3433 # and global variables created in xs 3703 # and global variables created in xs
3434 #Symbol::delete_package __PACKAGE__; 3704 #clear_package __PACKAGE__;
3435 3705
3436 warn "unload completed, starting to reload now"; 3706 warn "unload completed, starting to reload now";
3437 3707
3438 warn "reloading cf.pm"; 3708 warn "reloading cf.pm";
3439 require cf; 3709 require cf;
3440 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3710 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3441 3711
3442 warn "loading config and database again"; 3712 warn "loading config and database again";
3443 cf::reload_config; 3713 cf::reload_config;
3444 3714
3445 warn "loading extensions"; 3715 warn "loading extensions";
3446 cf::load_extensions; 3716 cf::load_extensions;
3447 3717
3448 warn "reattaching attachments to objects/players"; 3718 warn "reattaching attachments to objects/players";
3449 _global_reattach; # objects, sockets 3719 _global_reattach; # objects, sockets
3450 warn "reattaching attachments to maps"; 3720 warn "reattaching attachments to maps";
3451 reattach $_ for values %MAP; 3721 reattach $_ for values %MAP;
3452 warn "reattaching attachments to players"; 3722 warn "reattaching attachments to players";
3453 reattach $_ for values %PLAYER; 3723 reattach $_ for values %PLAYER;
3454 3724
3455 warn "leaving sync_job"; 3725 warn "leaving sync_job";
3456 3726
3457 1 3727 1
3458 } or do { 3728 } or do {
3459 warn $@; 3729 warn $@;
3460 warn "error while reloading, exiting."; 3730 cf::cleanup "error while reloading, exiting.";
3461 exit 1;
3462 }; 3731 };
3463 3732
3464 warn "reloaded"; 3733 warn "reloaded";
3734 --$RELOAD;
3735 }
3465}; 3736};
3466 3737
3467our $RELOAD_WATCHER; # used only during reload 3738our $RELOAD_WATCHER; # used only during reload
3468 3739
3469sub reload_perl() { 3740sub reload_perl() {
3470 # doing reload synchronously and two reloads happen back-to-back, 3741 # doing reload synchronously and two reloads happen back-to-back,
3471 # coro crashes during coro_state_free->destroy here. 3742 # coro crashes during coro_state_free->destroy here.
3472 3743
3473 $RELOAD_WATCHER ||= Event->timer ( 3744 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3474 reentrant => 0,
3475 after => 0,
3476 data => WF_AUTOCANCEL,
3477 cb => sub {
3478 do_reload_perl; 3745 do_reload_perl;
3479 undef $RELOAD_WATCHER; 3746 undef $RELOAD_WATCHER;
3480 },
3481 ); 3747 };
3482} 3748}
3483 3749
3484register_command "reload" => sub { 3750register_command "reload" => sub {
3485 my ($who, $arg) = @_; 3751 my ($who, $arg) = @_;
3486 3752
3499 3765
3500our @WAIT_FOR_TICK; 3766our @WAIT_FOR_TICK;
3501our @WAIT_FOR_TICK_BEGIN; 3767our @WAIT_FOR_TICK_BEGIN;
3502 3768
3503sub wait_for_tick { 3769sub wait_for_tick {
3504 return unless $TICK_WATCHER->is_active;
3505 return if $Coro::current == $Coro::main; 3770 return if tick_inhibit || $Coro::current == $Coro::main;
3506 3771
3507 my $signal = new Coro::Signal; 3772 my $signal = new Coro::Signal;
3508 push @WAIT_FOR_TICK, $signal; 3773 push @WAIT_FOR_TICK, $signal;
3509 $signal->wait; 3774 $signal->wait;
3510} 3775}
3511 3776
3512sub wait_for_tick_begin { 3777sub wait_for_tick_begin {
3513 return unless $TICK_WATCHER->is_active;
3514 return if $Coro::current == $Coro::main; 3778 return if tick_inhibit || $Coro::current == $Coro::main;
3515 3779
3516 my $signal = new Coro::Signal; 3780 my $signal = new Coro::Signal;
3517 push @WAIT_FOR_TICK_BEGIN, $signal; 3781 push @WAIT_FOR_TICK_BEGIN, $signal;
3518 $signal->wait; 3782 $signal->wait;
3519} 3783}
3520 3784
3521$TICK_WATCHER = Event->timer ( 3785sub tick {
3522 reentrant => 0,
3523 parked => 1,
3524 prio => 0,
3525 at => $NEXT_TICK || $TICK,
3526 data => WF_AUTOCANCEL,
3527 cb => sub {
3528 if ($Coro::current != $Coro::main) { 3786 if ($Coro::current != $Coro::main) {
3529 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3787 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3530 unless ++$bug_warning > 10; 3788 unless ++$bug_warning > 10;
3531 return; 3789 return;
3532 } 3790 }
3533 3791
3534 $NOW = $tick_start = Event::time;
3535
3536 cf::server_tick; # one server iteration 3792 cf::server_tick; # one server iteration
3537 3793
3538 $RUNTIME += $TICK;
3539 $NEXT_TICK += $TICK;
3540
3541 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3794 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3542 $NEXT_RUNTIME_WRITE = $NOW + 10; 3795 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3543 Coro::async_pool { 3796 Coro::async_pool {
3544 $Coro::current->{desc} = "runtime saver"; 3797 $Coro::current->{desc} = "runtime saver";
3545 write_runtime 3798 write_runtime_sync
3546 or warn "ERROR: unable to write runtime file: $!"; 3799 or warn "ERROR: unable to write runtime file: $!";
3547 };
3548 } 3800 };
3801 }
3549 3802
3550 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3803 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3551 $sig->send; 3804 $sig->send;
3552 } 3805 }
3553 while (my $sig = shift @WAIT_FOR_TICK) { 3806 while (my $sig = shift @WAIT_FOR_TICK) {
3554 $sig->send; 3807 $sig->send;
3555 } 3808 }
3556 3809
3557 $NOW = Event::time; 3810 $LOAD = ($NOW - $TICK_START) / $TICK;
3558
3559 # if we are delayed by four ticks or more, skip them all
3560 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3561
3562 $TICK_WATCHER->at ($NEXT_TICK);
3563 $TICK_WATCHER->start;
3564
3565 $LOAD = ($NOW - $tick_start) / $TICK;
3566 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3811 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3567 3812
3568 _post_tick; 3813 if (0) {
3814 if ($NEXT_TICK) {
3815 my $jitter = $TICK_START - $NEXT_TICK;
3816 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3817 warn "jitter $JITTER\n";#d#
3818 }
3569 }, 3819 }
3570); 3820}
3571 3821
3572{ 3822{
3823 # configure BDB
3824
3573 BDB::min_parallel 8; 3825 BDB::min_parallel 8;
3574 BDB::max_poll_time $TICK * 0.1; 3826 BDB::max_poll_reqs $TICK * 0.1;
3575 $BDB_POLL_WATCHER = Event->io ( 3827 $AnyEvent::BDB::WATCHER->priority (1);
3576 reentrant => 0,
3577 fd => BDB::poll_fileno,
3578 poll => 'r',
3579 prio => 0,
3580 data => WF_AUTOCANCEL,
3581 cb => \&BDB::poll_cb,
3582 );
3583
3584 BDB::set_sync_prepare {
3585 my $status;
3586 my $current = $Coro::current;
3587 (
3588 sub {
3589 $status = $!;
3590 $current->ready; undef $current;
3591 },
3592 sub {
3593 Coro::schedule while defined $current;
3594 $! = $status;
3595 },
3596 )
3597 };
3598 3828
3599 unless ($DB_ENV) { 3829 unless ($DB_ENV) {
3600 $DB_ENV = BDB::db_env_create; 3830 $DB_ENV = BDB::db_env_create;
3601 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3831 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3602 | BDB::LOG_AUTOREMOVE, 1); 3832 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3833 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3603 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3834 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3604 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3835 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3605 3836
3606 cf::sync_job { 3837 cf::sync_job {
3607 eval { 3838 eval {
3617 3848
3618 cf::cleanup "db_env_open(db): $@" if $@; 3849 cf::cleanup "db_env_open(db): $@" if $@;
3619 }; 3850 };
3620 } 3851 }
3621 3852
3622 $BDB_DEADLOCK_WATCHER = Event->timer ( 3853 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3623 after => 3,
3624 interval => 1,
3625 hard => 1,
3626 prio => 0,
3627 data => WF_AUTOCANCEL,
3628 cb => sub {
3629 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3854 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3630 },
3631 ); 3855 };
3632 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3856 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3633 after => 11,
3634 interval => 60,
3635 hard => 1,
3636 prio => 0,
3637 data => WF_AUTOCANCEL,
3638 cb => sub {
3639 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3857 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3640 },
3641 ); 3858 };
3642 $BDB_TRICKLE_WATCHER = Event->timer ( 3859 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3643 after => 5,
3644 interval => 10,
3645 hard => 1,
3646 prio => 0,
3647 data => WF_AUTOCANCEL,
3648 cb => sub {
3649 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3860 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3650 },
3651 ); 3861 };
3652} 3862}
3653 3863
3654{ 3864{
3865 # configure IO::AIO
3866
3655 IO::AIO::min_parallel 8; 3867 IO::AIO::min_parallel 8;
3656
3657 undef $Coro::AIO::WATCHER;
3658 IO::AIO::max_poll_time $TICK * 0.1; 3868 IO::AIO::max_poll_time $TICK * 0.1;
3659 $AIO_POLL_WATCHER = Event->io ( 3869 undef $AnyEvent::AIO::WATCHER;
3660 reentrant => 0,
3661 data => WF_AUTOCANCEL,
3662 fd => IO::AIO::poll_fileno,
3663 poll => 'r',
3664 prio => 0,
3665 cb => \&IO::AIO::poll_cb,
3666 );
3667} 3870}
3668 3871
3669my $_log_backtrace; 3872my $_log_backtrace;
3670 3873
3671sub _log_backtrace { 3874sub _log_backtrace {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines