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.361 by root, Sun Sep 9 12:52:48 2007 UTC vs.
Revision 1.448 by root, Fri Sep 19 05:30:23 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
15use Coro 3.64 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
24use Coro::Util (); 49use Coro::Util ();
25 50
26use JSON::XS (); 51use JSON::XS 2.01 ();
27use BDB (); 52use BDB ();
28use Data::Dumper; 53use Data::Dumper;
29use Digest::MD5; 54use Digest::MD5;
30use Fcntl; 55use Fcntl;
31use YAML::Syck (); 56use YAML ();
32use IO::AIO 2.32 (); 57use IO::AIO ();
33use Time::HiRes; 58use Time::HiRes;
34use Compress::LZF; 59use Compress::LZF;
35use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
36 63
37# configure various modules to our taste 64# configure various modules to our taste
38# 65#
39$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47 68
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71{
72 # very ugly, but ensure we acquire the storable lock
73
74 sub net_mstore {
75 my $guard = Coro::Storable::guard;
76 &Storable::net_mstore
77 }
78
79 sub mretrieve {
80 my $guard = Coro::Storable::guard;
81 &Storable::mretrieve
82 }
83
84 Compress::LZF::set_serializer "Coro::Storable", "cf::net_mstore", "cf::mretrieve";
85 Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
86}
49 87
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 88sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 89
52our %COMMAND = (); 90our %COMMAND = ();
53our %COMMAND_TIME = (); 91our %COMMAND_TIME = ();
59our %EXT_MAP = (); # pluggable maps 97our %EXT_MAP = (); # pluggable maps
60 98
61our $RELOAD; # number of reloads so far 99our $RELOAD; # number of reloads so far
62our @EVENT; 100our @EVENT;
63 101
64our $CONFDIR = confdir; 102our $CONFDIR = confdir;
65our $DATADIR = datadir; 103our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 107our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 108our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 109our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 110our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 111our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 112our $BDBDIR = "$LOCALDIR/db";
113our $PIDFILE = "$LOCALDIR/pid";
114our $RUNTIMEFILE = "$LOCALDIR/runtime";
115
116our %RESOURCE;
75 117
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 118our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 119our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 120our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 121our $USE_FSYNC = 1; # use fsync to write maps - default off
83 122
123our $BDB_DEADLOCK_WATCHER;
124our $BDB_CHECKPOINT_WATCHER;
84our $BDB_POLL_WATCHER; 125our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 126our $DB_ENV;
86 127
87our %CFG; 128our %CFG;
88 129
89our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 131our $RUNTIME;
132our $NOW;
91 133
92our (%PLAYER, %PLAYER_LOADING); # all users 134our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # all maps 135our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 136our $LINK_MAP; # the special {link} map, which is always available
95 137
96# used to convert map paths into valid unix filenames by replacing / by ∕ 138# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 139our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 140
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
102 145
103binmode STDOUT; 146binmode STDOUT;
104binmode STDERR; 147binmode STDERR;
105 148
106# read virtual server time, if available 149# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 150unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 151 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 152 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 153 $RUNTIME = <$fh> + 0.;
111} 154}
112 155
113mkdir $_ 156mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 157 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
159 202
160The raw value load value from the last tick. 203The raw value load value from the last tick.
161 204
162=item %cf::CFG 205=item %cf::CFG
163 206
164Configuration for the server, loaded from C</etc/crossfire/config>, or 207Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 208from wherever your confdir points to.
166 209
167=item cf::wait_for_tick, cf::wait_for_tick_begin 210=item cf::wait_for_tick, cf::wait_for_tick_begin
168 211
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 212These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
187 $msg .= "\n" 230 $msg .= "\n"
188 unless $msg =~ /\n$/; 231 unless $msg =~ /\n$/;
189 232
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 233 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 234
192 utf8::encode $msg;
193 LOG llevError, $msg; 235 LOG llevError, $msg;
194 }; 236 };
195} 237}
238
239$Coro::State::DIEHOOK = sub {
240 return unless $^S eq 0; # "eq", not "=="
241
242 if ($Coro::current == $Coro::main) {#d#
243 warn "DIEHOOK called in main context, Coro bug?\n";#d#
244 return;#d#
245 }#d#
246
247 # kill coroutine otherwise
248 warn Carp::longmess $_[0];
249 Coro::terminate
250};
251
252$SIG{__DIE__} = sub { }; #d#?
196 253
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 254@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 255@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 256@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 257@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 264for my $pkg (qw(
208 cf::global cf::attachable 265 cf::global cf::attachable
209 cf::object cf::object::player 266 cf::object cf::object::player
210 cf::client cf::player 267 cf::client cf::player
211 cf::arch cf::living 268 cf::arch cf::living
269 cf::map cf::mapspace
212 cf::map cf::party cf::region 270 cf::party cf::region
213)) { 271)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 272 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 273}
217 274
218$Event::DIED = sub { 275$EV::DIED = sub {
219 warn "error in event callback: @_"; 276 warn "error in event callback: @_";
220}; 277};
221 278
222############################################################################# 279#############################################################################
223 280
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 303 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 304 $d
248 } || "[unable to dump $_[0]: '$@']"; 305 } || "[unable to dump $_[0]: '$@']";
249} 306}
250 307
251=item $ref = cf::from_json $json 308=item $ref = cf::decode_json $json
252 309
253Converts a JSON string into the corresponding perl data structure. 310Converts a JSON string into the corresponding perl data structure.
254 311
255=item $json = cf::to_json $ref 312=item $json = cf::encode_json $ref
256 313
257Converts a perl data structure into its JSON representation. 314Converts a perl data structure into its JSON representation.
258 315
259=cut 316=cut
260 317
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 318our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 319
263sub to_json ($) { $json_coder->encode ($_[0]) } 320sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 321sub decode_json($) { $json_coder->decode ($_[0]) }
265 322
266=item cf::lock_wait $string 323=item cf::lock_wait $string
267 324
268Wait until the given lock is available. See cf::lock_acquire. 325Wait until the given lock is available. See cf::lock_acquire.
269 326
325 382
326 ! ! $LOCK{$key} 383 ! ! $LOCK{$key}
327} 384}
328 385
329sub freeze_mainloop { 386sub freeze_mainloop {
330 return unless $TICK_WATCHER->is_active; 387 tick_inhibit_inc;
331 388
332 my $guard = Coro::guard { 389 Coro::guard \&tick_inhibit_dec;
333 $TICK_WATCHER->start; 390}
334 }; 391
335 $TICK_WATCHER->stop; 392=item cf::periodic $interval, $cb
336 $guard 393
394Like EV::periodic, but randomly selects a starting point so that the actions
395get spread over timer.
396
397=cut
398
399sub periodic($$) {
400 my ($interval, $cb) = @_;
401
402 my $start = rand List::Util::min 180, $interval;
403
404 EV::periodic $start, $interval, 0, $cb
337} 405}
338 406
339=item cf::get_slot $time[, $priority[, $name]] 407=item cf::get_slot $time[, $priority[, $name]]
340 408
341Allocate $time seconds of blocking CPU time at priority C<$priority>: 409Allocate $time seconds of blocking CPU time at priority C<$priority>:
352our @SLOT_QUEUE; 420our @SLOT_QUEUE;
353our $SLOT_QUEUE; 421our $SLOT_QUEUE;
354 422
355$SLOT_QUEUE->cancel if $SLOT_QUEUE; 423$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async { 424$SLOT_QUEUE = Coro::async {
425 $Coro::current->desc ("timeslot manager");
426
357 my $signal = new Coro::Signal; 427 my $signal = new Coro::Signal;
358 428
359 while () { 429 while () {
360 next_job: 430 next_job:
361 my $avail = cf::till_tick; 431 my $avail = cf::till_tick;
369 } 439 }
370 } 440 }
371 } 441 }
372 442
373 if (@SLOT_QUEUE) { 443 if (@SLOT_QUEUE) {
374 # we do not use wait_For_tick() as it returns immediately when tick is inactive 444 # we do not use wait_for_tick() as it returns immediately when tick is inactive
375 push @cf::WAIT_FOR_TICK, $signal; 445 push @cf::WAIT_FOR_TICK, $signal;
376 $signal->wait; 446 $signal->wait;
377 } else { 447 } else {
378 Coro::schedule; 448 Coro::schedule;
379 } 449 }
380 } 450 }
381}; 451};
382 452
383sub get_slot($;$$) { 453sub get_slot($;$$) {
454 return if tick_inhibit || $Coro::current == $Coro::main;
455
384 my ($time, $pri, $name) = @_; 456 my ($time, $pri, $name) = @_;
385 457
386 $time = $TICK * .6 if $time > $TICK * .6; 458 $time = $TICK * .6 if $time > $TICK * .6;
387 my $sig = new Coro::Signal; 459 my $sig = new Coro::Signal;
388 460
402 474
403BEGIN { *async = \&Coro::async_pool } 475BEGIN { *async = \&Coro::async_pool }
404 476
405=item cf::sync_job { BLOCK } 477=item cf::sync_job { BLOCK }
406 478
407The design of Crossfire TRT requires that the main coroutine ($Coro::main) 479The design of Deliantra requires that the main coroutine ($Coro::main)
408is always able to handle events or runnable, as Crossfire TRT is only 480is always able to handle events or runnable, as Deliantra is only
409partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 481partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
410acceptable. 482acceptable.
411 483
412If it must be done, put the blocking parts into C<sync_job>. This will run 484If it must be done, put the blocking parts into C<sync_job>. This will run
413the given BLOCK in another coroutine while waiting for the result. The 485the given BLOCK in another coroutine while waiting for the result. The
418 490
419sub sync_job(&) { 491sub sync_job(&) {
420 my ($job) = @_; 492 my ($job) = @_;
421 493
422 if ($Coro::current == $Coro::main) { 494 if ($Coro::current == $Coro::main) {
423 my $time = Event::time; 495 my $time = EV::time;
424 496
425 # this is the main coro, too bad, we have to block 497 # this is the main coro, too bad, we have to block
426 # till the operation succeeds, freezing the server :/ 498 # till the operation succeeds, freezing the server :/
427 499
428 # TODO: use suspend/resume instead 500 LOG llevError, Carp::longmess "sync job";#d#
429 # (but this is cancel-safe) 501
430 my $freeze_guard = freeze_mainloop; 502 my $freeze_guard = freeze_mainloop;
431 503
432 my $busy = 1; 504 my $busy = 1;
433 my @res; 505 my @res;
434 506
435 (async { 507 (async {
508 $Coro::current->desc ("sync job coro");
436 @res = eval { $job->() }; 509 @res = eval { $job->() };
437 warn $@ if $@; 510 warn $@ if $@;
438 undef $busy; 511 undef $busy;
439 })->prio (Coro::PRIO_MAX); 512 })->prio (Coro::PRIO_MAX);
440 513
441 while ($busy) { 514 while ($busy) {
442 Coro::cede or Event::one_event; 515 if (Coro::nready) {
516 Coro::cede_notself;
517 } else {
518 EV::loop EV::LOOP_ONESHOT;
443 } 519 }
520 }
444 521
445 $time = Event::time - $time; 522 my $time = EV::time - $time;
446 523
447 LOG llevError | logBacktrace, Carp::longmess "long sync job"
448 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
449
450 $tick_start += $time; # do not account sync jobs to server load 524 $TICK_START += $time; # do not account sync jobs to server load
451 525
452 wantarray ? @res : $res[0] 526 wantarray ? @res : $res[0]
453 } else { 527 } else {
454 # we are in another coroutine, how wonderful, everything just works 528 # we are in another coroutine, how wonderful, everything just works
455 529
480=item fork_call { }, $args 554=item fork_call { }, $args
481 555
482Executes the given code block with the given arguments in a seperate 556Executes the given code block with the given arguments in a seperate
483process, returning the results. Everything must be serialisable with 557process, returning the results. Everything must be serialisable with
484Coro::Storable. May, of course, block. Note that the executed sub may 558Coro::Storable. May, of course, block. Note that the executed sub may
485never block itself or use any form of Event handling. 559never block itself or use any form of event handling.
486 560
487=cut 561=cut
488 562
489sub fork_call(&@) { 563sub fork_call(&@) {
490 my ($cb, @args) = @_; 564 my ($cb, @args) = @_;
499 }, @args; 573 }, @args;
500 574
501 wantarray ? @res : $res[-1] 575 wantarray ? @res : $res[-1]
502} 576}
503 577
578=item $coin = coin_from_name $name
579
580=cut
581
582our %coin_alias = (
583 "silver" => "silvercoin",
584 "silvercoin" => "silvercoin",
585 "silvercoins" => "silvercoin",
586 "gold" => "goldcoin",
587 "goldcoin" => "goldcoin",
588 "goldcoins" => "goldcoin",
589 "platinum" => "platinacoin",
590 "platinumcoin" => "platinacoin",
591 "platinumcoins" => "platinacoin",
592 "platina" => "platinacoin",
593 "platinacoin" => "platinacoin",
594 "platinacoins" => "platinacoin",
595 "royalty" => "royalty",
596 "royalties" => "royalty",
597);
598
599sub coin_from_name($) {
600 $coin_alias{$_[0]}
601 ? cf::arch::find $coin_alias{$_[0]}
602 : undef
603}
604
504=item $value = cf::db_get $family => $key 605=item $value = cf::db_get $family => $key
505 606
506Returns a single value from the environment database. 607Returns a single value from the environment database.
507 608
508=item cf::db_put $family => $key => $value 609=item cf::db_put $family => $key => $value
509 610
510Stores the given C<$value> in the family. It can currently store binary 611Stores the given C<$value> in the family. It can currently store binary
511data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 612data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
512 613
614=item $db = cf::db_table "name"
615
616Create and/or open a new database table. The string must not be "db" and must be unique
617within each server.
618
513=cut 619=cut
620
621sub db_table($) {
622 my ($name) = @_;
623 my $db = BDB::db_create $DB_ENV;
624
625 eval {
626 $db->set_flags (BDB::CHKSUM);
627
628 utf8::encode $name;
629 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
630 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
631 cf::cleanup "db_open(db): $!" if $!;
632 };
633 cf::cleanup "db_open(db): $@" if $@;
634
635 $db
636}
514 637
515our $DB; 638our $DB;
516 639
517sub db_init { 640sub db_init {
518 unless ($DB) {
519 $DB = BDB::db_create $DB_ENV;
520
521 cf::sync_job { 641 cf::sync_job {
522 eval { 642 $DB ||= db_table "db";
523 $DB->set_flags (BDB::CHKSUM);
524
525 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
526 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
527 cf::cleanup "db_open(db): $!" if $!;
528 };
529 cf::cleanup "db_open(db): $@" if $@;
530 };
531 } 643 };
532} 644}
533 645
534sub db_get($$) { 646sub db_get($$) {
535 my $key = "$_[0]/$_[1]"; 647 my $key = "$_[0]/$_[1]";
536 648
634 746
635############################################################################# 747#############################################################################
636 748
637=head2 ATTACHABLE OBJECTS 749=head2 ATTACHABLE OBJECTS
638 750
639Many objects in crossfire are so-called attachable objects. That means you can 751Many objects in deliantra are so-called attachable objects. That means you can
640attach callbacks/event handlers (a collection of which is called an "attachment") 752attach callbacks/event handlers (a collection of which is called an "attachment")
641to it. All such attachable objects support the following methods. 753to it. All such attachable objects support the following methods.
642 754
643In the following description, CLASS can be any of C<global>, C<object> 755In the following description, CLASS can be any of C<global>, C<object>
644C<player>, C<client> or C<map> (i.e. the attachable objects in 756C<player>, C<client> or C<map> (i.e. the attachable objects in
645Crossfire TRT). 757Deliantra).
646 758
647=over 4 759=over 4
648 760
649=item $attachable->attach ($attachment, key => $value...) 761=item $attachable->attach ($attachment, key => $value...)
650 762
694=item cf::CLASS::attachment $name, ... 806=item cf::CLASS::attachment $name, ...
695 807
696Register an attachment by C<$name> through which attachable objects of the 808Register an attachment by C<$name> through which attachable objects of the
697given CLASS can refer to this attachment. 809given CLASS can refer to this attachment.
698 810
699Some classes such as crossfire maps and objects can specify attachments 811Some classes such as deliantra maps and objects can specify attachments
700that are attached at load/instantiate time, thus the need for a name. 812that are attached at load/instantiate time, thus the need for a name.
701 813
702These calls expect any number of the following handler/hook descriptions: 814These calls expect any number of the following handler/hook descriptions:
703 815
704=over 4 816=over 4
932 } 1044 }
933 1045
934 0 1046 0
935} 1047}
936 1048
937=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1049=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
938 1050
939=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1051=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
940 1052
941Generate an object-specific event with the given arguments. 1053Generate an object-specific event with the given arguments.
942 1054
948 1060
949=cut 1061=cut
950 1062
951############################################################################# 1063#############################################################################
952# object support 1064# object support
953#
954 1065
1066sub _object_equal($$);
1067sub _object_equal($$) {
1068 my ($a, $b) = @_;
1069
1070 return 0 unless (ref $a) eq (ref $b);
1071
1072 if ("HASH" eq ref $a) {
1073 my @ka = keys %$a;
1074 my @kb = keys %$b;
1075
1076 return 0 if @ka != @kb;
1077
1078 for (0 .. $#ka) {
1079 return 0 unless $ka[$_] eq $kb[$_];
1080 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1081 }
1082
1083 } elsif ("ARRAY" eq ref $a) {
1084
1085 return 0 if @$a != @$b;
1086
1087 for (0 .. $#$a) {
1088 return 0 unless _object_equal $a->[$_], $b->[$_];
1089 }
1090
1091 } elsif ($a ne $b) {
1092 return 0;
1093 }
1094
1095 1
1096}
1097
1098our $SLOW_MERGES;#d#
955sub _can_merge { 1099sub _can_merge {
956 my ($ob1, $ob2) = @_; 1100 my ($ob1, $ob2) = @_;
957 1101
958 local $Storable::canonical = 1; 1102 ++$SLOW_MERGES;#d#
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961 1103
962 $fob1 eq $fob2 1104 # we do the slow way here
1105 return _object_equal $ob1, $ob2
963} 1106}
964 1107
965sub reattach { 1108sub reattach {
966 # basically do the same as instantiate, without calling instantiate 1109 # basically do the same as instantiate, without calling instantiate
967 my ($obj) = @_; 1110 my ($obj) = @_;
968 1111
1112 # no longer needed after getting rid of delete_package?
969 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1113 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
970 1114
971 my $registry = $obj->registry; 1115 my $registry = $obj->registry;
972 1116
973 @$registry = (); 1117 @$registry = ();
974 1118
989cf::attachable->attach ( 1133cf::attachable->attach (
990 prio => -1000000, 1134 prio => -1000000,
991 on_instantiate => sub { 1135 on_instantiate => sub {
992 my ($obj, $data) = @_; 1136 my ($obj, $data) = @_;
993 1137
994 $data = from_json $data; 1138 $data = decode_json $data;
995 1139
996 for (@$data) { 1140 for (@$data) {
997 my ($name, $args) = @$_; 1141 my ($name, $args) = @$_;
998 1142
999 $obj->attach ($name, %{$args || {} }); 1143 $obj->attach ($name, %{$args || {} });
1013); 1157);
1014 1158
1015sub object_freezer_save { 1159sub object_freezer_save {
1016 my ($filename, $rdata, $objs) = @_; 1160 my ($filename, $rdata, $objs) = @_;
1017 1161
1018 my $guard = cf::lock_acquire "io";
1019
1020 sync_job { 1162 sync_job {
1021 if (length $$rdata) { 1163 if (length $$rdata) {
1164 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1165 warn sprintf "saving %s (%d,%d)\n",
1023 $filename, length $$rdata, scalar @$objs; 1166 $decname, length $$rdata, scalar @$objs;
1024 1167
1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1168 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1026 chmod SAVE_MODE, $fh; 1169 aio_chmod $fh, SAVE_MODE;
1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1170 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1171 aio_fsync $fh if $cf::USE_FSYNC;
1029 close $fh; 1172 aio_close $fh;
1030 1173
1031 if (@$objs) { 1174 if (@$objs) {
1032 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1175 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1033 chmod SAVE_MODE, $fh; 1176 aio_chmod $fh, SAVE_MODE;
1034 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1177 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1035 aio_write $fh, 0, (length $data), $data, 0; 1178 aio_write $fh, 0, (length $data), $data, 0;
1036 aio_fsync $fh if $cf::USE_FSYNC; 1179 aio_fsync $fh if $cf::USE_FSYNC;
1037 close $fh; 1180 aio_close $fh;
1038 aio_rename "$filename.pst~", "$filename.pst"; 1181 aio_rename "$filename.pst~", "$filename.pst";
1039 } 1182 }
1040 } else { 1183 } else {
1041 aio_unlink "$filename.pst"; 1184 aio_unlink "$filename.pst";
1042 } 1185 }
1048 } else { 1191 } else {
1049 aio_unlink $filename; 1192 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1193 aio_unlink "$filename.pst";
1051 } 1194 }
1052 }; 1195 };
1053
1054 undef $guard;
1055} 1196}
1056 1197
1057sub object_freezer_as_string { 1198sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1199 my ($rdata, $objs) = @_;
1059 1200
1064 1205
1065sub object_thawer_load { 1206sub object_thawer_load {
1066 my ($filename) = @_; 1207 my ($filename) = @_;
1067 1208
1068 my ($data, $av); 1209 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1210
1072 (aio_load $filename, $data) >= 0 1211 (aio_load $filename, $data) >= 0
1073 or return; 1212 or return;
1074 1213
1075 unless (aio_stat "$filename.pst") { 1214 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1215 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1216 or return;
1078 1217
1079 undef $guard;
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1218 my $st = eval { Coro::Storable::thaw $av };
1219 $av = $st->{objs};
1081 } 1220 }
1082 1221
1222 utf8::decode (my $decname = $filename);
1083 warn sprintf "loading %s (%d)\n", 1223 warn sprintf "loading %s (%d,%d)\n",
1084 $filename, length $data, scalar @{$av || []}; 1224 $decname, length $data, scalar @{$av || []};
1085 1225
1086 ($data, $av) 1226 ($data, $av)
1087} 1227}
1088 1228
1089=head2 COMMAND CALLBACKS 1229=head2 COMMAND CALLBACKS
1214 1354
1215 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1355 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1216 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1356 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1217 1357
1218 $ext{source} = 1358 $ext{source} =
1219 "package $pkg; use strict; use utf8;\n" 1359 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1220 . "#line 1 \"$path\"\n{\n" 1360 . "#line 1 \"$path\"\n{\n"
1221 . $source 1361 . $source
1222 . "\n};\n1"; 1362 . "\n};\n1";
1223 1363
1224 $todo{$base} = \%ext; 1364 $todo{$base} = \%ext;
1240 my $msg = $@ ? "$v->{path}: $@\n" 1380 my $msg = $@ ? "$v->{path}: $@\n"
1241 : "$v->{base}: extension inactive.\n"; 1381 : "$v->{base}: extension inactive.\n";
1242 1382
1243 if (exists $v->{meta}{mandatory}) { 1383 if (exists $v->{meta}{mandatory}) {
1244 warn $msg; 1384 warn $msg;
1245 warn "mandatory extension failed to load, exiting.\n"; 1385 cf::cleanup "mandatory extension failed to load, exiting.";
1246 exit 1;
1247 } 1386 }
1248 1387
1249 warn $msg; 1388 warn $msg;
1250 } 1389 }
1251 1390
1265 1404
1266=back 1405=back
1267 1406
1268=head2 CORE EXTENSIONS 1407=head2 CORE EXTENSIONS
1269 1408
1270Functions and methods that extend core crossfire objects. 1409Functions and methods that extend core deliantra objects.
1271 1410
1272=cut 1411=cut
1273 1412
1274package cf::player; 1413package cf::player;
1275 1414
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1477 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1478
1340 my $f = new_from_file cf::object::thawer path $login 1479 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1480 or return;
1342 1481
1343 $f->next;
1344 my $pl = cf::player::load_pl $f 1482 my $pl = cf::player::load_pl $f
1345 or return; 1483 or return;
1484
1346 local $cf::PLAYER_LOADING{$login} = $pl; 1485 local $cf::PLAYER_LOADING{$login} = $pl;
1347 $f->resolve_delayed_derefs; 1486 $f->resolve_delayed_derefs;
1348 $cf::PLAYER{$login} = $pl 1487 $cf::PLAYER{$login} = $pl
1349 } 1488 }
1350 } 1489 }
1360 1499
1361 return if $pl->{deny_save}; 1500 return if $pl->{deny_save};
1362 1501
1363 aio_mkdir playerdir $pl, 0770; 1502 aio_mkdir playerdir $pl, 0770;
1364 $pl->{last_save} = $cf::RUNTIME; 1503 $pl->{last_save} = $cf::RUNTIME;
1504
1505 cf::get_slot 0.01;
1365 1506
1366 $pl->save_pl ($path); 1507 $pl->save_pl ($path);
1367 cf::cede_to_tick; 1508 cf::cede_to_tick;
1368} 1509}
1369 1510
1401 my ($pl) = @_; 1542 my ($pl) = @_;
1402 1543
1403 my $name = $pl->ob->name; 1544 my $name = $pl->ob->name;
1404 1545
1405 $pl->{deny_save} = 1; 1546 $pl->{deny_save} = 1;
1406 $pl->password ("*"); # this should lock out the player until we nuked the dir 1547 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1407 1548
1408 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1549 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1409 $pl->deactivate; 1550 $pl->deactivate;
1551 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1552 $pl->ob->check_score;
1410 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1553 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1411 $pl->ns->destroy if $pl->ns; 1554 $pl->ns->destroy if $pl->ns;
1412 1555
1413 my $path = playerdir $pl; 1556 my $path = playerdir $pl;
1414 my $temp = "$path~$cf::RUNTIME~deleting~"; 1557 my $temp = "$path~$cf::RUNTIME~deleting~";
1453 1596
1454 for my $login (@$dirs) { 1597 for my $login (@$dirs) {
1455 my $path = path $login; 1598 my $path = path $login;
1456 1599
1457 # a .pst is a dead give-away for a valid player 1600 # a .pst is a dead give-away for a valid player
1458 unless (-e "$path.pst") { 1601 # if no pst file found, open and chekc for blocked users
1602 if (aio_stat "$path.pst") {
1459 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1603 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1460 aio_read $fh, 0, 512, my $buf, 0 or next; 1604 aio_read $fh, 0, 512, my $buf, 0 or next;
1461 $buf !~ /^password -------------$/m or next; # official not-valid tag 1605 $buf !~ /^password -------------$/m or next; # official not-valid tag
1462 } 1606 }
1463 1607
1494 } 1638 }
1495 1639
1496 \@paths 1640 \@paths
1497} 1641}
1498 1642
1499=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1643=item $protocol_xml = $player->expand_cfpod ($cfpod)
1500 1644
1501Expand crossfire pod fragments into protocol xml. 1645Expand deliantra pod fragments into protocol xml.
1502
1503=cut
1504
1505sub expand_cfpod {
1506 ((my $self), (local $_)) = @_;
1507
1508 # escape & and <
1509 s/&/&amp;/g;
1510 s/(?<![BIUGHT])</&lt;/g;
1511
1512 # this is buggy, it needs to properly take care of nested <'s
1513
1514 1 while
1515 # replace B<>, I<>, U<> etc.
1516 s/B<([^\>]*)>/<b>$1<\/b>/
1517 || s/I<([^\>]*)>/<i>$1<\/i>/
1518 || s/U<([^\>]*)>/<u>$1<\/u>/
1519 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1520 # replace G<male|female> tags
1521 || s{G<([^>|]*)\|([^>]*)>}{
1522 $self->gender ? $2 : $1
1523 }ge
1524 # replace H<hint text>
1525 || s{H<([^\>]*)>}
1526 {
1527 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1528 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1529 "")
1530 [$self->{hintmode}]
1531 }ge;
1532
1533 # create single paragraphs (very hackish)
1534 s/(?<=\S)\n(?=\w)/ /g;
1535
1536 # compress some whitespace
1537 s/\s+\n/\n/g; # ws line-ends
1538 s/\n\n+/\n/g; # double lines
1539 s/^\n+//; # beginning lines
1540 s/\n+$//; # ending lines
1541
1542 $_
1543}
1544
1545sub hintmode {
1546 $_[0]{hintmode} = $_[1] if @_ > 1;
1547 $_[0]{hintmode}
1548}
1549 1646
1550=item $player->ext_reply ($msgid, @msg) 1647=item $player->ext_reply ($msgid, @msg)
1551 1648
1552Sends an ext reply to the player. 1649Sends an ext reply to the player.
1553 1650
1620our $MAX_RESET = 3600; 1717our $MAX_RESET = 3600;
1621our $DEFAULT_RESET = 3000; 1718our $DEFAULT_RESET = 3000;
1622 1719
1623sub generate_random_map { 1720sub generate_random_map {
1624 my ($self, $rmp) = @_; 1721 my ($self, $rmp) = @_;
1722
1723 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1724
1625 # mit "rum" bekleckern, nicht 1725 # mit "rum" bekleckern, nicht
1626 $self->_create_random_map ( 1726 $self->_create_random_map (
1627 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1727 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1628 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1728 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1629 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1729 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1751 1851
1752# the temporary/swap location 1852# the temporary/swap location
1753sub save_path { 1853sub save_path {
1754 my ($self) = @_; 1854 my ($self) = @_;
1755 1855
1756 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1856 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1757 "$TMPDIR/$path.map" 1857 "$TMPDIR/$path.map"
1758} 1858}
1759 1859
1760# the unique path, undef == no special unique path 1860# the unique path, undef == no special unique path
1761sub uniq_path { 1861sub uniq_path {
1762 my ($self) = @_; 1862 my ($self) = @_;
1763 1863
1764 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1864 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1765 "$UNIQUEDIR/$path" 1865 "$UNIQUEDIR/$path"
1766} 1866}
1767 1867
1768# and all this just because we cannot iterate over 1868# and all this just because we cannot iterate over
1769# all maps in C++... 1869# all maps in C++...
1867 1967
1868 cf::lock_wait "map_data:$path";#d#remove 1968 cf::lock_wait "map_data:$path";#d#remove
1869 cf::lock_wait "map_find:$path"; 1969 cf::lock_wait "map_find:$path";
1870 1970
1871 $cf::MAP{$path} || do { 1971 $cf::MAP{$path} || do {
1872 my $guard1 = cf::lock_acquire "map_find:$path";
1873 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 1972 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1973 my $guard2 = cf::lock_acquire "map_find:$path";
1874 1974
1875 my $map = new_from_path cf::map $path 1975 my $map = new_from_path cf::map $path
1876 or return; 1976 or return;
1877 1977
1878 $map->{last_save} = $cf::RUNTIME; 1978 $map->{last_save} = $cf::RUNTIME;
1881 or return; 1981 or return;
1882 1982
1883 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1983 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1884 # doing this can freeze the server in a sync job, obviously 1984 # doing this can freeze the server in a sync job, obviously
1885 #$cf::WAIT_FOR_TICK->wait; 1985 #$cf::WAIT_FOR_TICK->wait;
1986 undef $guard2;
1886 undef $guard1; 1987 undef $guard1;
1887 undef $guard2;
1888 $map->reset; 1988 $map->reset;
1889 return find $path; 1989 return find $path;
1890 } 1990 }
1891 1991
1892 $cf::MAP{$path} = $map 1992 $cf::MAP{$path} = $map
1919 my $f = new_from_file cf::object::thawer $self->{load_path}; 2019 my $f = new_from_file cf::object::thawer $self->{load_path};
1920 $f->skip_block; 2020 $f->skip_block;
1921 $self->_load_objects ($f) 2021 $self->_load_objects ($f)
1922 or return; 2022 or return;
1923 2023
1924 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2024 $self->post_load_original
1925 if delete $self->{load_original}; 2025 if delete $self->{load_original};
1926 2026
1927 if (my $uniq = $self->uniq_path) { 2027 if (my $uniq = $self->uniq_path) {
1928 utf8::encode $uniq; 2028 utf8::encode $uniq;
1929 unless (aio_stat $uniq) { 2029 unless (aio_stat $uniq) {
1955 } 2055 }
1956 2056
1957 $self->{last_save} = $cf::RUNTIME; 2057 $self->{last_save} = $cf::RUNTIME;
1958 $self->last_access ($cf::RUNTIME); 2058 $self->last_access ($cf::RUNTIME);
1959 2059
1960 $self->in_memory (cf::MAP_IN_MEMORY); 2060 $self->in_memory (cf::MAP_ACTIVE);
1961 } 2061 }
1962 2062
1963 $self->post_load; 2063 $self->post_load;
1964} 2064}
1965 2065
2023 my ($path, $origin, $load) = @_; 2123 my ($path, $origin, $load) = @_;
2024 2124
2025 $path = normalise $path, $origin && $origin->{path}; 2125 $path = normalise $path, $origin && $origin->{path};
2026 2126
2027 if (my $map = $cf::MAP{$path}) { 2127 if (my $map = $cf::MAP{$path}) {
2028 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2128 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2029 } 2129 }
2030 2130
2031 $MAP_PREFETCH{$path} |= $load; 2131 $MAP_PREFETCH{$path} |= $load;
2032 2132
2033 $MAP_PREFETCHER ||= cf::async { 2133 $MAP_PREFETCHER ||= cf::async {
2134 $Coro::current->{desc} = "map prefetcher";
2135
2034 while (%MAP_PREFETCH) { 2136 while (%MAP_PREFETCH) {
2035 while (my ($k, $v) = each %MAP_PREFETCH) { 2137 while (my ($k, $v) = each %MAP_PREFETCH) {
2036 if (my $map = find $k) { 2138 if (my $map = find $k) {
2037 $map->load if $v; 2139 $map->load if $v;
2038 } 2140 }
2064 return if $self->{deny_save}; 2166 return if $self->{deny_save};
2065 2167
2066 local $self->{last_access} = $self->last_access;#d# 2168 local $self->{last_access} = $self->last_access;#d#
2067 2169
2068 cf::async { 2170 cf::async {
2171 $Coro::current->{desc} = "map player save";
2069 $_->contr->save for $self->players; 2172 $_->contr->save for $self->players;
2070 }; 2173 };
2174
2175 cf::get_slot 0.02;
2071 2176
2072 if ($uniq) { 2177 if ($uniq) {
2073 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2178 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2074 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2179 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2075 } else { 2180 } else {
2084 $self->save; 2189 $self->save;
2085 2190
2086 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2191 my $lock = cf::lock_acquire "map_data:$self->{path}";
2087 2192
2088 return if $self->players; 2193 return if $self->players;
2089 return if $self->in_memory != cf::MAP_IN_MEMORY; 2194 return if $self->in_memory != cf::MAP_ACTIVE;
2090 return if $self->{deny_save}; 2195 return if $self->{deny_save};
2091 2196
2092 $self->in_memory (cf::MAP_SWAPPED); 2197 $self->in_memory (cf::MAP_SWAPPED);
2093 2198
2094 $self->deactivate; 2199 $self->deactivate;
2212 2317
2213sub unique_maps() { 2318sub unique_maps() {
2214 [ 2319 [
2215 map { 2320 map {
2216 utf8::decode $_; 2321 utf8::decode $_;
2217 /\.map$/ 2322 s/\.map$//; # TODO future compatibility hack
2323 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2324 ? ()
2218 ? normalise $_ 2325 : normalise $_
2219 : ()
2220 } @{ aio_readdir $UNIQUEDIR or [] } 2326 } @{ aio_readdir $UNIQUEDIR or [] }
2221 ] 2327 ]
2222} 2328}
2223 2329
2224package cf;
2225
2226=back 2330=back
2227 2331
2228=head3 cf::object 2332=head3 cf::object
2229 2333
2230=cut 2334=cut
2233 2337
2234=over 4 2338=over 4
2235 2339
2236=item $ob->inv_recursive 2340=item $ob->inv_recursive
2237 2341
2238Returns the inventory of the object _and_ their inventories, recursively. 2342Returns the inventory of the object I<and> their inventories, recursively,
2343but I<not> the object itself.
2239 2344
2240=cut 2345=cut
2241 2346
2242sub inv_recursive_; 2347sub inv_recursive_;
2243sub inv_recursive_ { 2348sub inv_recursive_ {
2248 inv_recursive_ inv $_[0] 2353 inv_recursive_ inv $_[0]
2249} 2354}
2250 2355
2251=item $ref = $ob->ref 2356=item $ref = $ob->ref
2252 2357
2253creates and returns a persistent reference to an objetc that can be stored as a string. 2358Creates and returns a persistent reference to an object that can be stored as a string.
2254 2359
2255=item $ob = cf::object::deref ($refstring) 2360=item $ob = cf::object::deref ($refstring)
2256 2361
2257returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2362returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2258even if the object actually exists. May block. 2363even if the object actually exists. May block.
2260=cut 2365=cut
2261 2366
2262sub deref { 2367sub deref {
2263 my ($ref) = @_; 2368 my ($ref) = @_;
2264 2369
2265 # temporary compatibility#TODO#remove
2266 $ref =~ s{^<}{player/<};
2267
2268 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2370 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2269 my ($uuid, $name) = ($1, $2); 2371 my ($uuid, $name) = ($1, $2);
2270 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2372 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2271 or return; 2373 or return;
2272 $pl->ob->uuid eq $uuid 2374 $pl->ob->uuid eq $uuid
2273 or return; 2375 or return;
2293can be C<undef>. Does the right thing when the player is currently in a 2395can be C<undef>. Does the right thing when the player is currently in a
2294dialogue with the given NPC character. 2396dialogue with the given NPC character.
2295 2397
2296=cut 2398=cut
2297 2399
2400our $SAY_CHANNEL = {
2401 id => "say",
2402 title => "Map",
2403 reply => "say ",
2404 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2405};
2406
2407our $CHAT_CHANNEL = {
2408 id => "chat",
2409 title => "Chat",
2410 reply => "chat ",
2411 tooltip => "Player chat and shouts, global to the server.",
2412};
2413
2298# rough implementation of a future "reply" method that works 2414# rough implementation of a future "reply" method that works
2299# with dialog boxes. 2415# with dialog boxes.
2300#TODO: the first argument must go, split into a $npc->reply_to ( method 2416#TODO: the first argument must go, split into a $npc->reply_to ( method
2301sub cf::object::player::reply($$$;$) { 2417sub cf::object::player::reply($$$;$) {
2302 my ($self, $npc, $msg, $flags) = @_; 2418 my ($self, $npc, $msg, $flags) = @_;
2313 my $dialog = $pl->{npc_dialog}; 2429 my $dialog = $pl->{npc_dialog};
2314 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2430 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2315 2431
2316 } else { 2432 } else {
2317 $msg = $npc->name . " says: $msg" if $npc; 2433 $msg = $npc->name . " says: $msg" if $npc;
2318 $self->message ($msg, $flags); 2434 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2319 } 2435 }
2320 } 2436 }
2321} 2437}
2322 2438
2323=item $object->send_msg ($channel, $msg, $color, [extra...]) 2439=item $object->send_msg ($channel, $msg, $color, [extra...])
2348 2464
2349=item $player_object->enter_link 2465=item $player_object->enter_link
2350 2466
2351Freezes the player and moves him/her to a special map (C<{link}>). 2467Freezes the player and moves him/her to a special map (C<{link}>).
2352 2468
2353The player should be reasonably safe there for short amounts of time. You 2469The player should be reasonably safe there for short amounts of time (e.g.
2354I<MUST> call C<leave_link> as soon as possible, though. 2470for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2471though, as the palyer cannot control the character while it is on the link
2472map.
2355 2473
2356Will never block. 2474Will never block.
2357 2475
2358=item $player_object->leave_link ($map, $x, $y) 2476=item $player_object->leave_link ($map, $x, $y)
2359 2477
2417 2535
2418 $map->load; 2536 $map->load;
2419 $map->load_neighbours; 2537 $map->load_neighbours;
2420 2538
2421 return unless $self->contr->active; 2539 return unless $self->contr->active;
2540 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2422 $self->activate_recursive; 2541 $self->activate_recursive;
2423 2542
2424 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2543 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2425 $self->enter_map ($map, $x, $y); 2544 $self->enter_map ($map, $x, $y);
2426} 2545}
2431her, loading and preparing them map, calling the provided $check callback 2550her, loading and preparing them map, calling the provided $check callback
2432that has to return the map if sucecssful, and then unfreezes the player on 2551that has to return the map if sucecssful, and then unfreezes the player on
2433the new (success) or old (failed) map position. In either case, $done will 2552the new (success) or old (failed) map position. In either case, $done will
2434be called at the end of this process. 2553be called at the end of this process.
2435 2554
2555Note that $check will be called with a potentially non-loaded map, so if
2556it needs a loaded map it has to call C<< ->load >>.
2557
2436=cut 2558=cut
2437 2559
2438our $GOTOGEN; 2560our $GOTOGEN;
2439 2561
2440sub cf::object::player::goto { 2562sub cf::object::player::goto {
2444 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2566 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2445 2567
2446 $self->enter_link; 2568 $self->enter_link;
2447 2569
2448 (async { 2570 (async {
2571 $Coro::current->{desc} = "player::goto $path $x $y";
2572
2573 # *tag paths override both path and x|y
2574 if ($path =~ /^\*(.*)$/) {
2575 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2576 my $ob = $obs[rand @obs];
2577
2578 # see if we actually can go there
2579 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2580 $ob = $obs[rand @obs];
2581 } else {
2582 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2583 }
2584 # else put us there anyways for now #d#
2585
2586 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2587 } else {
2588 ($path, $x, $y) = (undef, undef, undef);
2589 }
2590 }
2591
2449 my $map = eval { 2592 my $map = eval {
2450 my $map = cf::map::find $path; 2593 my $map = defined $path ? cf::map::find $path : undef;
2451 2594
2452 if ($map) { 2595 if ($map) {
2453 $map = $map->customise_for ($self); 2596 $map = $map->customise_for ($self);
2454 $map = $check->($map) if $check && $map; 2597 $map = $check->($map) if $check && $map;
2455 } else { 2598 } else {
2456 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2599 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2457 } 2600 }
2458 2601
2459 $map 2602 $map
2460 }; 2603 };
2461 2604
2497} 2640}
2498 2641
2499sub prepare_random_map { 2642sub prepare_random_map {
2500 my ($exit) = @_; 2643 my ($exit) = @_;
2501 2644
2502 my $guard = cf::lock_acquire "exit_prepare:$exit";
2503
2504 # all this does is basically replace the /! path by 2645 # all this does is basically replace the /! path by
2505 # a new random map path (?random/...) with a seed 2646 # a new random map path (?random/...) with a seed
2506 # that depends on the exit object 2647 # that depends on the exit object
2507 2648
2508 my $rmp = parse_random_map_params $exit->msg; 2649 my $rmp = parse_random_map_params $exit->msg;
2510 if ($exit->map) { 2651 if ($exit->map) {
2511 $rmp->{region} = $exit->region->name; 2652 $rmp->{region} = $exit->region->name;
2512 $rmp->{origin_map} = $exit->map->path; 2653 $rmp->{origin_map} = $exit->map->path;
2513 $rmp->{origin_x} = $exit->x; 2654 $rmp->{origin_x} = $exit->x;
2514 $rmp->{origin_y} = $exit->y; 2655 $rmp->{origin_y} = $exit->y;
2656
2657 $exit->map->touch;
2515 } 2658 }
2516 2659
2517 $rmp->{random_seed} ||= $exit->random_seed; 2660 $rmp->{random_seed} ||= $exit->random_seed;
2518 2661
2519 my $data = cf::to_json $rmp; 2662 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2520 my $md5 = Digest::MD5::md5_hex $data; 2663 my $md5 = Digest::MD5::md5_hex $data;
2521 my $meta = "$RANDOMDIR/$md5.meta"; 2664 my $meta = "$RANDOMDIR/$md5.meta";
2522 2665
2523 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2666 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2524 aio_write $fh, 0, (length $data), $data, 0; 2667 aio_write $fh, 0, (length $data), $data, 0;
2525 undef $fh; 2668 undef $fh;
2526 aio_rename "$meta~", $meta; 2669 aio_rename "$meta~", $meta;
2527 2670
2671 my $slaying = "?random/$md5";
2672
2673 if ($exit->valid) {
2528 $exit->slaying ("?random/$md5"); 2674 $exit->slaying ("?random/$md5");
2529 $exit->msg (undef); 2675 $exit->msg (undef);
2676 }
2530 } 2677 }
2531} 2678}
2532 2679
2533sub cf::object::player::enter_exit { 2680sub cf::object::player::enter_exit {
2534 my ($self, $exit) = @_; 2681 my ($self, $exit) = @_;
2535 2682
2536 return unless $self->type == cf::PLAYER; 2683 return unless $self->type == cf::PLAYER;
2537 2684
2538 if ($exit->slaying eq "/!") {
2539 #TODO: this should de-fi-ni-te-ly not be a sync-job
2540 # the problem is that $exit might not survive long enough
2541 # so it needs to be done right now, right here
2542 cf::sync_job { prepare_random_map $exit };
2543 }
2544
2545 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2546 my $hp = $exit->stats->hp;
2547 my $sp = $exit->stats->sp;
2548
2549 $self->enter_link; 2685 $self->enter_link;
2550 2686
2551 # if exit is damned, update players death & WoR home-position
2552 $self->contr->savebed ($slaying, $hp, $sp)
2553 if $exit->flag (FLAG_DAMNED);
2554
2555 (async { 2687 (async {
2556 $self->deactivate_recursive; # just to be sure 2688 $Coro::current->{desc} = "enter_exit";
2689
2557 unless (eval { 2690 unless (eval {
2691 $self->deactivate_recursive; # just to be sure
2692
2693 # random map handling
2694 {
2695 my $guard = cf::lock_acquire "exit_prepare:$exit";
2696
2697 prepare_random_map $exit
2698 if $exit->slaying eq "/!";
2699 }
2700
2701 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2702 my $x = $exit->stats->hp;
2703 my $y = $exit->stats->sp;
2704
2558 $self->goto ($slaying, $hp, $sp); 2705 $self->goto ($map, $x, $y);
2559 2706
2707 # if exit is damned, update players death & WoR home-position
2708 $self->contr->savebed ($map, $x, $y)
2709 if $exit->flag (cf::FLAG_DAMNED);
2710
2560 1; 2711 1
2561 }) { 2712 }) {
2562 $self->message ("Something went wrong deep within the crossfire server. " 2713 $self->message ("Something went wrong deep within the deliantra server. "
2563 . "I'll try to bring you back to the map you were before. " 2714 . "I'll try to bring you back to the map you were before. "
2564 . "Please report this to the dungeon master!", 2715 . "Please report this to the dungeon master!",
2565 cf::NDI_UNIQUE | cf::NDI_RED); 2716 cf::NDI_UNIQUE | cf::NDI_RED);
2566 2717
2567 warn "ERROR in enter_exit: $@"; 2718 warn "ERROR in enter_exit: $@";
2595the message, with C<log> being the default. If C<$color> is negative, suppress 2746the message, with C<log> being the default. If C<$color> is negative, suppress
2596the message unless the client supports the msg packet. 2747the message unless the client supports the msg packet.
2597 2748
2598=cut 2749=cut
2599 2750
2751# non-persistent channels (usually the info channel)
2600our %CHANNEL = ( 2752our %CHANNEL = (
2601 "c/identify" => { 2753 "c/identify" => {
2602 id => "identify", 2754 id => "infobox",
2603 title => "Identify", 2755 title => "Identify",
2604 reply => undef, 2756 reply => undef,
2605 tooltip => "Items recently identified", 2757 tooltip => "Items recently identified",
2606 }, 2758 },
2607 "c/examine" => { 2759 "c/examine" => {
2608 id => "examine", 2760 id => "infobox",
2609 title => "Examine", 2761 title => "Examine",
2610 reply => undef, 2762 reply => undef,
2611 tooltip => "Signs and other items you examined", 2763 tooltip => "Signs and other items you examined",
2612 }, 2764 },
2765 "c/book" => {
2766 id => "infobox",
2767 title => "Book",
2768 reply => undef,
2769 tooltip => "The contents of a note or book",
2770 },
2771 "c/lookat" => {
2772 id => "infobox",
2773 title => "Look",
2774 reply => undef,
2775 tooltip => "What you saw there",
2776 },
2777 "c/who" => {
2778 id => "infobox",
2779 title => "Players",
2780 reply => undef,
2781 tooltip => "Shows players who are currently online",
2782 },
2783 "c/body" => {
2784 id => "infobox",
2785 title => "Body Parts",
2786 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available",
2788 },
2789 "c/uptime" => {
2790 id => "infobox",
2791 title => "Uptime",
2792 reply => undef,
2793 tooltip => "How long the server has been running since last restart",
2794 },
2795 "c/mapinfo" => {
2796 id => "infobox",
2797 title => "Map Info",
2798 reply => undef,
2799 tooltip => "Information related to the maps",
2800 },
2801 "c/party" => {
2802 id => "party",
2803 title => "Party",
2804 reply => "gsay ",
2805 tooltip => "Messages and chat related to your party",
2806 },
2613); 2807);
2614 2808
2615sub cf::client::send_msg { 2809sub cf::client::send_msg {
2616 my ($self, $channel, $msg, $color, @extra) = @_; 2810 my ($self, $channel, $msg, $color, @extra) = @_;
2617 2811
2618 $msg = $self->pl->expand_cfpod ($msg); 2812 $msg = $self->pl->expand_cfpod ($msg)
2813 unless $color & cf::NDI_VERBATIM;
2619 2814
2620 $color &= cf::NDI_CLIENT_MASK; # just in case... 2815 $color &= cf::NDI_CLIENT_MASK; # just in case...
2621 2816
2622 # check predefined channels, for the benefit of C 2817 # check predefined channels, for the benefit of C
2623 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2818 if ($CHANNEL{$channel}) {
2819 $channel = $CHANNEL{$channel};
2624 2820
2821 $self->ext_msg (channel_info => $channel)
2822 if $self->can_msg;
2823
2824 $channel = $channel->{id};
2825
2625 if (ref $channel) { 2826 } elsif (ref $channel) {
2626 # send meta info to client, if not yet sent 2827 # send meta info to client, if not yet sent
2627 unless (exists $self->{channel}{$channel->{id}}) { 2828 unless (exists $self->{channel}{$channel->{id}}) {
2628 $self->{channel}{$channel->{id}} = $channel; 2829 $self->{channel}{$channel->{id}} = $channel;
2629 $self->ext_msg (channel_info => $channel) 2830 $self->ext_msg (channel_info => $channel)
2630 if $self->can_msg; 2831 if $self->can_msg;
2638 if ($self->can_msg) { 2839 if ($self->can_msg) {
2639 # default colour, mask it out 2840 # default colour, mask it out
2640 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2841 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2641 if $color & cf::NDI_DEF; 2842 if $color & cf::NDI_DEF;
2642 2843
2643 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2844 my $pkt = "msg "
2845 . $self->{json_coder}->encode (
2644 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2846 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2847 );
2848
2849 # try lzf for large packets
2850 $pkt = "lzf " . Compress::LZF::compress $pkt
2851 if 1024 <= length $pkt and $self->{can_lzf};
2852
2853 # split very large packets
2854 if (8192 < length $pkt and $self->{can_lzf}) {
2855 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2856 $pkt = "frag";
2857 }
2858
2859 $self->send_packet ($pkt);
2645 } else { 2860 } else {
2646 if ($color >= 0) { 2861 if ($color >= 0) {
2647 # replace some tags by gcfclient-compatible ones 2862 # replace some tags by gcfclient-compatible ones
2648 for ($msg) { 2863 for ($msg) {
2649 1 while 2864 1 while
2847=pod 3062=pod
2848 3063
2849The following functions and methods are available within a safe environment: 3064The following functions and methods are available within a safe environment:
2850 3065
2851 cf::object 3066 cf::object
2852 contr pay_amount pay_player map x y force_find force_add 3067 contr pay_amount pay_player map x y force_find force_add destroy
2853 insert remove name archname title slaying race decrease_ob_nr 3068 insert remove name archname title slaying race decrease split
2854 3069
2855 cf::object::player 3070 cf::object::player
2856 player 3071 player
2857 3072
2858 cf::player 3073 cf::player
2863 3078
2864=cut 3079=cut
2865 3080
2866for ( 3081for (
2867 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3082 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2868 insert remove inv name archname title slaying race 3083 insert remove inv nrof name archname title slaying race
2869 decrease_ob_nr)], 3084 decrease split destroy change_exp)],
2870 ["cf::object::player" => qw(player)], 3085 ["cf::object::player" => qw(player)],
2871 ["cf::player" => qw(peaceful)], 3086 ["cf::player" => qw(peaceful)],
2872 ["cf::map" => qw(trigger)], 3087 ["cf::map" => qw(trigger)],
2873) { 3088) {
2874 no strict 'refs'; 3089 no strict 'refs';
2979 { 3194 {
2980 my $faces = $facedata->{faceinfo}; 3195 my $faces = $facedata->{faceinfo};
2981 3196
2982 while (my ($face, $info) = each %$faces) { 3197 while (my ($face, $info) = each %$faces) {
2983 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3198 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3199
2984 cf::face::set_visibility $idx, $info->{visibility}; 3200 cf::face::set_visibility $idx, $info->{visibility};
2985 cf::face::set_magicmap $idx, $info->{magicmap}; 3201 cf::face::set_magicmap $idx, $info->{magicmap};
2986 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3202 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2987 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3203 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2988 3204
2989 cf::cede_to_tick; 3205 cf::cede_to_tick;
2990 } 3206 }
2991 3207
2992 while (my ($face, $info) = each %$faces) { 3208 while (my ($face, $info) = each %$faces) {
2993 next unless $info->{smooth}; 3209 next unless $info->{smooth};
3210
2994 my $idx = cf::face::find $face 3211 my $idx = cf::face::find $face
2995 or next; 3212 or next;
3213
2996 if (my $smooth = cf::face::find $info->{smooth}) { 3214 if (my $smooth = cf::face::find $info->{smooth}) {
2997 cf::face::set_smooth $idx, $smooth; 3215 cf::face::set_smooth $idx, $smooth;
2998 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3216 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2999 } else { 3217 } else {
3000 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3218 warn "smooth face '$info->{smooth}' not found for face '$face'";
3018 { 3236 {
3019 # TODO: for gcfclient pleasure, we should give resources 3237 # TODO: for gcfclient pleasure, we should give resources
3020 # that gcfclient doesn't grok a >10000 face index. 3238 # that gcfclient doesn't grok a >10000 face index.
3021 my $res = $facedata->{resource}; 3239 my $res = $facedata->{resource};
3022 3240
3023 my $soundconf = delete $res->{"res/sound.conf"};
3024
3025 while (my ($name, $info) = each %$res) { 3241 while (my ($name, $info) = each %$res) {
3242 if (defined $info->{type}) {
3026 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3243 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3027 my $data; 3244 my $data;
3028 3245
3029 if ($info->{type} & 1) { 3246 if ($info->{type} & 1) {
3030 # prepend meta info 3247 # prepend meta info
3031 3248
3032 my $meta = $enc->encode ({ 3249 my $meta = $enc->encode ({
3033 name => $name, 3250 name => $name,
3034 %{ $info->{meta} || {} }, 3251 %{ $info->{meta} || {} },
3035 }); 3252 });
3036 3253
3037 $data = pack "(w/a*)*", $meta, $info->{data}; 3254 $data = pack "(w/a*)*", $meta, $info->{data};
3255 } else {
3256 $data = $info->{data};
3257 }
3258
3259 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3260 cf::face::set_type $idx, $info->{type};
3038 } else { 3261 } else {
3039 $data = $info->{data}; 3262 $RESOURCE{$name} = $info;
3040 } 3263 }
3041 3264
3042 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3043 cf::face::set_type $idx, $info->{type};
3044
3045 cf::cede_to_tick; 3265 cf::cede_to_tick;
3046 } 3266 }
3047
3048 if ($soundconf) {
3049 $soundconf = $enc->decode (delete $soundconf->{data});
3050
3051 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3052 my $sound = $soundconf->{compat}[$_]
3053 or next;
3054
3055 my $face = cf::face::find "sound/$sound->[1]";
3056 cf::sound::set $sound->[0] => $face;
3057 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3058 }
3059
3060 while (my ($k, $v) = each %{$soundconf->{event}}) {
3061 my $face = cf::face::find "sound/$v";
3062 cf::sound::set $k => $face;
3063 }
3064 }
3065 } 3267 }
3268
3269 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3066 3270
3067 1 3271 1
3068} 3272}
3273
3274cf::global->attach (on_resource_update => sub {
3275 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3276 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3277
3278 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3279 my $sound = $soundconf->{compat}[$_]
3280 or next;
3281
3282 my $face = cf::face::find "sound/$sound->[1]";
3283 cf::sound::set $sound->[0] => $face;
3284 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3285 }
3286
3287 while (my ($k, $v) = each %{$soundconf->{event}}) {
3288 my $face = cf::face::find "sound/$v";
3289 cf::sound::set $k => $face;
3290 }
3291 }
3292});
3069 3293
3070register_exticmd fx_want => sub { 3294register_exticmd fx_want => sub {
3071 my ($ns, $want) = @_; 3295 my ($ns, $want) = @_;
3072 3296
3073 while (my ($k, $v) = each %$want) { 3297 while (my ($k, $v) = each %$want) {
3074 $ns->fx_want ($k, $v); 3298 $ns->fx_want ($k, $v);
3075 } 3299 }
3076}; 3300};
3301
3302sub load_resource_file($) {
3303 my $guard = lock_acquire "load_resource_file";
3304
3305 my $status = load_resource_file_ $_[0];
3306 get_slot 0.1, 100;
3307 cf::arch::commit_load;
3308
3309 $status
3310}
3077 3311
3078sub reload_regions { 3312sub reload_regions {
3079 # HACK to clear player env face cache, we need some signal framework 3313 # HACK to clear player env face cache, we need some signal framework
3080 # for this (global event?) 3314 # for this (global event?)
3081 %ext::player_env::MUSIC_FACE_CACHE = (); 3315 %ext::player_env::MUSIC_FACE_CACHE = ();
3095} 3329}
3096 3330
3097sub reload_archetypes { 3331sub reload_archetypes {
3098 load_resource_file "$DATADIR/archetypes" 3332 load_resource_file "$DATADIR/archetypes"
3099 or die "unable to load archetypes\n"; 3333 or die "unable to load archetypes\n";
3100 #d# NEED to laod twice to resolve forward references
3101 # this really needs to be done in an extra post-pass
3102 # (which needs to be synchronous, so solve it differently)
3103 load_resource_file "$DATADIR/archetypes"
3104 or die "unable to load archetypes\n";
3105} 3334}
3106 3335
3107sub reload_treasures { 3336sub reload_treasures {
3108 load_resource_file "$DATADIR/treasures" 3337 load_resource_file "$DATADIR/treasures"
3109 or die "unable to load treasurelists\n"; 3338 or die "unable to load treasurelists\n";
3110} 3339}
3111 3340
3112sub reload_resources { 3341sub reload_resources {
3113 warn "reloading resource files...\n"; 3342 warn "reloading resource files...\n";
3114 3343
3344 reload_facedata;
3345 reload_archetypes;
3115 reload_regions; 3346 reload_regions;
3116 reload_facedata;
3117 #reload_archetypes;#d#
3118 reload_archetypes;
3119 reload_treasures; 3347 reload_treasures;
3120 3348
3121 warn "finished reloading resource files\n"; 3349 warn "finished reloading resource files\n";
3122} 3350}
3123 3351
3124sub init { 3352sub init {
3353 my $guard = freeze_mainloop;
3354
3355 evthread_start IO::AIO::poll_fileno;
3356
3125 reload_resources; 3357 reload_resources;
3126} 3358}
3127 3359
3128sub reload_config { 3360sub reload_config {
3129 open my $fh, "<:utf8", "$CONFDIR/config" 3361 open my $fh, "<:utf8", "$CONFDIR/config"
3130 or return; 3362 or return;
3131 3363
3132 local $/; 3364 local $/;
3133 *CFG = YAML::Syck::Load <$fh>; 3365 *CFG = YAML::Load <$fh>;
3134 3366
3135 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3367 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3136 3368
3137 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3369 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3138 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3370 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3144 }; 3376 };
3145 warn $@ if $@; 3377 warn $@ if $@;
3146 } 3378 }
3147} 3379}
3148 3380
3381sub pidfile() {
3382 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3383 or die "$PIDFILE: $!";
3384 flock $fh, &Fcntl::LOCK_EX
3385 or die "$PIDFILE: flock: $!";
3386 $fh
3387}
3388
3389# make sure only one server instance is running at any one time
3390sub atomic {
3391 my $fh = pidfile;
3392
3393 my $pid = <$fh>;
3394 kill 9, $pid if $pid > 0;
3395
3396 seek $fh, 0, 0;
3397 print $fh $$;
3398}
3399
3149sub main { 3400sub main {
3401 atomic;
3402
3150 # we must not ever block the main coroutine 3403 # we must not ever block the main coroutine
3151 local $Coro::idle = sub { 3404 local $Coro::idle = sub {
3152 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3405 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3153 (async { 3406 (async {
3154 Event::one_event; 3407 $Coro::current->{desc} = "IDLE BUG HANDLER";
3408 EV::loop EV::LOOP_ONESHOT;
3155 })->prio (Coro::PRIO_MAX); 3409 })->prio (Coro::PRIO_MAX);
3156 }; 3410 };
3157 3411
3412 {
3413 my $guard = freeze_mainloop;
3158 reload_config; 3414 reload_config;
3159 db_init; 3415 db_init;
3160 load_extensions; 3416 load_extensions;
3161 3417
3162 $TICK_WATCHER->start; 3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 }
3420
3421 utime time, time, $RUNTIMEFILE;
3422
3423 # no (long-running) fork's whatsoever before this point(!)
3424 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3425
3163 Event::loop; 3426 EV::loop;
3164} 3427}
3165 3428
3166############################################################################# 3429#############################################################################
3167# initialisation and cleanup 3430# initialisation and cleanup
3168 3431
3169# install some emergency cleanup handlers 3432# install some emergency cleanup handlers
3170BEGIN { 3433BEGIN {
3434 our %SIGWATCHER = ();
3171 for my $signal (qw(INT HUP TERM)) { 3435 for my $signal (qw(INT HUP TERM)) {
3172 Event->signal ( 3436 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3173 reentrant => 0,
3174 data => WF_AUTOCANCEL,
3175 signal => $signal,
3176 prio => 0,
3177 cb => sub {
3178 cf::cleanup "SIG$signal"; 3437 cf::cleanup "SIG$signal";
3179 },
3180 ); 3438 };
3181 } 3439 }
3182} 3440}
3183 3441
3184sub write_runtime { 3442sub write_runtime_sync {
3185 my $runtime = "$LOCALDIR/runtime";
3186
3187 # first touch the runtime file to show we are still running: 3443 # first touch the runtime file to show we are still running:
3188 # the fsync below can take a very very long time. 3444 # the fsync below can take a very very long time.
3189 3445
3190 IO::AIO::aio_utime $runtime, undef, undef; 3446 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3191 3447
3192 my $guard = cf::lock_acquire "write_runtime"; 3448 my $guard = cf::lock_acquire "write_runtime";
3193 3449
3194 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3450 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3195 or return; 3451 or return;
3196 3452
3197 my $value = $cf::RUNTIME + 90 + 10; 3453 my $value = $cf::RUNTIME + 90 + 10;
3198 # 10 is the runtime save interval, for a monotonic clock 3454 # 10 is the runtime save interval, for a monotonic clock
3199 # 60 allows for the watchdog to kill the server. 3455 # 60 allows for the watchdog to kill the server.
3209 aio_utime $fh, undef, undef; 3465 aio_utime $fh, undef, undef;
3210 3466
3211 close $fh 3467 close $fh
3212 or return; 3468 or return;
3213 3469
3214 aio_rename "$runtime~", $runtime 3470 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3215 and return; 3471 and return;
3216 3472
3217 warn "runtime file written.\n"; 3473 warn "runtime file written.\n";
3218 3474
3219 1 3475 1
3476}
3477
3478our $uuid_lock;
3479our $uuid_skip;
3480
3481sub write_uuid_sync($) {
3482 $uuid_skip ||= $_[0];
3483
3484 return if $uuid_lock;
3485 local $uuid_lock = 1;
3486
3487 my $uuid = "$LOCALDIR/uuid";
3488
3489 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3490 or return;
3491
3492 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3493 $uuid_skip = 0;
3494
3495 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3496 and return;
3497
3498 # always fsync - this file is important
3499 aio_fsync $fh
3500 and return;
3501
3502 close $fh
3503 or return;
3504
3505 aio_rename "$uuid~", $uuid
3506 and return;
3507
3508 warn "uuid file written ($value).\n";
3509
3510 1
3511
3512}
3513
3514sub write_uuid($$) {
3515 my ($skip, $sync) = @_;
3516
3517 $sync ? write_uuid_sync $skip
3518 : async { write_uuid_sync $skip };
3220} 3519}
3221 3520
3222sub emergency_save() { 3521sub emergency_save() {
3223 my $freeze_guard = cf::freeze_mainloop; 3522 my $freeze_guard = cf::freeze_mainloop;
3224 3523
3230 # and maps saved/destroyed asynchronously. 3529 # and maps saved/destroyed asynchronously.
3231 warn "begin emergency player save\n"; 3530 warn "begin emergency player save\n";
3232 for my $login (keys %cf::PLAYER) { 3531 for my $login (keys %cf::PLAYER) {
3233 my $pl = $cf::PLAYER{$login} or next; 3532 my $pl = $cf::PLAYER{$login} or next;
3234 $pl->valid or next; 3533 $pl->valid or next;
3534 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3235 $pl->save; 3535 $pl->save;
3236 } 3536 }
3237 warn "end emergency player save\n"; 3537 warn "end emergency player save\n";
3238 3538
3239 warn "begin emergency map save\n"; 3539 warn "begin emergency map save\n";
3245 warn "end emergency map save\n"; 3545 warn "end emergency map save\n";
3246 3546
3247 warn "begin emergency database checkpoint\n"; 3547 warn "begin emergency database checkpoint\n";
3248 BDB::db_env_txn_checkpoint $DB_ENV; 3548 BDB::db_env_txn_checkpoint $DB_ENV;
3249 warn "end emergency database checkpoint\n"; 3549 warn "end emergency database checkpoint\n";
3550
3551 warn "begin write uuid\n";
3552 write_uuid_sync 1;
3553 warn "end write uuid\n";
3250 }; 3554 };
3251 3555
3252 warn "leave emergency perl save\n"; 3556 warn "leave emergency perl save\n";
3253} 3557}
3254 3558
3255sub post_cleanup { 3559sub post_cleanup {
3256 my ($make_core) = @_; 3560 my ($make_core) = @_;
3257 3561
3258 warn Carp::longmess "post_cleanup backtrace" 3562 warn Carp::longmess "post_cleanup backtrace"
3259 if $make_core; 3563 if $make_core;
3564
3565 my $fh = pidfile;
3566 unlink $PIDFILE if <$fh> == $$;
3260} 3567}
3568
3569# a safer delete_package, copied from Symbol
3570sub clear_package($) {
3571 my $pkg = shift;
3572
3573 # expand to full symbol table name if needed
3574 unless ($pkg =~ /^main::.*::$/) {
3575 $pkg = "main$pkg" if $pkg =~ /^::/;
3576 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3577 $pkg .= '::' unless $pkg =~ /::$/;
3578 }
3579
3580 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3581 my $stem_symtab = *{$stem}{HASH};
3582
3583 defined $stem_symtab and exists $stem_symtab->{$leaf}
3584 or return;
3585
3586 # clear all symbols
3587 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3588 for my $name (keys %$leaf_symtab) {
3589 _gv_clear *{"$pkg$name"};
3590# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3591 }
3592 warn "cleared package #$pkg\n";#d#
3593}
3594
3595our $RELOAD; # how many times to reload
3261 3596
3262sub do_reload_perl() { 3597sub do_reload_perl() {
3263 # can/must only be called in main 3598 # can/must only be called in main
3264 if ($Coro::current != $Coro::main) { 3599 if ($Coro::current != $Coro::main) {
3265 warn "can only reload from main coroutine"; 3600 warn "can only reload from main coroutine";
3266 return; 3601 return;
3267 } 3602 }
3268 3603
3604 return if $RELOAD++;
3605
3606 while ($RELOAD) {
3269 warn "reloading..."; 3607 warn "reloading...";
3270 3608
3271 warn "entering sync_job"; 3609 warn "entering sync_job";
3272 3610
3273 cf::sync_job { 3611 cf::sync_job {
3274 cf::write_runtime; # external watchdog should not bark 3612 cf::write_runtime_sync; # external watchdog should not bark
3275 cf::emergency_save; 3613 cf::emergency_save;
3276 cf::write_runtime; # external watchdog should not bark 3614 cf::write_runtime_sync; # external watchdog should not bark
3277 3615
3278 warn "syncing database to disk"; 3616 warn "syncing database to disk";
3279 BDB::db_env_txn_checkpoint $DB_ENV; 3617 BDB::db_env_txn_checkpoint $DB_ENV;
3280 3618
3281 # if anything goes wrong in here, we should simply crash as we already saved 3619 # if anything goes wrong in here, we should simply crash as we already saved
3282 3620
3283 warn "cancelling all WF_AUTOCANCEL watchers";
3284 for (Event::all_watchers) {
3285 $_->cancel if $_->data & WF_AUTOCANCEL;
3286 }
3287
3288 warn "flushing outstanding aio requests"; 3621 warn "flushing outstanding aio requests";
3289 for (;;) {
3290 BDB::flush;
3291 IO::AIO::flush;
3292 Coro::cede;
3293 last unless IO::AIO::nreqs || BDB::nreqs; 3622 while (IO::AIO::nreqs || BDB::nreqs) {
3294 warn "iterate..."; 3623 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3295 }
3296
3297 ++$RELOAD;
3298
3299 warn "cancelling all extension coros";
3300 $_->cancel for values %EXT_CORO;
3301 %EXT_CORO = ();
3302
3303 warn "removing commands";
3304 %COMMAND = ();
3305
3306 warn "removing ext/exti commands";
3307 %EXTCMD = ();
3308 %EXTICMD = ();
3309
3310 warn "unloading/nuking all extensions";
3311 for my $pkg (@EXTS) {
3312 warn "... unloading $pkg";
3313
3314 if (my $cb = $pkg->can ("unload")) {
3315 eval {
3316 $cb->($pkg);
3317 1
3318 } or warn "$pkg unloaded, but with errors: $@";
3319 } 3624 }
3320 3625
3321 warn "... nuking $pkg"; 3626 warn "cancelling all extension coros";
3322 Symbol::delete_package $pkg; 3627 $_->cancel for values %EXT_CORO;
3323 } 3628 %EXT_CORO = ();
3324 3629
3325 warn "unloading all perl modules loaded from $LIBDIR"; 3630 warn "removing commands";
3326 while (my ($k, $v) = each %INC) { 3631 %COMMAND = ();
3327 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3328 3632
3633 warn "removing ext/exti commands";
3634 %EXTCMD = ();
3635 %EXTICMD = ();
3636
3637 warn "unloading/nuking all extensions";
3638 for my $pkg (@EXTS) {
3329 warn "... unloading $k"; 3639 warn "... unloading $pkg";
3330 delete $INC{$k};
3331 3640
3332 $k =~ s/\.pm$//;
3333 $k =~ s/\//::/g;
3334
3335 if (my $cb = $k->can ("unload_module")) { 3641 if (my $cb = $pkg->can ("unload")) {
3642 eval {
3336 $cb->(); 3643 $cb->($pkg);
3644 1
3645 } or warn "$pkg unloaded, but with errors: $@";
3646 }
3647
3648 warn "... clearing $pkg";
3649 clear_package $pkg;
3337 } 3650 }
3338 3651
3339 Symbol::delete_package $k; 3652 warn "unloading all perl modules loaded from $LIBDIR";
3653 while (my ($k, $v) = each %INC) {
3654 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3655
3656 warn "... unloading $k";
3657 delete $INC{$k};
3658
3659 $k =~ s/\.pm$//;
3660 $k =~ s/\//::/g;
3661
3662 if (my $cb = $k->can ("unload_module")) {
3663 $cb->();
3664 }
3665
3666 clear_package $k;
3340 } 3667 }
3341 3668
3342 warn "getting rid of safe::, as good as possible"; 3669 warn "getting rid of safe::, as good as possible";
3343 Symbol::delete_package "safe::$_" 3670 clear_package "safe::$_"
3344 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3671 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3345 3672
3346 warn "unloading cf.pm \"a bit\""; 3673 warn "unloading cf.pm \"a bit\"";
3347 delete $INC{"cf.pm"}; 3674 delete $INC{"cf.pm"};
3348 delete $INC{"cf/pod.pm"}; 3675 delete $INC{"cf/pod.pm"};
3349 3676
3350 # don't, removes xs symbols, too, 3677 # don't, removes xs symbols, too,
3351 # and global variables created in xs 3678 # and global variables created in xs
3352 #Symbol::delete_package __PACKAGE__; 3679 #clear_package __PACKAGE__;
3353 3680
3354 warn "unload completed, starting to reload now"; 3681 warn "unload completed, starting to reload now";
3355 3682
3356 warn "reloading cf.pm"; 3683 warn "reloading cf.pm";
3357 require cf; 3684 require cf;
3358 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3685 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3359 3686
3360 warn "loading config and database again"; 3687 warn "loading config and database again";
3361 cf::reload_config; 3688 cf::reload_config;
3362 3689
3363 warn "loading extensions"; 3690 warn "loading extensions";
3364 cf::load_extensions; 3691 cf::load_extensions;
3365 3692
3366 warn "reattaching attachments to objects/players"; 3693 warn "reattaching attachments to objects/players";
3367 _global_reattach; # objects, sockets 3694 _global_reattach; # objects, sockets
3368 warn "reattaching attachments to maps"; 3695 warn "reattaching attachments to maps";
3369 reattach $_ for values %MAP; 3696 reattach $_ for values %MAP;
3370 warn "reattaching attachments to players"; 3697 warn "reattaching attachments to players";
3371 reattach $_ for values %PLAYER; 3698 reattach $_ for values %PLAYER;
3372 3699
3373 warn "leaving sync_job"; 3700 warn "leaving sync_job";
3374 3701
3375 1 3702 1
3376 } or do { 3703 } or do {
3377 warn $@; 3704 warn $@;
3378 warn "error while reloading, exiting."; 3705 cf::cleanup "error while reloading, exiting.";
3379 exit 1;
3380 }; 3706 };
3381 3707
3382 warn "reloaded"; 3708 warn "reloaded";
3709 --$RELOAD;
3710 }
3383}; 3711};
3384 3712
3385our $RELOAD_WATCHER; # used only during reload 3713our $RELOAD_WATCHER; # used only during reload
3386 3714
3387sub reload_perl() { 3715sub reload_perl() {
3388 # doing reload synchronously and two reloads happen back-to-back, 3716 # doing reload synchronously and two reloads happen back-to-back,
3389 # coro crashes during coro_state_free->destroy here. 3717 # coro crashes during coro_state_free->destroy here.
3390 3718
3391 $RELOAD_WATCHER ||= Event->timer ( 3719 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3392 reentrant => 0,
3393 after => 0,
3394 data => WF_AUTOCANCEL,
3395 cb => sub {
3396 do_reload_perl; 3720 do_reload_perl;
3397 undef $RELOAD_WATCHER; 3721 undef $RELOAD_WATCHER;
3398 },
3399 ); 3722 };
3400} 3723}
3401 3724
3402register_command "reload" => sub { 3725register_command "reload" => sub {
3403 my ($who, $arg) = @_; 3726 my ($who, $arg) = @_;
3404 3727
3405 if ($who->flag (FLAG_WIZ)) { 3728 if ($who->flag (FLAG_WIZ)) {
3406 $who->message ("reloading server."); 3729 $who->message ("reloading server.");
3730 async {
3731 $Coro::current->{desc} = "perl_reload";
3407 async { reload_perl }; 3732 reload_perl;
3733 };
3408 } 3734 }
3409}; 3735};
3410 3736
3411unshift @INC, $LIBDIR; 3737unshift @INC, $LIBDIR;
3412 3738
3414 3740
3415our @WAIT_FOR_TICK; 3741our @WAIT_FOR_TICK;
3416our @WAIT_FOR_TICK_BEGIN; 3742our @WAIT_FOR_TICK_BEGIN;
3417 3743
3418sub wait_for_tick { 3744sub wait_for_tick {
3419 return unless $TICK_WATCHER->is_active;
3420 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
3421 3746
3422 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
3423 push @WAIT_FOR_TICK, $signal; 3748 push @WAIT_FOR_TICK, $signal;
3424 $signal->wait; 3749 $signal->wait;
3425} 3750}
3426 3751
3427sub wait_for_tick_begin { 3752sub wait_for_tick_begin {
3428 return unless $TICK_WATCHER->is_active;
3429 return if $Coro::current == $Coro::main; 3753 return if tick_inhibit || $Coro::current == $Coro::main;
3430 3754
3431 my $signal = new Coro::Signal; 3755 my $signal = new Coro::Signal;
3432 push @WAIT_FOR_TICK_BEGIN, $signal; 3756 push @WAIT_FOR_TICK_BEGIN, $signal;
3433 $signal->wait; 3757 $signal->wait;
3434} 3758}
3435 3759
3436 my $min = 1e6;#d# 3760sub tick {
3437 my $avg = 10;
3438$TICK_WATCHER = Event->timer (
3439 reentrant => 0,
3440 parked => 1,
3441 prio => 0,
3442 at => $NEXT_TICK || $TICK,
3443 data => WF_AUTOCANCEL,
3444 cb => sub {
3445 if ($Coro::current != $Coro::main) { 3761 if ($Coro::current != $Coro::main) {
3446 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3762 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3447 unless ++$bug_warning > 10; 3763 unless ++$bug_warning > 10;
3448 return; 3764 return;
3449 } 3765 }
3450 3766
3451 $NOW = $tick_start = Event::time;
3452
3453 cf::server_tick; # one server iteration 3767 cf::server_tick; # one server iteration
3454 3768
3455 0 && sync_job {#d# 3769 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3456 for(1..10) { 3770 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3457 my $t = Event::time; 3771 Coro::async_pool {
3458 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3772 $Coro::current->{desc} = "runtime saver";
3459 or die; 3773 write_runtime_sync
3460 3774 or warn "ERROR: unable to write runtime file: $!";
3461 $map->width (50);
3462 $map->height (50);
3463 $map->alloc;
3464 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3465 my $t = Event::time - $t;
3466
3467 #next unless $t < 0.0013;#d#
3468 if ($t < $min) {
3469 $min = $t;
3470 }
3471 $avg = $avg * 0.99 + $t * 0.01;
3472 }
3473 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3474 exit 0;
3475 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3476 }; 3775 };
3776 }
3477 3777
3478 $RUNTIME += $TICK;
3479 $NEXT_TICK += $TICK;
3480
3481 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3482 $NEXT_RUNTIME_WRITE = $NOW + 10;
3483 Coro::async_pool {
3484 write_runtime
3485 or warn "ERROR: unable to write runtime file: $!";
3486 };
3487 }
3488
3489# my $AFTER = Event::time;
3490# warn $AFTER - $NOW;#d#
3491
3492 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3778 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3493 $sig->send; 3779 $sig->send;
3494 } 3780 }
3495 while (my $sig = shift @WAIT_FOR_TICK) { 3781 while (my $sig = shift @WAIT_FOR_TICK) {
3496 $sig->send; 3782 $sig->send;
3497 } 3783 }
3498 3784
3499 $NOW = Event::time; 3785 $LOAD = ($NOW - $TICK_START) / $TICK;
3500
3501 # if we are delayed by four ticks or more, skip them all
3502 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3503
3504 $TICK_WATCHER->at ($NEXT_TICK);
3505 $TICK_WATCHER->start;
3506
3507 $LOAD = ($NOW - $tick_start) / $TICK;
3508 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3786 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3509 3787
3510 _post_tick; 3788 if (0) {
3511 3789 if ($NEXT_TICK) {
3512 3790 my $jitter = $TICK_START - $NEXT_TICK;
3791 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3792 warn "jitter $JITTER\n";#d#
3793 }
3513 }, 3794 }
3514); 3795}
3515 3796
3516{ 3797{
3517 BDB::max_poll_time $TICK * 0.1; 3798 # configure BDB
3518 $BDB_POLL_WATCHER = Event->io ( 3799
3519 reentrant => 0,
3520 fd => BDB::poll_fileno,
3521 poll => 'r',
3522 prio => 0,
3523 data => WF_AUTOCANCEL,
3524 cb => \&BDB::poll_cb,
3525 );
3526 BDB::min_parallel 8; 3800 BDB::min_parallel 8;
3527 3801 BDB::max_poll_reqs $TICK * 0.1;
3528 BDB::set_sync_prepare { 3802 $AnyEvent::BDB::WATCHER->priority (1);
3529 my $status;
3530 my $current = $Coro::current;
3531 (
3532 sub {
3533 $status = $!;
3534 $current->ready; undef $current;
3535 },
3536 sub {
3537 Coro::schedule while defined $current;
3538 $! = $status;
3539 },
3540 )
3541 };
3542 3803
3543 unless ($DB_ENV) { 3804 unless ($DB_ENV) {
3544 $DB_ENV = BDB::db_env_create; 3805 $DB_ENV = BDB::db_env_create;
3806 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3807 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3808 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3809 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3810 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3545 3811
3546 cf::sync_job { 3812 cf::sync_job {
3547 eval { 3813 eval {
3548 BDB::db_env_open 3814 BDB::db_env_open
3549 $DB_ENV, 3815 $DB_ENV,
3551 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3817 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3552 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3818 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3553 0666; 3819 0666;
3554 3820
3555 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3821 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3556
3557 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3558 $DB_ENV->set_lk_detect;
3559 }; 3822 };
3560 3823
3561 cf::cleanup "db_env_open(db): $@" if $@; 3824 cf::cleanup "db_env_open(db): $@" if $@;
3562 }; 3825 };
3563 } 3826 }
3827
3828 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3829 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3830 };
3831 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3832 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3833 };
3834 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3835 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3836 };
3564} 3837}
3565 3838
3566{ 3839{
3840 # configure IO::AIO
3841
3567 IO::AIO::min_parallel 8; 3842 IO::AIO::min_parallel 8;
3568
3569 undef $Coro::AIO::WATCHER;
3570 IO::AIO::max_poll_time $TICK * 0.1; 3843 IO::AIO::max_poll_time $TICK * 0.1;
3571 $AIO_POLL_WATCHER = Event->io ( 3844 undef $AnyEvent::AIO::WATCHER;
3572 reentrant => 0,
3573 data => WF_AUTOCANCEL,
3574 fd => IO::AIO::poll_fileno,
3575 poll => 'r',
3576 prio => 6,
3577 cb => \&IO::AIO::poll_cb,
3578 );
3579} 3845}
3580 3846
3581my $_log_backtrace; 3847my $_log_backtrace;
3582 3848
3583sub _log_backtrace { 3849sub _log_backtrace {
3586 $msg =~ s/\n//; 3852 $msg =~ s/\n//;
3587 3853
3588 # limit the # of concurrent backtraces 3854 # limit the # of concurrent backtraces
3589 if ($_log_backtrace < 2) { 3855 if ($_log_backtrace < 2) {
3590 ++$_log_backtrace; 3856 ++$_log_backtrace;
3857 my $perl_bt = Carp::longmess $msg;
3591 async { 3858 async {
3859 $Coro::current->{desc} = "abt $msg";
3860
3592 my @bt = fork_call { 3861 my @bt = fork_call {
3593 @addr = map { sprintf "%x", $_ } @addr; 3862 @addr = map { sprintf "%x", $_ } @addr;
3594 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3863 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3595 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3864 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3596 or die "addr2line: $!"; 3865 or die "addr2line: $!";
3604 } 3873 }
3605 3874
3606 @funcs 3875 @funcs
3607 }; 3876 };
3608 3877
3609 LOG llevInfo, "[ABT] $msg\n"; 3878 LOG llevInfo, "[ABT] $perl_bt\n";
3879 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3610 LOG llevInfo, "[ABT] $_\n" for @bt; 3880 LOG llevInfo, "[ABT] $_\n" for @bt;
3611 --$_log_backtrace; 3881 --$_log_backtrace;
3612 }; 3882 };
3613 } else { 3883 } else {
3614 LOG llevInfo, "[ABT] $msg\n"; 3884 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines