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.491 by root, Sat Oct 24 09:18:44 2009 UTC vs.
Revision 1.573 by root, Sun May 8 12:40:42 2011 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
20# 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>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
33use Opcode; 31use Opcode;
34use Safe; 32use Safe;
35use Safe::Hole; 33use Safe::Hole;
36use Storable (); 34use Storable ();
35use Carp ();
37 36
38use Guard (); 37use Guard ();
39use Coro (); 38use Coro ();
40use Coro::State; 39use Coro::State;
41use Coro::Handle; 40use Coro::Handle;
52use Coro::Util (); 51use Coro::Util ();
53 52
54use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
55use BDB (); 54use BDB ();
56use Data::Dumper; 55use Data::Dumper;
57use Digest::MD5;
58use Fcntl; 56use Fcntl;
59use YAML::XS (); 57use YAML::XS ();
60use IO::AIO (); 58use IO::AIO ();
61use Time::HiRes; 59use Time::HiRes;
62use Compress::LZF; 60use Compress::LZF;
78# strictly for debugging 76# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 78
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 80
81our @ORIG_INC;
82
83our %COMMAND = (); 83our %COMMAND = ();
84our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
85 85
86our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 87our %EXTCMD = ();
93our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS 94our @REFLECT; # set by XS
95our %REFLECT; # set by us 95our %REFLECT; # set by us
96 96
97our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
98our $DATADIR = datadir; 99our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
102our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 112
111our %RESOURCE; 113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
112 120
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 123our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
118our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
120our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
121our $DB_ENV; 129our $DB_ENV;
122 130
123our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
124 132
125our %CFG; 133our %CFG;
126 134
127our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
128our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
129our $NOW; 138our $NOW;
130 139
131our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
132our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
133our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
142 151
143our @POST_INIT; 152our @POST_INIT;
144 153
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 154our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :) 155our $REALLY_UNLOOP; # never set to true, please :)
156
157our $WAIT_FOR_TICK = new Coro::Signal;
158our @WAIT_FOR_TICK_BEGIN;
147 159
148binmode STDOUT; 160binmode STDOUT;
149binmode STDERR; 161binmode STDERR;
150 162
151# read virtual server time, if available 163# read virtual server time, if available
162 174
163our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
164 176
165sub cf::map::normalise; 177sub cf::map::normalise;
166 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
167############################################################################# 183#############################################################################
168 184
169%REFLECT = (); 185%REFLECT = ();
170for (@REFLECT) { 186for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 187 my $reflect = JSON::XS::decode_json $_;
181 197
182=over 4 198=over 4
183 199
184=item $cf::UPTIME 200=item $cf::UPTIME
185 201
186The timestamp of the server start (so not actually an uptime). 202The timestamp of the server start (so not actually an "uptime").
203
204=item $cf::SERVER_TICK
205
206An unsigned integer that starts at zero when the server is started and is
207incremented on every tick.
208
209=item $cf::NOW
210
211The (real) time of the last (current) server tick - updated before and
212after tick processing, so this is useful only as a rough "what time is it
213now" estimate.
214
215=item $cf::TICK
216
217The interval between each server tick, in seconds.
187 218
188=item $cf::RUNTIME 219=item $cf::RUNTIME
189 220
190The time this server has run, starts at 0 and is increased by $cf::TICK on 221The time this server has run, starts at 0 and is increased by $cf::TICK on
191every server tick. 222every server tick.
197Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
198directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
199unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
200database environment. 231database environment.
201 232
202=item $cf::NOW
203
204The time of the last (current) server tick.
205
206=item $cf::TICK
207
208The interval between server ticks, in seconds.
209
210=item $cf::LOADAVG 233=item $cf::LOADAVG
211 234
212The current CPU load on the server (alpha-smoothed), as a value between 0 235The current CPU load on the server (alpha-smoothed), as a value between 0
213(none) and 1 (overloaded), indicating how much time is spent on processing 236(none) and 1 (overloaded), indicating how much time is spent on processing
214objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
223from wherever your confdir points to. 246from wherever your confdir points to.
224 247
225=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
226 249
227These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 250These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
228returns directly I<after> the tick processing (and consequently, can only wake one process 251returns directly I<after> the tick processing (and consequently, can only wake one thread
229per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 252per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
253
254Note that cf::Wait_for_tick will immediately return when the server is not
255ticking, making it suitable for small pauses in threads that need to run
256when the server is paused. If that is not applicable (i.e. you I<really>
257want to wait, use C<$cf::WAIT_FOR_TICK>).
258
259=item $cf::WAIT_FOR_TICK
260
261Note that C<cf::wait_for_tick> is probably the correct thing to use. This
262variable contains a L<Coro::Signal> that is broadcats after every server
263tick. Calling C<< ->wait >> on it will suspend the caller until after the
264next server tick.
265
266=cut
267
268sub wait_for_tick();
269sub wait_for_tick_begin();
230 270
231=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
232 272
233This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 274C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
242 282
243=back 283=back
244 284
245=cut 285=cut
246 286
287sub error(@) { LOG llevError, join "", @_ }
288sub warn (@) { LOG llevWarn , join "", @_ }
289sub info (@) { LOG llevInfo , join "", @_ }
290sub debug(@) { LOG llevDebug, join "", @_ }
291sub trace(@) { LOG llevTrace, join "", @_ }
292
247$Coro::State::WARNHOOK = sub { 293$Coro::State::WARNHOOK = sub {
248 my $msg = join "", @_; 294 my $msg = join "", @_;
249 295
250 $msg .= "\n" 296 $msg .= "\n"
251 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
252 298
253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 299 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
254 300
255 LOG llevError, $msg; 301 LOG llevWarn, $msg;
256}; 302};
257 303
258$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
260 306
261 warn Carp::longmess $_[0]; 307 error Carp::longmess $_[0];
262 308
263 if ($Coro::current == $Coro::main) {#d# 309 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 310 error "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 311 return;#d#
266 }#d# 312 }#d#
267 313
268 # kill coroutine otherwise 314 # kill coroutine otherwise
269 Coro::terminate 315 Coro::terminate
289)) { 335)) {
290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
291} 337}
292 338
293$EV::DIED = sub { 339$EV::DIED = sub {
294 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
295}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
296 347
297############################################################################# 348#############################################################################
298 349
299=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
300 351
321 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 372 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
322 $d 373 $d
323 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
324} 375}
325 376
377=item $scalar = load_file $path
378
379Loads the given file from path and returns its contents. Croaks on error
380and can block.
381
382=cut
383
384sub load_file($) {
385 0 <= aio_load $_[0], my $data
386 or Carp::croak "$_[0]: $!";
387
388 $data
389}
390
326=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
327 392
328Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
329 394
330=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 401our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
337 402
338sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
339sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
340 405
406=item $ref = cf::decode_storable $scalar
407
408Same as Coro::Storable::thaw, so blocks.
409
410=cut
411
412BEGIN { *decode_storable = \&Coro::Storable::thaw }
413
414=item $ref = cf::decode_yaml $scalar
415
416Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
417
418=cut
419
420sub decode_yaml($) {
421 fork_call { YAML::XS::Load $_[0] } @_
422}
423
424=item $scalar = cf::unlzf $scalar
425
426Same as Compress::LZF::compress, but takes server ticks into account, so
427blocks.
428
429=cut
430
431sub unlzf($) {
432 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
433 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
434 Compress::LZF::decompress $_[0]
435}
436
341=item cf::post_init { BLOCK } 437=item cf::post_init { BLOCK }
342 438
343Execute the given codeblock, I<after> all extensions have been (re-)loaded, 439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again. 440but I<before> the server starts ticking again.
345 441
346The cdoeblock will have a single boolean argument to indicate whether this 442The codeblock will have a single boolean argument to indicate whether this
347is a reload or not. 443is a reload or not.
348 444
349=cut 445=cut
350 446
351sub post_init(&) { 447sub post_init(&) {
352 push @POST_INIT, shift; 448 push @POST_INIT, shift;
449}
450
451sub _post_init {
452 trace "running post_init jobs";
453
454 # run them in parallel...
455
456 my @join;
457
458 while () {
459 push @join, map &Coro::async ($_, 0), @POST_INIT;
460 @POST_INIT = ();
461
462 @join or last;
463
464 (pop @join)->join;
465 }
353} 466}
354 467
355=item cf::lock_wait $string 468=item cf::lock_wait $string
356 469
357Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
396} 509}
397 510
398=item cf::periodic $interval, $cb 511=item cf::periodic $interval, $cb
399 512
400Like EV::periodic, but randomly selects a starting point so that the actions 513Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 514get spread over time.
402 515
403=cut 516=cut
404 517
405sub periodic($$) { 518sub periodic($$) {
406 my ($interval, $cb) = @_; 519 my ($interval, $cb) = @_;
410 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
411} 524}
412 525
413=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
414 527
415Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
416This call blocks and returns only when you have at least C<$time> seconds 529(default: 0): This call blocks and returns only when you have at least
417of cpu time till the next tick. The slot is only valid till the next cede. 530C<$time> seconds of cpu time till the next tick. The slot is only valid
531till the next cede.
532
533Background jobs should use a priority les than zero, interactive jobs
534should use 100 or more.
418 535
419The optional C<$name> can be used to identify the job to run. It might be 536The optional C<$name> can be used to identify the job to run. It might be
420used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
421 538
422Useful for short background jobs. 539Useful for short background jobs.
423 540
424=cut 541=cut
425 542
426our @SLOT_QUEUE; 543our @SLOT_QUEUE;
427our $SLOT_QUEUE; 544our $SLOT_QUEUE;
545our $SLOT_DECAY = 0.9;
428 546
429$SLOT_QUEUE->cancel if $SLOT_QUEUE; 547$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async { 548$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager"); 549 $Coro::current->desc ("timeslot manager");
432 550
433 my $signal = new Coro::Signal; 551 my $signal = new Coro::Signal;
552 my $busy;
434 553
435 while () { 554 while () {
436 next_job: 555 next_job:
556
437 my $avail = cf::till_tick; 557 my $avail = cf::till_tick;
438 if ($avail > 0.01) { 558
439 for (0 .. $#SLOT_QUEUE) { 559 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) { 560 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0;
441 my $job = splice @SLOT_QUEUE, $_, 1, (); 562 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send; 563 $job->[2]->send;
443 Coro::cede; 564 Coro::cede;
444 goto next_job; 565 goto next_job;
445 } 566 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446 } 568 }
447 } 569 }
448 570
449 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
450 # we do not use wait_for_tick() as it returns immediately when tick is inactive 572 # we do not use wait_for_tick() as it returns immediately when tick is inactive
451 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
452 $signal->wait;
453 } else { 574 } else {
575 $busy = 0;
454 Coro::schedule; 576 Coro::schedule;
455 } 577 }
456 } 578 }
457}; 579};
458 580
459sub get_slot($;$$) { 581sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main; 582 return if tick_inhibit || $Coro::current == $Coro::main;
461 583
462 my ($time, $pri, $name) = @_; 584 my ($time, $pri, $name) = @_;
463 585
464 $time = $TICK * .6 if $time > $TICK * .6; 586 $time = clamp $time, 0.01, $TICK * .6;
587
465 my $sig = new Coro::Signal; 588 my $sig = new Coro::Signal;
466 589
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 590 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 591 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready; 592 $SLOT_QUEUE->ready;
495=cut 618=cut
496 619
497sub sync_job(&) { 620sub sync_job(&) {
498 my ($job) = @_; 621 my ($job) = @_;
499 622
500 if ($Coro::current == $Coro::main) { 623 if (in_main) {
501 my $time = EV::time; 624 my $time = AE::time;
502 625
503 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
504 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
505 628
506 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
507 630
508 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
509 632
510 my $busy = 1; 633 my $busy = 1;
511 my @res; 634 my @res;
512 635
513 (async { 636 (async {
514 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
515 @res = eval { $job->() }; 638 @res = eval { $job->() };
516 warn $@ if $@; 639 error $@ if $@;
517 undef $busy; 640 undef $busy;
518 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
519 642
520 while ($busy) { 643 while ($busy) {
521 if (Coro::nready) { 644 if (Coro::nready) {
523 } else { 646 } else {
524 EV::loop EV::LOOP_ONESHOT; 647 EV::loop EV::LOOP_ONESHOT;
525 } 648 }
526 } 649 }
527 650
528 my $time = EV::time - $time; 651 my $time = AE::time - $time;
529 652
530 $TICK_START += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
531 654
532 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
533 } else { 656 } else {
555 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
556 679
557 $coro 680 $coro
558} 681}
559 682
560=item fork_call { }, $args 683=item fork_call { }, @args
561 684
562Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
563process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
564Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
565never block itself or use any form of event handling. 688never block itself or use any form of event handling.
566 689
567=cut 690=cut
568 691
692sub post_fork {
693 reset_signals;
694}
695
569sub fork_call(&@) { 696sub fork_call(&@) {
570 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
571 698
572 # we seemingly have to make a local copy of the whole thing, 699 # we seemingly have to make a local copy of the whole thing,
573 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
574 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
575 702
576 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
577 reset_signals; 704 cf::post_fork;
578 &$cb 705 &$cb
579 }, @args; 706 } @args;
580 707
581 wantarray ? @res : $res[-1] 708 wantarray ? @res : $res[-1]
709}
710
711sub objinfo {
712 (
713 "counter value" => cf::object::object_count,
714 "objects created" => cf::object::create_count,
715 "objects destroyed" => cf::object::destroy_count,
716 "freelist size" => cf::object::free_count,
717 "allocated objects" => cf::object::objects_size,
718 "active objects" => cf::object::actives_size,
719 )
582} 720}
583 721
584=item $coin = coin_from_name $name 722=item $coin = coin_from_name $name
585 723
586=cut 724=cut
623within each server. 761within each server.
624 762
625=cut 763=cut
626 764
627sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
628 my ($name) = @_; 769 my ($name) = @_;
629 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
630 771
631 eval { 772 eval {
632 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
642} 783}
643 784
644our $DB; 785our $DB;
645 786
646sub db_init { 787sub db_init {
647 cf::sync_job {
648 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
649 };
650} 789}
651 790
652sub db_get($$) { 791sub db_get($$) {
653 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
654 793
655 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
656 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
657 798
658 $! ? () 799 $! ? ()
659 : $data 800 : $data
660 }
661} 801}
662 802
663sub db_put($$$) { 803sub db_put($$$) {
664 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
665 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
693 833
694 my @data; 834 my @data;
695 my $md5; 835 my $md5;
696 836
697 for (0 .. $#$src) { 837 for (0 .. $#$src) {
698 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
699 or Carp::croak "$src->[$_]: $!";
700 } 839 }
701 840
702 # if processing is expensive, check 841 # if processing is expensive, check
703 # checksum first 842 # checksum first
704 if (1) { 843 if (1) {
721 860
722 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
723 my $data = $process->(\@data); 862 my $data = $process->(\@data);
724 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
725 864
726 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
727 866
728 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
729 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
730 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
731 870
741 880
742=cut 881=cut
743 882
744sub datalog($@) { 883sub datalog($@) {
745 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
746 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
747} 886}
748 887
749=back 888=back
750 889
751=cut 890=cut
946 1085
947 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
948 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
949 1088
950 } elsif (ref $type) { 1089 } elsif (ref $type) {
951 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
952 1091
953 } else { 1092 } else {
954 shift @arg; 1093 shift @arg;
955 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
956 } 1095 }
957 } 1096 }
958} 1097}
959 1098
960sub _object_attach { 1099sub _object_attach {
970 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
971 } 1110 }
972 1111
973 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
974 } else { 1113 } else {
975 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
976 } 1115 }
977 1116
978 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
979} 1118}
980 1119
1039 1178
1040 for (@$callbacks) { 1179 for (@$callbacks) {
1041 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
1042 1181
1043 if ($@) { 1182 if ($@) {
1044 warn "$@";
1045 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1046 override; 1184 override;
1047 } 1185 }
1048 1186
1049 return 1 if $override; 1187 return 1 if $override;
1050 } 1188 }
1129 for (@$attach) { 1267 for (@$attach) {
1130 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1131 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1132 } 1270 }
1133 } else { 1271 } else {
1134 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1135 } 1273 }
1136 } 1274 }
1137} 1275}
1138 1276
1139cf::attachable->attach ( 1277cf::attachable->attach (
1166 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1167 1305
1168 sync_job { 1306 sync_job {
1169 if (length $$rdata) { 1307 if (length $$rdata) {
1170 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1171 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1172 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1173 1312
1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175 aio_chmod $fh, SAVE_MODE; 1314 aio_chmod $fh, SAVE_MODE;
1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177 if ($cf::USE_FSYNC) { 1316 if ($cf::USE_FSYNC) {
1199 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1200 1339
1201 $filename =~ s%/[^/]+$%%; 1340 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC; 1341 aio_pathsync $filename if $cf::USE_FSYNC;
1203 } else { 1342 } else {
1204 warn "unable to save objects: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1205 } 1344 }
1206 } else { 1345 } else {
1207 aio_unlink $filename; 1346 aio_unlink $filename;
1208 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1209 } 1348 }
1233 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1234 $av = $st->{objs}; 1373 $av = $st->{objs};
1235 } 1374 }
1236 1375
1237 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1238 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1239 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1240 1380
1241 ($data, $av) 1381 ($data, $av)
1242} 1382}
1243 1383
1244=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1303} 1443}
1304 1444
1305use File::Glob (); 1445use File::Glob ();
1306 1446
1307cf::player->attach ( 1447cf::player->attach (
1308 on_command => sub { 1448 on_unknown_command => sub {
1309 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1310 1450
1311 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1312 or return; 1452 or return;
1313 1453
1336 1476
1337 $pl->ext_reply ($reply, @reply) 1477 $pl->ext_reply ($reply, @reply)
1338 if $reply; 1478 if $reply;
1339 1479
1340 } else { 1480 } else {
1341 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1481 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1342 } 1482 }
1343 1483
1344 cf::override; 1484 cf::override;
1345 }, 1485 },
1346); 1486);
1357 1497
1358 $grp 1498 $grp
1359} 1499}
1360 1500
1361sub load_extensions { 1501sub load_extensions {
1502 info "loading extensions...";
1503
1362 cf::sync_job { 1504 cf::sync_job {
1363 my %todo; 1505 my %todo;
1364 1506
1365 for my $path (<$LIBDIR/*.ext>) { 1507 for my $path (<$LIBDIR/*.ext>) {
1366 next unless -r $path; 1508 next unless -r $path;
1384 1526
1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1527 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1528 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1387 1529
1388 $ext{source} = 1530 $ext{source} =
1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1531 "package $pkg; use common::sense;\n"
1390 . "#line 1 \"$path\"\n{\n" 1532 . "#line 1 \"$path\"\n{\n"
1391 . $source 1533 . $source
1392 . "\n};\n1"; 1534 . "\n};\n1";
1393 1535
1394 $todo{$base} = \%ext; 1536 $todo{$base} = \%ext;
1395 } 1537 }
1396 1538
1539 my $pass = 0;
1397 my %done; 1540 my %done;
1398 while (%todo) { 1541 while (%todo) {
1399 my $progress; 1542 my $progress;
1400 1543
1544 ++$pass;
1545
1546 ext:
1401 while (my ($k, $v) = each %todo) { 1547 while (my ($k, $v) = each %todo) {
1402 for (split /,\s*/, $v->{meta}{depends}) { 1548 for (split /,\s*/, $v->{meta}{depends}) {
1403 goto skip 1549 next ext
1404 unless exists $done{$_}; 1550 unless exists $done{$_};
1405 } 1551 }
1406 1552
1407 warn "... loading '$k' into '$v->{pkg}'\n"; 1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1408 1554
1409 unless (eval $v->{source}) { 1555 my $active = eval $v->{source};
1556
1557 if (length $@) {
1410 my $msg = $@ ? "$v->{path}: $@\n" 1558 error "$v->{path}: $@\n";
1411 : "$v->{base}: extension inactive.\n";
1412 1559
1413 if (exists $v->{meta}{mandatory}) {
1414 warn $msg;
1415 cf::cleanup "mandatory extension failed to load, exiting."; 1560 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1416 } 1561 if exists $v->{meta}{mandatory};
1417 1562
1418 warn $msg; 1563 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1564 delete $todo{$k};
1565 } else {
1566 $done{$k} = delete $todo{$k};
1567 push @EXTS, $v->{pkg};
1568 $progress = 1;
1569
1570 info "$v->{base}: extension inactive.\n"
1571 unless $active;
1419 } 1572 }
1420
1421 $done{$k} = delete $todo{$k};
1422 push @EXTS, $v->{pkg};
1423 $progress = 1;
1424 } 1573 }
1425 1574
1426 skip: 1575 unless ($progress) {
1427 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1576 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1428 unless $progress; 1577
1578 while (my ($k, $v) = each %todo) {
1579 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1580 if exists $v->{meta}{mandatory};
1581 }
1582
1583 last;
1584 }
1429 } 1585 }
1430 }; 1586 };
1431} 1587}
1432 1588
1433############################################################################# 1589#############################################################################
1517 $cf::PLAYER{$login} = $pl 1673 $cf::PLAYER{$login} = $pl
1518 } 1674 }
1519 } 1675 }
1520} 1676}
1521 1677
1678cf::player->attach (
1679 on_load => sub {
1680 my ($pl, $path) = @_;
1681
1682 # restore slots saved in save, below
1683 my $slots = delete $pl->{_slots};
1684
1685 $pl->ob->current_weapon ($slots->[0]);
1686 $pl->combat_ob ($slots->[1]);
1687 $pl->ranged_ob ($slots->[2]);
1688 },
1689);
1690
1522sub save($) { 1691sub save($) {
1523 my ($pl) = @_; 1692 my ($pl) = @_;
1524 1693
1525 return if $pl->{deny_save}; 1694 return if $pl->{deny_save};
1526 1695
1531 1700
1532 aio_mkdir playerdir $pl, 0770; 1701 aio_mkdir playerdir $pl, 0770;
1533 $pl->{last_save} = $cf::RUNTIME; 1702 $pl->{last_save} = $cf::RUNTIME;
1534 1703
1535 cf::get_slot 0.01; 1704 cf::get_slot 0.01;
1705
1706 # save slots, to be restored later
1707 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1536 1708
1537 $pl->save_pl ($path); 1709 $pl->save_pl ($path);
1538 cf::cede_to_tick; 1710 cf::cede_to_tick;
1539} 1711}
1540 1712
1574 my $name = $pl->ob->name; 1746 my $name = $pl->ob->name;
1575 1747
1576 $pl->{deny_save} = 1; 1748 $pl->{deny_save} = 1;
1577 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1749 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1578 1750
1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1751 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1580 $pl->deactivate; 1752 $pl->deactivate;
1753
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1754 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1583 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1755 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1756 ext::highscore::check ($pl->ob);
1757
1584 $pl->ns->destroy if $pl->ns; 1758 $pl->ns->destroy if $pl->ns;
1585 1759
1586 my $path = playerdir $pl; 1760 my $path = playerdir $pl;
1587 my $temp = "$path~$cf::RUNTIME~deleting~"; 1761 my $temp = "$path~$cf::RUNTIME~deleting~";
1588 aio_rename $path, $temp; 1762 aio_rename $path, $temp;
1642 \@logins 1816 \@logins
1643} 1817}
1644 1818
1645=item $player->maps 1819=item $player->maps
1646 1820
1821=item cf::player::maps $login
1822
1647Returns an arrayref of map paths that are private for this 1823Returns an arrayref of map paths that are private for this
1648player. May block. 1824player. May block.
1649 1825
1650=cut 1826=cut
1651 1827
1713=cut 1889=cut
1714 1890
1715sub find_by_path($) { 1891sub find_by_path($) {
1716 my ($path) = @_; 1892 my ($path) = @_;
1717 1893
1894 $path =~ s/^~[^\/]*//; # skip ~login
1895
1718 my ($match, $specificity); 1896 my ($match, $specificity);
1719 1897
1720 for my $region (list) { 1898 for my $region (list) {
1721 if ($region->{match} && $path =~ $region->{match}) { 1899 if ($region->{match} && $path =~ $region->{match}) {
1722 ($match, $specificity) = ($region, $region->specificity) 1900 ($match, $specificity) = ($region, $region->specificity)
1750sub generate_random_map { 1928sub generate_random_map {
1751 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1752 1930
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1931 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754 1932
1755 # mit "rum" bekleckern, nicht
1756 $self->_create_random_map ( 1933 $self->_create_random_map ($rmp);
1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1760 $rmp->{exit_on_final_map},
1761 $rmp->{xsize}, $rmp->{ysize},
1762 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1763 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1764 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1765 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1766 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1767 (cf::region::find $rmp->{region}), $rmp->{custom}
1768 )
1769} 1934}
1770 1935
1771=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1772 1937
1773Register a handler for the map path matching the given regex at the 1938Register a handler for the map path matching the given regex at the
1778 1943
1779sub register { 1944sub register {
1780 my (undef, $regex, $prio) = @_; 1945 my (undef, $regex, $prio) = @_;
1781 my $pkg = caller; 1946 my $pkg = caller;
1782 1947
1783 no strict;
1784 push @{"$pkg\::ISA"}, __PACKAGE__; 1948 push @{"$pkg\::ISA"}, __PACKAGE__;
1785 1949
1786 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1950 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1787} 1951}
1788 1952
1789# also paths starting with '/' 1953# also paths starting with '/'
1790$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1954$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1791 1955
1792sub thawer_merge { 1956sub thawer_merge {
1793 my ($self, $merge) = @_; 1957 my ($self, $merge) = @_;
1794 1958
1795 # we have to keep some variables in memory intact 1959 # we have to keep some variables in memory intact
1800} 1964}
1801 1965
1802sub normalise { 1966sub normalise {
1803 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1804 1968
1805 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1806 1970
1807 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1808 1972
1809 # map plan: 1973 # map plan:
1810 # 1974 #
1825 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1826 $path = "$base/$path"; 1990 $path = "$base/$path";
1827 } 1991 }
1828 1992
1829 for ($path) { 1993 for ($path) {
1830 redo if s{//}{/};
1831 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1832 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1833 } 1996 }
1834 1997
1835 $path 1998 $path
1849 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1850 return $self; 2013 return $self;
1851 } 2014 }
1852 } 2015 }
1853 2016
1854 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1855 () 2018 ()
1856} 2019}
1857 2020
2021# may re-bless or do other evil things
1858sub init { 2022sub init {
1859 my ($self) = @_; 2023 my ($self) = @_;
1860 2024
1861 $self 2025 $self
1862} 2026}
1927 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1928 2092
1929 1 2093 1
1930} 2094}
1931 2095
2096# used to laod the header of an original map
1932sub load_header_orig { 2097sub load_header_orig {
1933 my ($self) = @_; 2098 my ($self) = @_;
1934 2099
1935 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
1936} 2101}
1937 2102
2103# used to laod the header of an instantiated map
1938sub load_header_temp { 2104sub load_header_temp {
1939 my ($self) = @_; 2105 my ($self) = @_;
1940 2106
1941 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
1942} 2108}
1943 2109
2110# called after loading the header from an instantiated map
1944sub prepare_temp { 2111sub prepare_temp {
1945 my ($self) = @_; 2112 my ($self) = @_;
1946 2113
1947 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
1948 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
1949 # safety 2116 # safety
1950 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
1951 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
1952} 2119}
1953 2120
2121# called after loading the header from an original map
1954sub prepare_orig { 2122sub prepare_orig {
1955 my ($self) = @_; 2123 my ($self) = @_;
1956 2124
1957 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
1958 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
1982 2150
1983sub find; 2151sub find;
1984sub find { 2152sub find {
1985 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
1986 2154
2155 cf::cede_to_tick;
2156
1987 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
1988 2158
1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1990 my $guard2 = cf::lock_acquire "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
1991 2161
1992 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
2009 2179
2010 $cf::MAP{$path} = $map 2180 $cf::MAP{$path} = $map
2011 } 2181 }
2012} 2182}
2013 2183
2014sub pre_load { } 2184sub pre_load { }
2015sub post_load { } 2185#sub post_load { } # XS
2016 2186
2017sub load { 2187sub load {
2018 my ($self) = @_; 2188 my ($self) = @_;
2019 2189
2020 local $self->{deny_reset} = 1; # loading can take a long time 2190 local $self->{deny_reset} = 1; # loading can take a long time
2023 2193
2024 { 2194 {
2025 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2026 2196
2027 return unless $self->valid; 2197 return unless $self->valid;
2028 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2029
2030 $self->in_memory (cf::MAP_LOADING);
2031 2199
2032 $self->alloc; 2200 $self->alloc;
2033 2201
2034 $self->pre_load; 2202 $self->pre_load;
2035 cf::cede_to_tick; 2203 cf::cede_to_tick;
2036 2204
2205 if (exists $self->{load_path}) {
2037 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2038 $f->skip_block; 2207 $f->skip_block;
2039 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2040 or return; 2209 or return;
2041 2210
2042 $self->post_load_original 2211 $self->post_load_original
2043 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2044 2213
2045 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2046 utf8::encode $uniq; 2215 utf8::encode $uniq;
2047 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2048 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2049 $self->clear_unique_items; 2218 $self->clear_unique_items;
2050 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2051 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2052 } 2222 }
2053 } 2223 }
2054 }
2055 2224
2056 $f->resolve_delayed_derefs; 2225 $f->resolve_delayed_derefs;
2226 } else {
2227 $self->post_load_original
2228 if delete $self->{load_original};
2229 }
2230
2231 $self->state (cf::MAP_INACTIVE);
2057 2232
2058 cf::cede_to_tick; 2233 cf::cede_to_tick;
2059 # now do the right thing for maps 2234 # now do the right thing for maps
2060 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2061 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
2065 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2066 $self->decay_objects; 2241 $self->decay_objects;
2067 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2068 $self->update_buttons; 2243 $self->update_buttons;
2069 cf::cede_to_tick; 2244 cf::cede_to_tick;
2070 $self->activate; 2245 #$self->activate; # no longer activate maps automatically
2071 } 2246 }
2072 2247
2073 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME); 2249 $self->last_access ($cf::RUNTIME);
2075
2076 $self->in_memory (cf::MAP_ACTIVE);
2077 } 2250 }
2078 2251
2079 $self->post_load; 2252 $self->post_load;
2080}
2081 2253
2254 1
2255}
2256
2257# customize the map for a given player, i.e.
2258# return the _real_ map. used by e.g. per-player
2259# maps to change the path to ~playername/mappath
2082sub customise_for { 2260sub customise_for {
2083 my ($self, $ob) = @_; 2261 my ($self, $ob) = @_;
2084 2262
2085 return find "~" . $ob->name . "/" . $self->{path} 2263 return find "~" . $ob->name . "/" . $self->{path}
2086 if $self->per_player; 2264 if $self->per_player;
2102 or next; 2280 or next;
2103 $neigh = find $neigh, $map 2281 $neigh = find $neigh, $map
2104 or next; 2282 or next;
2105 $neigh->load; 2283 $neigh->load;
2106 2284
2285 # now find the diagonal neighbours
2107 push @neigh, 2286 push @neigh,
2108 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2287 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2109 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2288 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2110 } 2289 }
2111 2290
2118} 2297}
2119 2298
2120sub find_sync { 2299sub find_sync {
2121 my ($path, $origin) = @_; 2300 my ($path, $origin) = @_;
2122 2301
2123 cf::sync_job { find $path, $origin } 2302 # it's a bug to call this from the main context
2303 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2304 if $Coro::current == $Coro::main;
2305
2306 find $path, $origin
2124} 2307}
2125 2308
2126sub do_load_sync { 2309sub do_load_sync {
2127 my ($map) = @_; 2310 my ($map) = @_;
2128 2311
2312 # it's a bug to call this from the main context
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2313 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main; 2314 if $Coro::current == $Coro::main;
2131 2315
2132 cf::sync_job { $map->load }; 2316 $map->load;
2133} 2317}
2134 2318
2135our %MAP_PREFETCH; 2319our %MAP_PREFETCH;
2136our $MAP_PREFETCHER = undef; 2320our $MAP_PREFETCHER = undef;
2137 2321
2138sub find_async { 2322sub find_async {
2139 my ($path, $origin, $load) = @_; 2323 my ($path, $origin, $load) = @_;
2140 2324
2141 $path = normalise $path, $origin && $origin->{path}; 2325 $path = normalise $path, $origin;
2142 2326
2143 if (my $map = $cf::MAP{$path}) { 2327 if (my $map = $cf::MAP{$path}) {
2144 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2328 return $map if !$load || $map->linkable;
2145 } 2329 }
2146 2330
2147 $MAP_PREFETCH{$path} |= $load; 2331 $MAP_PREFETCH{$path} |= $load;
2148 2332
2149 $MAP_PREFETCHER ||= cf::async { 2333 $MAP_PREFETCHER ||= cf::async {
2163 $MAP_PREFETCHER->prio (6); 2347 $MAP_PREFETCHER->prio (6);
2164 2348
2165 () 2349 ()
2166} 2350}
2167 2351
2352# common code, used by both ->save and ->swapout
2168sub save { 2353sub _save {
2169 my ($self) = @_; 2354 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172 2355
2173 $self->{last_save} = $cf::RUNTIME; 2356 $self->{last_save} = $cf::RUNTIME;
2174 2357
2175 return unless $self->dirty; 2358 return unless $self->dirty;
2176 2359
2196 } else { 2379 } else {
2197 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2380 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2198 } 2381 }
2199} 2382}
2200 2383
2384sub save {
2385 my ($self) = @_;
2386
2387 my $lock = cf::lock_acquire "map_data:$self->{path}";
2388
2389 $self->_save;
2390}
2391
2201sub swap_out { 2392sub swap_out {
2202 my ($self) = @_; 2393 my ($self) = @_;
2203 2394
2204 # save first because save cedes
2205 $self->save;
2206
2207 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2395 my $lock = cf::lock_acquire "map_data:$self->{path}";
2208 2396
2397 return if !$self->linkable;
2398 return if $self->{deny_save};
2209 return if $self->players; 2399 return if $self->players;
2210 return if $self->in_memory != cf::MAP_ACTIVE; 2400
2401 # first deactivate the map and "unlink" it from the core
2402 $self->deactivate;
2403 $_->clear_links_to ($self) for values %cf::MAP;
2404 $self->state (cf::MAP_SWAPPED);
2405
2406 # then atomically save
2407 $self->_save;
2408
2409 # then free the map
2410 $self->clear;
2411}
2412
2413sub reset_at {
2414 my ($self) = @_;
2415
2416 # TODO: safety, remove and allow resettable per-player maps
2211 return if $self->{deny_save}; 2417 return 1e99 if $self->{deny_reset};
2212 2418
2419 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2420 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2421
2422 $time + $to
2423}
2424
2425sub should_reset {
2426 my ($self) = @_;
2427
2428 $self->reset_at <= $cf::RUNTIME
2429}
2430
2431sub reset {
2432 my ($self) = @_;
2433
2434 my $lock = cf::lock_acquire "map_data:$self->{path}";
2435
2436 return if $self->players;
2437
2438 cf::trace "resetting map ", $self->path, "\n";
2439
2213 $self->in_memory (cf::MAP_SWAPPED); 2440 $self->state (cf::MAP_SWAPPED);
2441
2442 # need to save uniques path
2443 unless ($self->{deny_save}) {
2444 my $uniq = $self->uniq_path; utf8::encode $uniq;
2445
2446 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2447 if $uniq;
2448 }
2449
2450 delete $cf::MAP{$self->path};
2214 2451
2215 $self->deactivate; 2452 $self->deactivate;
2216 $_->clear_links_to ($self) for values %cf::MAP; 2453 $_->clear_links_to ($self) for values %cf::MAP;
2217 $self->clear; 2454 $self->clear;
2218}
2219
2220sub reset_at {
2221 my ($self) = @_;
2222
2223 # TODO: safety, remove and allow resettable per-player maps
2224 return 1e99 if $self->{deny_reset};
2225
2226 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2227 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2228
2229 $time + $to
2230}
2231
2232sub should_reset {
2233 my ($self) = @_;
2234
2235 $self->reset_at <= $cf::RUNTIME
2236}
2237
2238sub reset {
2239 my ($self) = @_;
2240
2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2242
2243 return if $self->players;
2244
2245 warn "resetting map ", $self->path, "\n";
2246
2247 $self->in_memory (cf::MAP_SWAPPED);
2248
2249 # need to save uniques path
2250 unless ($self->{deny_save}) {
2251 my $uniq = $self->uniq_path; utf8::encode $uniq;
2252
2253 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2254 if $uniq;
2255 }
2256
2257 delete $cf::MAP{$self->path};
2258
2259 $self->deactivate;
2260 $_->clear_links_to ($self) for values %cf::MAP;
2261 $self->clear;
2262 2455
2263 $self->unlink_save; 2456 $self->unlink_save;
2264 $self->destroy; 2457 $self->destroy;
2265} 2458}
2266 2459
2274 2467
2275 delete $cf::MAP{$self->path}; 2468 delete $cf::MAP{$self->path};
2276 2469
2277 $self->unlink_save; 2470 $self->unlink_save;
2278 2471
2279 bless $self, "cf::map"; 2472 bless $self, "cf::map::wrap";
2280 delete $self->{deny_reset}; 2473 delete $self->{deny_reset};
2281 $self->{deny_save} = 1; 2474 $self->{deny_save} = 1;
2282 $self->reset_timeout (1); 2475 $self->reset_timeout (1);
2283 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2476 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2284 2477
2514 2707
2515Freezes the player and moves him/her to a special map (C<{link}>). 2708Freezes the player and moves him/her to a special map (C<{link}>).
2516 2709
2517The player should be reasonably safe there for short amounts of time (e.g. 2710The player should be reasonably safe there for short amounts of time (e.g.
2518for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2711for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2519though, as the palyer cannot control the character while it is on the link 2712though, as the player cannot control the character while it is on the link
2520map. 2713map.
2521 2714
2522Will never block. 2715Will never block.
2523 2716
2524=item $player_object->leave_link ($map, $x, $y) 2717=item $player_object->leave_link ($map, $x, $y)
2545sub cf::object::player::enter_link { 2738sub cf::object::player::enter_link {
2546 my ($self) = @_; 2739 my ($self) = @_;
2547 2740
2548 $self->deactivate_recursive; 2741 $self->deactivate_recursive;
2549 2742
2743 ++$self->{_link_recursion};
2744
2550 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2745 return if UNIVERSAL::isa $self->map, "ext::map_link";
2551 2746
2552 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2747 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2553 if $self->map && $self->map->{path} ne "{link}"; 2748 if $self->map && $self->map->{path} ne "{link}";
2554 2749
2555 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2750 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2556} 2751}
2557 2752
2558sub cf::object::player::leave_link { 2753sub cf::object::player::leave_link {
2559 my ($self, $map, $x, $y) = @_; 2754 my ($self, $map, $x, $y) = @_;
2560 2755
2577 ($x, $y) = (-1, -1) 2772 ($x, $y) = (-1, -1)
2578 unless (defined $x) && (defined $y); 2773 unless (defined $x) && (defined $y);
2579 2774
2580 # use -1 or undef as default coordinates, not 0, 0 2775 # use -1 or undef as default coordinates, not 0, 0
2581 ($x, $y) = ($map->enter_x, $map->enter_y) 2776 ($x, $y) = ($map->enter_x, $map->enter_y)
2582 if $x <=0 && $y <= 0; 2777 if $x <= 0 && $y <= 0;
2583 2778
2584 $map->load; 2779 $map->load;
2585 $map->load_neighbours; 2780 $map->load_neighbours;
2586 2781
2587 return unless $self->contr->active; 2782 return unless $self->contr->active;
2588 2783
2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2784 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2590 $self->enter_map ($map, $x, $y); 2785 if ($self->enter_map ($map, $x, $y)) {
2591 2786 # entering was successful
2787 delete $self->{_link_recursion};
2592 # only activate afterwards, to support waiting in hooks 2788 # only activate afterwards, to support waiting in hooks
2593 $self->activate_recursive; 2789 $self->activate_recursive;
2594} 2790 }
2595 2791
2792}
2793
2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2794=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2597 2795
2598Moves the player to the given map-path and coordinates by first freezing 2796Moves the player to the given map-path and coordinates by first freezing
2599her, loading and preparing them map, calling the provided $check callback 2797her, loading and preparing them map, calling the provided $check callback
2600that has to return the map if sucecssful, and then unfreezes the player on 2798that has to return the map if sucecssful, and then unfreezes the player on
2601the new (success) or old (failed) map position. In either case, $done will 2799the new (success) or old (failed) map position. In either case, $done will
2608 2806
2609our $GOTOGEN; 2807our $GOTOGEN;
2610 2808
2611sub cf::object::player::goto { 2809sub cf::object::player::goto {
2612 my ($self, $path, $x, $y, $check, $done) = @_; 2810 my ($self, $path, $x, $y, $check, $done) = @_;
2811
2812 if ($self->{_link_recursion} >= $MAX_LINKS) {
2813 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2814 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2815 ($path, $x, $y) = @$EMERGENCY_POSITION;
2816 }
2613 2817
2614 # do generation counting so two concurrent goto's will be executed in-order 2818 # do generation counting so two concurrent goto's will be executed in-order
2615 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2819 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2616 2820
2617 $self->enter_link; 2821 $self->enter_link;
2637 ($path, $x, $y) = (undef, undef, undef); 2841 ($path, $x, $y) = (undef, undef, undef);
2638 } 2842 }
2639 } 2843 }
2640 2844
2641 my $map = eval { 2845 my $map = eval {
2642 my $map = defined $path ? cf::map::find $path : undef; 2846 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2643 2847
2644 if ($map) { 2848 if ($map) {
2645 $map = $map->customise_for ($self); 2849 $map = $map->customise_for ($self);
2646 $map = $check->($map) if $check && $map; 2850 $map = $check->($map, $x, $y, $self) if $check && $map;
2647 } else { 2851 } else {
2648 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2852 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2649 } 2853 }
2650 2854
2651 $map 2855 $map
2659 if ($gen == $self->{_goto_generation}) { 2863 if ($gen == $self->{_goto_generation}) {
2660 delete $self->{_goto_generation}; 2864 delete $self->{_goto_generation};
2661 $self->leave_link ($map, $x, $y); 2865 $self->leave_link ($map, $x, $y);
2662 } 2866 }
2663 2867
2664 $done->() if $done; 2868 $done->($self) if $done;
2665 })->prio (1); 2869 })->prio (1);
2666} 2870}
2667 2871
2668=item $player_object->enter_exit ($exit_object) 2872=item $player_object->enter_exit ($exit_object)
2669 2873
2737 $Coro::current->{desc} = "enter_exit"; 2941 $Coro::current->{desc} = "enter_exit";
2738 2942
2739 unless (eval { 2943 unless (eval {
2740 $self->deactivate_recursive; # just to be sure 2944 $self->deactivate_recursive; # just to be sure
2741 2945
2742 # random map handling
2743 {
2744 my $guard = cf::lock_acquire "exit_prepare:$exit";
2745
2746 prepare_random_map $exit
2747 if $exit->slaying eq "/!";
2748 }
2749
2750 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2946 my $map = cf::map::normalise $exit->slaying, $exit->map;
2751 my $x = $exit->stats->hp; 2947 my $x = $exit->stats->hp;
2752 my $y = $exit->stats->sp; 2948 my $y = $exit->stats->sp;
2949
2950 # special map handling
2951 my $slaying = $exit->slaying;
2952
2953 # special map handling
2954 if ($slaying eq "/!") {
2955 my $guard = cf::lock_acquire "exit_prepare:$exit";
2956
2957 prepare_random_map $exit
2958 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2959
2960 $map = $exit->slaying;
2961
2962 } elsif ($slaying eq '!up') {
2963 $map = $exit->map->tile_path (cf::TILE_UP);
2964 $x = $exit->x;
2965 $y = $exit->y;
2966
2967 } elsif ($slaying eq '!down') {
2968 $map = $exit->map->tile_path (cf::TILE_DOWN);
2969 $x = $exit->x;
2970 $y = $exit->y;
2971 }
2753 2972
2754 $self->goto ($map, $x, $y); 2973 $self->goto ($map, $x, $y);
2755 2974
2756 # if exit is damned, update players death & WoR home-position 2975 # if exit is damned, update players death & WoR home-position
2757 $self->contr->savebed ($map, $x, $y) 2976 $self->contr->savebed ($map, $x, $y)
2762 $self->message ("Something went wrong deep within the deliantra server. " 2981 $self->message ("Something went wrong deep within the deliantra server. "
2763 . "I'll try to bring you back to the map you were before. " 2982 . "I'll try to bring you back to the map you were before. "
2764 . "Please report this to the dungeon master!", 2983 . "Please report this to the dungeon master!",
2765 cf::NDI_UNIQUE | cf::NDI_RED); 2984 cf::NDI_UNIQUE | cf::NDI_RED);
2766 2985
2767 warn "ERROR in enter_exit: $@"; 2986 error "ERROR in enter_exit: $@";
2768 $self->leave_link; 2987 $self->leave_link;
2769 } 2988 }
2770 })->prio (1); 2989 })->prio (1);
2771} 2990}
2772 2991
2784sub cf::client::send_drawinfo { 3003sub cf::client::send_drawinfo {
2785 my ($self, $text, $flags) = @_; 3004 my ($self, $text, $flags) = @_;
2786 3005
2787 utf8::encode $text; 3006 utf8::encode $text;
2788 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3007 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3008}
3009
3010=item $client->send_big_packet ($pkt)
3011
3012Like C<send_packet>, but tries to compress large packets, and fragments
3013them as required.
3014
3015=cut
3016
3017our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3018
3019sub cf::client::send_big_packet {
3020 my ($self, $pkt) = @_;
3021
3022 # try lzf for large packets
3023 $pkt = "lzf " . Compress::LZF::compress $pkt
3024 if 1024 <= length $pkt and $self->{can_lzf};
3025
3026 # split very large packets
3027 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3028 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3029 $pkt = "frag";
3030 }
3031
3032 $self->send_packet ($pkt);
2789} 3033}
2790 3034
2791=item $client->send_msg ($channel, $msg, $color, [extra...]) 3035=item $client->send_msg ($channel, $msg, $color, [extra...])
2792 3036
2793Send a drawinfo or msg packet to the client, formatting the msg for the 3037Send a drawinfo or msg packet to the client, formatting the msg for the
2945 my $pkt = "msg " 3189 my $pkt = "msg "
2946 . $self->{json_coder}->encode ( 3190 . $self->{json_coder}->encode (
2947 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3191 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2948 ); 3192 );
2949 3193
2950 # try lzf for large packets
2951 $pkt = "lzf " . Compress::LZF::compress $pkt
2952 if 1024 <= length $pkt and $self->{can_lzf};
2953
2954 # split very large packets
2955 if (8192 < length $pkt and $self->{can_lzf}) {
2956 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2957 $pkt = "frag";
2958 }
2959
2960 $self->send_packet ($pkt); 3194 $self->send_big_packet ($pkt);
2961} 3195}
2962 3196
2963=item $client->ext_msg ($type, @msg) 3197=item $client->ext_msg ($type, @msg)
2964 3198
2965Sends an ext event to the client. 3199Sends an ext event to the client.
2968 3202
2969sub cf::client::ext_msg($$@) { 3203sub cf::client::ext_msg($$@) {
2970 my ($self, $type, @msg) = @_; 3204 my ($self, $type, @msg) = @_;
2971 3205
2972 if ($self->extcmd == 2) { 3206 if ($self->extcmd == 2) {
2973 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3207 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2974 } elsif ($self->extcmd == 1) { # TODO: remove 3208 } elsif ($self->extcmd == 1) { # TODO: remove
2975 push @msg, msgtype => "event_$type"; 3209 push @msg, msgtype => "event_$type";
2976 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3210 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2977 } 3211 }
2978} 3212}
2979 3213
2980=item $client->ext_reply ($msgid, @msg) 3214=item $client->ext_reply ($msgid, @msg)
2981 3215
2985 3219
2986sub cf::client::ext_reply($$@) { 3220sub cf::client::ext_reply($$@) {
2987 my ($self, $id, @msg) = @_; 3221 my ($self, $id, @msg) = @_;
2988 3222
2989 if ($self->extcmd == 2) { 3223 if ($self->extcmd == 2) {
2990 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3224 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2991 } elsif ($self->extcmd == 1) { 3225 } elsif ($self->extcmd == 1) {
2992 #TODO: version 1, remove 3226 #TODO: version 1, remove
2993 unshift @msg, msgtype => "reply", msgid => $id; 3227 unshift @msg, msgtype => "reply", msgid => $id;
2994 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3228 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2995 } 3229 }
2996} 3230}
2997 3231
2998=item $success = $client->query ($flags, "text", \&cb) 3232=item $success = $client->query ($flags, "text", \&cb)
2999 3233
3070 3304
3071 $ns->ext_reply ($reply, @reply) 3305 $ns->ext_reply ($reply, @reply)
3072 if $reply; 3306 if $reply;
3073 3307
3074 } else { 3308 } else {
3075 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3309 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3076 } 3310 }
3077 3311
3078 cf::override; 3312 cf::override;
3079 }, 3313 },
3080); 3314);
3100 3334
3101 $coro 3335 $coro
3102} 3336}
3103 3337
3104cf::client->attach ( 3338cf::client->attach (
3105 on_destroy => sub { 3339 on_client_destroy => sub {
3106 my ($ns) = @_; 3340 my ($ns) = @_;
3107 3341
3108 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3342 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3109 }, 3343 },
3110); 3344);
3126our $safe_hole = new Safe::Hole; 3360our $safe_hole = new Safe::Hole;
3127 3361
3128$SIG{FPE} = 'IGNORE'; 3362$SIG{FPE} = 'IGNORE';
3129 3363
3130$safe->permit_only (Opcode::opset qw( 3364$safe->permit_only (Opcode::opset qw(
3131 :base_core :base_mem :base_orig :base_math 3365 :base_core :base_mem :base_orig :base_math :base_loop
3132 grepstart grepwhile mapstart mapwhile 3366 grepstart grepwhile mapstart mapwhile
3133 sort time 3367 sort time
3134)); 3368));
3135 3369
3136# here we export the classes and methods available to script code 3370# here we export the classes and methods available to script code
3161 decrease split destroy change_exp value msg lore send_msg)], 3395 decrease split destroy change_exp value msg lore send_msg)],
3162 ["cf::object::player" => qw(player)], 3396 ["cf::object::player" => qw(player)],
3163 ["cf::player" => qw(peaceful send_msg)], 3397 ["cf::player" => qw(peaceful send_msg)],
3164 ["cf::map" => qw(trigger)], 3398 ["cf::map" => qw(trigger)],
3165) { 3399) {
3166 no strict 'refs';
3167 my ($pkg, @funs) = @$_; 3400 my ($pkg, @funs) = @$_;
3168 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3401 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3169 for @funs; 3402 for @funs;
3170} 3403}
3171 3404
3188 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3421 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3189 $qcode =~ s/\n/\\n/g; 3422 $qcode =~ s/\n/\\n/g;
3190 3423
3191 %vars = (_dummy => 0) unless %vars; 3424 %vars = (_dummy => 0) unless %vars;
3192 3425
3426 my @res;
3193 local $_; 3427 local $_;
3194 local @safe::cf::_safe_eval_args = values %vars;
3195 3428
3196 my $eval = 3429 my $eval =
3197 "do {\n" 3430 "do {\n"
3198 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3431 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3199 . "#line 0 \"{$qcode}\"\n" 3432 . "#line 0 \"{$qcode}\"\n"
3200 . $code 3433 . $code
3201 . "\n}" 3434 . "\n}"
3202 ; 3435 ;
3203 3436
3437 if ($CFG{safe_eval}) {
3204 sub_generation_inc; 3438 sub_generation_inc;
3439 local @safe::cf::_safe_eval_args = values %vars;
3205 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3440 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3206 sub_generation_inc; 3441 sub_generation_inc;
3442 } else {
3443 local @cf::_safe_eval_args = values %vars;
3444 @res = wantarray ? eval eval : scalar eval $eval;
3445 }
3207 3446
3208 if ($@) { 3447 if ($@) {
3209 warn "$@"; 3448 warn "$@",
3210 warn "while executing safe code '$code'\n"; 3449 "while executing safe code '$code'\n",
3211 warn "with arguments " . (join " ", %vars) . "\n"; 3450 "with arguments " . (join " ", %vars) . "\n";
3212 } 3451 }
3213 3452
3214 wantarray ? @res : $res[0] 3453 wantarray ? @res : $res[0]
3215} 3454}
3216 3455
3230=cut 3469=cut
3231 3470
3232sub register_script_function { 3471sub register_script_function {
3233 my ($fun, $cb) = @_; 3472 my ($fun, $cb) = @_;
3234 3473
3235 no strict 'refs'; 3474 $fun = "safe::$fun" if $CFG{safe_eval};
3236 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3475 *$fun = $safe_hole->wrap ($cb);
3237} 3476}
3238 3477
3239=back 3478=back
3240 3479
3241=cut 3480=cut
3250 # for this (global event?) 3489 # for this (global event?)
3251 %ext::player_env::MUSIC_FACE_CACHE = (); 3490 %ext::player_env::MUSIC_FACE_CACHE = ();
3252 3491
3253 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3492 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3254 3493
3255 warn "loading facedata from $path\n"; 3494 trace "loading facedata from $path\n";
3256 3495
3257 my $facedata; 3496 my $facedata = decode_storable load_file $path;
3258 0 < aio_load $path, $facedata
3259 or die "$path: $!";
3260
3261 $facedata = Coro::Storable::thaw $facedata;
3262 3497
3263 $facedata->{version} == 2 3498 $facedata->{version} == 2
3264 or cf::cleanup "$path: version mismatch, cannot proceed."; 3499 or cf::cleanup "$path: version mismatch, cannot proceed.";
3265 3500
3266 # patch in the exptable 3501 # patch in the exptable
3502 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3267 $facedata->{resource}{"res/exp_table"} = { 3503 $facedata->{resource}{"res/exp_table"} = {
3268 type => FT_RSRC, 3504 type => FT_RSRC,
3269 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3505 data => $exp_table,
3506 hash => (Digest::MD5::md5 $exp_table),
3270 }; 3507 };
3271 cf::cede_to_tick; 3508 cf::cede_to_tick;
3272 3509
3273 { 3510 {
3274 my $faces = $facedata->{faceinfo}; 3511 my $faces = $facedata->{faceinfo};
3276 while (my ($face, $info) = each %$faces) { 3513 while (my ($face, $info) = each %$faces) {
3277 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3514 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3278 3515
3279 cf::face::set_visibility $idx, $info->{visibility}; 3516 cf::face::set_visibility $idx, $info->{visibility};
3280 cf::face::set_magicmap $idx, $info->{magicmap}; 3517 cf::face::set_magicmap $idx, $info->{magicmap};
3281 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3518 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3282 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3519 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3520 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3283 3521
3284 cf::cede_to_tick; 3522 cf::cede_to_tick;
3285 } 3523 }
3286 3524
3287 while (my ($face, $info) = each %$faces) { 3525 while (my ($face, $info) = each %$faces) {
3292 3530
3293 if (my $smooth = cf::face::find $info->{smooth}) { 3531 if (my $smooth = cf::face::find $info->{smooth}) {
3294 cf::face::set_smooth $idx, $smooth; 3532 cf::face::set_smooth $idx, $smooth;
3295 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3533 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3296 } else { 3534 } else {
3297 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3535 error "smooth face '$info->{smooth}' not found for face '$face'";
3298 } 3536 }
3299 3537
3300 cf::cede_to_tick; 3538 cf::cede_to_tick;
3301 } 3539 }
3302 } 3540 }
3311 3549
3312 cf::anim::invalidate_all; # d'oh 3550 cf::anim::invalidate_all; # d'oh
3313 } 3551 }
3314 3552
3315 { 3553 {
3316 # TODO: for gcfclient pleasure, we should give resources
3317 # that gcfclient doesn't grok a >10000 face index.
3318 my $res = $facedata->{resource}; 3554 my $res = $facedata->{resource};
3319 3555
3320 while (my ($name, $info) = each %$res) { 3556 while (my ($name, $info) = each %$res) {
3321 if (defined $info->{type}) { 3557 if (defined $info->{type}) {
3322 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3558 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3323 my $data;
3324 3559
3325 if ($info->{type} & 1) { 3560 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3326 # prepend meta info
3327
3328 my $meta = $enc->encode ({
3329 name => $name,
3330 %{ $info->{meta} || {} },
3331 });
3332
3333 $data = pack "(w/a*)*", $meta, $info->{data};
3334 } else {
3335 $data = $info->{data};
3336 }
3337
3338 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3339 cf::face::set_type $idx, $info->{type}; 3561 cf::face::set_type $idx, $info->{type};
3340 } else { 3562 } else {
3341 $RESOURCE{$name} = $info; 3563 $RESOURCE{$name} = $info; # unused
3342 } 3564 }
3343 3565
3344 cf::cede_to_tick; 3566 cf::cede_to_tick;
3345 } 3567 }
3346 } 3568 }
3347 3569
3348 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3570 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3349 3571
3350 1 3572 1
3351} 3573}
3352
3353cf::global->attach (on_resource_update => sub {
3354 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3355 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3356
3357 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3358 my $sound = $soundconf->{compat}[$_]
3359 or next;
3360
3361 my $face = cf::face::find "sound/$sound->[1]";
3362 cf::sound::set $sound->[0] => $face;
3363 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3364 }
3365
3366 while (my ($k, $v) = each %{$soundconf->{event}}) {
3367 my $face = cf::face::find "sound/$v";
3368 cf::sound::set $k => $face;
3369 }
3370 }
3371});
3372 3574
3373register_exticmd fx_want => sub { 3575register_exticmd fx_want => sub {
3374 my ($ns, $want) = @_; 3576 my ($ns, $want) = @_;
3375 3577
3376 while (my ($k, $v) = each %$want) { 3578 while (my ($k, $v) = each %$want) {
3415sub reload_treasures { 3617sub reload_treasures {
3416 load_resource_file "$DATADIR/treasures" 3618 load_resource_file "$DATADIR/treasures"
3417 or die "unable to load treasurelists\n"; 3619 or die "unable to load treasurelists\n";
3418} 3620}
3419 3621
3622sub reload_sound {
3623 trace "loading sound config from $DATADIR/sound\n";
3624
3625 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3626
3627 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3628 my $sound = $soundconf->{compat}[$_]
3629 or next;
3630
3631 my $face = cf::face::find "sound/$sound->[1]";
3632 cf::sound::set $sound->[0] => $face;
3633 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3634 }
3635
3636 while (my ($k, $v) = each %{$soundconf->{event}}) {
3637 my $face = cf::face::find "sound/$v";
3638 cf::sound::set $k => $face;
3639 }
3640}
3641
3420sub reload_resources { 3642sub reload_resources {
3421 warn "reloading resource files...\n"; 3643 trace "reloading resource files...\n";
3422 3644
3645 reload_exp_table;
3646 reload_materials;
3423 reload_facedata; 3647 reload_facedata;
3648 reload_sound;
3424 reload_archetypes; 3649 reload_archetypes;
3425 reload_regions; 3650 reload_regions;
3426 reload_treasures; 3651 reload_treasures;
3427 3652
3428 warn "finished reloading resource files\n"; 3653 trace "finished reloading resource files\n";
3429} 3654}
3430 3655
3431sub reload_config { 3656sub reload_config {
3432 warn "reloading config file...\n"; 3657 trace "reloading config file...\n";
3433 3658
3434 open my $fh, "<:utf8", "$CONFDIR/config" 3659 my $config = load_file "$CONFDIR/config";
3435 or return; 3660 utf8::decode $config;
3661 *CFG = decode_yaml $config;
3436 3662
3437 local $/;
3438 *CFG = YAML::XS::Load scalar <$fh>;
3439
3440 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3663 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3441 3664
3442 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3665 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3443 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3666 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3444 3667
3445 if (exists $CFG{mlockall}) { 3668 if (exists $CFG{mlockall}) {
3447 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3670 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3448 and die "WARNING: m(un)lockall failed: $!\n"; 3671 and die "WARNING: m(un)lockall failed: $!\n";
3449 }; 3672 };
3450 warn $@ if $@; 3673 warn $@ if $@;
3451 } 3674 }
3452
3453 warn "finished reloading resource files\n";
3454} 3675}
3455 3676
3456sub pidfile() { 3677sub pidfile() {
3457 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3678 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3458 or die "$PIDFILE: $!"; 3679 or die "$PIDFILE: $!";
3471 seek $fh, 0, 0; 3692 seek $fh, 0, 0;
3472 print $fh $$; 3693 print $fh $$;
3473} 3694}
3474 3695
3475sub main_loop { 3696sub main_loop {
3476 warn "EV::loop starting\n"; 3697 trace "EV::loop starting\n";
3477 if (1) { 3698 if (1) {
3478 EV::loop; 3699 EV::loop;
3479 } 3700 }
3480 warn "EV::loop returned\n"; 3701 trace "EV::loop returned\n";
3481 goto &main_loop unless $REALLY_UNLOOP; 3702 goto &main_loop unless $REALLY_UNLOOP;
3482} 3703}
3483 3704
3484sub main { 3705sub main {
3485 cf::init_globals; # initialise logging 3706 cf::init_globals; # initialise logging
3486 3707
3487 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3708 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3488 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3709 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3489 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3710 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3490 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3711 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3491
3492 cf::init_experience;
3493 cf::init_anim;
3494 cf::init_attackmess;
3495 cf::init_dynamic;
3496 3712
3497 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3713 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3498 3714
3499 # we must not ever block the main coroutine 3715 # we must not ever block the main coroutine
3500 local $Coro::idle = sub { 3716 local $Coro::idle = sub {
3506 }; 3722 };
3507 3723
3508 evthread_start IO::AIO::poll_fileno; 3724 evthread_start IO::AIO::poll_fileno;
3509 3725
3510 cf::sync_job { 3726 cf::sync_job {
3727 cf::incloader::init ();
3728
3729 cf::init_anim;
3730 cf::init_attackmess;
3731 cf::init_dynamic;
3732
3733 cf::load_settings;
3734
3511 reload_resources; 3735 reload_resources;
3512 reload_config; 3736 reload_config;
3513 db_init; 3737 db_init;
3514 3738
3515 cf::load_settings;
3516 cf::load_materials;
3517 cf::init_uuid; 3739 cf::init_uuid;
3518 cf::init_signals; 3740 cf::init_signals;
3519 cf::init_commands;
3520 cf::init_skills; 3741 cf::init_skills;
3521 3742
3522 cf::init_beforeplay; 3743 cf::init_beforeplay;
3523 3744
3524 atomic; 3745 atomic;
3529 3750
3530 # no (long-running) fork's whatsoever before this point(!) 3751 # no (long-running) fork's whatsoever before this point(!)
3531 use POSIX (); 3752 use POSIX ();
3532 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3753 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3533 3754
3534 (pop @POST_INIT)->(0) while @POST_INIT; 3755 cf::_post_init 0;
3535 }; 3756 };
3536 3757
3758 cf::object::thawer::errors_are_fatal 0;
3759 info "parse errors in files are no longer fatal from this point on.\n";
3760
3761 my $free_main; $free_main = EV::idle sub {
3762 undef $free_main;
3763 undef &main; # free gobs of memory :)
3764 };
3765
3537 main_loop; 3766 goto &main_loop;
3538} 3767}
3539 3768
3540############################################################################# 3769#############################################################################
3541# initialisation and cleanup 3770# initialisation and cleanup
3542 3771
3543# install some emergency cleanup handlers 3772# install some emergency cleanup handlers
3544BEGIN { 3773BEGIN {
3545 our %SIGWATCHER = (); 3774 our %SIGWATCHER = ();
3546 for my $signal (qw(INT HUP TERM)) { 3775 for my $signal (qw(INT HUP TERM)) {
3547 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3776 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3548 cf::cleanup "SIG$signal"; 3777 cf::cleanup "SIG$signal";
3549 }; 3778 };
3550 } 3779 }
3551} 3780}
3552 3781
3553sub write_runtime_sync { 3782sub write_runtime_sync {
3783 my $t0 = AE::time;
3784
3554 # first touch the runtime file to show we are still running: 3785 # first touch the runtime file to show we are still running:
3555 # the fsync below can take a very very long time. 3786 # the fsync below can take a very very long time.
3556 3787
3557 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3788 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3558 3789
3559 my $guard = cf::lock_acquire "write_runtime"; 3790 my $guard = cf::lock_acquire "write_runtime";
3560 3791
3561 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3792 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3562 or return; 3793 or return;
3563 3794
3564 my $value = $cf::RUNTIME + 90 + 10; 3795 my $value = $cf::RUNTIME + 90 + 10;
3565 # 10 is the runtime save interval, for a monotonic clock 3796 # 10 is the runtime save interval, for a monotonic clock
3566 # 60 allows for the watchdog to kill the server. 3797 # 60 allows for the watchdog to kill the server.
3579 or return; 3810 or return;
3580 3811
3581 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3812 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3582 and return; 3813 and return;
3583 3814
3584 warn "runtime file written.\n"; 3815 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3585 3816
3586 1 3817 1
3587} 3818}
3588 3819
3589our $uuid_lock; 3820our $uuid_lock;
3601 or return; 3832 or return;
3602 3833
3603 my $value = uuid_seq uuid_cur; 3834 my $value = uuid_seq uuid_cur;
3604 3835
3605 unless ($value) { 3836 unless ($value) {
3606 warn "cowardly refusing to write zero uuid value!\n"; 3837 info "cowardly refusing to write zero uuid value!\n";
3607 return; 3838 return;
3608 } 3839 }
3609 3840
3610 my $value = uuid_str $value + $uuid_skip; 3841 my $value = uuid_str $value + $uuid_skip;
3611 $uuid_skip = 0; 3842 $uuid_skip = 0;
3621 or return; 3852 or return;
3622 3853
3623 aio_rename "$uuid~", $uuid 3854 aio_rename "$uuid~", $uuid
3624 and return; 3855 and return;
3625 3856
3626 warn "uuid file written ($value).\n"; 3857 trace "uuid file written ($value).\n";
3627 3858
3628 1 3859 1
3629 3860
3630} 3861}
3631 3862
3637} 3868}
3638 3869
3639sub emergency_save() { 3870sub emergency_save() {
3640 my $freeze_guard = cf::freeze_mainloop; 3871 my $freeze_guard = cf::freeze_mainloop;
3641 3872
3642 warn "emergency_perl_save: enter\n"; 3873 info "emergency_perl_save: enter\n";
3874
3875 # this is a trade-off: we want to be very quick here, so
3876 # save all maps without fsync, and later call a global sync
3877 # (which in turn might be very very slow)
3878 local $USE_FSYNC = 0;
3643 3879
3644 cf::sync_job { 3880 cf::sync_job {
3645 # this is a trade-off: we want to be very quick here, so 3881 cf::write_runtime_sync; # external watchdog should not bark
3646 # save all maps without fsync, and later call a global sync
3647 # (which in turn might be very very slow)
3648 local $USE_FSYNC = 0;
3649 3882
3650 # use a peculiar iteration method to avoid tripping on perl 3883 # use a peculiar iteration method to avoid tripping on perl
3651 # refcount bugs in for. also avoids problems with players 3884 # refcount bugs in for. also avoids problems with players
3652 # and maps saved/destroyed asynchronously. 3885 # and maps saved/destroyed asynchronously.
3653 warn "emergency_perl_save: begin player save\n"; 3886 info "emergency_perl_save: begin player save\n";
3654 for my $login (keys %cf::PLAYER) { 3887 for my $login (keys %cf::PLAYER) {
3655 my $pl = $cf::PLAYER{$login} or next; 3888 my $pl = $cf::PLAYER{$login} or next;
3656 $pl->valid or next; 3889 $pl->valid or next;
3657 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3890 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3658 $pl->save; 3891 $pl->save;
3659 } 3892 }
3660 warn "emergency_perl_save: end player save\n"; 3893 info "emergency_perl_save: end player save\n";
3661 3894
3895 cf::write_runtime_sync; # external watchdog should not bark
3896
3662 warn "emergency_perl_save: begin map save\n"; 3897 info "emergency_perl_save: begin map save\n";
3663 for my $path (keys %cf::MAP) { 3898 for my $path (keys %cf::MAP) {
3664 my $map = $cf::MAP{$path} or next; 3899 my $map = $cf::MAP{$path} or next;
3665 $map->valid or next; 3900 $map->valid or next;
3666 $map->save; 3901 $map->save;
3667 } 3902 }
3668 warn "emergency_perl_save: end map save\n"; 3903 info "emergency_perl_save: end map save\n";
3669 3904
3905 cf::write_runtime_sync; # external watchdog should not bark
3906
3670 warn "emergency_perl_save: begin database checkpoint\n"; 3907 info "emergency_perl_save: begin database checkpoint\n";
3671 BDB::db_env_txn_checkpoint $DB_ENV; 3908 BDB::db_env_txn_checkpoint $DB_ENV;
3672 warn "emergency_perl_save: end database checkpoint\n"; 3909 info "emergency_perl_save: end database checkpoint\n";
3673 3910
3674 warn "emergency_perl_save: begin write uuid\n"; 3911 info "emergency_perl_save: begin write uuid\n";
3675 write_uuid_sync 1; 3912 write_uuid_sync 1;
3676 warn "emergency_perl_save: end write uuid\n"; 3913 info "emergency_perl_save: end write uuid\n";
3914
3915 cf::write_runtime_sync; # external watchdog should not bark
3916
3917 trace "emergency_perl_save: syncing database to disk";
3918 BDB::db_env_txn_checkpoint $DB_ENV;
3919
3920 info "emergency_perl_save: starting sync\n";
3921 IO::AIO::aio_sync sub {
3922 info "emergency_perl_save: finished sync\n";
3923 };
3924
3925 cf::write_runtime_sync; # external watchdog should not bark
3926
3927 trace "emergency_perl_save: flushing outstanding aio requests";
3928 while (IO::AIO::nreqs || BDB::nreqs) {
3929 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3930 }
3931
3932 cf::write_runtime_sync; # external watchdog should not bark
3677 }; 3933 };
3678 3934
3679 warn "emergency_perl_save: starting sync()\n";
3680 IO::AIO::aio_sync sub {
3681 warn "emergency_perl_save: finished sync()\n";
3682 };
3683
3684 warn "emergency_perl_save: leave\n"; 3935 info "emergency_perl_save: leave\n";
3685} 3936}
3686 3937
3687sub post_cleanup { 3938sub post_cleanup {
3688 my ($make_core) = @_; 3939 my ($make_core) = @_;
3689 3940
3941 IO::AIO::flush;
3942
3690 warn Carp::longmess "post_cleanup backtrace" 3943 error Carp::longmess "post_cleanup backtrace"
3691 if $make_core; 3944 if $make_core;
3692 3945
3693 my $fh = pidfile; 3946 my $fh = pidfile;
3694 unlink $PIDFILE if <$fh> == $$; 3947 unlink $PIDFILE if <$fh> == $$;
3695} 3948}
3715 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3968 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3716 for my $name (keys %$leaf_symtab) { 3969 for my $name (keys %$leaf_symtab) {
3717 _gv_clear *{"$pkg$name"}; 3970 _gv_clear *{"$pkg$name"};
3718# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3971# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3719 } 3972 }
3720 warn "cleared package $pkg\n";#d#
3721} 3973}
3722 3974
3723sub do_reload_perl() { 3975sub do_reload_perl() {
3724 # can/must only be called in main 3976 # can/must only be called in main
3725 if ($Coro::current != $Coro::main) { 3977 unless (in_main) {
3726 warn "can only reload from main coroutine"; 3978 error "can only reload from main coroutine";
3727 return; 3979 return;
3728 } 3980 }
3729 3981
3730 return if $RELOAD++; 3982 return if $RELOAD++;
3731 3983
3732 my $t1 = EV::time; 3984 my $t1 = AE::time;
3733 3985
3734 while ($RELOAD) { 3986 while ($RELOAD) {
3735 warn "reloading..."; 3987 cf::get_slot 0.1, -1, "reload_perl";
3988 info "perl_reload: reloading...";
3736 3989
3737 warn "entering sync_job"; 3990 trace "perl_reload: entering sync_job";
3738 3991
3739 cf::sync_job { 3992 cf::sync_job {
3740 cf::write_runtime_sync; # external watchdog should not bark
3741 cf::emergency_save; 3993 #cf::emergency_save;
3742 cf::write_runtime_sync; # external watchdog should not bark
3743 3994
3744 warn "syncing database to disk";
3745 BDB::db_env_txn_checkpoint $DB_ENV;
3746
3747 # if anything goes wrong in here, we should simply crash as we already saved
3748
3749 warn "flushing outstanding aio requests";
3750 while (IO::AIO::nreqs || BDB::nreqs) {
3751 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3752 }
3753
3754 warn "cancelling all extension coros"; 3995 trace "perl_reload: cancelling all extension coros";
3755 $_->cancel for values %EXT_CORO; 3996 $_->cancel for values %EXT_CORO;
3756 %EXT_CORO = (); 3997 %EXT_CORO = ();
3757 3998
3758 warn "removing commands"; 3999 trace "perl_reload: removing commands";
3759 %COMMAND = (); 4000 %COMMAND = ();
3760 4001
3761 warn "removing ext/exti commands"; 4002 trace "perl_reload: removing ext/exti commands";
3762 %EXTCMD = (); 4003 %EXTCMD = ();
3763 %EXTICMD = (); 4004 %EXTICMD = ();
3764 4005
3765 warn "unloading/nuking all extensions"; 4006 trace "perl_reload: unloading/nuking all extensions";
3766 for my $pkg (@EXTS) { 4007 for my $pkg (@EXTS) {
3767 warn "... unloading $pkg"; 4008 trace "... unloading $pkg";
3768 4009
3769 if (my $cb = $pkg->can ("unload")) { 4010 if (my $cb = $pkg->can ("unload")) {
3770 eval { 4011 eval {
3771 $cb->($pkg); 4012 $cb->($pkg);
3772 1 4013 1
3773 } or warn "$pkg unloaded, but with errors: $@"; 4014 } or error "$pkg unloaded, but with errors: $@";
3774 } 4015 }
3775 4016
3776 warn "... clearing $pkg"; 4017 trace "... clearing $pkg";
3777 clear_package $pkg; 4018 clear_package $pkg;
3778 } 4019 }
3779 4020
3780 warn "unloading all perl modules loaded from $LIBDIR"; 4021 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3781 while (my ($k, $v) = each %INC) { 4022 while (my ($k, $v) = each %INC) {
3782 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4023 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3783 4024
3784 warn "... unloading $k"; 4025 trace "... unloading $k";
3785 delete $INC{$k}; 4026 delete $INC{$k};
3786 4027
3787 $k =~ s/\.pm$//; 4028 $k =~ s/\.pm$//;
3788 $k =~ s/\//::/g; 4029 $k =~ s/\//::/g;
3789 4030
3792 } 4033 }
3793 4034
3794 clear_package $k; 4035 clear_package $k;
3795 } 4036 }
3796 4037
3797 warn "getting rid of safe::, as good as possible"; 4038 trace "perl_reload: getting rid of safe::, as good as possible";
3798 clear_package "safe::$_" 4039 clear_package "safe::$_"
3799 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4040 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3800 4041
3801 warn "unloading cf.pm \"a bit\""; 4042 trace "perl_reload: unloading cf.pm \"a bit\"";
3802 delete $INC{"cf.pm"}; 4043 delete $INC{"cf.pm"};
3803 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4044 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3804 4045
3805 # don't, removes xs symbols, too, 4046 # don't, removes xs symbols, too,
3806 # and global variables created in xs 4047 # and global variables created in xs
3807 #clear_package __PACKAGE__; 4048 #clear_package __PACKAGE__;
3808 4049
3809 warn "unload completed, starting to reload now"; 4050 info "perl_reload: unload completed, starting to reload now";
3810 4051
3811 warn "reloading cf.pm"; 4052 trace "perl_reload: reloading cf.pm";
3812 require cf; 4053 require cf;
3813 cf::_connect_to_perl_1; 4054 cf::_connect_to_perl_1;
3814 4055
3815 warn "loading config and database again"; 4056 trace "perl_reload: loading config and database again";
3816 cf::reload_config; 4057 cf::reload_config;
3817 4058
3818 warn "loading extensions"; 4059 trace "perl_reload: loading extensions";
3819 cf::load_extensions; 4060 cf::load_extensions;
3820 4061
3821 if ($REATTACH_ON_RELOAD) { 4062 if ($REATTACH_ON_RELOAD) {
3822 warn "reattaching attachments to objects/players"; 4063 trace "perl_reload: reattaching attachments to objects/players";
3823 _global_reattach; # objects, sockets 4064 _global_reattach; # objects, sockets
3824 warn "reattaching attachments to maps"; 4065 trace "perl_reload: reattaching attachments to maps";
3825 reattach $_ for values %MAP; 4066 reattach $_ for values %MAP;
3826 warn "reattaching attachments to players"; 4067 trace "perl_reload: reattaching attachments to players";
3827 reattach $_ for values %PLAYER; 4068 reattach $_ for values %PLAYER;
3828 } 4069 }
3829 4070
3830 warn "running post_init jobs"; 4071 cf::_post_init 1;
3831 (pop @POST_INIT)->(1) while @POST_INIT;
3832 4072
3833 warn "leaving sync_job"; 4073 trace "perl_reload: leaving sync_job";
3834 4074
3835 1 4075 1
3836 } or do { 4076 } or do {
3837 warn $@; 4077 error $@;
3838 cf::cleanup "error while reloading, exiting."; 4078 cf::cleanup "perl_reload: error, exiting.";
3839 }; 4079 };
3840 4080
3841 warn "reloaded";
3842 --$RELOAD; 4081 --$RELOAD;
3843 } 4082 }
3844 4083
3845 $t1 = EV::time - $t1; 4084 $t1 = AE::time - $t1;
3846 warn "reload completed in ${t1}s\n"; 4085 info "perl_reload: completed in ${t1}s\n";
3847}; 4086};
3848 4087
3849our $RELOAD_WATCHER; # used only during reload 4088our $RELOAD_WATCHER; # used only during reload
3850 4089
3851sub reload_perl() { 4090sub reload_perl() {
3853 # coro crashes during coro_state_free->destroy here. 4092 # coro crashes during coro_state_free->destroy here.
3854 4093
3855 $RELOAD_WATCHER ||= cf::async { 4094 $RELOAD_WATCHER ||= cf::async {
3856 Coro::AIO::aio_wait cache_extensions; 4095 Coro::AIO::aio_wait cache_extensions;
3857 4096
3858 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4097 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3859 do_reload_perl; 4098 do_reload_perl;
3860 undef $RELOAD_WATCHER; 4099 undef $RELOAD_WATCHER;
3861 }; 4100 };
3862 }; 4101 };
3863} 4102}
3872 reload_perl; 4111 reload_perl;
3873 }; 4112 };
3874 } 4113 }
3875}; 4114};
3876 4115
3877unshift @INC, $LIBDIR; 4116#############################################################################
3878 4117
3879my $bug_warning = 0; 4118my $bug_warning = 0;
3880 4119
3881our @WAIT_FOR_TICK;
3882our @WAIT_FOR_TICK_BEGIN;
3883
3884sub wait_for_tick { 4120sub wait_for_tick() {
3885 return if tick_inhibit || $Coro::current == $Coro::main; 4121 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3886 4122
3887 my $signal = new Coro::Signal; 4123 $WAIT_FOR_TICK->wait;
3888 push @WAIT_FOR_TICK, $signal;
3889 $signal->wait;
3890} 4124}
3891 4125
3892sub wait_for_tick_begin { 4126sub wait_for_tick_begin() {
3893 return if tick_inhibit || $Coro::current == $Coro::main; 4127 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3894 4128
3895 my $signal = new Coro::Signal; 4129 my $signal = new Coro::Signal;
3896 push @WAIT_FOR_TICK_BEGIN, $signal; 4130 push @WAIT_FOR_TICK_BEGIN, $signal;
3897 $signal->wait; 4131 $signal->wait;
3898} 4132}
3902 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4136 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3903 unless ++$bug_warning > 10; 4137 unless ++$bug_warning > 10;
3904 return; 4138 return;
3905 } 4139 }
3906 4140
3907 cf::server_tick; # one server iteration 4141 cf::one_tick; # one server iteration
4142
4143 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3908 4144
3909 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4145 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3910 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4146 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3911 Coro::async_pool { 4147 Coro::async_pool {
3912 $Coro::current->{desc} = "runtime saver"; 4148 $Coro::current->{desc} = "runtime saver";
3913 write_runtime_sync 4149 write_runtime_sync
3914 or warn "ERROR: unable to write runtime file: $!"; 4150 or error "ERROR: unable to write runtime file: $!";
3915 }; 4151 };
3916 } 4152 }
3917 4153
3918 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4154 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3919 $sig->send; 4155 $sig->send;
3920 } 4156 }
3921 while (my $sig = shift @WAIT_FOR_TICK) { 4157 $WAIT_FOR_TICK->broadcast;
3922 $sig->send;
3923 }
3924 4158
3925 $LOAD = ($NOW - $TICK_START) / $TICK; 4159 $LOAD = ($NOW - $TICK_START) / $TICK;
3926 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4160 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3927 4161
3928 if (0) { 4162 if (0) {
3929 if ($NEXT_TICK) { 4163 if ($NEXT_TICK) {
3930 my $jitter = $TICK_START - $NEXT_TICK; 4164 my $jitter = $TICK_START - $NEXT_TICK;
3931 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4165 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3932 warn "jitter $JITTER\n";#d# 4166 debug "jitter $JITTER\n";#d#
3933 } 4167 }
3934 } 4168 }
3935} 4169}
3936 4170
3937{ 4171{
3938 # configure BDB 4172 # configure BDB
3939 4173
3940 BDB::min_parallel 8; 4174 BDB::min_parallel 16;
3941 BDB::max_poll_reqs $TICK * 0.1; 4175 BDB::max_poll_reqs $TICK * 0.1;
3942 $AnyEvent::BDB::WATCHER->priority (1); 4176 $AnyEvent::BDB::WATCHER->priority (1);
3943 4177
3944 unless ($DB_ENV) { 4178 unless ($DB_ENV) {
3945 $DB_ENV = BDB::db_env_create; 4179 $DB_ENV = BDB::db_env_create;
3982 IO::AIO::min_parallel 8; 4216 IO::AIO::min_parallel 8;
3983 IO::AIO::max_poll_time $TICK * 0.1; 4217 IO::AIO::max_poll_time $TICK * 0.1;
3984 undef $AnyEvent::AIO::WATCHER; 4218 undef $AnyEvent::AIO::WATCHER;
3985} 4219}
3986 4220
3987my $_log_backtrace; 4221our $_log_backtrace;
4222our $_log_backtrace_last;
3988 4223
3989sub _log_backtrace { 4224sub _log_backtrace {
3990 my ($msg, @addr) = @_; 4225 my ($msg, @addr) = @_;
3991 4226
3992 $msg =~ s/\n//; 4227 $msg =~ s/\n$//;
3993 4228
4229 if ($_log_backtrace_last eq $msg) {
4230 LOG llevInfo, "[ABT] $msg\n";
4231 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3994 # limit the # of concurrent backtraces 4232 # limit the # of concurrent backtraces
3995 if ($_log_backtrace < 2) { 4233 } elsif ($_log_backtrace < 2) {
4234 $_log_backtrace_last = $msg;
3996 ++$_log_backtrace; 4235 ++$_log_backtrace;
3997 my $perl_bt = Carp::longmess $msg; 4236 my $perl_bt = Carp::longmess $msg;
3998 async { 4237 async {
3999 $Coro::current->{desc} = "abt $msg"; 4238 $Coro::current->{desc} = "abt $msg";
4000 4239
4020 LOG llevInfo, "[ABT] $_\n" for @bt; 4259 LOG llevInfo, "[ABT] $_\n" for @bt;
4021 --$_log_backtrace; 4260 --$_log_backtrace;
4022 }; 4261 };
4023 } else { 4262 } else {
4024 LOG llevInfo, "[ABT] $msg\n"; 4263 LOG llevInfo, "[ABT] $msg\n";
4025 LOG llevInfo, "[ABT] [suppressed]\n"; 4264 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4026 } 4265 }
4027} 4266}
4028 4267
4029# load additional modules 4268# load additional modules
4030require "cf/$_.pm" for @EXTRA_MODULES; 4269require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines