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.500 by root, Sat Jan 16 00:08:33 2010 UTC vs.
Revision 1.572 by root, Sun May 8 11:44:43 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;
… …
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
… …
291} 337}
292 338
293$EV::DIED = sub { 339$EV::DIED = sub {
294 Carp::cluck "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 {
… …
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)
… …
2064 2239
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;
2244 $self->post_load_physics;
2069 cf::cede_to_tick; 2245 cf::cede_to_tick;
2070 $self->activate; 2246 #$self->activate; # no longer activate maps automatically
2071 } 2247 }
2072 2248
2073 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME); 2250 $self->last_access ($cf::RUNTIME);
2075
2076 $self->in_memory (cf::MAP_ACTIVE);
2077 } 2251 }
2078 2252
2079 $self->post_load; 2253 $self->post_load;
2080}
2081 2254
2255 1
2256}
2257
2258# customize the map for a given player, i.e.
2259# return the _real_ map. used by e.g. per-player
2260# maps to change the path to ~playername/mappath
2082sub customise_for { 2261sub customise_for {
2083 my ($self, $ob) = @_; 2262 my ($self, $ob) = @_;
2084 2263
2085 return find "~" . $ob->name . "/" . $self->{path} 2264 return find "~" . $ob->name . "/" . $self->{path}
2086 if $self->per_player; 2265 if $self->per_player;
… …
2102 or next; 2281 or next;
2103 $neigh = find $neigh, $map 2282 $neigh = find $neigh, $map
2104 or next; 2283 or next;
2105 $neigh->load; 2284 $neigh->load;
2106 2285
2286 # now find the diagonal neighbours
2107 push @neigh, 2287 push @neigh,
2108 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2288 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2109 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2289 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2110 } 2290 }
2111 2291
… …
2118} 2298}
2119 2299
2120sub find_sync { 2300sub find_sync {
2121 my ($path, $origin) = @_; 2301 my ($path, $origin) = @_;
2122 2302
2123 cf::sync_job { find $path, $origin } 2303 # it's a bug to call this from the main context
2304 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2305 if $Coro::current == $Coro::main;
2306
2307 find $path, $origin
2124} 2308}
2125 2309
2126sub do_load_sync { 2310sub do_load_sync {
2127 my ($map) = @_; 2311 my ($map) = @_;
2128 2312
2313 # it's a bug to call this from the main context
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2314 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main; 2315 if $Coro::current == $Coro::main;
2131 2316
2132 cf::sync_job { $map->load }; 2317 $map->load;
2133} 2318}
2134 2319
2135our %MAP_PREFETCH; 2320our %MAP_PREFETCH;
2136our $MAP_PREFETCHER = undef; 2321our $MAP_PREFETCHER = undef;
2137 2322
2138sub find_async { 2323sub find_async {
2139 my ($path, $origin, $load) = @_; 2324 my ($path, $origin, $load) = @_;
2140 2325
2141 $path = normalise $path, $origin && $origin->{path}; 2326 $path = normalise $path, $origin;
2142 2327
2328 print "find async $path (from $origin)\n";#d#
2329
2143 if (my $map = $cf::MAP{$path}) { 2330 if (my $map = $cf::MAP{$path}) {
2144 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2331 return $map if !$load || $map->linkable;
2145 } 2332 }
2146 2333
2147 $MAP_PREFETCH{$path} |= $load; 2334 $MAP_PREFETCH{$path} |= $load;
2148 2335
2149 $MAP_PREFETCHER ||= cf::async { 2336 $MAP_PREFETCHER ||= cf::async {
… …
2163 $MAP_PREFETCHER->prio (6); 2350 $MAP_PREFETCHER->prio (6);
2164 2351
2165 () 2352 ()
2166} 2353}
2167 2354
2355# common code, used by both ->save and ->swapout
2168sub save { 2356sub _save {
2169 my ($self) = @_; 2357 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172 2358
2173 $self->{last_save} = $cf::RUNTIME; 2359 $self->{last_save} = $cf::RUNTIME;
2174 2360
2175 return unless $self->dirty; 2361 return unless $self->dirty;
2176 2362
… …
2196 } else { 2382 } else {
2197 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2383 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2198 } 2384 }
2199} 2385}
2200 2386
2387sub save {
2388 my ($self) = @_;
2389
2390 my $lock = cf::lock_acquire "map_data:$self->{path}";
2391
2392 $self->_save;
2393}
2394
2201sub swap_out { 2395sub swap_out {
2202 my ($self) = @_; 2396 my ($self) = @_;
2203 2397
2204 # save first because save cedes
2205 $self->save;
2206
2207 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2398 my $lock = cf::lock_acquire "map_data:$self->{path}";
2208 2399
2400 return if !$self->linkable;
2401 return if $self->{deny_save};
2209 return if $self->players; 2402 return if $self->players;
2210 return if $self->in_memory != cf::MAP_ACTIVE; 2403
2404 # first deactivate the map and "unlink" it from the core
2405 $self->deactivate;
2406 $_->clear_links_to ($self) for values %cf::MAP;
2407 $self->state (cf::MAP_SWAPPED);
2408
2409 # then atomically save
2410 $self->_save;
2411
2412 # then free the map
2413 $self->clear;
2414}
2415
2416sub reset_at {
2417 my ($self) = @_;
2418
2419 # TODO: safety, remove and allow resettable per-player maps
2211 return if $self->{deny_save}; 2420 return 1e99 if $self->{deny_reset};
2212 2421
2422 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2423 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2424
2425 $time + $to
2426}
2427
2428sub should_reset {
2429 my ($self) = @_;
2430
2431 $self->reset_at <= $cf::RUNTIME
2432}
2433
2434sub reset {
2435 my ($self) = @_;
2436
2437 my $lock = cf::lock_acquire "map_data:$self->{path}";
2438
2439 return if $self->players;
2440
2441 cf::trace "resetting map ", $self->path, "\n";
2442
2213 $self->in_memory (cf::MAP_SWAPPED); 2443 $self->state (cf::MAP_SWAPPED);
2444
2445 # need to save uniques path
2446 unless ($self->{deny_save}) {
2447 my $uniq = $self->uniq_path; utf8::encode $uniq;
2448
2449 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2450 if $uniq;
2451 }
2452
2453 delete $cf::MAP{$self->path};
2214 2454
2215 $self->deactivate; 2455 $self->deactivate;
2216 $_->clear_links_to ($self) for values %cf::MAP; 2456 $_->clear_links_to ($self) for values %cf::MAP;
2217 $self->clear; 2457 $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 2458
2263 $self->unlink_save; 2459 $self->unlink_save;
2264 $self->destroy; 2460 $self->destroy;
2265} 2461}
2266 2462
… …
2274 2470
2275 delete $cf::MAP{$self->path}; 2471 delete $cf::MAP{$self->path};
2276 2472
2277 $self->unlink_save; 2473 $self->unlink_save;
2278 2474
2279 bless $self, "cf::map"; 2475 bless $self, "cf::map::wrap";
2280 delete $self->{deny_reset}; 2476 delete $self->{deny_reset};
2281 $self->{deny_save} = 1; 2477 $self->{deny_save} = 1;
2282 $self->reset_timeout (1); 2478 $self->reset_timeout (1);
2283 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2479 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2284 2480
… …
2514 2710
2515Freezes the player and moves him/her to a special map (C<{link}>). 2711Freezes the player and moves him/her to a special map (C<{link}>).
2516 2712
2517The player should be reasonably safe there for short amounts of time (e.g. 2713The 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, 2714for 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 2715though, as the player cannot control the character while it is on the link
2520map. 2716map.
2521 2717
2522Will never block. 2718Will never block.
2523 2719
2524=item $player_object->leave_link ($map, $x, $y) 2720=item $player_object->leave_link ($map, $x, $y)
… …
2545sub cf::object::player::enter_link { 2741sub cf::object::player::enter_link {
2546 my ($self) = @_; 2742 my ($self) = @_;
2547 2743
2548 $self->deactivate_recursive; 2744 $self->deactivate_recursive;
2549 2745
2746 ++$self->{_link_recursion};
2747
2550 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2748 return if UNIVERSAL::isa $self->map, "ext::map_link";
2551 2749
2552 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2750 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2553 if $self->map && $self->map->{path} ne "{link}"; 2751 if $self->map && $self->map->{path} ne "{link}";
2554 2752
2555 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2753 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2556} 2754}
2557 2755
2558sub cf::object::player::leave_link { 2756sub cf::object::player::leave_link {
2559 my ($self, $map, $x, $y) = @_; 2757 my ($self, $map, $x, $y) = @_;
2560 2758
… …
2585 $map->load_neighbours; 2783 $map->load_neighbours;
2586 2784
2587 return unless $self->contr->active; 2785 return unless $self->contr->active;
2588 2786
2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2787 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2590 $self->enter_map ($map, $x, $y); 2788 if ($self->enter_map ($map, $x, $y)) {
2591 2789 # entering was successful
2790 delete $self->{_link_recursion};
2592 # only activate afterwards, to support waiting in hooks 2791 # only activate afterwards, to support waiting in hooks
2593 $self->activate_recursive; 2792 $self->activate_recursive;
2594} 2793 }
2595 2794
2795}
2796
2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2797=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2597 2798
2598Moves the player to the given map-path and coordinates by first freezing 2799Moves the player to the given map-path and coordinates by first freezing
2599her, loading and preparing them map, calling the provided $check callback 2800her, loading and preparing them map, calling the provided $check callback
2600that has to return the map if sucecssful, and then unfreezes the player on 2801that 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 2802the new (success) or old (failed) map position. In either case, $done will
… …
2608 2809
2609our $GOTOGEN; 2810our $GOTOGEN;
2610 2811
2611sub cf::object::player::goto { 2812sub cf::object::player::goto {
2612 my ($self, $path, $x, $y, $check, $done) = @_; 2813 my ($self, $path, $x, $y, $check, $done) = @_;
2814
2815 if ($self->{_link_recursion} >= $MAX_LINKS) {
2816 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2817 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2818 ($path, $x, $y) = @$EMERGENCY_POSITION;
2819 }
2613 2820
2614 # do generation counting so two concurrent goto's will be executed in-order 2821 # do generation counting so two concurrent goto's will be executed in-order
2615 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2822 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2616 2823
2617 $self->enter_link; 2824 $self->enter_link;
… …
2637 ($path, $x, $y) = (undef, undef, undef); 2844 ($path, $x, $y) = (undef, undef, undef);
2638 } 2845 }
2639 } 2846 }
2640 2847
2641 my $map = eval { 2848 my $map = eval {
2642 my $map = defined $path ? cf::map::find $path : undef; 2849 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2643 2850
2644 if ($map) { 2851 if ($map) {
2645 $map = $map->customise_for ($self); 2852 $map = $map->customise_for ($self);
2646 $map = $check->($map) if $check && $map; 2853 $map = $check->($map, $x, $y, $self) if $check && $map;
2647 } else { 2854 } else {
2648 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2855 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2649 } 2856 }
2650 2857
2651 $map 2858 $map
… …
2659 if ($gen == $self->{_goto_generation}) { 2866 if ($gen == $self->{_goto_generation}) {
2660 delete $self->{_goto_generation}; 2867 delete $self->{_goto_generation};
2661 $self->leave_link ($map, $x, $y); 2868 $self->leave_link ($map, $x, $y);
2662 } 2869 }
2663 2870
2664 $done->() if $done; 2871 $done->($self) if $done;
2665 })->prio (1); 2872 })->prio (1);
2666} 2873}
2667 2874
2668=item $player_object->enter_exit ($exit_object) 2875=item $player_object->enter_exit ($exit_object)
2669 2876
… …
2737 $Coro::current->{desc} = "enter_exit"; 2944 $Coro::current->{desc} = "enter_exit";
2738 2945
2739 unless (eval { 2946 unless (eval {
2740 $self->deactivate_recursive; # just to be sure 2947 $self->deactivate_recursive; # just to be sure
2741 2948
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; 2949 my $map = cf::map::normalise $exit->slaying, $exit->map;
2751 my $x = $exit->stats->hp; 2950 my $x = $exit->stats->hp;
2752 my $y = $exit->stats->sp; 2951 my $y = $exit->stats->sp;
2952
2953 # special map handling
2954 my $slaying = $exit->slaying;
2955
2956 # special map handling
2957 if ($slaying eq "/!") {
2958 my $guard = cf::lock_acquire "exit_prepare:$exit";
2959
2960 prepare_random_map $exit
2961 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2962
2963 $map = $exit->slaying;
2964
2965 } elsif ($slaying eq '!up') {
2966 $map = $exit->map->tile_path (cf::TILE_UP);
2967 $x = $exit->x;
2968 $y = $exit->y;
2969
2970 } elsif ($slaying eq '!down') {
2971 $map = $exit->map->tile_path (cf::TILE_DOWN);
2972 $x = $exit->x;
2973 $y = $exit->y;
2974 }
2753 2975
2754 $self->goto ($map, $x, $y); 2976 $self->goto ($map, $x, $y);
2755 2977
2756 # if exit is damned, update players death & WoR home-position 2978 # if exit is damned, update players death & WoR home-position
2757 $self->contr->savebed ($map, $x, $y) 2979 $self->contr->savebed ($map, $x, $y)
… …
2762 $self->message ("Something went wrong deep within the deliantra server. " 2984 $self->message ("Something went wrong deep within the deliantra server. "
2763 . "I'll try to bring you back to the map you were before. " 2985 . "I'll try to bring you back to the map you were before. "
2764 . "Please report this to the dungeon master!", 2986 . "Please report this to the dungeon master!",
2765 cf::NDI_UNIQUE | cf::NDI_RED); 2987 cf::NDI_UNIQUE | cf::NDI_RED);
2766 2988
2767 warn "ERROR in enter_exit: $@"; 2989 error "ERROR in enter_exit: $@";
2768 $self->leave_link; 2990 $self->leave_link;
2769 } 2991 }
2770 })->prio (1); 2992 })->prio (1);
2771} 2993}
2772 2994
… …
3085 3307
3086 $ns->ext_reply ($reply, @reply) 3308 $ns->ext_reply ($reply, @reply)
3087 if $reply; 3309 if $reply;
3088 3310
3089 } else { 3311 } else {
3090 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3312 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3091 } 3313 }
3092 3314
3093 cf::override; 3315 cf::override;
3094 }, 3316 },
3095); 3317);
… …
3115 3337
3116 $coro 3338 $coro
3117} 3339}
3118 3340
3119cf::client->attach ( 3341cf::client->attach (
3120 on_destroy => sub { 3342 on_client_destroy => sub {
3121 my ($ns) = @_; 3343 my ($ns) = @_;
3122 3344
3123 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3345 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3124 }, 3346 },
3125); 3347);
… …
3176 decrease split destroy change_exp value msg lore send_msg)], 3398 decrease split destroy change_exp value msg lore send_msg)],
3177 ["cf::object::player" => qw(player)], 3399 ["cf::object::player" => qw(player)],
3178 ["cf::player" => qw(peaceful send_msg)], 3400 ["cf::player" => qw(peaceful send_msg)],
3179 ["cf::map" => qw(trigger)], 3401 ["cf::map" => qw(trigger)],
3180) { 3402) {
3181 no strict 'refs';
3182 my ($pkg, @funs) = @$_; 3403 my ($pkg, @funs) = @$_;
3183 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3404 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3184 for @funs; 3405 for @funs;
3185} 3406}
3186 3407
… …
3225 local @cf::_safe_eval_args = values %vars; 3446 local @cf::_safe_eval_args = values %vars;
3226 @res = wantarray ? eval eval : scalar eval $eval; 3447 @res = wantarray ? eval eval : scalar eval $eval;
3227 } 3448 }
3228 3449
3229 if ($@) { 3450 if ($@) {
3230 warn "$@"; 3451 warn "$@",
3231 warn "while executing safe code '$code'\n"; 3452 "while executing safe code '$code'\n",
3232 warn "with arguments " . (join " ", %vars) . "\n"; 3453 "with arguments " . (join " ", %vars) . "\n";
3233 } 3454 }
3234 3455
3235 wantarray ? @res : $res[0] 3456 wantarray ? @res : $res[0]
3236} 3457}
3237 3458
… …
3251=cut 3472=cut
3252 3473
3253sub register_script_function { 3474sub register_script_function {
3254 my ($fun, $cb) = @_; 3475 my ($fun, $cb) = @_;
3255 3476
3256 no strict 'refs'; 3477 $fun = "safe::$fun" if $CFG{safe_eval};
3257 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3478 *$fun = $safe_hole->wrap ($cb);
3258} 3479}
3259 3480
3260=back 3481=back
3261 3482
3262=cut 3483=cut
… …
3271 # for this (global event?) 3492 # for this (global event?)
3272 %ext::player_env::MUSIC_FACE_CACHE = (); 3493 %ext::player_env::MUSIC_FACE_CACHE = ();
3273 3494
3274 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3495 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3275 3496
3276 warn "loading facedata from $path\n"; 3497 trace "loading facedata from $path\n";
3277 3498
3278 my $facedata; 3499 my $facedata = decode_storable load_file $path;
3279 0 < aio_load $path, $facedata
3280 or die "$path: $!";
3281
3282 $facedata = Coro::Storable::thaw $facedata;
3283 3500
3284 $facedata->{version} == 2 3501 $facedata->{version} == 2
3285 or cf::cleanup "$path: version mismatch, cannot proceed."; 3502 or cf::cleanup "$path: version mismatch, cannot proceed.";
3286 3503
3287 # patch in the exptable 3504 # patch in the exptable
… …
3301 3518
3302 cf::face::set_visibility $idx, $info->{visibility}; 3519 cf::face::set_visibility $idx, $info->{visibility};
3303 cf::face::set_magicmap $idx, $info->{magicmap}; 3520 cf::face::set_magicmap $idx, $info->{magicmap};
3304 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3521 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3305 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3522 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3523 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3306 3524
3307 cf::cede_to_tick; 3525 cf::cede_to_tick;
3308 } 3526 }
3309 3527
3310 while (my ($face, $info) = each %$faces) { 3528 while (my ($face, $info) = each %$faces) {
… …
3315 3533
3316 if (my $smooth = cf::face::find $info->{smooth}) { 3534 if (my $smooth = cf::face::find $info->{smooth}) {
3317 cf::face::set_smooth $idx, $smooth; 3535 cf::face::set_smooth $idx, $smooth;
3318 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3536 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3319 } else { 3537 } else {
3320 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3538 error "smooth face '$info->{smooth}' not found for face '$face'";
3321 } 3539 }
3322 3540
3323 cf::cede_to_tick; 3541 cf::cede_to_tick;
3324 } 3542 }
3325 } 3543 }
… …
3343 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3561 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3344 3562
3345 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3563 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3346 cf::face::set_type $idx, $info->{type}; 3564 cf::face::set_type $idx, $info->{type};
3347 } else { 3565 } else {
3348 $RESOURCE{$name} = $info; 3566 $RESOURCE{$name} = $info; # unused
3349 } 3567 }
3350 3568
3351 cf::cede_to_tick; 3569 cf::cede_to_tick;
3352 } 3570 }
3353 } 3571 }
3354 3572
3355 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3573 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3356 3574
3357 1 3575 1
3358} 3576}
3359
3360cf::global->attach (on_resource_update => sub {
3361 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3362 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3363
3364 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3365 my $sound = $soundconf->{compat}[$_]
3366 or next;
3367
3368 my $face = cf::face::find "sound/$sound->[1]";
3369 cf::sound::set $sound->[0] => $face;
3370 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3371 }
3372
3373 while (my ($k, $v) = each %{$soundconf->{event}}) {
3374 my $face = cf::face::find "sound/$v";
3375 cf::sound::set $k => $face;
3376 }
3377 }
3378});
3379 3577
3380register_exticmd fx_want => sub { 3578register_exticmd fx_want => sub {
3381 my ($ns, $want) = @_; 3579 my ($ns, $want) = @_;
3382 3580
3383 while (my ($k, $v) = each %$want) { 3581 while (my ($k, $v) = each %$want) {
… …
3422sub reload_treasures { 3620sub reload_treasures {
3423 load_resource_file "$DATADIR/treasures" 3621 load_resource_file "$DATADIR/treasures"
3424 or die "unable to load treasurelists\n"; 3622 or die "unable to load treasurelists\n";
3425} 3623}
3426 3624
3625sub reload_sound {
3626 trace "loading sound config from $DATADIR/sound\n";
3627
3628 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3629
3630 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3631 my $sound = $soundconf->{compat}[$_]
3632 or next;
3633
3634 my $face = cf::face::find "sound/$sound->[1]";
3635 cf::sound::set $sound->[0] => $face;
3636 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3637 }
3638
3639 while (my ($k, $v) = each %{$soundconf->{event}}) {
3640 my $face = cf::face::find "sound/$v";
3641 cf::sound::set $k => $face;
3642 }
3643}
3644
3427sub reload_resources { 3645sub reload_resources {
3428 warn "reloading resource files...\n"; 3646 trace "reloading resource files...\n";
3429 3647
3648 reload_exp_table;
3649 reload_materials;
3430 reload_facedata; 3650 reload_facedata;
3651 reload_sound;
3431 reload_archetypes; 3652 reload_archetypes;
3432 reload_regions; 3653 reload_regions;
3433 reload_treasures; 3654 reload_treasures;
3434 3655
3435 warn "finished reloading resource files\n"; 3656 trace "finished reloading resource files\n";
3436} 3657}
3437 3658
3438sub reload_config { 3659sub reload_config {
3439 warn "reloading config file...\n"; 3660 trace "reloading config file...\n";
3440 3661
3441 open my $fh, "<:utf8", "$CONFDIR/config" 3662 my $config = load_file "$CONFDIR/config";
3442 or return; 3663 utf8::decode $config;
3664 *CFG = decode_yaml $config;
3443 3665
3444 local $/;
3445 *CFG = YAML::XS::Load scalar <$fh>;
3446
3447 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3666 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3448 3667
3449 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3668 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3450 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3669 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3451 3670
3452 if (exists $CFG{mlockall}) { 3671 if (exists $CFG{mlockall}) {
… …
3454 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3673 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3455 and die "WARNING: m(un)lockall failed: $!\n"; 3674 and die "WARNING: m(un)lockall failed: $!\n";
3456 }; 3675 };
3457 warn $@ if $@; 3676 warn $@ if $@;
3458 } 3677 }
3459
3460 warn "finished reloading resource files\n";
3461} 3678}
3462 3679
3463sub pidfile() { 3680sub pidfile() {
3464 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3681 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3465 or die "$PIDFILE: $!"; 3682 or die "$PIDFILE: $!";
… …
3478 seek $fh, 0, 0; 3695 seek $fh, 0, 0;
3479 print $fh $$; 3696 print $fh $$;
3480} 3697}
3481 3698
3482sub main_loop { 3699sub main_loop {
3483 warn "EV::loop starting\n"; 3700 trace "EV::loop starting\n";
3484 if (1) { 3701 if (1) {
3485 EV::loop; 3702 EV::loop;
3486 } 3703 }
3487 warn "EV::loop returned\n"; 3704 trace "EV::loop returned\n";
3488 goto &main_loop unless $REALLY_UNLOOP; 3705 goto &main_loop unless $REALLY_UNLOOP;
3489} 3706}
3490 3707
3491sub main { 3708sub main {
3492 cf::init_globals; # initialise logging 3709 cf::init_globals; # initialise logging
3493 3710
3494 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3711 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3495 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3712 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3496 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3713 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3497 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3714 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3498
3499 cf::init_experience;
3500 cf::init_anim;
3501 cf::init_attackmess;
3502 cf::init_dynamic;
3503 3715
3504 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3716 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3505 3717
3506 # we must not ever block the main coroutine 3718 # we must not ever block the main coroutine
3507 local $Coro::idle = sub { 3719 local $Coro::idle = sub {
… …
3513 }; 3725 };
3514 3726
3515 evthread_start IO::AIO::poll_fileno; 3727 evthread_start IO::AIO::poll_fileno;
3516 3728
3517 cf::sync_job { 3729 cf::sync_job {
3730 cf::incloader::init ();
3731
3732 cf::init_anim;
3733 cf::init_attackmess;
3734 cf::init_dynamic;
3735
3518 cf::load_settings; 3736 cf::load_settings;
3519 cf::load_materials;
3520 3737
3521 reload_resources; 3738 reload_resources;
3522 reload_config; 3739 reload_config;
3523 db_init; 3740 db_init;
3524 3741
3525 cf::init_uuid; 3742 cf::init_uuid;
3526 cf::init_signals; 3743 cf::init_signals;
3527 cf::init_commands;
3528 cf::init_skills; 3744 cf::init_skills;
3529 3745
3530 cf::init_beforeplay; 3746 cf::init_beforeplay;
3531 3747
3532 atomic; 3748 atomic;
… …
3537 3753
3538 # no (long-running) fork's whatsoever before this point(!) 3754 # no (long-running) fork's whatsoever before this point(!)
3539 use POSIX (); 3755 use POSIX ();
3540 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3756 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3541 3757
3542 (pop @POST_INIT)->(0) while @POST_INIT; 3758 cf::_post_init 0;
3543 }; 3759 };
3544 3760
3761 cf::object::thawer::errors_are_fatal 0;
3762 info "parse errors in files are no longer fatal from this point on.\n";
3763
3764 my $free_main; $free_main = EV::idle sub {
3765 undef $free_main;
3766 undef &main; # free gobs of memory :)
3767 };
3768
3545 main_loop; 3769 goto &main_loop;
3546} 3770}
3547 3771
3548############################################################################# 3772#############################################################################
3549# initialisation and cleanup 3773# initialisation and cleanup
3550 3774
3551# install some emergency cleanup handlers 3775# install some emergency cleanup handlers
3552BEGIN { 3776BEGIN {
3553 our %SIGWATCHER = (); 3777 our %SIGWATCHER = ();
3554 for my $signal (qw(INT HUP TERM)) { 3778 for my $signal (qw(INT HUP TERM)) {
3555 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3779 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3556 cf::cleanup "SIG$signal"; 3780 cf::cleanup "SIG$signal";
3557 }; 3781 };
3558 } 3782 }
3559} 3783}
3560 3784
3561sub write_runtime_sync { 3785sub write_runtime_sync {
3786 my $t0 = AE::time;
3787
3562 # first touch the runtime file to show we are still running: 3788 # first touch the runtime file to show we are still running:
3563 # the fsync below can take a very very long time. 3789 # the fsync below can take a very very long time.
3564 3790
3565 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3791 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3566 3792
3567 my $guard = cf::lock_acquire "write_runtime"; 3793 my $guard = cf::lock_acquire "write_runtime";
3568 3794
3569 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3795 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3570 or return; 3796 or return;
3571 3797
3572 my $value = $cf::RUNTIME + 90 + 10; 3798 my $value = $cf::RUNTIME + 90 + 10;
3573 # 10 is the runtime save interval, for a monotonic clock 3799 # 10 is the runtime save interval, for a monotonic clock
3574 # 60 allows for the watchdog to kill the server. 3800 # 60 allows for the watchdog to kill the server.
… …
3587 or return; 3813 or return;
3588 3814
3589 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3815 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3590 and return; 3816 and return;
3591 3817
3592 warn "runtime file written.\n"; 3818 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3593 3819
3594 1 3820 1
3595} 3821}
3596 3822
3597our $uuid_lock; 3823our $uuid_lock;
… …
3609 or return; 3835 or return;
3610 3836
3611 my $value = uuid_seq uuid_cur; 3837 my $value = uuid_seq uuid_cur;
3612 3838
3613 unless ($value) { 3839 unless ($value) {
3614 warn "cowardly refusing to write zero uuid value!\n"; 3840 info "cowardly refusing to write zero uuid value!\n";
3615 return; 3841 return;
3616 } 3842 }
3617 3843
3618 my $value = uuid_str $value + $uuid_skip; 3844 my $value = uuid_str $value + $uuid_skip;
3619 $uuid_skip = 0; 3845 $uuid_skip = 0;
… …
3629 or return; 3855 or return;
3630 3856
3631 aio_rename "$uuid~", $uuid 3857 aio_rename "$uuid~", $uuid
3632 and return; 3858 and return;
3633 3859
3634 warn "uuid file written ($value).\n"; 3860 trace "uuid file written ($value).\n";
3635 3861
3636 1 3862 1
3637 3863
3638} 3864}
3639 3865
… …
3645} 3871}
3646 3872
3647sub emergency_save() { 3873sub emergency_save() {
3648 my $freeze_guard = cf::freeze_mainloop; 3874 my $freeze_guard = cf::freeze_mainloop;
3649 3875
3650 warn "emergency_perl_save: enter\n"; 3876 info "emergency_perl_save: enter\n";
3877
3878 # this is a trade-off: we want to be very quick here, so
3879 # save all maps without fsync, and later call a global sync
3880 # (which in turn might be very very slow)
3881 local $USE_FSYNC = 0;
3651 3882
3652 cf::sync_job { 3883 cf::sync_job {
3653 # this is a trade-off: we want to be very quick here, so 3884 cf::write_runtime_sync; # external watchdog should not bark
3654 # save all maps without fsync, and later call a global sync
3655 # (which in turn might be very very slow)
3656 local $USE_FSYNC = 0;
3657 3885
3658 # use a peculiar iteration method to avoid tripping on perl 3886 # use a peculiar iteration method to avoid tripping on perl
3659 # refcount bugs in for. also avoids problems with players 3887 # refcount bugs in for. also avoids problems with players
3660 # and maps saved/destroyed asynchronously. 3888 # and maps saved/destroyed asynchronously.
3661 warn "emergency_perl_save: begin player save\n"; 3889 info "emergency_perl_save: begin player save\n";
3662 for my $login (keys %cf::PLAYER) { 3890 for my $login (keys %cf::PLAYER) {
3663 my $pl = $cf::PLAYER{$login} or next; 3891 my $pl = $cf::PLAYER{$login} or next;
3664 $pl->valid or next; 3892 $pl->valid or next;
3665 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3893 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3666 $pl->save; 3894 $pl->save;
3667 } 3895 }
3668 warn "emergency_perl_save: end player save\n"; 3896 info "emergency_perl_save: end player save\n";
3669 3897
3898 cf::write_runtime_sync; # external watchdog should not bark
3899
3670 warn "emergency_perl_save: begin map save\n"; 3900 info "emergency_perl_save: begin map save\n";
3671 for my $path (keys %cf::MAP) { 3901 for my $path (keys %cf::MAP) {
3672 my $map = $cf::MAP{$path} or next; 3902 my $map = $cf::MAP{$path} or next;
3673 $map->valid or next; 3903 $map->valid or next;
3674 $map->save; 3904 $map->save;
3675 } 3905 }
3676 warn "emergency_perl_save: end map save\n"; 3906 info "emergency_perl_save: end map save\n";
3677 3907
3908 cf::write_runtime_sync; # external watchdog should not bark
3909
3678 warn "emergency_perl_save: begin database checkpoint\n"; 3910 info "emergency_perl_save: begin database checkpoint\n";
3679 BDB::db_env_txn_checkpoint $DB_ENV; 3911 BDB::db_env_txn_checkpoint $DB_ENV;
3680 warn "emergency_perl_save: end database checkpoint\n"; 3912 info "emergency_perl_save: end database checkpoint\n";
3681 3913
3682 warn "emergency_perl_save: begin write uuid\n"; 3914 info "emergency_perl_save: begin write uuid\n";
3683 write_uuid_sync 1; 3915 write_uuid_sync 1;
3684 warn "emergency_perl_save: end write uuid\n"; 3916 info "emergency_perl_save: end write uuid\n";
3917
3918 cf::write_runtime_sync; # external watchdog should not bark
3919
3920 trace "emergency_perl_save: syncing database to disk";
3921 BDB::db_env_txn_checkpoint $DB_ENV;
3922
3923 info "emergency_perl_save: starting sync\n";
3924 IO::AIO::aio_sync sub {
3925 info "emergency_perl_save: finished sync\n";
3926 };
3927
3928 cf::write_runtime_sync; # external watchdog should not bark
3929
3930 trace "emergency_perl_save: flushing outstanding aio requests";
3931 while (IO::AIO::nreqs || BDB::nreqs) {
3932 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3933 }
3934
3935 cf::write_runtime_sync; # external watchdog should not bark
3685 }; 3936 };
3686 3937
3687 warn "emergency_perl_save: starting sync()\n";
3688 IO::AIO::aio_sync sub {
3689 warn "emergency_perl_save: finished sync()\n";
3690 };
3691
3692 warn "emergency_perl_save: leave\n"; 3938 info "emergency_perl_save: leave\n";
3693} 3939}
3694 3940
3695sub post_cleanup { 3941sub post_cleanup {
3696 my ($make_core) = @_; 3942 my ($make_core) = @_;
3697 3943
3944 IO::AIO::flush;
3945
3698 warn Carp::longmess "post_cleanup backtrace" 3946 error Carp::longmess "post_cleanup backtrace"
3699 if $make_core; 3947 if $make_core;
3700 3948
3701 my $fh = pidfile; 3949 my $fh = pidfile;
3702 unlink $PIDFILE if <$fh> == $$; 3950 unlink $PIDFILE if <$fh> == $$;
3703} 3951}
… …
3723 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3971 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3724 for my $name (keys %$leaf_symtab) { 3972 for my $name (keys %$leaf_symtab) {
3725 _gv_clear *{"$pkg$name"}; 3973 _gv_clear *{"$pkg$name"};
3726# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3974# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3727 } 3975 }
3728 warn "cleared package $pkg\n";#d#
3729} 3976}
3730 3977
3731sub do_reload_perl() { 3978sub do_reload_perl() {
3732 # can/must only be called in main 3979 # can/must only be called in main
3733 if ($Coro::current != $Coro::main) { 3980 unless (in_main) {
3734 warn "can only reload from main coroutine"; 3981 error "can only reload from main coroutine";
3735 return; 3982 return;
3736 } 3983 }
3737 3984
3738 return if $RELOAD++; 3985 return if $RELOAD++;
3739 3986
3740 my $t1 = EV::time; 3987 my $t1 = AE::time;
3741 3988
3742 while ($RELOAD) { 3989 while ($RELOAD) {
3743 warn "reloading..."; 3990 cf::get_slot 0.1, -1, "reload_perl";
3991 info "perl_reload: reloading...";
3744 3992
3745 warn "entering sync_job"; 3993 trace "perl_reload: entering sync_job";
3746 3994
3747 cf::sync_job { 3995 cf::sync_job {
3748 cf::write_runtime_sync; # external watchdog should not bark
3749 cf::emergency_save; 3996 #cf::emergency_save;
3750 cf::write_runtime_sync; # external watchdog should not bark
3751 3997
3752 warn "syncing database to disk";
3753 BDB::db_env_txn_checkpoint $DB_ENV;
3754
3755 # if anything goes wrong in here, we should simply crash as we already saved
3756
3757 warn "flushing outstanding aio requests";
3758 while (IO::AIO::nreqs || BDB::nreqs) {
3759 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3760 }
3761
3762 warn "cancelling all extension coros"; 3998 trace "perl_reload: cancelling all extension coros";
3763 $_->cancel for values %EXT_CORO; 3999 $_->cancel for values %EXT_CORO;
3764 %EXT_CORO = (); 4000 %EXT_CORO = ();
3765 4001
3766 warn "removing commands"; 4002 trace "perl_reload: removing commands";
3767 %COMMAND = (); 4003 %COMMAND = ();
3768 4004
3769 warn "removing ext/exti commands"; 4005 trace "perl_reload: removing ext/exti commands";
3770 %EXTCMD = (); 4006 %EXTCMD = ();
3771 %EXTICMD = (); 4007 %EXTICMD = ();
3772 4008
3773 warn "unloading/nuking all extensions"; 4009 trace "perl_reload: unloading/nuking all extensions";
3774 for my $pkg (@EXTS) { 4010 for my $pkg (@EXTS) {
3775 warn "... unloading $pkg"; 4011 trace "... unloading $pkg";
3776 4012
3777 if (my $cb = $pkg->can ("unload")) { 4013 if (my $cb = $pkg->can ("unload")) {
3778 eval { 4014 eval {
3779 $cb->($pkg); 4015 $cb->($pkg);
3780 1 4016 1
3781 } or warn "$pkg unloaded, but with errors: $@"; 4017 } or error "$pkg unloaded, but with errors: $@";
3782 } 4018 }
3783 4019
3784 warn "... clearing $pkg"; 4020 trace "... clearing $pkg";
3785 clear_package $pkg; 4021 clear_package $pkg;
3786 } 4022 }
3787 4023
3788 warn "unloading all perl modules loaded from $LIBDIR"; 4024 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3789 while (my ($k, $v) = each %INC) { 4025 while (my ($k, $v) = each %INC) {
3790 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4026 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3791 4027
3792 warn "... unloading $k"; 4028 trace "... unloading $k";
3793 delete $INC{$k}; 4029 delete $INC{$k};
3794 4030
3795 $k =~ s/\.pm$//; 4031 $k =~ s/\.pm$//;
3796 $k =~ s/\//::/g; 4032 $k =~ s/\//::/g;
3797 4033
… …
3800 } 4036 }
3801 4037
3802 clear_package $k; 4038 clear_package $k;
3803 } 4039 }
3804 4040
3805 warn "getting rid of safe::, as good as possible"; 4041 trace "perl_reload: getting rid of safe::, as good as possible";
3806 clear_package "safe::$_" 4042 clear_package "safe::$_"
3807 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4043 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3808 4044
3809 warn "unloading cf.pm \"a bit\""; 4045 trace "perl_reload: unloading cf.pm \"a bit\"";
3810 delete $INC{"cf.pm"}; 4046 delete $INC{"cf.pm"};
3811 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4047 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3812 4048
3813 # don't, removes xs symbols, too, 4049 # don't, removes xs symbols, too,
3814 # and global variables created in xs 4050 # and global variables created in xs
3815 #clear_package __PACKAGE__; 4051 #clear_package __PACKAGE__;
3816 4052
3817 warn "unload completed, starting to reload now"; 4053 info "perl_reload: unload completed, starting to reload now";
3818 4054
3819 warn "reloading cf.pm"; 4055 trace "perl_reload: reloading cf.pm";
3820 require cf; 4056 require cf;
3821 cf::_connect_to_perl_1; 4057 cf::_connect_to_perl_1;
3822 4058
3823 warn "loading config and database again"; 4059 trace "perl_reload: loading config and database again";
3824 cf::reload_config; 4060 cf::reload_config;
3825 4061
3826 warn "loading extensions"; 4062 trace "perl_reload: loading extensions";
3827 cf::load_extensions; 4063 cf::load_extensions;
3828 4064
3829 if ($REATTACH_ON_RELOAD) { 4065 if ($REATTACH_ON_RELOAD) {
3830 warn "reattaching attachments to objects/players"; 4066 trace "perl_reload: reattaching attachments to objects/players";
3831 _global_reattach; # objects, sockets 4067 _global_reattach; # objects, sockets
3832 warn "reattaching attachments to maps"; 4068 trace "perl_reload: reattaching attachments to maps";
3833 reattach $_ for values %MAP; 4069 reattach $_ for values %MAP;
3834 warn "reattaching attachments to players"; 4070 trace "perl_reload: reattaching attachments to players";
3835 reattach $_ for values %PLAYER; 4071 reattach $_ for values %PLAYER;
3836 } 4072 }
3837 4073
3838 warn "running post_init jobs"; 4074 cf::_post_init 1;
3839 (pop @POST_INIT)->(1) while @POST_INIT;
3840 4075
3841 warn "leaving sync_job"; 4076 trace "perl_reload: leaving sync_job";
3842 4077
3843 1 4078 1
3844 } or do { 4079 } or do {
3845 warn $@; 4080 error $@;
3846 cf::cleanup "error while reloading, exiting."; 4081 cf::cleanup "perl_reload: error, exiting.";
3847 }; 4082 };
3848 4083
3849 warn "reloaded";
3850 --$RELOAD; 4084 --$RELOAD;
3851 } 4085 }
3852 4086
3853 $t1 = EV::time - $t1; 4087 $t1 = AE::time - $t1;
3854 warn "reload completed in ${t1}s\n"; 4088 info "perl_reload: completed in ${t1}s\n";
3855}; 4089};
3856 4090
3857our $RELOAD_WATCHER; # used only during reload 4091our $RELOAD_WATCHER; # used only during reload
3858 4092
3859sub reload_perl() { 4093sub reload_perl() {
… …
3861 # coro crashes during coro_state_free->destroy here. 4095 # coro crashes during coro_state_free->destroy here.
3862 4096
3863 $RELOAD_WATCHER ||= cf::async { 4097 $RELOAD_WATCHER ||= cf::async {
3864 Coro::AIO::aio_wait cache_extensions; 4098 Coro::AIO::aio_wait cache_extensions;
3865 4099
3866 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4100 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3867 do_reload_perl; 4101 do_reload_perl;
3868 undef $RELOAD_WATCHER; 4102 undef $RELOAD_WATCHER;
3869 }; 4103 };
3870 }; 4104 };
3871} 4105}
… …
3880 reload_perl; 4114 reload_perl;
3881 }; 4115 };
3882 } 4116 }
3883}; 4117};
3884 4118
3885unshift @INC, $LIBDIR; 4119#############################################################################
3886 4120
3887my $bug_warning = 0; 4121my $bug_warning = 0;
3888 4122
3889our @WAIT_FOR_TICK;
3890our @WAIT_FOR_TICK_BEGIN;
3891
3892sub wait_for_tick { 4123sub wait_for_tick() {
3893 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4124 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3894 4125
3895 my $signal = new Coro::Signal; 4126 $WAIT_FOR_TICK->wait;
3896 push @WAIT_FOR_TICK, $signal;
3897 $signal->wait;
3898} 4127}
3899 4128
3900sub wait_for_tick_begin { 4129sub wait_for_tick_begin() {
3901 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4130 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3902 4131
3903 my $signal = new Coro::Signal; 4132 my $signal = new Coro::Signal;
3904 push @WAIT_FOR_TICK_BEGIN, $signal; 4133 push @WAIT_FOR_TICK_BEGIN, $signal;
3905 $signal->wait; 4134 $signal->wait;
3906} 4135}
… …
3910 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4139 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3911 unless ++$bug_warning > 10; 4140 unless ++$bug_warning > 10;
3912 return; 4141 return;
3913 } 4142 }
3914 4143
3915 cf::server_tick; # one server iteration 4144 cf::one_tick; # one server iteration
4145
4146 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3916 4147
3917 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4148 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3918 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4149 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3919 Coro::async_pool { 4150 Coro::async_pool {
3920 $Coro::current->{desc} = "runtime saver"; 4151 $Coro::current->{desc} = "runtime saver";
3921 write_runtime_sync 4152 write_runtime_sync
3922 or warn "ERROR: unable to write runtime file: $!"; 4153 or error "ERROR: unable to write runtime file: $!";
3923 }; 4154 };
3924 } 4155 }
3925 4156
3926 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3927 $sig->send; 4158 $sig->send;
3928 } 4159 }
3929 while (my $sig = shift @WAIT_FOR_TICK) { 4160 $WAIT_FOR_TICK->broadcast;
3930 $sig->send;
3931 }
3932 4161
3933 $LOAD = ($NOW - $TICK_START) / $TICK; 4162 $LOAD = ($NOW - $TICK_START) / $TICK;
3934 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4163 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3935 4164
3936 if (0) { 4165 if (0) {
3937 if ($NEXT_TICK) { 4166 if ($NEXT_TICK) {
3938 my $jitter = $TICK_START - $NEXT_TICK; 4167 my $jitter = $TICK_START - $NEXT_TICK;
3939 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4168 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3940 warn "jitter $JITTER\n";#d# 4169 debug "jitter $JITTER\n";#d#
3941 } 4170 }
3942 } 4171 }
3943} 4172}
3944 4173
3945{ 4174{
3946 # configure BDB 4175 # configure BDB
3947 4176
3948 BDB::min_parallel 8; 4177 BDB::min_parallel 16;
3949 BDB::max_poll_reqs $TICK * 0.1; 4178 BDB::max_poll_reqs $TICK * 0.1;
3950 $AnyEvent::BDB::WATCHER->priority (1); 4179 $AnyEvent::BDB::WATCHER->priority (1);
3951 4180
3952 unless ($DB_ENV) { 4181 unless ($DB_ENV) {
3953 $DB_ENV = BDB::db_env_create; 4182 $DB_ENV = BDB::db_env_create;
… …
3990 IO::AIO::min_parallel 8; 4219 IO::AIO::min_parallel 8;
3991 IO::AIO::max_poll_time $TICK * 0.1; 4220 IO::AIO::max_poll_time $TICK * 0.1;
3992 undef $AnyEvent::AIO::WATCHER; 4221 undef $AnyEvent::AIO::WATCHER;
3993} 4222}
3994 4223
3995my $_log_backtrace; 4224our $_log_backtrace;
4225our $_log_backtrace_last;
3996 4226
3997sub _log_backtrace { 4227sub _log_backtrace {
3998 my ($msg, @addr) = @_; 4228 my ($msg, @addr) = @_;
3999 4229
4000 $msg =~ s/\n//; 4230 $msg =~ s/\n$//;
4001 4231
4232 if ($_log_backtrace_last eq $msg) {
4233 LOG llevInfo, "[ABT] $msg\n";
4234 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4002 # limit the # of concurrent backtraces 4235 # limit the # of concurrent backtraces
4003 if ($_log_backtrace < 2) { 4236 } elsif ($_log_backtrace < 2) {
4237 $_log_backtrace_last = $msg;
4004 ++$_log_backtrace; 4238 ++$_log_backtrace;
4005 my $perl_bt = Carp::longmess $msg; 4239 my $perl_bt = Carp::longmess $msg;
4006 async { 4240 async {
4007 $Coro::current->{desc} = "abt $msg"; 4241 $Coro::current->{desc} = "abt $msg";
4008 4242
… …
4028 LOG llevInfo, "[ABT] $_\n" for @bt; 4262 LOG llevInfo, "[ABT] $_\n" for @bt;
4029 --$_log_backtrace; 4263 --$_log_backtrace;
4030 }; 4264 };
4031 } else { 4265 } else {
4032 LOG llevInfo, "[ABT] $msg\n"; 4266 LOG llevInfo, "[ABT] $msg\n";
4033 LOG llevInfo, "[ABT] [suppressed]\n"; 4267 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4034 } 4268 }
4035} 4269}
4036 4270
4037# load additional modules 4271# load additional modules
4038require "cf/$_.pm" for @EXTRA_MODULES; 4272require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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