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.476 by root, Wed Sep 2 16:54:20 2009 UTC vs.
Revision 1.598 by root, Sun Nov 11 02:38:10 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# 18# <http://www.gnu.org/licenses/>.
19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict qw(vars subs);
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
36
37use Guard (); 35use Carp ();
36
37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
38use Coro (); 41use Coro ();
39use Coro::State; 42use Coro::State;
40use Coro::Handle; 43use Coro::Handle;
41use Coro::EV; 44use Coro::EV;
42use Coro::AnyEvent; 45use Coro::AnyEvent;
48use Coro::AIO; 51use Coro::AIO;
49use Coro::BDB 1.6; 52use Coro::BDB 1.6;
50use Coro::Storable; 53use Coro::Storable;
51use Coro::Util (); 54use Coro::Util ();
52 55
56use Guard ();
53use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
54use BDB (); 58use BDB ();
55use Data::Dumper; 59use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 60use Fcntl;
58use YAML (); 61use YAML::XS ();
59use IO::AIO (); 62use IO::AIO ();
60use Time::HiRes;
61use Compress::LZF; 63use Compress::LZF;
62use Digest::MD5 (); 64use Digest::MD5 ();
63 65
64AnyEvent::detect; 66AnyEvent::detect;
65 67
77# strictly for debugging 79# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
79 81
80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
81 83
84our @ORIG_INC;
85
82our %COMMAND = (); 86our %COMMAND = ();
83our %COMMAND_TIME = (); 87our %COMMAND_TIME = ();
84 88
85our @EXTS = (); # list of extension package names 89our @EXTS = (); # list of extension package names
86our %EXTCMD = (); 90our %EXTCMD = ();
91our %EXTACMD = ();
87our %EXTICMD = (); 92our %EXTICMD = ();
93our %EXTIACMD = ();
88our %EXT_CORO = (); # coroutines bound to extensions 94our %EXT_CORO = (); # coroutines bound to extensions
89our %EXT_MAP = (); # pluggable maps 95our %EXT_MAP = (); # pluggable maps
90 96
91our $RELOAD; # number of reloads so far, non-zero while in reload 97our $RELOAD; # number of reloads so far, non-zero while in reload
92our @EVENT; 98our @EVENT;
99our @REFLECT; # set by XS
100our %REFLECT; # set by us
93 101
94our $CONFDIR = confdir; 102our $CONFDIR = confdir;
103
95our $DATADIR = datadir; 104our $DATADIR = datadir;
96our $LIBDIR = "$DATADIR/ext"; 105our $LIBDIR = "$DATADIR/ext";
97our $PODDIR = "$DATADIR/pod"; 106our $PODDIR = "$DATADIR/pod";
98our $MAPDIR = "$DATADIR/" . mapdir; 107our $MAPDIR = "$DATADIR/" . mapdir;
108
99our $LOCALDIR = localdir; 109our $LOCALDIR = localdir;
100our $TMPDIR = "$LOCALDIR/" . tmpdir; 110our $TMPDIR = "$LOCALDIR/" . tmpdir;
101our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 111our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
102our $PLAYERDIR = "$LOCALDIR/" . playerdir; 112our $PLAYERDIR = "$LOCALDIR/" . playerdir;
103our $RANDOMDIR = "$LOCALDIR/random"; 113our $RANDOMDIR = "$LOCALDIR/random";
104our $BDBDIR = "$LOCALDIR/db"; 114our $BDBDIR = "$LOCALDIR/db";
105our $PIDFILE = "$LOCALDIR/pid"; 115our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime"; 116our $RUNTIMEFILE = "$LOCALDIR/runtime";
107 117
108our %RESOURCE; 118#our %RESOURCE; # unused
119
120our $OUTPUT_RATE_MIN = 3000;
121our $OUTPUT_RATE_MAX = 1000000;
122
123our $MAX_LINKS = 32; # how many chained exits to follow
124our $VERBOSE_IO = 1;
109 125
110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 126our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 127our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
112our $NEXT_TICK; 128our $NEXT_TICK;
113our $USE_FSYNC = 1; # use fsync to write maps - default on 129our $USE_FSYNC = 1; # use fsync to write maps - default on
115our $BDB_DEADLOCK_WATCHER; 131our $BDB_DEADLOCK_WATCHER;
116our $BDB_CHECKPOINT_WATCHER; 132our $BDB_CHECKPOINT_WATCHER;
117our $BDB_TRICKLE_WATCHER; 133our $BDB_TRICKLE_WATCHER;
118our $DB_ENV; 134our $DB_ENV;
119 135
120our @EXTRA_MODULES = qw(pod mapscript); 136our @EXTRA_MODULES = qw(pod match mapscript incloader);
121 137
122our %CFG; 138our %CFG;
139our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
123 140
124our $UPTIME; $UPTIME ||= time; 141our $UPTIME; $UPTIME ||= time;
125our $RUNTIME; 142our $RUNTIME = 0;
143our $SERVER_TICK = 0;
126our $NOW; 144our $NOW;
127 145
128our (%PLAYER, %PLAYER_LOADING); # all users 146our (%PLAYER, %PLAYER_LOADING); # all users
129our (%MAP, %MAP_LOADING ); # all maps 147our (%MAP, %MAP_LOADING ); # all maps
130our $LINK_MAP; # the special {link} map, which is always available 148our $LINK_MAP; # the special {link} map, which is always available
139 157
140our @POST_INIT; 158our @POST_INIT;
141 159
142our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 160our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
143our $REALLY_UNLOOP; # never set to true, please :) 161our $REALLY_UNLOOP; # never set to true, please :)
162
163our $WAIT_FOR_TICK = new Coro::Signal;
164our @WAIT_FOR_TICK_BEGIN;
144 165
145binmode STDOUT; 166binmode STDOUT;
146binmode STDERR; 167binmode STDERR;
147 168
148# read virtual server time, if available 169# read virtual server time, if available
159 180
160our $EMERGENCY_POSITION; 181our $EMERGENCY_POSITION;
161 182
162sub cf::map::normalise; 183sub cf::map::normalise;
163 184
185sub in_main() {
186 $Coro::current == $Coro::main
187}
188
164############################################################################# 189#############################################################################
165 190
191%REFLECT = ();
192for (@REFLECT) {
193 my $reflect = JSON::XS::decode_json $_;
194 $REFLECT{$reflect->{class}} = $reflect;
195}
196
197# this is decidedly evil
198$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
199
200#############################################################################
201
166=head2 GLOBAL VARIABLES 202=head2 GLOBAL VARIABLES
167 203
168=over 4 204=over 4
169 205
170=item $cf::UPTIME 206=item $cf::UPTIME
171 207
172The timestamp of the server start (so not actually an uptime). 208The timestamp of the server start (so not actually an "uptime").
209
210=item $cf::SERVER_TICK
211
212An unsigned integer that starts at zero when the server is started and is
213incremented on every tick.
214
215=item $cf::NOW
216
217The (real) time of the last (current) server tick - updated before and
218after tick processing, so this is useful only as a rough "what time is it
219now" estimate.
220
221=item $cf::TICK
222
223The interval between each server tick, in seconds.
173 224
174=item $cf::RUNTIME 225=item $cf::RUNTIME
175 226
176The time this server has run, starts at 0 and is increased by $cf::TICK on 227The time this server has run, starts at 0 and is increased by $cf::TICK on
177every server tick. 228every server tick.
178 229
179=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
180$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
181$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
182 233
183Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
184directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
185unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
186database environment. 237database environment.
187 238
188=item $cf::NOW
189
190The time of the last (current) server tick.
191
192=item $cf::TICK
193
194The interval between server ticks, in seconds.
195
196=item $cf::LOADAVG 239=item $cf::LOADAVG
197 240
198The current CPU load on the server (alpha-smoothed), as a value between 0 241The current CPU load on the server (alpha-smoothed), as a value between 0
199(none) and 1 (overloaded), indicating how much time is spent on processing 242(none) and 1 (overloaded), indicating how much time is spent on processing
200objects per tick. Healthy values are < 0.5. 243objects per tick. Healthy values are < 0.5.
209from wherever your confdir points to. 252from wherever your confdir points to.
210 253
211=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
212 255
213These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 256These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
214returns directly I<after> the tick processing (and consequently, can only wake one process 257returns directly I<after> the tick processing (and consequently, can only wake one thread
215per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 258per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
216 259
260Note that cf::Wait_for_tick will immediately return when the server is not
261ticking, making it suitable for small pauses in threads that need to run
262when the server is paused. If that is not applicable (i.e. you I<really>
263want to wait, use C<$cf::WAIT_FOR_TICK>).
264
265=item $cf::WAIT_FOR_TICK
266
267Note that C<cf::wait_for_tick> is probably the correct thing to use. This
268variable contains a L<Coro::Signal> that is broadcats after every server
269tick. Calling C<< ->wait >> on it will suspend the caller until after the
270next server tick.
271
272=cut
273
274sub wait_for_tick();
275sub wait_for_tick_begin();
276
217=item @cf::INVOKE_RESULTS 277=item @cf::INVOKE_RESULTS
218 278
219This array contains the results of the last C<invoke ()> call. When 279This array contains the results of the last C<invoke ()> call. When
220C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 280C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
221that call. 281that call.
222 282
283=item %cf::REFLECT
284
285Contains, for each (C++) class name, a hash reference with information
286about object members (methods, scalars, arrays and flags) and other
287metadata, which is useful for introspection.
288
223=back 289=back
224 290
225=cut 291=cut
226 292
227BEGIN { 293sub error(@) { LOG llevError, join "", @_ }
228 *CORE::GLOBAL::warn = sub { 294sub warn (@) { LOG llevWarn , join "", @_ }
295sub info (@) { LOG llevInfo , join "", @_ }
296sub debug(@) { LOG llevDebug, join "", @_ }
297sub trace(@) { LOG llevTrace, join "", @_ }
298
299$Coro::State::WARNHOOK = sub {
229 my $msg = join "", @_; 300 my $msg = join "", @_;
230 301
231 $msg .= "\n" 302 $msg .= "\n"
232 unless $msg =~ /\n$/; 303 unless $msg =~ /\n$/;
233 304
234 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 305 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
235 306
236 LOG llevError, $msg; 307 LOG llevWarn, $msg;
237 }; 308};
238}
239 309
240$Coro::State::DIEHOOK = sub { 310$Coro::State::DIEHOOK = sub {
241 return unless $^S eq 0; # "eq", not "==" 311 return unless $^S eq 0; # "eq", not "=="
242 312
243 if ($Coro::current == $Coro::main) {#d# 313 error Carp::longmess $_[0];
314
315 if (in_main) {#d#
244 warn "DIEHOOK called in main context, Coro bug?\n";#d# 316 error "DIEHOOK called in main context, Coro bug?\n";#d#
245 return;#d# 317 return;#d#
246 }#d# 318 }#d#
247 319
248 # kill coroutine otherwise 320 # kill coroutine otherwise
249 warn Carp::longmess $_[0];
250 Coro::terminate 321 Coro::terminate
251}; 322};
252
253$SIG{__DIE__} = sub { }; #d#?
254 323
255@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 324@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
256@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 325@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
257@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 326@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
258@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 327@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
272)) { 341)) {
273 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 342 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
274} 343}
275 344
276$EV::DIED = sub { 345$EV::DIED = sub {
277 warn "error in event callback: @_"; 346 warn "error in event callback: $@";
278}; 347};
348
349#############################################################################
350
351sub fork_call(&@);
352sub get_slot($;$$);
279 353
280############################################################################# 354#############################################################################
281 355
282=head2 UTILITY FUNCTIONS 356=head2 UTILITY FUNCTIONS
283 357
304 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 378 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
305 $d 379 $d
306 } || "[unable to dump $_[0]: '$@']"; 380 } || "[unable to dump $_[0]: '$@']";
307} 381}
308 382
383=item $scalar = cf::load_file $path
384
385Loads the given file from path and returns its contents. Croaks on error
386and can block.
387
388=cut
389
390sub load_file($) {
391 0 <= aio_load $_[0], my $data
392 or Carp::croak "$_[0]: $!";
393
394 $data
395}
396
397=item $success = cf::replace_file $path, $data, $sync
398
399Atomically replaces the file at the given $path with new $data, and
400optionally $sync the data to disk before replacing the file.
401
402=cut
403
404sub replace_file($$;$) {
405 my ($path, $data, $sync) = @_;
406
407 my $lock = cf::lock_acquire ("replace_file:$path");
408
409 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
410 or return;
411
412 $data = $data->() if ref $data;
413
414 length $data == aio_write $fh, 0, (length $data), $data, 0
415 or return;
416
417 !$sync
418 or !aio_fsync $fh
419 or return;
420
421 aio_close $fh
422 and return;
423
424 aio_rename "$path~", $path
425 and return;
426
427 if ($sync) {
428 $path =~ s%/[^/]*$%%;
429 aio_pathsync $path;
430 }
431
432 1
433}
434
309=item $ref = cf::decode_json $json 435=item $ref = cf::decode_json $json
310 436
311Converts a JSON string into the corresponding perl data structure. 437Converts a JSON string into the corresponding perl data structure.
312 438
313=item $json = cf::encode_json $ref 439=item $json = cf::encode_json $ref
319our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 445our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
320 446
321sub encode_json($) { $json_coder->encode ($_[0]) } 447sub encode_json($) { $json_coder->encode ($_[0]) }
322sub decode_json($) { $json_coder->decode ($_[0]) } 448sub decode_json($) { $json_coder->decode ($_[0]) }
323 449
450=item $ref = cf::decode_storable $scalar
451
452Same as Coro::Storable::thaw, so blocks.
453
454=cut
455
456BEGIN { *decode_storable = \&Coro::Storable::thaw }
457
458=item $ref = cf::decode_yaml $scalar
459
460Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
461
462=cut
463
464sub decode_yaml($) {
465 fork_call { YAML::XS::Load $_[0] } @_
466}
467
468=item $scalar = cf::unlzf $scalar
469
470Same as Compress::LZF::compress, but takes server ticks into account, so
471blocks.
472
473=cut
474
475sub unlzf($) {
476 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
477 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
478 Compress::LZF::decompress $_[0]
479}
480
324=item cf::post_init { BLOCK } 481=item cf::post_init { BLOCK }
325 482
326Execute the given codeblock, I<after> all extensions have been (re-)loaded, 483Execute the given codeblock, I<after> all extensions have been (re-)loaded,
327but I<before> the server starts ticking again. 484but I<before> the server starts ticking again.
328 485
329The cdoeblock will have a single boolean argument to indicate whether this 486The codeblock will have a single boolean argument to indicate whether this
330is a reload or not. 487is a reload or not.
331 488
332=cut 489=cut
333 490
334sub post_init(&) { 491sub post_init(&) {
335 push @POST_INIT, shift; 492 push @POST_INIT, shift;
493}
494
495sub _post_init {
496 trace "running post_init jobs";
497
498 # run them in parallel...
499
500 my @join;
501
502 while () {
503 push @join, map &Coro::async ($_, 0), @POST_INIT;
504 @POST_INIT = ();
505
506 @join or last;
507
508 (pop @join)->join;
509 }
336} 510}
337 511
338=item cf::lock_wait $string 512=item cf::lock_wait $string
339 513
340Wait until the given lock is available. See cf::lock_acquire. 514Wait until the given lock is available. See cf::lock_acquire.
379} 553}
380 554
381=item cf::periodic $interval, $cb 555=item cf::periodic $interval, $cb
382 556
383Like EV::periodic, but randomly selects a starting point so that the actions 557Like EV::periodic, but randomly selects a starting point so that the actions
384get spread over timer. 558get spread over time.
385 559
386=cut 560=cut
387 561
388sub periodic($$) { 562sub periodic($$) {
389 my ($interval, $cb) = @_; 563 my ($interval, $cb) = @_;
393 EV::periodic $start, $interval, 0, $cb 567 EV::periodic $start, $interval, 0, $cb
394} 568}
395 569
396=item cf::get_slot $time[, $priority[, $name]] 570=item cf::get_slot $time[, $priority[, $name]]
397 571
398Allocate $time seconds of blocking CPU time at priority C<$priority>: 572Allocate $time seconds of blocking CPU time at priority C<$priority>
399This call blocks and returns only when you have at least C<$time> seconds 573(default: 0): This call blocks and returns only when you have at least
400of cpu time till the next tick. The slot is only valid till the next cede. 574C<$time> seconds of cpu time till the next tick. The slot is only valid
575till the next cede.
576
577Background jobs should use a priority les than zero, interactive jobs
578should use 100 or more.
401 579
402The optional C<$name> can be used to identify the job to run. It might be 580The optional C<$name> can be used to identify the job to run. It might be
403used for statistical purposes and should identify the same time-class. 581used for statistical purposes and should identify the same time-class.
404 582
405Useful for short background jobs. 583Useful for short background jobs.
406 584
407=cut 585=cut
408 586
409our @SLOT_QUEUE; 587our @SLOT_QUEUE;
410our $SLOT_QUEUE; 588our $SLOT_QUEUE;
589our $SLOT_DECAY = 0.9;
411 590
412$SLOT_QUEUE->cancel if $SLOT_QUEUE; 591$SLOT_QUEUE->cancel if $SLOT_QUEUE;
413$SLOT_QUEUE = Coro::async { 592$SLOT_QUEUE = Coro::async {
414 $Coro::current->desc ("timeslot manager"); 593 $Coro::current->desc ("timeslot manager");
415 594
416 my $signal = new Coro::Signal; 595 my $signal = new Coro::Signal;
596 my $busy;
417 597
418 while () { 598 while () {
419 next_job: 599 next_job:
600
420 my $avail = cf::till_tick; 601 my $avail = cf::till_tick;
421 if ($avail > 0.01) { 602
422 for (0 .. $#SLOT_QUEUE) { 603 for (0 .. $#SLOT_QUEUE) {
423 if ($SLOT_QUEUE[$_][0] < $avail) { 604 if ($SLOT_QUEUE[$_][0] <= $avail) {
605 $busy = 0;
424 my $job = splice @SLOT_QUEUE, $_, 1, (); 606 my $job = splice @SLOT_QUEUE, $_, 1, ();
425 $job->[2]->send; 607 $job->[2]->send;
426 Coro::cede; 608 Coro::cede;
427 goto next_job; 609 goto next_job;
428 } 610 } else {
611 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
429 } 612 }
430 } 613 }
431 614
432 if (@SLOT_QUEUE) { 615 if (@SLOT_QUEUE) {
433 # we do not use wait_for_tick() as it returns immediately when tick is inactive 616 # we do not use wait_for_tick() as it returns immediately when tick is inactive
434 push @cf::WAIT_FOR_TICK, $signal; 617 $WAIT_FOR_TICK->wait;
435 $signal->wait;
436 } else { 618 } else {
619 $busy = 0;
437 Coro::schedule; 620 Coro::schedule;
438 } 621 }
439 } 622 }
440}; 623};
441 624
442sub get_slot($;$$) { 625sub get_slot($;$$) {
443 return if tick_inhibit || $Coro::current == $Coro::main; 626 return if tick_inhibit || $Coro::current == $Coro::main;
444 627
445 my ($time, $pri, $name) = @_; 628 my ($time, $pri, $name) = @_;
446 629
447 $time = $TICK * .6 if $time > $TICK * .6; 630 $time = clamp $time, 0.01, $TICK * .6;
631
448 my $sig = new Coro::Signal; 632 my $sig = new Coro::Signal;
449 633
450 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 634 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
451 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 635 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
452 $SLOT_QUEUE->ready; 636 $SLOT_QUEUE->ready;
478=cut 662=cut
479 663
480sub sync_job(&) { 664sub sync_job(&) {
481 my ($job) = @_; 665 my ($job) = @_;
482 666
483 if ($Coro::current == $Coro::main) { 667 if (in_main) {
484 my $time = EV::time; 668 my $time = AE::time;
485 669
486 # this is the main coro, too bad, we have to block 670 # this is the main coro, too bad, we have to block
487 # till the operation succeeds, freezing the server :/ 671 # till the operation succeeds, freezing the server :/
488 672
489 LOG llevError, Carp::longmess "sync job";#d# 673 #LOG llevError, Carp::longmess "sync job";#d#
490 674
491 my $freeze_guard = freeze_mainloop; 675 my $freeze_guard = freeze_mainloop;
492 676
493 my $busy = 1; 677 my $busy = 1;
494 my @res; 678 my @res;
495 679
496 (async { 680 (async {
497 $Coro::current->desc ("sync job coro"); 681 $Coro::current->desc ("sync job coro");
498 @res = eval { $job->() }; 682 @res = eval { $job->() };
499 warn $@ if $@; 683 error $@ if $@;
500 undef $busy; 684 undef $busy;
501 })->prio (Coro::PRIO_MAX); 685 })->prio (Coro::PRIO_MAX);
502 686
503 while ($busy) { 687 while ($busy) {
504 if (Coro::nready) { 688 if (Coro::nready) {
506 } else { 690 } else {
507 EV::loop EV::LOOP_ONESHOT; 691 EV::loop EV::LOOP_ONESHOT;
508 } 692 }
509 } 693 }
510 694
511 my $time = EV::time - $time; 695 my $time = AE::time - $time;
512 696
513 $TICK_START += $time; # do not account sync jobs to server load 697 $TICK_START += $time; # do not account sync jobs to server load
514 698
515 wantarray ? @res : $res[0] 699 wantarray ? @res : $res[0]
516 } else { 700 } else {
538 $EXT_CORO{$coro+0} = $coro; 722 $EXT_CORO{$coro+0} = $coro;
539 723
540 $coro 724 $coro
541} 725}
542 726
543=item fork_call { }, $args 727=item fork_call { }, @args
544 728
545Executes the given code block with the given arguments in a seperate 729Executes the given code block with the given arguments in a seperate
546process, returning the results. Everything must be serialisable with 730process, returning the results. Everything must be serialisable with
547Coro::Storable. May, of course, block. Note that the executed sub may 731Coro::Storable. May, of course, block. Note that the executed sub may
548never block itself or use any form of event handling. 732never block itself or use any form of event handling.
549 733
550=cut 734=cut
551 735
736sub post_fork {
737 reset_signals;
738}
739
552sub fork_call(&@) { 740sub fork_call(&@) {
553 my ($cb, @args) = @_; 741 my ($cb, @args) = @_;
554 742
555 # we seemingly have to make a local copy of the whole thing, 743 # we seemingly have to make a local copy of the whole thing,
556 # otherwise perl prematurely frees the stuff :/ 744 # otherwise perl prematurely frees the stuff :/
557 # TODO: investigate and fix (likely this will be rather laborious) 745 # TODO: investigate and fix (likely this will be rather laborious)
558 746
559 my @res = Coro::Util::fork_eval { 747 my @res = Coro::Util::fork_eval {
560 reset_signals; 748 cf::post_fork;
561 &$cb 749 &$cb
562 }, @args; 750 } @args;
563 751
564 wantarray ? @res : $res[-1] 752 wantarray ? @res : $res[-1]
753}
754
755sub objinfo {
756 (
757 "counter value" => cf::object::object_count,
758 "objects created" => cf::object::create_count,
759 "objects destroyed" => cf::object::destroy_count,
760 "freelist size" => cf::object::free_count,
761 "allocated objects" => cf::object::objects_size,
762 "active objects" => cf::object::actives_size,
763 )
565} 764}
566 765
567=item $coin = coin_from_name $name 766=item $coin = coin_from_name $name
568 767
569=cut 768=cut
606within each server. 805within each server.
607 806
608=cut 807=cut
609 808
610sub db_table($) { 809sub db_table($) {
810 cf::error "db_get called from main context"
811 if $Coro::current == $Coro::main;
812
611 my ($name) = @_; 813 my ($name) = @_;
612 my $db = BDB::db_create $DB_ENV; 814 my $db = BDB::db_create $DB_ENV;
613 815
614 eval { 816 eval {
615 $db->set_flags (BDB::CHKSUM); 817 $db->set_flags (BDB::CHKSUM);
625} 827}
626 828
627our $DB; 829our $DB;
628 830
629sub db_init { 831sub db_init {
630 cf::sync_job {
631 $DB ||= db_table "db"; 832 $DB ||= db_table "db";
632 };
633} 833}
634 834
635sub db_get($$) { 835sub db_get($$) {
636 my $key = "$_[0]/$_[1]"; 836 my $key = "$_[0]/$_[1]";
637 837
638 cf::sync_job { 838 cf::error "db_get called from main context"
839 if $Coro::current == $Coro::main;
840
639 BDB::db_get $DB, undef, $key, my $data; 841 BDB::db_get $DB, undef, $key, my $data;
640 842
641 $! ? () 843 $! ? ()
642 : $data 844 : $data
643 }
644} 845}
645 846
646sub db_put($$$) { 847sub db_put($$$) {
647 BDB::dbreq_pri 4; 848 BDB::dbreq_pri 4;
648 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 849 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
676 877
677 my @data; 878 my @data;
678 my $md5; 879 my $md5;
679 880
680 for (0 .. $#$src) { 881 for (0 .. $#$src) {
681 0 <= aio_load $src->[$_], $data[$_] 882 $data[$_] = load_file $src->[$_];
682 or Carp::croak "$src->[$_]: $!";
683 } 883 }
684 884
685 # if processing is expensive, check 885 # if processing is expensive, check
686 # checksum first 886 # checksum first
687 if (1) { 887 if (1) {
700 900
701 return db_get cache => "$id/data"; 901 return db_get cache => "$id/data";
702 } 902 }
703 } 903 }
704 904
705 my $t1 = Time::HiRes::time; 905 my $t1 = EV::time;
706 my $data = $process->(\@data); 906 my $data = $process->(\@data);
707 my $t2 = Time::HiRes::time; 907 my $t2 = EV::time;
708 908
709 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 909 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
710 910
711 db_put cache => "$id/data", $data; 911 db_put cache => "$id/data", $data;
712 db_put cache => "$id/md5" , $md5; 912 db_put cache => "$id/md5" , $md5;
713 db_put cache => "$id/meta", $meta; 913 db_put cache => "$id/meta", $meta;
714 914
724 924
725=cut 925=cut
726 926
727sub datalog($@) { 927sub datalog($@) {
728 my ($type, %kv) = @_; 928 my ($type, %kv) = @_;
729 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 929 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
730} 930}
731 931
732=back 932=back
733 933
734=cut 934=cut
929 1129
930 } elsif (exists $cb_id{$type}) { 1130 } elsif (exists $cb_id{$type}) {
931 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1131 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
932 1132
933 } elsif (ref $type) { 1133 } elsif (ref $type) {
934 warn "attaching objects not supported, ignoring.\n"; 1134 error "attaching objects not supported, ignoring.\n";
935 1135
936 } else { 1136 } else {
937 shift @arg; 1137 shift @arg;
938 warn "attach argument '$type' not supported, ignoring.\n"; 1138 error "attach argument '$type' not supported, ignoring.\n";
939 } 1139 }
940 } 1140 }
941} 1141}
942 1142
943sub _object_attach { 1143sub _object_attach {
953 _attach $registry, $klass, @attach; 1153 _attach $registry, $klass, @attach;
954 } 1154 }
955 1155
956 $obj->{$name} = \%arg; 1156 $obj->{$name} = \%arg;
957 } else { 1157 } else {
958 warn "object uses attachment '$name' which is not available, postponing.\n"; 1158 info "object uses attachment '$name' which is not available, postponing.\n";
959 } 1159 }
960 1160
961 $obj->{_attachment}{$name} = undef; 1161 $obj->{_attachment}{$name} = undef;
962} 1162}
963 1163
1022 1222
1023 for (@$callbacks) { 1223 for (@$callbacks) {
1024 eval { &{$_->[1]} }; 1224 eval { &{$_->[1]} };
1025 1225
1026 if ($@) { 1226 if ($@) {
1027 warn "$@";
1028 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1227 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1029 override; 1228 override;
1030 } 1229 }
1031 1230
1032 return 1 if $override; 1231 return 1 if $override;
1033 } 1232 }
1112 for (@$attach) { 1311 for (@$attach) {
1113 my ($klass, @attach) = @$_; 1312 my ($klass, @attach) = @$_;
1114 _attach $registry, $klass, @attach; 1313 _attach $registry, $klass, @attach;
1115 } 1314 }
1116 } else { 1315 } else {
1117 warn "object uses attachment '$name' that is not available, postponing.\n"; 1316 info "object uses attachment '$name' that is not available, postponing.\n";
1118 } 1317 }
1119 } 1318 }
1120} 1319}
1121 1320
1122cf::attachable->attach ( 1321cf::attachable->attach (
1149 my ($filename, $rdata, $objs) = @_; 1348 my ($filename, $rdata, $objs) = @_;
1150 1349
1151 sync_job { 1350 sync_job {
1152 if (length $$rdata) { 1351 if (length $$rdata) {
1153 utf8::decode (my $decname = $filename); 1352 utf8::decode (my $decname = $filename);
1154 warn sprintf "saving %s (%d,%d)\n", 1353 trace sprintf "saving %s (%d,%d)\n",
1155 $decname, length $$rdata, scalar @$objs; 1354 $decname, length $$rdata, scalar @$objs
1355 if $VERBOSE_IO;
1156 1356
1157 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1357 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1158 aio_chmod $fh, SAVE_MODE; 1358 aio_chmod $fh, SAVE_MODE;
1159 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1359 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1160 if ($cf::USE_FSYNC) { 1360 if ($cf::USE_FSYNC) {
1182 aio_rename "$filename~", $filename; 1382 aio_rename "$filename~", $filename;
1183 1383
1184 $filename =~ s%/[^/]+$%%; 1384 $filename =~ s%/[^/]+$%%;
1185 aio_pathsync $filename if $cf::USE_FSYNC; 1385 aio_pathsync $filename if $cf::USE_FSYNC;
1186 } else { 1386 } else {
1187 warn "unable to save objects: $filename~: $!\n"; 1387 error "unable to save objects: $filename~: $!\n";
1188 } 1388 }
1189 } else { 1389 } else {
1190 aio_unlink $filename; 1390 aio_unlink $filename;
1191 aio_unlink "$filename.pst"; 1391 aio_unlink "$filename.pst";
1192 } 1392 }
1216 my $st = eval { Coro::Storable::thaw $av }; 1416 my $st = eval { Coro::Storable::thaw $av };
1217 $av = $st->{objs}; 1417 $av = $st->{objs};
1218 } 1418 }
1219 1419
1220 utf8::decode (my $decname = $filename); 1420 utf8::decode (my $decname = $filename);
1221 warn sprintf "loading %s (%d,%d)\n", 1421 trace sprintf "loading %s (%d,%d)\n",
1222 $decname, length $data, scalar @{$av || []}; 1422 $decname, length $data, scalar @{$av || []}
1423 if $VERBOSE_IO;
1223 1424
1224 ($data, $av) 1425 ($data, $av)
1225} 1426}
1226 1427
1227=head2 COMMAND CALLBACKS 1428=head2 COMMAND CALLBACKS
1231=cut 1432=cut
1232 1433
1233############################################################################# 1434#############################################################################
1234# command handling &c 1435# command handling &c
1235 1436
1236=item cf::register_command $name => \&callback($ob,$args); 1437=item cf::register_command $name => \&callback($ob,$args)
1237 1438
1238Register a callback for execution when the client sends the user command 1439Register a callback for execution when the client sends the user command
1239$name. 1440$name.
1240 1441
1241=cut 1442=cut
1247 #warn "registering command '$name/$time' to '$caller'"; 1448 #warn "registering command '$name/$time' to '$caller'";
1248 1449
1249 push @{ $COMMAND{$name} }, [$caller, $cb]; 1450 push @{ $COMMAND{$name} }, [$caller, $cb];
1250} 1451}
1251 1452
1252=item cf::register_extcmd $name => \&callback($pl,$packet); 1453=item cf::register_extcmd $name => \&callback($pl,@args)
1253 1454
1254Register a callback for execution when the client sends an (synchronous) 1455Register a callback for execution when the client sends an (synchronous)
1255extcmd packet. Ext commands will be processed in the order they are 1456extcmd packet. Ext commands will be processed in the order they are
1256received by the server, like other user commands. The first argument is 1457received by the server, like other user commands. The first argument is
1257the logged-in player. Ext commands can only be processed after a player 1458the logged-in player. Ext commands can only be processed after a player
1258has logged in successfully. 1459has logged in successfully.
1259 1460
1260If the callback returns something, it is sent back as if reply was being 1461The values will be sent back to the client.
1261called.
1262 1462
1463=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1464
1465Same as C<cf::register_extcmd>, but instead of returning values, the
1466callback needs to clal the C<$reply> function.
1467
1263=item cf::register_exticmd $name => \&callback($ns,$packet); 1468=item cf::register_exticmd $name => \&callback($ns,@args)
1264 1469
1265Register a callback for execution when the client sends an (asynchronous) 1470Register a callback for execution when the client sends an (asynchronous)
1266exticmd packet. Exti commands are processed by the server as soon as they 1471exticmd packet. Exti commands are processed by the server as soon as they
1267are received, i.e. out of order w.r.t. other commands. The first argument 1472are received, i.e. out of order w.r.t. other commands. The first argument
1268is a client socket. Exti commands can be received anytime, even before 1473is a client socket. Exti commands can be received anytime, even before
1269log-in. 1474log-in.
1270 1475
1271If the callback returns something, it is sent back as if reply was being 1476The values will be sent back to the client.
1272called.
1273 1477
1274=cut 1478=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1275 1479
1480Same as C<cf::register_extcmd>, but instead of returning values, the
1481callback needs to clal the C<$reply> function.
1482
1483=cut
1484
1276sub register_extcmd { 1485sub register_extcmd($$) {
1277 my ($name, $cb) = @_; 1486 my ($name, $cb) = @_;
1278 1487
1279 $EXTCMD{$name} = $cb; 1488 $EXTCMD{$name} = $cb;
1280} 1489}
1281 1490
1282sub register_exticmd { 1491sub register_async_extcmd($$) {
1283 my ($name, $cb) = @_; 1492 my ($name, $cb) = @_;
1284 1493
1494 $EXTACMD{$name} = $cb;
1495}
1496
1497sub register_exticmd($$) {
1498 my ($name, $cb) = @_;
1499
1285 $EXTICMD{$name} = $cb; 1500 $EXTICMD{$name} = $cb;
1286} 1501}
1287 1502
1503sub register_async_exticmd($$) {
1504 my ($name, $cb) = @_;
1505
1506 $EXTIACMD{$name} = $cb;
1507}
1508
1288use File::Glob (); 1509use File::Glob ();
1289 1510
1290cf::player->attach ( 1511cf::player->attach (
1291 on_command => sub { 1512 on_unknown_command => sub {
1292 my ($pl, $name, $params) = @_; 1513 my ($pl, $name, $params) = @_;
1293 1514
1294 my $cb = $COMMAND{$name} 1515 my $cb = $COMMAND{$name}
1295 or return; 1516 or return;
1296 1517
1304 my ($pl, $buf) = @_; 1525 my ($pl, $buf) = @_;
1305 1526
1306 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1527 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1307 1528
1308 if (ref $msg) { 1529 if (ref $msg) {
1309 my ($type, $reply, @payload) = 1530 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1310 "ARRAY" eq ref $msg
1311 ? @$msg
1312 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1313 1531
1314 my @reply;
1315
1316 if (my $cb = $EXTCMD{$type}) { 1532 if (my $cb = $EXTACMD{$type}) {
1533 $cb->(
1534 $pl,
1535 sub {
1536 $pl->ext_msg ("reply-$reply", @_)
1537 if $reply;
1538 },
1539 @payload
1540 );
1541 } else {
1542 my @reply;
1543
1544 if (my $cb = $EXTCMD{$type}) {
1317 @reply = $cb->($pl, @payload); 1545 @reply = $cb->($pl, @payload);
1546 }
1547
1548 $pl->ext_msg ("reply-$reply", @reply)
1549 if $reply;
1318 } 1550 }
1319 1551
1320 $pl->ext_reply ($reply, @reply)
1321 if $reply;
1322
1323 } else { 1552 } else {
1324 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1553 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1325 } 1554 }
1326 1555
1327 cf::override; 1556 cf::override;
1328 }, 1557 },
1329); 1558);
1339 }; 1568 };
1340 1569
1341 $grp 1570 $grp
1342} 1571}
1343 1572
1573sub _ext_cfg_reg($$$$) {
1574 my ($rvar, $varname, $cfgname, $default) = @_;
1575
1576 $cfgname = lc $varname
1577 unless length $cfgname;
1578
1579 $EXT_CFG{$cfgname} = [$rvar, $default];
1580
1581 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1582}
1583
1344sub load_extensions { 1584sub load_extensions {
1585 info "loading extensions...";
1586
1587 %EXT_CFG = ();
1588
1345 cf::sync_job { 1589 cf::sync_job {
1346 my %todo; 1590 my %todo;
1347 1591
1348 for my $path (<$LIBDIR/*.ext>) { 1592 for my $path (<$LIBDIR/*.ext>) {
1349 next unless -r $path; 1593 next unless -r $path;
1367 1611
1368 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1612 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1369 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1613 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1370 1614
1371 $ext{source} = 1615 $ext{source} =
1372 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1616 "package $pkg; use common::sense;\n"
1373 . "#line 1 \"$path\"\n{\n" 1617 . "#line 1 \"$path\"\n{\n"
1374 . $source 1618 . $source
1375 . "\n};\n1"; 1619 . "\n};\n1";
1376 1620
1377 $todo{$base} = \%ext; 1621 $todo{$base} = \%ext;
1378 } 1622 }
1379 1623
1624 my $pass = 0;
1380 my %done; 1625 my %done;
1381 while (%todo) { 1626 while (%todo) {
1382 my $progress; 1627 my $progress;
1383 1628
1629 ++$pass;
1630
1631 ext:
1384 while (my ($k, $v) = each %todo) { 1632 while (my ($k, $v) = each %todo) {
1385 for (split /,\s*/, $v->{meta}{depends}) { 1633 for (split /,\s*/, $v->{meta}{depends}) {
1386 goto skip 1634 next ext
1387 unless exists $done{$_}; 1635 unless exists $done{$_};
1388 } 1636 }
1389 1637
1390 warn "... loading '$k' into '$v->{pkg}'\n"; 1638 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1391 1639
1392 unless (eval $v->{source}) { 1640 my $source = $v->{source};
1641
1642 # support "CONF varname :confname = default" pseudo-statements
1643 $source =~ s{
1644 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1645 }{
1646 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1647 }gmxe;
1648
1649 my $active = eval $source;
1650
1651 if (length $@) {
1393 my $msg = $@ ? "$v->{path}: $@\n" 1652 error "$v->{path}: $@\n";
1394 : "$v->{base}: extension inactive.\n";
1395 1653
1396 if (exists $v->{meta}{mandatory}) {
1397 warn $msg;
1398 cf::cleanup "mandatory extension failed to load, exiting."; 1654 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1399 } 1655 if exists $v->{meta}{mandatory};
1400 1656
1401 warn $msg; 1657 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1658 delete $todo{$k};
1659 } else {
1660 $done{$k} = delete $todo{$k};
1661 push @EXTS, $v->{pkg};
1662 $progress = 1;
1663
1664 info "$v->{base}: extension inactive.\n"
1665 unless $active;
1402 } 1666 }
1403
1404 $done{$k} = delete $todo{$k};
1405 push @EXTS, $v->{pkg};
1406 $progress = 1;
1407 } 1667 }
1408 1668
1409 skip: 1669 unless ($progress) {
1410 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1670 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1411 unless $progress; 1671
1672 while (my ($k, $v) = each %todo) {
1673 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1674 if exists $v->{meta}{mandatory};
1675 }
1676
1677 last;
1678 }
1412 } 1679 }
1413 }; 1680 };
1414} 1681}
1415 1682
1416############################################################################# 1683#############################################################################
1500 $cf::PLAYER{$login} = $pl 1767 $cf::PLAYER{$login} = $pl
1501 } 1768 }
1502 } 1769 }
1503} 1770}
1504 1771
1772cf::player->attach (
1773 on_load => sub {
1774 my ($pl, $path) = @_;
1775
1776 # restore slots saved in save, below
1777 my $slots = delete $pl->{_slots};
1778
1779 $pl->ob->current_weapon ($slots->[0]);
1780 $pl->combat_ob ($slots->[1]);
1781 $pl->ranged_ob ($slots->[2]);
1782 },
1783);
1784
1505sub save($) { 1785sub save($) {
1506 my ($pl) = @_; 1786 my ($pl) = @_;
1507 1787
1508 return if $pl->{deny_save}; 1788 return if $pl->{deny_save};
1509 1789
1514 1794
1515 aio_mkdir playerdir $pl, 0770; 1795 aio_mkdir playerdir $pl, 0770;
1516 $pl->{last_save} = $cf::RUNTIME; 1796 $pl->{last_save} = $cf::RUNTIME;
1517 1797
1518 cf::get_slot 0.01; 1798 cf::get_slot 0.01;
1799
1800 # save slots, to be restored later
1801 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1519 1802
1520 $pl->save_pl ($path); 1803 $pl->save_pl ($path);
1521 cf::cede_to_tick; 1804 cf::cede_to_tick;
1522} 1805}
1523 1806
1557 my $name = $pl->ob->name; 1840 my $name = $pl->ob->name;
1558 1841
1559 $pl->{deny_save} = 1; 1842 $pl->{deny_save} = 1;
1560 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1843 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1561 1844
1562 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1845 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1563 $pl->deactivate; 1846 $pl->deactivate;
1847
1564 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1848 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1565 $pl->ob->check_score;
1566 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1849 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1850 ext::highscore::check ($pl->ob);
1851
1567 $pl->ns->destroy if $pl->ns; 1852 $pl->ns->destroy if $pl->ns;
1568 1853
1569 my $path = playerdir $pl; 1854 my $path = playerdir $pl;
1570 my $temp = "$path~$cf::RUNTIME~deleting~"; 1855 my $temp = "$path~$cf::RUNTIME~deleting~";
1571 aio_rename $path, $temp; 1856 aio_rename $path, $temp;
1625 \@logins 1910 \@logins
1626} 1911}
1627 1912
1628=item $player->maps 1913=item $player->maps
1629 1914
1915=item cf::player::maps $login
1916
1630Returns an arrayref of map paths that are private for this 1917Returns an arrayref of map paths that are private for this
1631player. May block. 1918player. May block.
1632 1919
1633=cut 1920=cut
1634 1921
1655 1942
1656=item $protocol_xml = $player->expand_cfpod ($cfpod) 1943=item $protocol_xml = $player->expand_cfpod ($cfpod)
1657 1944
1658Expand deliantra pod fragments into protocol xml. 1945Expand deliantra pod fragments into protocol xml.
1659 1946
1660=item $player->ext_reply ($msgid, @msg)
1661
1662Sends an ext reply to the player.
1663
1664=cut
1665
1666sub ext_reply($$@) {
1667 my ($self, $id, @msg) = @_;
1668
1669 $self->ns->ext_reply ($id, @msg)
1670}
1671
1672=item $player->ext_msg ($type, @msg) 1947=item $player->ext_msg ($type, @msg)
1673 1948
1674Sends an ext event to the client. 1949Sends an ext event to the client.
1675 1950
1676=cut 1951=cut
1695 1970
1696=cut 1971=cut
1697 1972
1698sub find_by_path($) { 1973sub find_by_path($) {
1699 my ($path) = @_; 1974 my ($path) = @_;
1975
1976 $path =~ s/^~[^\/]*//; # skip ~login
1700 1977
1701 my ($match, $specificity); 1978 my ($match, $specificity);
1702 1979
1703 for my $region (list) { 1980 for my $region (list) {
1704 if ($region->{match} && $path =~ $region->{match}) { 1981 if ($region->{match} && $path =~ $region->{match}) {
1733sub generate_random_map { 2010sub generate_random_map {
1734 my ($self, $rmp) = @_; 2011 my ($self, $rmp) = @_;
1735 2012
1736 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 2013 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1737 2014
1738 # mit "rum" bekleckern, nicht
1739 $self->_create_random_map ( 2015 $self->_create_random_map ($rmp);
1740 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1741 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1742 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1743 $rmp->{exit_on_final_map},
1744 $rmp->{xsize}, $rmp->{ysize},
1745 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1746 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1747 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1748 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1749 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1750 (cf::region::find $rmp->{region}), $rmp->{custom}
1751 )
1752} 2016}
1753 2017
1754=item cf::map->register ($regex, $prio) 2018=item cf::map->register ($regex, $prio)
1755 2019
1756Register a handler for the map path matching the given regex at the 2020Register a handler for the map path matching the given regex at the
1761 2025
1762sub register { 2026sub register {
1763 my (undef, $regex, $prio) = @_; 2027 my (undef, $regex, $prio) = @_;
1764 my $pkg = caller; 2028 my $pkg = caller;
1765 2029
1766 no strict;
1767 push @{"$pkg\::ISA"}, __PACKAGE__; 2030 push @{"$pkg\::ISA"}, __PACKAGE__;
1768 2031
1769 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2032 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1770} 2033}
1771 2034
1772# also paths starting with '/' 2035# also paths starting with '/'
1773$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2036$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1774 2037
1775sub thawer_merge { 2038sub thawer_merge {
1776 my ($self, $merge) = @_; 2039 my ($self, $merge) = @_;
1777 2040
1778 # we have to keep some variables in memory intact 2041 # we have to keep some variables in memory intact
1783} 2046}
1784 2047
1785sub normalise { 2048sub normalise {
1786 my ($path, $base) = @_; 2049 my ($path, $base) = @_;
1787 2050
1788 $path = "$path"; # make sure its a string 2051 $path = "$path"; # make sure it's a string
1789 2052
1790 $path =~ s/\.map$//; 2053 $path =~ s/\.map$//;
1791 2054
1792 # map plan: 2055 # map plan:
1793 # 2056 #
1808 $base =~ s{[^/]+/?$}{}; 2071 $base =~ s{[^/]+/?$}{};
1809 $path = "$base/$path"; 2072 $path = "$base/$path";
1810 } 2073 }
1811 2074
1812 for ($path) { 2075 for ($path) {
1813 redo if s{//}{/};
1814 redo if s{/\.?/}{/}; 2076 redo if s{/\.?/}{/};
1815 redo if s{/[^/]+/\.\./}{/}; 2077 redo if s{/[^/]+/\.\./}{/};
1816 } 2078 }
1817 2079
1818 $path 2080 $path
1832 $self->init; # pass $1 etc. 2094 $self->init; # pass $1 etc.
1833 return $self; 2095 return $self;
1834 } 2096 }
1835 } 2097 }
1836 2098
1837 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2099 Carp::cluck "unable to resolve path '$path' (base '$base')";
1838 () 2100 ()
1839} 2101}
1840 2102
2103# may re-bless or do other evil things
1841sub init { 2104sub init {
1842 my ($self) = @_; 2105 my ($self) = @_;
1843 2106
1844 $self 2107 $self
1845} 2108}
1910 $self->{load_path} = $path; 2173 $self->{load_path} = $path;
1911 2174
1912 1 2175 1
1913} 2176}
1914 2177
2178# used to laod the header of an original map
1915sub load_header_orig { 2179sub load_header_orig {
1916 my ($self) = @_; 2180 my ($self) = @_;
1917 2181
1918 $self->load_header_from ($self->load_path) 2182 $self->load_header_from ($self->load_path)
1919} 2183}
1920 2184
2185# used to laod the header of an instantiated map
1921sub load_header_temp { 2186sub load_header_temp {
1922 my ($self) = @_; 2187 my ($self) = @_;
1923 2188
1924 $self->load_header_from ($self->save_path) 2189 $self->load_header_from ($self->save_path)
1925} 2190}
1926 2191
2192# called after loading the header from an instantiated map
1927sub prepare_temp { 2193sub prepare_temp {
1928 my ($self) = @_; 2194 my ($self) = @_;
1929 2195
1930 $self->last_access ((delete $self->{last_access}) 2196 $self->last_access ((delete $self->{last_access})
1931 || $cf::RUNTIME); #d# 2197 || $cf::RUNTIME); #d#
1932 # safety 2198 # safety
1933 $self->{instantiate_time} = $cf::RUNTIME 2199 $self->{instantiate_time} = $cf::RUNTIME
1934 if $self->{instantiate_time} > $cf::RUNTIME; 2200 if $self->{instantiate_time} > $cf::RUNTIME;
1935} 2201}
1936 2202
2203# called after loading the header from an original map
1937sub prepare_orig { 2204sub prepare_orig {
1938 my ($self) = @_; 2205 my ($self) = @_;
1939 2206
1940 $self->{load_original} = 1; 2207 $self->{load_original} = 1;
1941 $self->{instantiate_time} = $cf::RUNTIME; 2208 $self->{instantiate_time} = $cf::RUNTIME;
1965 2232
1966sub find; 2233sub find;
1967sub find { 2234sub find {
1968 my ($path, $origin) = @_; 2235 my ($path, $origin) = @_;
1969 2236
2237 cf::cede_to_tick;
2238
1970 $path = normalise $path, $origin && $origin->path; 2239 $path = normalise $path, $origin;
1971 2240
1972 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2241 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 my $guard2 = cf::lock_acquire "map_find:$path"; 2242 my $guard2 = cf::lock_acquire "map_find:$path";
1974 2243
1975 $cf::MAP{$path} || do { 2244 $cf::MAP{$path} || do {
1992 2261
1993 $cf::MAP{$path} = $map 2262 $cf::MAP{$path} = $map
1994 } 2263 }
1995} 2264}
1996 2265
1997sub pre_load { } 2266sub pre_load { }
1998sub post_load { } 2267#sub post_load { } # XS
1999 2268
2000sub load { 2269sub load {
2001 my ($self) = @_; 2270 my ($self) = @_;
2002 2271
2003 local $self->{deny_reset} = 1; # loading can take a long time 2272 local $self->{deny_reset} = 1; # loading can take a long time
2006 2275
2007 { 2276 {
2008 my $guard = cf::lock_acquire "map_data:$path"; 2277 my $guard = cf::lock_acquire "map_data:$path";
2009 2278
2010 return unless $self->valid; 2279 return unless $self->valid;
2011 return unless $self->in_memory == cf::MAP_SWAPPED; 2280 return unless $self->state == cf::MAP_SWAPPED;
2012
2013 $self->in_memory (cf::MAP_LOADING);
2014 2281
2015 $self->alloc; 2282 $self->alloc;
2016 2283
2017 $self->pre_load; 2284 $self->pre_load;
2018 cf::cede_to_tick; 2285 cf::cede_to_tick;
2019 2286
2287 if (exists $self->{load_path}) {
2020 my $f = new_from_file cf::object::thawer $self->{load_path}; 2288 my $f = new_from_file cf::object::thawer $self->{load_path};
2021 $f->skip_block; 2289 $f->skip_block;
2022 $self->_load_objects ($f) 2290 $self->_load_objects ($f)
2023 or return; 2291 or return;
2024 2292
2025 $self->post_load_original 2293 $self->post_load_original
2026 if delete $self->{load_original}; 2294 if delete $self->{load_original};
2027 2295
2028 if (my $uniq = $self->uniq_path) { 2296 if (my $uniq = $self->uniq_path) {
2029 utf8::encode $uniq; 2297 utf8::encode $uniq;
2030 unless (aio_stat $uniq) { 2298 unless (aio_stat $uniq) {
2031 if (my $f = new_from_file cf::object::thawer $uniq) { 2299 if (my $f = new_from_file cf::object::thawer $uniq) {
2032 $self->clear_unique_items; 2300 $self->clear_unique_items;
2033 $self->_load_objects ($f); 2301 $self->_load_objects ($f);
2034 $f->resolve_delayed_derefs; 2302 $f->resolve_delayed_derefs;
2303 }
2035 } 2304 }
2036 } 2305 }
2037 }
2038 2306
2039 $f->resolve_delayed_derefs; 2307 $f->resolve_delayed_derefs;
2308 } else {
2309 $self->post_load_original
2310 if delete $self->{load_original};
2311 }
2312
2313 $self->state (cf::MAP_INACTIVE);
2040 2314
2041 cf::cede_to_tick; 2315 cf::cede_to_tick;
2042 # now do the right thing for maps 2316 # now do the right thing for maps
2043 $self->link_multipart_objects; 2317 $self->link_multipart_objects;
2044 $self->difficulty ($self->estimate_difficulty) 2318 $self->difficulty ($self->estimate_difficulty)
2048 unless ($self->{deny_activate}) { 2322 unless ($self->{deny_activate}) {
2049 $self->decay_objects; 2323 $self->decay_objects;
2050 $self->fix_auto_apply; 2324 $self->fix_auto_apply;
2051 $self->update_buttons; 2325 $self->update_buttons;
2052 cf::cede_to_tick; 2326 cf::cede_to_tick;
2053 $self->activate; 2327 #$self->activate; # no longer activate maps automatically
2054 } 2328 }
2055 2329
2056 $self->{last_save} = $cf::RUNTIME; 2330 $self->{last_save} = $cf::RUNTIME;
2057 $self->last_access ($cf::RUNTIME); 2331 $self->last_access ($cf::RUNTIME);
2058
2059 $self->in_memory (cf::MAP_ACTIVE);
2060 } 2332 }
2061 2333
2062 $self->post_load; 2334 $self->post_load;
2063}
2064 2335
2336 1
2337}
2338
2339# customize the map for a given player, i.e.
2340# return the _real_ map. used by e.g. per-player
2341# maps to change the path to ~playername/mappath
2065sub customise_for { 2342sub customise_for {
2066 my ($self, $ob) = @_; 2343 my ($self, $ob) = @_;
2067 2344
2068 return find "~" . $ob->name . "/" . $self->{path} 2345 return find "~" . $ob->name . "/" . $self->{path}
2069 if $self->per_player; 2346 if $self->per_player;
2072# if $self->per_party; 2349# if $self->per_party;
2073 2350
2074 $self 2351 $self
2075} 2352}
2076 2353
2077# find and load all maps in the 3x3 area around a map
2078sub load_neighbours {
2079 my ($map) = @_;
2080
2081 my @neigh; # diagonal neighbours
2082
2083 for (0 .. 3) {
2084 my $neigh = $map->tile_path ($_)
2085 or next;
2086 $neigh = find $neigh, $map
2087 or next;
2088 $neigh->load;
2089
2090 push @neigh,
2091 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2092 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2093 }
2094
2095 for (grep defined $_->[0], @neigh) {
2096 my ($path, $origin) = @$_;
2097 my $neigh = find $path, $origin
2098 or next;
2099 $neigh->load;
2100 }
2101}
2102
2103sub find_sync { 2354sub find_sync {
2104 my ($path, $origin) = @_; 2355 my ($path, $origin) = @_;
2105 2356
2106 cf::sync_job { find $path, $origin } 2357 # it's a bug to call this from the main context
2358 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2359 if $Coro::current == $Coro::main;
2360
2361 find $path, $origin
2107} 2362}
2108 2363
2109sub do_load_sync { 2364sub do_load_sync {
2110 my ($map) = @_; 2365 my ($map) = @_;
2111 2366
2367 # it's a bug to call this from the main context
2112 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2368 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2113 if $Coro::current == $Coro::main; 2369 if $Coro::current == $Coro::main;
2114 2370
2115 cf::sync_job { $map->load }; 2371 $map->load;
2116} 2372}
2117 2373
2118our %MAP_PREFETCH; 2374our %MAP_PREFETCH;
2119our $MAP_PREFETCHER = undef; 2375our $MAP_PREFETCHER = undef;
2120 2376
2121sub find_async { 2377sub find_async {
2122 my ($path, $origin, $load) = @_; 2378 my ($path, $origin, $load) = @_;
2123 2379
2124 $path = normalise $path, $origin && $origin->{path}; 2380 $path = normalise $path, $origin;
2125 2381
2126 if (my $map = $cf::MAP{$path}) { 2382 if (my $map = $cf::MAP{$path}) {
2127 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2383 return $map if !$load || $map->linkable;
2128 } 2384 }
2129 2385
2130 $MAP_PREFETCH{$path} |= $load; 2386 $MAP_PREFETCH{$path} |= $load;
2131 2387
2132 $MAP_PREFETCHER ||= cf::async { 2388 $MAP_PREFETCHER ||= cf::async {
2146 $MAP_PREFETCHER->prio (6); 2402 $MAP_PREFETCHER->prio (6);
2147 2403
2148 () 2404 ()
2149} 2405}
2150 2406
2407# common code, used by both ->save and ->swapout
2151sub save { 2408sub _save {
2152 my ($self) = @_; 2409 my ($self) = @_;
2153
2154 my $lock = cf::lock_acquire "map_data:$self->{path}";
2155 2410
2156 $self->{last_save} = $cf::RUNTIME; 2411 $self->{last_save} = $cf::RUNTIME;
2157 2412
2158 return unless $self->dirty; 2413 return unless $self->dirty;
2159 2414
2179 } else { 2434 } else {
2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2435 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2181 } 2436 }
2182} 2437}
2183 2438
2439sub save {
2440 my ($self) = @_;
2441
2442 my $lock = cf::lock_acquire "map_data:$self->{path}";
2443
2444 $self->_save;
2445}
2446
2184sub swap_out { 2447sub swap_out {
2185 my ($self) = @_; 2448 my ($self) = @_;
2186 2449
2187 # save first because save cedes
2188 $self->save;
2189
2190 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2450 my $lock = cf::lock_acquire "map_data:$self->{path}";
2191 2451
2452 return if !$self->linkable;
2453 return if $self->{deny_save};
2192 return if $self->players; 2454 return if $self->players;
2193 return if $self->in_memory != cf::MAP_ACTIVE; 2455
2456 # first deactivate the map and "unlink" it from the core
2457 $self->deactivate;
2458 $_->clear_links_to ($self) for values %cf::MAP;
2459 $self->state (cf::MAP_SWAPPED);
2460
2461 # then atomically save
2462 $self->_save;
2463
2464 # then free the map
2465 $self->clear;
2466}
2467
2468sub reset_at {
2469 my ($self) = @_;
2470
2471 # TODO: safety, remove and allow resettable per-player maps
2194 return if $self->{deny_save}; 2472 return 1e99 if $self->{deny_reset};
2195 2473
2474 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2475 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2476
2477 $time + $to
2478}
2479
2480sub should_reset {
2481 my ($self) = @_;
2482
2483 $self->reset_at <= $cf::RUNTIME
2484}
2485
2486sub reset {
2487 my ($self) = @_;
2488
2489 my $lock = cf::lock_acquire "map_data:$self->{path}";
2490
2491 return if $self->players;
2492
2493 cf::trace "resetting map ", $self->path, "\n";
2494
2196 $self->in_memory (cf::MAP_SWAPPED); 2495 $self->state (cf::MAP_SWAPPED);
2496
2497 # need to save uniques path
2498 unless ($self->{deny_save}) {
2499 my $uniq = $self->uniq_path; utf8::encode $uniq;
2500
2501 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2502 if $uniq;
2503 }
2504
2505 delete $cf::MAP{$self->path};
2197 2506
2198 $self->deactivate; 2507 $self->deactivate;
2199 $_->clear_links_to ($self) for values %cf::MAP; 2508 $_->clear_links_to ($self) for values %cf::MAP;
2200 $self->clear; 2509 $self->clear;
2201}
2202
2203sub reset_at {
2204 my ($self) = @_;
2205
2206 # TODO: safety, remove and allow resettable per-player maps
2207 return 1e99 if $self->{deny_reset};
2208
2209 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2210 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2211
2212 $time + $to
2213}
2214
2215sub should_reset {
2216 my ($self) = @_;
2217
2218 $self->reset_at <= $cf::RUNTIME
2219}
2220
2221sub reset {
2222 my ($self) = @_;
2223
2224 my $lock = cf::lock_acquire "map_data:$self->{path}";
2225
2226 return if $self->players;
2227
2228 warn "resetting map ", $self->path;
2229
2230 $self->in_memory (cf::MAP_SWAPPED);
2231
2232 # need to save uniques path
2233 unless ($self->{deny_save}) {
2234 my $uniq = $self->uniq_path; utf8::encode $uniq;
2235
2236 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2237 if $uniq;
2238 }
2239
2240 delete $cf::MAP{$self->path};
2241
2242 $self->deactivate;
2243 $_->clear_links_to ($self) for values %cf::MAP;
2244 $self->clear;
2245 2510
2246 $self->unlink_save; 2511 $self->unlink_save;
2247 $self->destroy; 2512 $self->destroy;
2248} 2513}
2249 2514
2257 2522
2258 delete $cf::MAP{$self->path}; 2523 delete $cf::MAP{$self->path};
2259 2524
2260 $self->unlink_save; 2525 $self->unlink_save;
2261 2526
2262 bless $self, "cf::map"; 2527 bless $self, "cf::map::wrap";
2263 delete $self->{deny_reset}; 2528 delete $self->{deny_reset};
2264 $self->{deny_save} = 1; 2529 $self->{deny_save} = 1;
2265 $self->reset_timeout (1); 2530 $self->reset_timeout (1);
2266 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2531 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2267 2532
2324 : normalise $_ 2589 : normalise $_
2325 } @{ aio_readdir $UNIQUEDIR or [] } 2590 } @{ aio_readdir $UNIQUEDIR or [] }
2326 ] 2591 ]
2327} 2592}
2328 2593
2594=item cf::map::static_maps
2595
2596Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2597file in the shared directory excluding F</styles> and F</editor>). May
2598block.
2599
2600=cut
2601
2602sub static_maps() {
2603 my @dirs = "";
2604 my @maps;
2605
2606 while (@dirs) {
2607 my $dir = shift @dirs;
2608
2609 next if $dir eq "/styles" || $dir eq "/editor";
2610
2611 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2612 or return;
2613
2614 for (@$files) {
2615 s/\.map$// or next;
2616 utf8::decode $_;
2617 push @maps, "$dir/$_";
2618 }
2619
2620 push @dirs, map "$dir/$_", @$dirs;
2621 }
2622
2623 \@maps
2624}
2625
2329=back 2626=back
2330 2627
2331=head3 cf::object 2628=head3 cf::object
2332 2629
2333=cut 2630=cut
2465 2762
2466Freezes the player and moves him/her to a special map (C<{link}>). 2763Freezes the player and moves him/her to a special map (C<{link}>).
2467 2764
2468The player should be reasonably safe there for short amounts of time (e.g. 2765The player should be reasonably safe there for short amounts of time (e.g.
2469for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2766for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2470though, as the palyer cannot control the character while it is on the link 2767though, as the player cannot control the character while it is on the link
2471map. 2768map.
2472 2769
2473Will never block. 2770Will never block.
2474 2771
2475=item $player_object->leave_link ($map, $x, $y) 2772=item $player_object->leave_link ($map, $x, $y)
2496sub cf::object::player::enter_link { 2793sub cf::object::player::enter_link {
2497 my ($self) = @_; 2794 my ($self) = @_;
2498 2795
2499 $self->deactivate_recursive; 2796 $self->deactivate_recursive;
2500 2797
2798 ++$self->{_link_recursion};
2799
2501 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2800 return if UNIVERSAL::isa $self->map, "ext::map_link";
2502 2801
2503 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2802 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2504 if $self->map && $self->map->{path} ne "{link}"; 2803 if $self->map && $self->map->{path} ne "{link}";
2505 2804
2506 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2805 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2507} 2806}
2508 2807
2509sub cf::object::player::leave_link { 2808sub cf::object::player::leave_link {
2510 my ($self, $map, $x, $y) = @_; 2809 my ($self, $map, $x, $y) = @_;
2511 2810
2528 ($x, $y) = (-1, -1) 2827 ($x, $y) = (-1, -1)
2529 unless (defined $x) && (defined $y); 2828 unless (defined $x) && (defined $y);
2530 2829
2531 # use -1 or undef as default coordinates, not 0, 0 2830 # use -1 or undef as default coordinates, not 0, 0
2532 ($x, $y) = ($map->enter_x, $map->enter_y) 2831 ($x, $y) = ($map->enter_x, $map->enter_y)
2533 if $x <=0 && $y <= 0; 2832 if $x <= 0 && $y <= 0;
2534 2833
2535 $map->load; 2834 $map->load;
2536 $map->load_neighbours;
2537 2835
2538 return unless $self->contr->active; 2836 return unless $self->contr->active;
2539 2837
2540 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2838 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2541 $self->enter_map ($map, $x, $y); 2839 if ($self->enter_map ($map, $x, $y)) {
2542 2840 # entering was successful
2841 delete $self->{_link_recursion};
2543 # only activate afterwards, to support waiting in hooks 2842 # only activate afterwards, to support waiting in hooks
2544 $self->activate_recursive; 2843 $self->activate_recursive;
2545} 2844 }
2546 2845
2846}
2847
2547=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2848=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2548 2849
2549Moves the player to the given map-path and coordinates by first freezing 2850Moves the player to the given map-path and coordinates by first freezing
2550her, loading and preparing them map, calling the provided $check callback 2851her, loading and preparing them map, calling the provided $check callback
2551that has to return the map if sucecssful, and then unfreezes the player on 2852that has to return the map if sucecssful, and then unfreezes the player on
2552the new (success) or old (failed) map position. In either case, $done will 2853the new (success) or old (failed) map position. In either case, $done will
2559 2860
2560our $GOTOGEN; 2861our $GOTOGEN;
2561 2862
2562sub cf::object::player::goto { 2863sub cf::object::player::goto {
2563 my ($self, $path, $x, $y, $check, $done) = @_; 2864 my ($self, $path, $x, $y, $check, $done) = @_;
2865
2866 if ($self->{_link_recursion} >= $MAX_LINKS) {
2867 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2868 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2869 ($path, $x, $y) = @$EMERGENCY_POSITION;
2870 }
2564 2871
2565 # do generation counting so two concurrent goto's will be executed in-order 2872 # do generation counting so two concurrent goto's will be executed in-order
2566 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2873 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2567 2874
2568 $self->enter_link; 2875 $self->enter_link;
2588 ($path, $x, $y) = (undef, undef, undef); 2895 ($path, $x, $y) = (undef, undef, undef);
2589 } 2896 }
2590 } 2897 }
2591 2898
2592 my $map = eval { 2899 my $map = eval {
2593 my $map = defined $path ? cf::map::find $path : undef; 2900 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2594 2901
2595 if ($map) { 2902 if ($map) {
2596 $map = $map->customise_for ($self); 2903 $map = $map->customise_for ($self);
2597 $map = $check->($map) if $check && $map; 2904 $map = $check->($map, $x, $y, $self) if $check && $map;
2598 } else { 2905 } else {
2599 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2906 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2600 } 2907 }
2601 2908
2602 $map 2909 $map
2610 if ($gen == $self->{_goto_generation}) { 2917 if ($gen == $self->{_goto_generation}) {
2611 delete $self->{_goto_generation}; 2918 delete $self->{_goto_generation};
2612 $self->leave_link ($map, $x, $y); 2919 $self->leave_link ($map, $x, $y);
2613 } 2920 }
2614 2921
2615 $done->() if $done; 2922 $done->($self) if $done;
2616 })->prio (1); 2923 })->prio (1);
2617} 2924}
2618 2925
2619=item $player_object->enter_exit ($exit_object) 2926=item $player_object->enter_exit ($exit_object)
2620 2927
2688 $Coro::current->{desc} = "enter_exit"; 2995 $Coro::current->{desc} = "enter_exit";
2689 2996
2690 unless (eval { 2997 unless (eval {
2691 $self->deactivate_recursive; # just to be sure 2998 $self->deactivate_recursive; # just to be sure
2692 2999
2693 # random map handling
2694 {
2695 my $guard = cf::lock_acquire "exit_prepare:$exit";
2696
2697 prepare_random_map $exit
2698 if $exit->slaying eq "/!";
2699 }
2700
2701 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3000 my $map = cf::map::normalise $exit->slaying, $exit->map;
2702 my $x = $exit->stats->hp; 3001 my $x = $exit->stats->hp;
2703 my $y = $exit->stats->sp; 3002 my $y = $exit->stats->sp;
3003
3004 # special map handling
3005 my $slaying = $exit->slaying;
3006
3007 # special map handling
3008 if ($slaying eq "/!") {
3009 my $guard = cf::lock_acquire "exit_prepare:$exit";
3010
3011 prepare_random_map $exit
3012 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3013
3014 $map = $exit->slaying;
3015
3016 } elsif ($slaying eq '!up') {
3017 $map = $exit->map->tile_path (cf::TILE_UP);
3018 $x = $exit->x;
3019 $y = $exit->y;
3020
3021 } elsif ($slaying eq '!down') {
3022 $map = $exit->map->tile_path (cf::TILE_DOWN);
3023 $x = $exit->x;
3024 $y = $exit->y;
3025 }
2704 3026
2705 $self->goto ($map, $x, $y); 3027 $self->goto ($map, $x, $y);
2706 3028
2707 # if exit is damned, update players death & WoR home-position 3029 # if exit is damned, update players death & WoR home-position
2708 $self->contr->savebed ($map, $x, $y) 3030 $self->contr->savebed ($map, $x, $y)
2713 $self->message ("Something went wrong deep within the deliantra server. " 3035 $self->message ("Something went wrong deep within the deliantra server. "
2714 . "I'll try to bring you back to the map you were before. " 3036 . "I'll try to bring you back to the map you were before. "
2715 . "Please report this to the dungeon master!", 3037 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 3038 cf::NDI_UNIQUE | cf::NDI_RED);
2717 3039
2718 warn "ERROR in enter_exit: $@"; 3040 error "ERROR in enter_exit: $@";
2719 $self->leave_link; 3041 $self->leave_link;
2720 } 3042 }
2721 })->prio (1); 3043 })->prio (1);
2722} 3044}
2723 3045
2735sub cf::client::send_drawinfo { 3057sub cf::client::send_drawinfo {
2736 my ($self, $text, $flags) = @_; 3058 my ($self, $text, $flags) = @_;
2737 3059
2738 utf8::encode $text; 3060 utf8::encode $text;
2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3061 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3062}
3063
3064=item $client->send_big_packet ($pkt)
3065
3066Like C<send_packet>, but tries to compress large packets, and fragments
3067them as required.
3068
3069=cut
3070
3071our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3072
3073sub cf::client::send_big_packet {
3074 my ($self, $pkt) = @_;
3075
3076 # try lzf for large packets
3077 $pkt = "lzf " . Compress::LZF::compress $pkt
3078 if 1024 <= length $pkt and $self->{can_lzf};
3079
3080 # split very large packets
3081 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3082 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3083 $pkt = "frag";
3084 }
3085
3086 $self->send_packet ($pkt);
2740} 3087}
2741 3088
2742=item $client->send_msg ($channel, $msg, $color, [extra...]) 3089=item $client->send_msg ($channel, $msg, $color, [extra...])
2743 3090
2744Send a drawinfo or msg packet to the client, formatting the msg for the 3091Send a drawinfo or msg packet to the client, formatting the msg for the
2748 3095
2749=cut 3096=cut
2750 3097
2751# non-persistent channels (usually the info channel) 3098# non-persistent channels (usually the info channel)
2752our %CHANNEL = ( 3099our %CHANNEL = (
3100 "c/motd" => {
3101 id => "infobox",
3102 title => "MOTD",
3103 reply => undef,
3104 tooltip => "The message of the day",
3105 },
2753 "c/identify" => { 3106 "c/identify" => {
2754 id => "infobox", 3107 id => "infobox",
2755 title => "Identify", 3108 title => "Identify",
2756 reply => undef, 3109 reply => undef,
2757 tooltip => "Items recently identified", 3110 tooltip => "Items recently identified",
2759 "c/examine" => { 3112 "c/examine" => {
2760 id => "infobox", 3113 id => "infobox",
2761 title => "Examine", 3114 title => "Examine",
2762 reply => undef, 3115 reply => undef,
2763 tooltip => "Signs and other items you examined", 3116 tooltip => "Signs and other items you examined",
3117 },
3118 "c/shopinfo" => {
3119 id => "infobox",
3120 title => "Shop Info",
3121 reply => undef,
3122 tooltip => "What your bargaining skill tells you about the shop",
2764 }, 3123 },
2765 "c/book" => { 3124 "c/book" => {
2766 id => "infobox", 3125 id => "infobox",
2767 title => "Book", 3126 title => "Book",
2768 reply => undef, 3127 reply => undef,
2884 my $pkt = "msg " 3243 my $pkt = "msg "
2885 . $self->{json_coder}->encode ( 3244 . $self->{json_coder}->encode (
2886 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3245 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2887 ); 3246 );
2888 3247
2889 # try lzf for large packets
2890 $pkt = "lzf " . Compress::LZF::compress $pkt
2891 if 1024 <= length $pkt and $self->{can_lzf};
2892
2893 # split very large packets
2894 if (8192 < length $pkt and $self->{can_lzf}) {
2895 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2896 $pkt = "frag";
2897 }
2898
2899 $self->send_packet ($pkt); 3248 $self->send_big_packet ($pkt);
2900} 3249}
2901 3250
2902=item $client->ext_msg ($type, @msg) 3251=item $client->ext_msg ($type, @msg)
2903 3252
2904Sends an ext event to the client. 3253Sends an ext event to the client.
2906=cut 3255=cut
2907 3256
2908sub cf::client::ext_msg($$@) { 3257sub cf::client::ext_msg($$@) {
2909 my ($self, $type, @msg) = @_; 3258 my ($self, $type, @msg) = @_;
2910 3259
2911 if ($self->extcmd == 2) {
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3260 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2913 } elsif ($self->extcmd == 1) { # TODO: remove
2914 push @msg, msgtype => "event_$type";
2915 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2916 }
2917}
2918
2919=item $client->ext_reply ($msgid, @msg)
2920
2921Sends an ext reply to the client.
2922
2923=cut
2924
2925sub cf::client::ext_reply($$@) {
2926 my ($self, $id, @msg) = @_;
2927
2928 if ($self->extcmd == 2) {
2929 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2930 } elsif ($self->extcmd == 1) {
2931 #TODO: version 1, remove
2932 unshift @msg, msgtype => "reply", msgid => $id;
2933 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2934 }
2935} 3261}
2936 3262
2937=item $success = $client->query ($flags, "text", \&cb) 3263=item $success = $client->query ($flags, "text", \&cb)
2938 3264
2939Queues a query to the client, calling the given callback with 3265Queues a query to the client, calling the given callback with
2994 my ($ns, $buf) = @_; 3320 my ($ns, $buf) = @_;
2995 3321
2996 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3322 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2997 3323
2998 if (ref $msg) { 3324 if (ref $msg) {
2999 my ($type, $reply, @payload) = 3325 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3000 "ARRAY" eq ref $msg
3001 ? @$msg
3002 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3003 3326
3004 my @reply;
3005
3006 if (my $cb = $EXTICMD{$type}) { 3327 if (my $cb = $EXTIACMD{$type}) {
3328 $cb->(
3329 $ns,
3330 sub {
3331 $ns->ext_msg ("reply-$reply", @_)
3332 if $reply;
3333 },
3334 @payload
3335 );
3336 } else {
3337 my @reply;
3338
3339 if (my $cb = $EXTICMD{$type}) {
3007 @reply = $cb->($ns, @payload); 3340 @reply = $cb->($ns, @payload);
3341 }
3342
3343 $ns->ext_msg ("reply-$reply", @reply)
3344 if $reply;
3008 } 3345 }
3009
3010 $ns->ext_reply ($reply, @reply)
3011 if $reply;
3012
3013 } else { 3346 } else {
3014 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3347 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3015 } 3348 }
3016 3349
3017 cf::override; 3350 cf::override;
3018 }, 3351 },
3019); 3352);
3039 3372
3040 $coro 3373 $coro
3041} 3374}
3042 3375
3043cf::client->attach ( 3376cf::client->attach (
3044 on_destroy => sub { 3377 on_client_destroy => sub {
3045 my ($ns) = @_; 3378 my ($ns) = @_;
3046 3379
3047 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3380 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3048 }, 3381 },
3049); 3382);
3065our $safe_hole = new Safe::Hole; 3398our $safe_hole = new Safe::Hole;
3066 3399
3067$SIG{FPE} = 'IGNORE'; 3400$SIG{FPE} = 'IGNORE';
3068 3401
3069$safe->permit_only (Opcode::opset qw( 3402$safe->permit_only (Opcode::opset qw(
3070 :base_core :base_mem :base_orig :base_math 3403 :base_core :base_mem :base_orig :base_math :base_loop
3071 grepstart grepwhile mapstart mapwhile 3404 grepstart grepwhile mapstart mapwhile
3072 sort time 3405 sort time
3073)); 3406));
3074 3407
3075# here we export the classes and methods available to script code 3408# here we export the classes and methods available to script code
3100 decrease split destroy change_exp value msg lore send_msg)], 3433 decrease split destroy change_exp value msg lore send_msg)],
3101 ["cf::object::player" => qw(player)], 3434 ["cf::object::player" => qw(player)],
3102 ["cf::player" => qw(peaceful send_msg)], 3435 ["cf::player" => qw(peaceful send_msg)],
3103 ["cf::map" => qw(trigger)], 3436 ["cf::map" => qw(trigger)],
3104) { 3437) {
3105 no strict 'refs';
3106 my ($pkg, @funs) = @$_; 3438 my ($pkg, @funs) = @$_;
3107 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3439 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3108 for @funs; 3440 for @funs;
3109} 3441}
3110 3442
3127 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3459 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3128 $qcode =~ s/\n/\\n/g; 3460 $qcode =~ s/\n/\\n/g;
3129 3461
3130 %vars = (_dummy => 0) unless %vars; 3462 %vars = (_dummy => 0) unless %vars;
3131 3463
3464 my @res;
3132 local $_; 3465 local $_;
3133 local @safe::cf::_safe_eval_args = values %vars;
3134 3466
3135 my $eval = 3467 my $eval =
3136 "do {\n" 3468 "do {\n"
3137 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3469 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3138 . "#line 0 \"{$qcode}\"\n" 3470 . "#line 0 \"{$qcode}\"\n"
3139 . $code 3471 . $code
3140 . "\n}" 3472 . "\n}"
3141 ; 3473 ;
3142 3474
3475 if ($CFG{safe_eval}) {
3143 sub_generation_inc; 3476 sub_generation_inc;
3477 local @safe::cf::_safe_eval_args = values %vars;
3144 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3478 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3145 sub_generation_inc; 3479 sub_generation_inc;
3480 } else {
3481 local @cf::_safe_eval_args = values %vars;
3482 @res = wantarray ? eval eval : scalar eval $eval;
3483 }
3146 3484
3147 if ($@) { 3485 if ($@) {
3148 warn "$@"; 3486 warn "$@",
3149 warn "while executing safe code '$code'\n"; 3487 "while executing safe code '$code'\n",
3150 warn "with arguments " . (join " ", %vars) . "\n"; 3488 "with arguments " . (join " ", %vars) . "\n";
3151 } 3489 }
3152 3490
3153 wantarray ? @res : $res[0] 3491 wantarray ? @res : $res[0]
3154} 3492}
3155 3493
3169=cut 3507=cut
3170 3508
3171sub register_script_function { 3509sub register_script_function {
3172 my ($fun, $cb) = @_; 3510 my ($fun, $cb) = @_;
3173 3511
3174 no strict 'refs'; 3512 $fun = "safe::$fun" if $CFG{safe_eval};
3175 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3513 *$fun = $safe_hole->wrap ($cb);
3176} 3514}
3177 3515
3178=back 3516=back
3179 3517
3180=cut 3518=cut
3181 3519
3182############################################################################# 3520#############################################################################
3183# the server's init and main functions 3521# the server's init and main functions
3522
3523our %FACEHASH; # hash => idx, #d# HACK for http server
3524
3525# internal api, not fianlised
3526sub set_face {
3527 my ($name, $type, $data) = @_;
3528
3529 my $idx = cf::face::find $name;
3530
3531 if ($idx) {
3532 delete $FACEHASH{cf::face::get_chksum $idx};
3533 } else {
3534 $idx = cf::face::alloc $name;
3535 }
3536
3537 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3538
3539 cf::face::set_type $idx, $type;
3540 cf::face::set_data $idx, 0, $data, $hash;
3541 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3542 $FACEHASH{$hash} = $idx;#d#
3543
3544 $idx
3545}
3184 3546
3185sub load_facedata($) { 3547sub load_facedata($) {
3186 my ($path) = @_; 3548 my ($path) = @_;
3187 3549
3188 # HACK to clear player env face cache, we need some signal framework 3550 # HACK to clear player env face cache, we need some signal framework
3189 # for this (global event?) 3551 # for this (global event?)
3190 %ext::player_env::MUSIC_FACE_CACHE = (); 3552 %ext::player_env::MUSIC_FACE_CACHE = ();
3191 3553
3192 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3554 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3193 3555
3194 warn "loading facedata from $path\n"; 3556 trace "loading facedata from $path\n";
3195 3557
3196 my $facedata; 3558 my $facedata = decode_storable load_file $path;
3197 0 < aio_load $path, $facedata
3198 or die "$path: $!";
3199
3200 $facedata = Coro::Storable::thaw $facedata;
3201 3559
3202 $facedata->{version} == 2 3560 $facedata->{version} == 2
3203 or cf::cleanup "$path: version mismatch, cannot proceed."; 3561 or cf::cleanup "$path: version mismatch, cannot proceed.";
3204 3562
3205 # patch in the exptable
3206 $facedata->{resource}{"res/exp_table"} = {
3207 type => FT_RSRC,
3208 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3209 };
3210 cf::cede_to_tick; 3563 cf::cede_to_tick;
3211 3564
3212 { 3565 {
3213 my $faces = $facedata->{faceinfo}; 3566 my $faces = delete $facedata->{faceinfo};
3214 3567
3215 while (my ($face, $info) = each %$faces) { 3568 for my $face (sort keys %$faces) {
3569 my $info = $faces->{$face};
3216 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3570 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3217 3571
3218 cf::face::set_visibility $idx, $info->{visibility}; 3572 cf::face::set_visibility $idx, $info->{visibility};
3219 cf::face::set_magicmap $idx, $info->{magicmap}; 3573 cf::face::set_magicmap $idx, $info->{magicmap};
3220 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3574 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3221 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3575 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3222 3576 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3577 $FACEHASH{$info->{hash64}} = $idx;#d#
3578
3223 cf::cede_to_tick; 3579 cf::cede_to_tick;
3224 } 3580 }
3225 3581
3226 while (my ($face, $info) = each %$faces) { 3582 while (my ($face, $info) = each %$faces) {
3227 next unless $info->{smooth}; 3583 next unless $info->{smooth};
3231 3587
3232 if (my $smooth = cf::face::find $info->{smooth}) { 3588 if (my $smooth = cf::face::find $info->{smooth}) {
3233 cf::face::set_smooth $idx, $smooth; 3589 cf::face::set_smooth $idx, $smooth;
3234 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3590 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3235 } else { 3591 } else {
3236 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3592 error "smooth face '$info->{smooth}' not found for face '$face'";
3237 } 3593 }
3238 3594
3239 cf::cede_to_tick; 3595 cf::cede_to_tick;
3240 } 3596 }
3241 } 3597 }
3242 3598
3243 { 3599 {
3244 my $anims = $facedata->{animinfo}; 3600 my $anims = delete $facedata->{animinfo};
3245 3601
3246 while (my ($anim, $info) = each %$anims) { 3602 while (my ($anim, $info) = each %$anims) {
3247 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3603 cf::anim::set $anim, $info->{frames}, $info->{facings};
3248 cf::cede_to_tick; 3604 cf::cede_to_tick;
3249 } 3605 }
3250 3606
3251 cf::anim::invalidate_all; # d'oh 3607 cf::anim::invalidate_all; # d'oh
3252 } 3608 }
3253 3609
3254 { 3610 {
3255 # TODO: for gcfclient pleasure, we should give resources
3256 # that gcfclient doesn't grok a >10000 face index.
3257 my $res = $facedata->{resource}; 3611 my $res = delete $facedata->{resource};
3258 3612
3259 while (my ($name, $info) = each %$res) { 3613 while (my ($name, $info) = each %$res) {
3260 if (defined $info->{type}) { 3614 if (defined (my $type = $info->{type})) {
3615 # TODO: different hash - must free and use new index, or cache ixface data queue
3261 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3616 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3262 my $data;
3263 3617
3264 if ($info->{type} & 1) {
3265 # prepend meta info
3266
3267 my $meta = $enc->encode ({
3268 name => $name,
3269 %{ $info->{meta} || {} },
3270 });
3271
3272 $data = pack "(w/a*)*", $meta, $info->{data};
3273 } else {
3274 $data = $info->{data};
3275 }
3276
3277 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3278 cf::face::set_type $idx, $info->{type}; 3618 cf::face::set_type $idx, $type;
3619 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3620 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3621 $FACEHASH{$info->{hash}} = $idx;#d#
3279 } else { 3622 } else {
3280 $RESOURCE{$name} = $info; 3623# $RESOURCE{$name} = $info; # unused
3281 } 3624 }
3282 3625
3283 cf::cede_to_tick; 3626 cf::cede_to_tick;
3284 } 3627 }
3285 } 3628 }
3286 3629
3287 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3630 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3288 3631
3289 1 3632 1
3290} 3633}
3291
3292cf::global->attach (on_resource_update => sub {
3293 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3294 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3295
3296 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3297 my $sound = $soundconf->{compat}[$_]
3298 or next;
3299
3300 my $face = cf::face::find "sound/$sound->[1]";
3301 cf::sound::set $sound->[0] => $face;
3302 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3303 }
3304
3305 while (my ($k, $v) = each %{$soundconf->{event}}) {
3306 my $face = cf::face::find "sound/$v";
3307 cf::sound::set $k => $face;
3308 }
3309 }
3310});
3311 3634
3312register_exticmd fx_want => sub { 3635register_exticmd fx_want => sub {
3313 my ($ns, $want) = @_; 3636 my ($ns, $want) = @_;
3314 3637
3315 while (my ($k, $v) = each %$want) { 3638 while (my ($k, $v) = each %$want) {
3323 my $status = load_resource_file_ $_[0]; 3646 my $status = load_resource_file_ $_[0];
3324 get_slot 0.1, 100; 3647 get_slot 0.1, 100;
3325 cf::arch::commit_load; 3648 cf::arch::commit_load;
3326 3649
3327 $status 3650 $status
3651}
3652
3653sub reload_exp_table {
3654 _reload_exp_table;
3655
3656 set_face "res/exp_table" => FT_RSRC,
3657 JSON::XS->new->utf8->canonical->encode (
3658 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3659 );
3660}
3661
3662sub reload_materials {
3663 _reload_materials;
3328} 3664}
3329 3665
3330sub reload_regions { 3666sub reload_regions {
3331 # HACK to clear player env face cache, we need some signal framework 3667 # HACK to clear player env face cache, we need some signal framework
3332 # for this (global event?) 3668 # for this (global event?)
3347} 3683}
3348 3684
3349sub reload_archetypes { 3685sub reload_archetypes {
3350 load_resource_file "$DATADIR/archetypes" 3686 load_resource_file "$DATADIR/archetypes"
3351 or die "unable to load archetypes\n"; 3687 or die "unable to load archetypes\n";
3688
3689 set_face "res/skill_info" => FT_RSRC,
3690 JSON::XS->new->utf8->canonical->encode (
3691 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3692 );
3693 set_face "res/spell_paths" => FT_RSRC,
3694 JSON::XS->new->utf8->canonical->encode (
3695 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3696 );
3352} 3697}
3353 3698
3354sub reload_treasures { 3699sub reload_treasures {
3355 load_resource_file "$DATADIR/treasures" 3700 load_resource_file "$DATADIR/treasures"
3356 or die "unable to load treasurelists\n"; 3701 or die "unable to load treasurelists\n";
3357} 3702}
3358 3703
3704sub reload_sound {
3705 trace "loading sound config from $DATADIR/sound\n";
3706
3707 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3708
3709 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3710 my $sound = $soundconf->{compat}[$_]
3711 or next;
3712
3713 my $face = cf::face::find "sound/$sound->[1]";
3714 cf::sound::set $sound->[0] => $face;
3715 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3716 }
3717
3718 while (my ($k, $v) = each %{$soundconf->{event}}) {
3719 my $face = cf::face::find "sound/$v";
3720 cf::sound::set $k => $face;
3721 }
3722}
3723
3359sub reload_resources { 3724sub reload_resources {
3360 warn "reloading resource files...\n"; 3725 trace "reloading resource files...\n";
3361 3726
3727 reload_materials;
3362 reload_facedata; 3728 reload_facedata;
3729 reload_exp_table;
3730 reload_sound;
3363 reload_archetypes; 3731 reload_archetypes;
3364 reload_regions; 3732 reload_regions;
3365 reload_treasures; 3733 reload_treasures;
3366 3734
3367 warn "finished reloading resource files\n"; 3735 trace "finished reloading resource files\n";
3368} 3736}
3369 3737
3370sub reload_config { 3738sub reload_config {
3371 open my $fh, "<:utf8", "$CONFDIR/config" 3739 trace "reloading config file...\n";
3372 or return;
3373 3740
3374 local $/; 3741 my $config = load_file "$CONFDIR/config";
3375 *CFG = YAML::Load <$fh>; 3742 utf8::decode $config;
3743 *CFG = decode_yaml $config;
3376 3744
3377 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3745 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3378 3746
3379 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3747 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3380 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3748 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3381 3749
3382 if (exists $CFG{mlockall}) { 3750 if (exists $CFG{mlockall}) {
3406 seek $fh, 0, 0; 3774 seek $fh, 0, 0;
3407 print $fh $$; 3775 print $fh $$;
3408} 3776}
3409 3777
3410sub main_loop { 3778sub main_loop {
3411 warn "EV::loop starting\n"; 3779 trace "EV::loop starting\n";
3412 if (1) { 3780 if (1) {
3413 EV::loop; 3781 EV::loop;
3414 } 3782 }
3415 warn "EV::loop returned\n"; 3783 trace "EV::loop returned\n";
3416 goto &main_loop unless $REALLY_UNLOOP; 3784 goto &main_loop unless $REALLY_UNLOOP;
3417} 3785}
3418 3786
3419sub main { 3787sub main {
3420 cf::init_globals; # initialise logging 3788 cf::init_globals; # initialise logging
3421 3789
3422 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3790 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3423 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3791 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3424 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3792 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3425 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3793 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3426 3794
3427 cf::init_experience;
3428 cf::init_anim;
3429 cf::init_attackmess;
3430 cf::init_dynamic;
3431
3432 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3795 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3433 3796
3434 # we must not ever block the main coroutine 3797 # we must not ever block the main coroutine
3435 local $Coro::idle = sub { 3798 $Coro::idle = sub {
3436 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3799 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3437 (async { 3800 (async {
3438 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3801 $Coro::current->{desc} = "IDLE BUG HANDLER";
3439 EV::loop EV::LOOP_ONESHOT; 3802 EV::loop EV::LOOP_ONESHOT;
3440 })->prio (Coro::PRIO_MAX); 3803 })->prio (Coro::PRIO_MAX);
3441 }; 3804 };
3442 3805
3443 evthread_start IO::AIO::poll_fileno; 3806 evthread_start IO::AIO::poll_fileno;
3444 3807
3445 cf::sync_job { 3808 cf::sync_job {
3809 cf::incloader::init ();
3810
3811 db_init;
3812
3813 cf::init_anim;
3814 cf::init_attackmess;
3815 cf::init_dynamic;
3816
3817 cf::load_settings;
3818
3446 reload_resources; 3819 reload_resources;
3447 reload_config; 3820 reload_config;
3448 db_init;
3449 3821
3450 cf::load_settings;
3451 cf::load_materials;
3452 cf::init_uuid; 3822 cf::init_uuid;
3453 cf::init_signals; 3823 cf::init_signals;
3454 cf::init_commands;
3455 cf::init_skills; 3824 cf::init_skills;
3456 3825
3457 cf::init_beforeplay; 3826 cf::init_beforeplay;
3458 3827
3459 atomic; 3828 atomic;
3464 3833
3465 # no (long-running) fork's whatsoever before this point(!) 3834 # no (long-running) fork's whatsoever before this point(!)
3466 use POSIX (); 3835 use POSIX ();
3467 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3836 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3468 3837
3469 (pop @POST_INIT)->(0) while @POST_INIT; 3838 cf::_post_init 0;
3470 }; 3839 };
3471 3840
3841 cf::object::thawer::errors_are_fatal 0;
3842 info "parse errors in files are no longer fatal from this point on.\n";
3843
3844 AE::postpone {
3845 undef &main; # free gobs of memory :)
3846 };
3847
3472 main_loop; 3848 goto &main_loop;
3473} 3849}
3474 3850
3475############################################################################# 3851#############################################################################
3476# initialisation and cleanup 3852# initialisation and cleanup
3477 3853
3478# install some emergency cleanup handlers 3854# install some emergency cleanup handlers
3479BEGIN { 3855BEGIN {
3480 our %SIGWATCHER = (); 3856 our %SIGWATCHER = ();
3481 for my $signal (qw(INT HUP TERM)) { 3857 for my $signal (qw(INT HUP TERM)) {
3482 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3858 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3483 cf::cleanup "SIG$signal"; 3859 cf::cleanup "SIG$signal";
3484 }; 3860 };
3485 } 3861 }
3486} 3862}
3487 3863
3488sub write_runtime_sync { 3864sub write_runtime_sync {
3865 my $t0 = AE::time;
3866
3489 # first touch the runtime file to show we are still running: 3867 # first touch the runtime file to show we are still running:
3490 # the fsync below can take a very very long time. 3868 # the fsync below can take a very very long time.
3491 3869
3492 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3870 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3493 3871
3494 my $guard = cf::lock_acquire "write_runtime"; 3872 my $guard = cf::lock_acquire "write_runtime";
3495 3873
3496 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3874 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3497 or return; 3875 or return;
3498 3876
3499 my $value = $cf::RUNTIME + 90 + 10; 3877 my $value = $cf::RUNTIME + 90 + 10;
3500 # 10 is the runtime save interval, for a monotonic clock 3878 # 10 is the runtime save interval, for a monotonic clock
3501 # 60 allows for the watchdog to kill the server. 3879 # 60 allows for the watchdog to kill the server.
3514 or return; 3892 or return;
3515 3893
3516 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3894 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3517 and return; 3895 and return;
3518 3896
3519 warn "runtime file written.\n"; 3897 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3520 3898
3521 1 3899 1
3522} 3900}
3523 3901
3524our $uuid_lock; 3902our $uuid_lock;
3536 or return; 3914 or return;
3537 3915
3538 my $value = uuid_seq uuid_cur; 3916 my $value = uuid_seq uuid_cur;
3539 3917
3540 unless ($value) { 3918 unless ($value) {
3541 warn "cowardly refusing to write zero uuid value!\n"; 3919 info "cowardly refusing to write zero uuid value!\n";
3542 return; 3920 return;
3543 } 3921 }
3544 3922
3545 my $value = uuid_str $value + $uuid_skip; 3923 my $value = uuid_str $value + $uuid_skip;
3546 $uuid_skip = 0; 3924 $uuid_skip = 0;
3556 or return; 3934 or return;
3557 3935
3558 aio_rename "$uuid~", $uuid 3936 aio_rename "$uuid~", $uuid
3559 and return; 3937 and return;
3560 3938
3561 warn "uuid file written ($value).\n"; 3939 trace "uuid file written ($value).\n";
3562 3940
3563 1 3941 1
3564 3942
3565} 3943}
3566 3944
3572} 3950}
3573 3951
3574sub emergency_save() { 3952sub emergency_save() {
3575 my $freeze_guard = cf::freeze_mainloop; 3953 my $freeze_guard = cf::freeze_mainloop;
3576 3954
3577 warn "emergency_perl_save: enter\n"; 3955 info "emergency_perl_save: enter\n";
3956
3957 # this is a trade-off: we want to be very quick here, so
3958 # save all maps without fsync, and later call a global sync
3959 # (which in turn might be very very slow)
3960 local $USE_FSYNC = 0;
3578 3961
3579 cf::sync_job { 3962 cf::sync_job {
3580 # this is a trade-off: we want to be very quick here, so 3963 cf::write_runtime_sync; # external watchdog should not bark
3581 # save all maps without fsync, and later call a global sync
3582 # (which in turn might be very very slow)
3583 local $USE_FSYNC = 0;
3584 3964
3585 # use a peculiar iteration method to avoid tripping on perl 3965 # use a peculiar iteration method to avoid tripping on perl
3586 # refcount bugs in for. also avoids problems with players 3966 # refcount bugs in for. also avoids problems with players
3587 # and maps saved/destroyed asynchronously. 3967 # and maps saved/destroyed asynchronously.
3588 warn "emergency_perl_save: begin player save\n"; 3968 info "emergency_perl_save: begin player save\n";
3589 for my $login (keys %cf::PLAYER) { 3969 for my $login (keys %cf::PLAYER) {
3590 my $pl = $cf::PLAYER{$login} or next; 3970 my $pl = $cf::PLAYER{$login} or next;
3591 $pl->valid or next; 3971 $pl->valid or next;
3592 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3972 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3593 $pl->save; 3973 $pl->save;
3594 } 3974 }
3595 warn "emergency_perl_save: end player save\n"; 3975 info "emergency_perl_save: end player save\n";
3596 3976
3977 cf::write_runtime_sync; # external watchdog should not bark
3978
3597 warn "emergency_perl_save: begin map save\n"; 3979 info "emergency_perl_save: begin map save\n";
3598 for my $path (keys %cf::MAP) { 3980 for my $path (keys %cf::MAP) {
3599 my $map = $cf::MAP{$path} or next; 3981 my $map = $cf::MAP{$path} or next;
3600 $map->valid or next; 3982 $map->valid or next;
3601 $map->save; 3983 $map->save;
3602 } 3984 }
3603 warn "emergency_perl_save: end map save\n"; 3985 info "emergency_perl_save: end map save\n";
3604 3986
3987 cf::write_runtime_sync; # external watchdog should not bark
3988
3605 warn "emergency_perl_save: begin database checkpoint\n"; 3989 info "emergency_perl_save: begin database checkpoint\n";
3606 BDB::db_env_txn_checkpoint $DB_ENV; 3990 BDB::db_env_txn_checkpoint $DB_ENV;
3607 warn "emergency_perl_save: end database checkpoint\n"; 3991 info "emergency_perl_save: end database checkpoint\n";
3608 3992
3609 warn "emergency_perl_save: begin write uuid\n"; 3993 info "emergency_perl_save: begin write uuid\n";
3610 write_uuid_sync 1; 3994 write_uuid_sync 1;
3611 warn "emergency_perl_save: end write uuid\n"; 3995 info "emergency_perl_save: end write uuid\n";
3996
3997 cf::write_runtime_sync; # external watchdog should not bark
3998
3999 trace "emergency_perl_save: syncing database to disk";
4000 BDB::db_env_txn_checkpoint $DB_ENV;
4001
4002 info "emergency_perl_save: starting sync\n";
4003 IO::AIO::aio_sync sub {
4004 info "emergency_perl_save: finished sync\n";
4005 };
4006
4007 cf::write_runtime_sync; # external watchdog should not bark
4008
4009 trace "emergency_perl_save: flushing outstanding aio requests";
4010 while (IO::AIO::nreqs || BDB::nreqs) {
4011 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4012 }
4013
4014 cf::write_runtime_sync; # external watchdog should not bark
3612 }; 4015 };
3613 4016
3614 warn "emergency_perl_save: starting sync()\n";
3615 IO::AIO::aio_sync sub {
3616 warn "emergency_perl_save: finished sync()\n";
3617 };
3618
3619 warn "emergency_perl_save: leave\n"; 4017 info "emergency_perl_save: leave\n";
3620} 4018}
3621 4019
3622sub post_cleanup { 4020sub post_cleanup {
3623 my ($make_core) = @_; 4021 my ($make_core) = @_;
3624 4022
4023 IO::AIO::flush;
4024
3625 warn Carp::longmess "post_cleanup backtrace" 4025 error Carp::longmess "post_cleanup backtrace"
3626 if $make_core; 4026 if $make_core;
3627 4027
3628 my $fh = pidfile; 4028 my $fh = pidfile;
3629 unlink $PIDFILE if <$fh> == $$; 4029 unlink $PIDFILE if <$fh> == $$;
3630} 4030}
3650 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4050 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3651 for my $name (keys %$leaf_symtab) { 4051 for my $name (keys %$leaf_symtab) {
3652 _gv_clear *{"$pkg$name"}; 4052 _gv_clear *{"$pkg$name"};
3653# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4053# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3654 } 4054 }
3655 warn "cleared package $pkg\n";#d#
3656} 4055}
3657 4056
3658sub do_reload_perl() { 4057sub do_reload_perl() {
3659 # can/must only be called in main 4058 # can/must only be called in main
3660 if ($Coro::current != $Coro::main) { 4059 unless (in_main) {
3661 warn "can only reload from main coroutine"; 4060 error "can only reload from main coroutine";
3662 return; 4061 return;
3663 } 4062 }
3664 4063
3665 return if $RELOAD++; 4064 return if $RELOAD++;
3666 4065
3667 my $t1 = EV::time; 4066 my $t1 = AE::time;
3668 4067
3669 while ($RELOAD) { 4068 while ($RELOAD) {
3670 warn "reloading..."; 4069 cf::get_slot 0.1, -1, "reload_perl";
4070 info "perl_reload: reloading...";
3671 4071
3672 warn "entering sync_job"; 4072 trace "perl_reload: entering sync_job";
3673 4073
3674 cf::sync_job { 4074 cf::sync_job {
3675 cf::write_runtime_sync; # external watchdog should not bark
3676 cf::emergency_save; 4075 #cf::emergency_save;
3677 cf::write_runtime_sync; # external watchdog should not bark
3678 4076
3679 warn "syncing database to disk";
3680 BDB::db_env_txn_checkpoint $DB_ENV;
3681
3682 # if anything goes wrong in here, we should simply crash as we already saved
3683
3684 warn "flushing outstanding aio requests";
3685 while (IO::AIO::nreqs || BDB::nreqs) {
3686 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3687 }
3688
3689 warn "cancelling all extension coros"; 4077 trace "perl_reload: cancelling all extension coros";
3690 $_->cancel for values %EXT_CORO; 4078 $_->cancel for values %EXT_CORO;
3691 %EXT_CORO = (); 4079 %EXT_CORO = ();
3692 4080
3693 warn "removing commands"; 4081 trace "perl_reload: removing commands";
3694 %COMMAND = (); 4082 %COMMAND = ();
3695 4083
3696 warn "removing ext/exti commands"; 4084 trace "perl_reload: removing ext/exti commands";
3697 %EXTCMD = (); 4085 %EXTCMD = ();
3698 %EXTICMD = (); 4086 %EXTICMD = ();
3699 4087
3700 warn "unloading/nuking all extensions"; 4088 trace "perl_reload: unloading/nuking all extensions";
3701 for my $pkg (@EXTS) { 4089 for my $pkg (@EXTS) {
3702 warn "... unloading $pkg"; 4090 trace "... unloading $pkg";
3703 4091
3704 if (my $cb = $pkg->can ("unload")) { 4092 if (my $cb = $pkg->can ("unload")) {
3705 eval { 4093 eval {
3706 $cb->($pkg); 4094 $cb->($pkg);
3707 1 4095 1
3708 } or warn "$pkg unloaded, but with errors: $@"; 4096 } or error "$pkg unloaded, but with errors: $@";
3709 } 4097 }
3710 4098
3711 warn "... clearing $pkg"; 4099 trace "... clearing $pkg";
3712 clear_package $pkg; 4100 clear_package $pkg;
3713 } 4101 }
3714 4102
3715 warn "unloading all perl modules loaded from $LIBDIR"; 4103 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3716 while (my ($k, $v) = each %INC) { 4104 while (my ($k, $v) = each %INC) {
3717 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4105 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3718 4106
3719 warn "... unloading $k"; 4107 trace "... unloading $k";
3720 delete $INC{$k}; 4108 delete $INC{$k};
3721 4109
3722 $k =~ s/\.pm$//; 4110 $k =~ s/\.pm$//;
3723 $k =~ s/\//::/g; 4111 $k =~ s/\//::/g;
3724 4112
3727 } 4115 }
3728 4116
3729 clear_package $k; 4117 clear_package $k;
3730 } 4118 }
3731 4119
3732 warn "getting rid of safe::, as good as possible"; 4120 trace "perl_reload: getting rid of safe::, as good as possible";
3733 clear_package "safe::$_" 4121 clear_package "safe::$_"
3734 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4122 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3735 4123
3736 warn "unloading cf.pm \"a bit\""; 4124 trace "perl_reload: unloading cf.pm \"a bit\"";
3737 delete $INC{"cf.pm"}; 4125 delete $INC{"cf.pm"};
3738 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4126 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3739 4127
3740 # don't, removes xs symbols, too, 4128 # don't, removes xs symbols, too,
3741 # and global variables created in xs 4129 # and global variables created in xs
3742 #clear_package __PACKAGE__; 4130 #clear_package __PACKAGE__;
3743 4131
3744 warn "unload completed, starting to reload now"; 4132 info "perl_reload: unload completed, starting to reload now";
3745 4133
3746 warn "reloading cf.pm"; 4134 trace "perl_reload: reloading cf.pm";
3747 require cf; 4135 require cf;
3748 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4136 cf::_connect_to_perl_1;
3749 4137
3750 warn "loading config and database again"; 4138 trace "perl_reload: loading config and database again";
3751 cf::reload_config; 4139 cf::reload_config;
3752 4140
3753 warn "loading extensions"; 4141 trace "perl_reload: loading extensions";
3754 cf::load_extensions; 4142 cf::load_extensions;
3755 4143
3756 if ($REATTACH_ON_RELOAD) { 4144 if ($REATTACH_ON_RELOAD) {
3757 warn "reattaching attachments to objects/players"; 4145 trace "perl_reload: reattaching attachments to objects/players";
3758 _global_reattach; # objects, sockets 4146 _global_reattach; # objects, sockets
3759 warn "reattaching attachments to maps"; 4147 trace "perl_reload: reattaching attachments to maps";
3760 reattach $_ for values %MAP; 4148 reattach $_ for values %MAP;
3761 warn "reattaching attachments to players"; 4149 trace "perl_reload: reattaching attachments to players";
3762 reattach $_ for values %PLAYER; 4150 reattach $_ for values %PLAYER;
3763 } 4151 }
3764 4152
3765 warn "running post_init jobs"; 4153 cf::_post_init 1;
3766 (pop @POST_INIT)->(1) while @POST_INIT;
3767 4154
3768 warn "leaving sync_job"; 4155 trace "perl_reload: leaving sync_job";
3769 4156
3770 1 4157 1
3771 } or do { 4158 } or do {
3772 warn $@; 4159 error $@;
3773 cf::cleanup "error while reloading, exiting."; 4160 cf::cleanup "perl_reload: error, exiting.";
3774 }; 4161 };
3775 4162
3776 warn "reloaded";
3777 --$RELOAD; 4163 --$RELOAD;
3778 } 4164 }
3779 4165
3780 $t1 = EV::time - $t1; 4166 $t1 = AE::time - $t1;
3781 warn "reload completed in ${t1}s\n"; 4167 info "perl_reload: completed in ${t1}s\n";
3782}; 4168};
3783 4169
3784our $RELOAD_WATCHER; # used only during reload 4170our $RELOAD_WATCHER; # used only during reload
3785 4171
3786sub reload_perl() { 4172sub reload_perl() {
3788 # coro crashes during coro_state_free->destroy here. 4174 # coro crashes during coro_state_free->destroy here.
3789 4175
3790 $RELOAD_WATCHER ||= cf::async { 4176 $RELOAD_WATCHER ||= cf::async {
3791 Coro::AIO::aio_wait cache_extensions; 4177 Coro::AIO::aio_wait cache_extensions;
3792 4178
3793 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4179 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3794 do_reload_perl; 4180 do_reload_perl;
3795 undef $RELOAD_WATCHER; 4181 undef $RELOAD_WATCHER;
3796 }; 4182 };
3797 }; 4183 };
3798} 4184}
3807 reload_perl; 4193 reload_perl;
3808 }; 4194 };
3809 } 4195 }
3810}; 4196};
3811 4197
3812unshift @INC, $LIBDIR; 4198#############################################################################
3813 4199
3814my $bug_warning = 0; 4200my $bug_warning = 0;
3815 4201
3816our @WAIT_FOR_TICK;
3817our @WAIT_FOR_TICK_BEGIN;
3818
3819sub wait_for_tick { 4202sub wait_for_tick() {
3820 return if tick_inhibit || $Coro::current == $Coro::main; 4203 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3821 4204
3822 my $signal = new Coro::Signal; 4205 $WAIT_FOR_TICK->wait;
3823 push @WAIT_FOR_TICK, $signal;
3824 $signal->wait;
3825} 4206}
3826 4207
3827sub wait_for_tick_begin { 4208sub wait_for_tick_begin() {
3828 return if tick_inhibit || $Coro::current == $Coro::main; 4209 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3829 4210
3830 my $signal = new Coro::Signal; 4211 my $signal = new Coro::Signal;
3831 push @WAIT_FOR_TICK_BEGIN, $signal; 4212 push @WAIT_FOR_TICK_BEGIN, $signal;
3832 $signal->wait; 4213 $signal->wait;
3833} 4214}
3837 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4218 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3838 unless ++$bug_warning > 10; 4219 unless ++$bug_warning > 10;
3839 return; 4220 return;
3840 } 4221 }
3841 4222
3842 cf::server_tick; # one server iteration 4223 cf::one_tick; # one server iteration
4224
4225 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3843 4226
3844 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4227 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3845 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4228 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3846 Coro::async_pool { 4229 Coro::async_pool {
3847 $Coro::current->{desc} = "runtime saver"; 4230 $Coro::current->{desc} = "runtime saver";
3848 write_runtime_sync 4231 write_runtime_sync
3849 or warn "ERROR: unable to write runtime file: $!"; 4232 or error "ERROR: unable to write runtime file: $!";
3850 }; 4233 };
3851 } 4234 }
3852 4235
3853 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4236 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3854 $sig->send; 4237 $sig->send;
3855 } 4238 }
3856 while (my $sig = shift @WAIT_FOR_TICK) { 4239 $WAIT_FOR_TICK->broadcast;
3857 $sig->send;
3858 }
3859 4240
3860 $LOAD = ($NOW - $TICK_START) / $TICK; 4241 $LOAD = ($NOW - $TICK_START) / $TICK;
3861 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4242 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3862 4243
3863 if (0) { 4244 if (0) {
3864 if ($NEXT_TICK) { 4245 if ($NEXT_TICK) {
3865 my $jitter = $TICK_START - $NEXT_TICK; 4246 my $jitter = $TICK_START - $NEXT_TICK;
3866 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4247 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3867 warn "jitter $JITTER\n";#d# 4248 debug "jitter $JITTER\n";#d#
3868 } 4249 }
3869 } 4250 }
3870} 4251}
3871 4252
3872{ 4253{
3873 # configure BDB 4254 # configure BDB
4255 info "initialising database";
3874 4256
3875 BDB::min_parallel 8; 4257 BDB::min_parallel 16;
3876 BDB::max_poll_reqs $TICK * 0.1; 4258 BDB::max_poll_reqs $TICK * 0.1;
3877 $AnyEvent::BDB::WATCHER->priority (1); 4259 #$AnyEvent::BDB::WATCHER->priority (1);
3878 4260
3879 unless ($DB_ENV) { 4261 unless ($DB_ENV) {
3880 $DB_ENV = BDB::db_env_create; 4262 $DB_ENV = BDB::db_env_create;
3881 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4263 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3882 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4264 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3907 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4289 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3908 }; 4290 };
3909 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4291 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3910 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4292 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3911 }; 4293 };
4294
4295 info "database initialised";
3912} 4296}
3913 4297
3914{ 4298{
3915 # configure IO::AIO 4299 # configure IO::AIO
3916 4300
4301 info "initialising aio";
3917 IO::AIO::min_parallel 8; 4302 IO::AIO::min_parallel 8;
3918 IO::AIO::max_poll_time $TICK * 0.1; 4303 IO::AIO::max_poll_time $TICK * 0.1;
3919 undef $AnyEvent::AIO::WATCHER; 4304 undef $AnyEvent::AIO::WATCHER;
4305 info "aio initialised";
3920} 4306}
3921 4307
3922my $_log_backtrace; 4308our $_log_backtrace;
4309our $_log_backtrace_last;
3923 4310
3924sub _log_backtrace { 4311sub _log_backtrace {
3925 my ($msg, @addr) = @_; 4312 my ($msg, @addr) = @_;
3926 4313
3927 $msg =~ s/\n//; 4314 $msg =~ s/\n$//;
3928 4315
4316 if ($_log_backtrace_last eq $msg) {
4317 LOG llevInfo, "[ABT] $msg\n";
4318 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3929 # limit the # of concurrent backtraces 4319 # limit the # of concurrent backtraces
3930 if ($_log_backtrace < 2) { 4320 } elsif ($_log_backtrace < 2) {
4321 $_log_backtrace_last = $msg;
3931 ++$_log_backtrace; 4322 ++$_log_backtrace;
3932 my $perl_bt = Carp::longmess $msg; 4323 my $perl_bt = Carp::longmess $msg;
3933 async { 4324 async {
3934 $Coro::current->{desc} = "abt $msg"; 4325 $Coro::current->{desc} = "abt $msg";
3935 4326
3955 LOG llevInfo, "[ABT] $_\n" for @bt; 4346 LOG llevInfo, "[ABT] $_\n" for @bt;
3956 --$_log_backtrace; 4347 --$_log_backtrace;
3957 }; 4348 };
3958 } else { 4349 } else {
3959 LOG llevInfo, "[ABT] $msg\n"; 4350 LOG llevInfo, "[ABT] $msg\n";
3960 LOG llevInfo, "[ABT] [suppressed]\n"; 4351 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3961 } 4352 }
3962} 4353}
3963 4354
3964# load additional modules 4355# load additional modules
3965require "cf/$_.pm" for @EXTRA_MODULES; 4356require "cf/$_.pm" for @EXTRA_MODULES;
4357cf::_connect_to_perl_2;
3966 4358
3967END { cf::emergency_save } 4359END { cf::emergency_save }
3968 4360
39691 43611
3970 4362

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines