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.360 by root, Sun Sep 9 06:25:46 2007 UTC vs.
Revision 1.457 by root, Wed Oct 1 05:50:19 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
68
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 73Compress::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
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 74
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 76
52our %COMMAND = (); 77our %COMMAND = ();
53our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
56our %EXTCMD = (); 81our %EXTCMD = ();
57our %EXTICMD = (); 82our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 83our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
60 85
61our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 87our @EVENT;
63 88
64our $CONFDIR = confdir; 89our $CONFDIR = confdir;
65our $DATADIR = datadir; 90our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 92our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 93our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 94our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 95our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 97our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 98our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 99our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime";
102
103our %RESOURCE;
75 104
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 105our $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 106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 107our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 108our $USE_FSYNC = 1; # use fsync to write maps - default off
83 109
110our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER;
84our $BDB_POLL_WATCHER; 112our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 113our $DB_ENV;
86 114
87our %CFG; 115our %CFG;
88 116
89our $UPTIME; $UPTIME ||= time; 117our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 118our $RUNTIME;
119our $NOW;
91 120
92our (%PLAYER, %PLAYER_LOADING); # all users 121our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # all maps 122our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 123our $LINK_MAP; # the special {link} map, which is always available
95 124
96# used to convert map paths into valid unix filenames by replacing / by ∕ 125# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 126our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 127
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 128our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 129our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 131our $TICK_START; # for load detecting purposes
132
133our @POST_INIT;
134
135our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
102 136
103binmode STDOUT; 137binmode STDOUT;
104binmode STDERR; 138binmode STDERR;
105 139
106# read virtual server time, if available 140# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 141unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 142 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 143 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 144 $RUNTIME = <$fh> + 0.;
111} 145}
112 146
113mkdir $_ 147mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 148 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
159 193
160The raw value load value from the last tick. 194The raw value load value from the last tick.
161 195
162=item %cf::CFG 196=item %cf::CFG
163 197
164Configuration for the server, loaded from C</etc/crossfire/config>, or 198Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 199from wherever your confdir points to.
166 200
167=item cf::wait_for_tick, cf::wait_for_tick_begin 201=item cf::wait_for_tick, cf::wait_for_tick_begin
168 202
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 203These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
187 $msg .= "\n" 221 $msg .= "\n"
188 unless $msg =~ /\n$/; 222 unless $msg =~ /\n$/;
189 223
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 224 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 225
192 utf8::encode $msg;
193 LOG llevError, $msg; 226 LOG llevError, $msg;
194 }; 227 };
195} 228}
229
230$Coro::State::DIEHOOK = sub {
231 return unless $^S eq 0; # "eq", not "=="
232
233 if ($Coro::current == $Coro::main) {#d#
234 warn "DIEHOOK called in main context, Coro bug?\n";#d#
235 return;#d#
236 }#d#
237
238 # kill coroutine otherwise
239 warn Carp::longmess $_[0];
240 Coro::terminate
241};
242
243$SIG{__DIE__} = sub { }; #d#?
196 244
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 245@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 246@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 247@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 248@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 255for my $pkg (qw(
208 cf::global cf::attachable 256 cf::global cf::attachable
209 cf::object cf::object::player 257 cf::object cf::object::player
210 cf::client cf::player 258 cf::client cf::player
211 cf::arch cf::living 259 cf::arch cf::living
260 cf::map cf::mapspace
212 cf::map cf::party cf::region 261 cf::party cf::region
213)) { 262)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 263 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 264}
217 265
218$Event::DIED = sub { 266$EV::DIED = sub {
219 warn "error in event callback: @_"; 267 warn "error in event callback: @_";
220}; 268};
221 269
222############################################################################# 270#############################################################################
223 271
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 294 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 295 $d
248 } || "[unable to dump $_[0]: '$@']"; 296 } || "[unable to dump $_[0]: '$@']";
249} 297}
250 298
251=item $ref = cf::from_json $json 299=item $ref = cf::decode_json $json
252 300
253Converts a JSON string into the corresponding perl data structure. 301Converts a JSON string into the corresponding perl data structure.
254 302
255=item $json = cf::to_json $ref 303=item $json = cf::encode_json $ref
256 304
257Converts a perl data structure into its JSON representation. 305Converts a perl data structure into its JSON representation.
258 306
259=cut 307=cut
260 308
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 309our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 310
263sub to_json ($) { $json_coder->encode ($_[0]) } 311sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 312sub decode_json($) { $json_coder->decode ($_[0]) }
313
314=item cf::post_init { BLOCK }
315
316Execute the given codeblock, I<after> all extensions have been (re-)loaded,
317but I<before> the server starts ticking again.
318
319The cdoeblock will have a single boolean argument to indicate whether this
320is a reload or not.
321
322=cut
323
324sub post_init(&) {
325 push @POST_INIT, shift;
326}
265 327
266=item cf::lock_wait $string 328=item cf::lock_wait $string
267 329
268Wait until the given lock is available. See cf::lock_acquire. 330Wait until the given lock is available. See cf::lock_acquire.
269 331
297 return;#d# 359 return;#d#
298 }#d# 360 }#d#
299 361
300 # wait for lock, if any 362 # wait for lock, if any
301 while ($LOCK{$key}) { 363 while ($LOCK{$key}) {
364 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
302 push @{ $LOCK{$key} }, $Coro::current; 365 push @{ $LOCK{$key} }, $Coro::current;
303 Coro::schedule; 366 Coro::schedule;
304 } 367 }
305} 368}
306 369
325 388
326 ! ! $LOCK{$key} 389 ! ! $LOCK{$key}
327} 390}
328 391
329sub freeze_mainloop { 392sub freeze_mainloop {
330 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
331 394
332 my $guard = Coro::guard { 395 Coro::guard \&tick_inhibit_dec;
333 $TICK_WATCHER->start; 396}
334 }; 397
335 $TICK_WATCHER->stop; 398=item cf::periodic $interval, $cb
336 $guard 399
400Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer.
402
403=cut
404
405sub periodic($$) {
406 my ($interval, $cb) = @_;
407
408 my $start = rand List::Util::min 180, $interval;
409
410 EV::periodic $start, $interval, 0, $cb
337} 411}
338 412
339=item cf::get_slot $time[, $priority[, $name]] 413=item cf::get_slot $time[, $priority[, $name]]
340 414
341Allocate $time seconds of blocking CPU time at priority C<$priority>: 415Allocate $time seconds of blocking CPU time at priority C<$priority>:
352our @SLOT_QUEUE; 426our @SLOT_QUEUE;
353our $SLOT_QUEUE; 427our $SLOT_QUEUE;
354 428
355$SLOT_QUEUE->cancel if $SLOT_QUEUE; 429$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async { 430$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager");
432
357 my $signal = new Coro::Signal; 433 my $signal = new Coro::Signal;
358 434
359 while () { 435 while () {
360 next_job: 436 next_job:
361 my $avail = cf::till_tick; 437 my $avail = cf::till_tick;
369 } 445 }
370 } 446 }
371 } 447 }
372 448
373 if (@SLOT_QUEUE) { 449 if (@SLOT_QUEUE) {
374 # we do not use wait_For_tick() as it returns immediately when tick is inactive 450 # we do not use wait_for_tick() as it returns immediately when tick is inactive
375 push @cf::WAIT_FOR_TICK, $signal; 451 push @cf::WAIT_FOR_TICK, $signal;
376 $signal->wait; 452 $signal->wait;
377 } else { 453 } else {
378 Coro::schedule; 454 Coro::schedule;
379 } 455 }
380 } 456 }
381}; 457};
382 458
383sub get_slot($;$$) { 459sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main;
461
384 my ($time, $pri, $name) = @_; 462 my ($time, $pri, $name) = @_;
385 463
386 $time = $TICK * .6 if $time > $TICK * .6; 464 $time = $TICK * .6 if $time > $TICK * .6;
387 my $sig = new Coro::Signal; 465 my $sig = new Coro::Signal;
388 466
402 480
403BEGIN { *async = \&Coro::async_pool } 481BEGIN { *async = \&Coro::async_pool }
404 482
405=item cf::sync_job { BLOCK } 483=item cf::sync_job { BLOCK }
406 484
407The design of Crossfire TRT requires that the main coroutine ($Coro::main) 485The design of Deliantra requires that the main coroutine ($Coro::main)
408is always able to handle events or runnable, as Crossfire TRT is only 486is 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 487partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
410acceptable. 488acceptable.
411 489
412If it must be done, put the blocking parts into C<sync_job>. This will run 490If 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 491the given BLOCK in another coroutine while waiting for the result. The
418 496
419sub sync_job(&) { 497sub sync_job(&) {
420 my ($job) = @_; 498 my ($job) = @_;
421 499
422 if ($Coro::current == $Coro::main) { 500 if ($Coro::current == $Coro::main) {
423 my $time = Event::time; 501 my $time = EV::time;
424 502
425 # this is the main coro, too bad, we have to block 503 # this is the main coro, too bad, we have to block
426 # till the operation succeeds, freezing the server :/ 504 # till the operation succeeds, freezing the server :/
427 505
428 # TODO: use suspend/resume instead 506 LOG llevError, Carp::longmess "sync job";#d#
429 # (but this is cancel-safe) 507
430 my $freeze_guard = freeze_mainloop; 508 my $freeze_guard = freeze_mainloop;
431 509
432 my $busy = 1; 510 my $busy = 1;
433 my @res; 511 my @res;
434 512
435 (async { 513 (async {
514 $Coro::current->desc ("sync job coro");
436 @res = eval { $job->() }; 515 @res = eval { $job->() };
437 warn $@ if $@; 516 warn $@ if $@;
438 undef $busy; 517 undef $busy;
439 })->prio (Coro::PRIO_MAX); 518 })->prio (Coro::PRIO_MAX);
440 519
441 while ($busy) { 520 while ($busy) {
442 Coro::cede or Event::one_event; 521 if (Coro::nready) {
522 Coro::cede_notself;
523 } else {
524 EV::loop EV::LOOP_ONESHOT;
443 } 525 }
526 }
444 527
445 $time = Event::time - $time; 528 my $time = EV::time - $time;
446 529
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 530 $TICK_START += $time; # do not account sync jobs to server load
451 531
452 wantarray ? @res : $res[0] 532 wantarray ? @res : $res[0]
453 } else { 533 } else {
454 # we are in another coroutine, how wonderful, everything just works 534 # we are in another coroutine, how wonderful, everything just works
455 535
480=item fork_call { }, $args 560=item fork_call { }, $args
481 561
482Executes the given code block with the given arguments in a seperate 562Executes the given code block with the given arguments in a seperate
483process, returning the results. Everything must be serialisable with 563process, returning the results. Everything must be serialisable with
484Coro::Storable. May, of course, block. Note that the executed sub may 564Coro::Storable. May, of course, block. Note that the executed sub may
485never block itself or use any form of Event handling. 565never block itself or use any form of event handling.
486 566
487=cut 567=cut
488 568
489sub fork_call(&@) { 569sub fork_call(&@) {
490 my ($cb, @args) = @_; 570 my ($cb, @args) = @_;
499 }, @args; 579 }, @args;
500 580
501 wantarray ? @res : $res[-1] 581 wantarray ? @res : $res[-1]
502} 582}
503 583
584=item $coin = coin_from_name $name
585
586=cut
587
588our %coin_alias = (
589 "silver" => "silvercoin",
590 "silvercoin" => "silvercoin",
591 "silvercoins" => "silvercoin",
592 "gold" => "goldcoin",
593 "goldcoin" => "goldcoin",
594 "goldcoins" => "goldcoin",
595 "platinum" => "platinacoin",
596 "platinumcoin" => "platinacoin",
597 "platinumcoins" => "platinacoin",
598 "platina" => "platinacoin",
599 "platinacoin" => "platinacoin",
600 "platinacoins" => "platinacoin",
601 "royalty" => "royalty",
602 "royalties" => "royalty",
603);
604
605sub coin_from_name($) {
606 $coin_alias{$_[0]}
607 ? cf::arch::find $coin_alias{$_[0]}
608 : undef
609}
610
504=item $value = cf::db_get $family => $key 611=item $value = cf::db_get $family => $key
505 612
506Returns a single value from the environment database. 613Returns a single value from the environment database.
507 614
508=item cf::db_put $family => $key => $value 615=item cf::db_put $family => $key => $value
509 616
510Stores the given C<$value> in the family. It can currently store binary 617Stores 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). 618data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
512 619
620=item $db = cf::db_table "name"
621
622Create and/or open a new database table. The string must not be "db" and must be unique
623within each server.
624
513=cut 625=cut
626
627sub db_table($) {
628 my ($name) = @_;
629 my $db = BDB::db_create $DB_ENV;
630
631 eval {
632 $db->set_flags (BDB::CHKSUM);
633
634 utf8::encode $name;
635 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
636 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
637 cf::cleanup "db_open(db): $!" if $!;
638 };
639 cf::cleanup "db_open(db): $@" if $@;
640
641 $db
642}
514 643
515our $DB; 644our $DB;
516 645
517sub db_init { 646sub db_init {
518 unless ($DB) {
519 $DB = BDB::db_create $DB_ENV;
520
521 cf::sync_job { 647 cf::sync_job {
522 eval { 648 $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 } 649 };
532} 650}
533 651
534sub db_get($$) { 652sub db_get($$) {
535 my $key = "$_[0]/$_[1]"; 653 my $key = "$_[0]/$_[1]";
536 654
634 752
635############################################################################# 753#############################################################################
636 754
637=head2 ATTACHABLE OBJECTS 755=head2 ATTACHABLE OBJECTS
638 756
639Many objects in crossfire are so-called attachable objects. That means you can 757Many objects in deliantra are so-called attachable objects. That means you can
640attach callbacks/event handlers (a collection of which is called an "attachment") 758attach callbacks/event handlers (a collection of which is called an "attachment")
641to it. All such attachable objects support the following methods. 759to it. All such attachable objects support the following methods.
642 760
643In the following description, CLASS can be any of C<global>, C<object> 761In 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 762C<player>, C<client> or C<map> (i.e. the attachable objects in
645Crossfire TRT). 763Deliantra).
646 764
647=over 4 765=over 4
648 766
649=item $attachable->attach ($attachment, key => $value...) 767=item $attachable->attach ($attachment, key => $value...)
650 768
694=item cf::CLASS::attachment $name, ... 812=item cf::CLASS::attachment $name, ...
695 813
696Register an attachment by C<$name> through which attachable objects of the 814Register an attachment by C<$name> through which attachable objects of the
697given CLASS can refer to this attachment. 815given CLASS can refer to this attachment.
698 816
699Some classes such as crossfire maps and objects can specify attachments 817Some classes such as deliantra maps and objects can specify attachments
700that are attached at load/instantiate time, thus the need for a name. 818that are attached at load/instantiate time, thus the need for a name.
701 819
702These calls expect any number of the following handler/hook descriptions: 820These calls expect any number of the following handler/hook descriptions:
703 821
704=over 4 822=over 4
932 } 1050 }
933 1051
934 0 1052 0
935} 1053}
936 1054
937=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
938 1056
939=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1057=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
940 1058
941Generate an object-specific event with the given arguments. 1059Generate an object-specific event with the given arguments.
942 1060
948 1066
949=cut 1067=cut
950 1068
951############################################################################# 1069#############################################################################
952# object support 1070# object support
953#
954 1071
1072sub _object_equal($$);
1073sub _object_equal($$) {
1074 my ($a, $b) = @_;
1075
1076 return 0 unless (ref $a) eq (ref $b);
1077
1078 if ("HASH" eq ref $a) {
1079 my @ka = keys %$a;
1080 my @kb = keys %$b;
1081
1082 return 0 if @ka != @kb;
1083
1084 for (0 .. $#ka) {
1085 return 0 unless $ka[$_] eq $kb[$_];
1086 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1087 }
1088
1089 } elsif ("ARRAY" eq ref $a) {
1090
1091 return 0 if @$a != @$b;
1092
1093 for (0 .. $#$a) {
1094 return 0 unless _object_equal $a->[$_], $b->[$_];
1095 }
1096
1097 } elsif ($a ne $b) {
1098 return 0;
1099 }
1100
1101 1
1102}
1103
1104our $SLOW_MERGES;#d#
955sub _can_merge { 1105sub _can_merge {
956 my ($ob1, $ob2) = @_; 1106 my ($ob1, $ob2) = @_;
957 1107
958 local $Storable::canonical = 1; 1108 ++$SLOW_MERGES;#d#
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961 1109
962 $fob1 eq $fob2 1110 # we do the slow way here
1111 return _object_equal $ob1, $ob2
963} 1112}
964 1113
965sub reattach { 1114sub reattach {
966 # basically do the same as instantiate, without calling instantiate 1115 # basically do the same as instantiate, without calling instantiate
967 my ($obj) = @_; 1116 my ($obj) = @_;
968 1117
1118 # no longer needed after getting rid of delete_package?
969 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1119 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
970 1120
971 my $registry = $obj->registry; 1121 my $registry = $obj->registry;
972 1122
973 @$registry = (); 1123 @$registry = ();
974 1124
989cf::attachable->attach ( 1139cf::attachable->attach (
990 prio => -1000000, 1140 prio => -1000000,
991 on_instantiate => sub { 1141 on_instantiate => sub {
992 my ($obj, $data) = @_; 1142 my ($obj, $data) = @_;
993 1143
994 $data = from_json $data; 1144 $data = decode_json $data;
995 1145
996 for (@$data) { 1146 for (@$data) {
997 my ($name, $args) = @$_; 1147 my ($name, $args) = @$_;
998 1148
999 $obj->attach ($name, %{$args || {} }); 1149 $obj->attach ($name, %{$args || {} });
1013); 1163);
1014 1164
1015sub object_freezer_save { 1165sub object_freezer_save {
1016 my ($filename, $rdata, $objs) = @_; 1166 my ($filename, $rdata, $objs) = @_;
1017 1167
1018 my $guard = cf::lock_acquire "io";
1019
1020 sync_job { 1168 sync_job {
1021 if (length $$rdata) { 1169 if (length $$rdata) {
1170 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1171 warn sprintf "saving %s (%d,%d)\n",
1023 $filename, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1024 1173
1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1026 chmod SAVE_MODE, $fh; 1175 aio_chmod $fh, SAVE_MODE;
1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1177 aio_fsync $fh if $cf::USE_FSYNC;
1029 close $fh; 1178 aio_close $fh;
1030 1179
1031 if (@$objs) { 1180 if (@$objs) {
1032 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1033 chmod SAVE_MODE, $fh; 1182 aio_chmod $fh, SAVE_MODE;
1034 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1183 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1035 aio_write $fh, 0, (length $data), $data, 0; 1184 aio_write $fh, 0, (length $data), $data, 0;
1036 aio_fsync $fh if $cf::USE_FSYNC; 1185 aio_fsync $fh if $cf::USE_FSYNC;
1037 close $fh; 1186 aio_close $fh;
1038 aio_rename "$filename.pst~", "$filename.pst"; 1187 aio_rename "$filename.pst~", "$filename.pst";
1039 } 1188 }
1040 } else { 1189 } else {
1041 aio_unlink "$filename.pst"; 1190 aio_unlink "$filename.pst";
1042 } 1191 }
1043 1192
1044 aio_rename "$filename~", $filename; 1193 aio_rename "$filename~", $filename;
1194
1195 $filename =~ s%/[^/]+$%%;
1196 aio_pathsync $filename if $cf::USE_FSYNC;
1045 } else { 1197 } else {
1046 warn "FATAL: $filename~: $!\n"; 1198 warn "FATAL: $filename~: $!\n";
1047 } 1199 }
1048 } else { 1200 } else {
1049 aio_unlink $filename; 1201 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1202 aio_unlink "$filename.pst";
1051 } 1203 }
1052 }; 1204 };
1053
1054 undef $guard;
1055} 1205}
1056 1206
1057sub object_freezer_as_string { 1207sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1208 my ($rdata, $objs) = @_;
1059 1209
1064 1214
1065sub object_thawer_load { 1215sub object_thawer_load {
1066 my ($filename) = @_; 1216 my ($filename) = @_;
1067 1217
1068 my ($data, $av); 1218 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1219
1072 (aio_load $filename, $data) >= 0 1220 (aio_load $filename, $data) >= 0
1073 or return; 1221 or return;
1074 1222
1075 unless (aio_stat "$filename.pst") { 1223 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1224 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1225 or return;
1078 1226
1079 undef $guard;
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1227 my $st = eval { Coro::Storable::thaw $av };
1228 $av = $st->{objs};
1081 } 1229 }
1082 1230
1231 utf8::decode (my $decname = $filename);
1083 warn sprintf "loading %s (%d)\n", 1232 warn sprintf "loading %s (%d,%d)\n",
1084 $filename, length $data, scalar @{$av || []}; 1233 $decname, length $data, scalar @{$av || []};
1085 1234
1086 ($data, $av) 1235 ($data, $av)
1087} 1236}
1088 1237
1089=head2 COMMAND CALLBACKS 1238=head2 COMMAND CALLBACKS
1145 my ($name, $cb) = @_; 1294 my ($name, $cb) = @_;
1146 1295
1147 $EXTICMD{$name} = $cb; 1296 $EXTICMD{$name} = $cb;
1148} 1297}
1149 1298
1299use File::Glob ();
1300
1150cf::player->attach ( 1301cf::player->attach (
1151 on_command => sub { 1302 on_command => sub {
1152 my ($pl, $name, $params) = @_; 1303 my ($pl, $name, $params) = @_;
1153 1304
1154 my $cb = $COMMAND{$name} 1305 my $cb = $COMMAND{$name}
1186 1337
1187 cf::override; 1338 cf::override;
1188 }, 1339 },
1189); 1340);
1190 1341
1342# "readahead" all extensions
1343sub cache_extensions {
1344 my $grp = IO::AIO::aio_group;
1345
1346 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1347 for (grep /\.ext$/, @{$_[0]}) {
1348 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1349 }
1350 };
1351
1352 $grp
1353}
1354
1191sub load_extensions { 1355sub load_extensions {
1192 cf::sync_job { 1356 cf::sync_job {
1193 my %todo; 1357 my %todo;
1194 1358
1195 for my $path (<$LIBDIR/*.ext>) { 1359 for my $path (<$LIBDIR/*.ext>) {
1214 1378
1215 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1379 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1216 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1380 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1217 1381
1218 $ext{source} = 1382 $ext{source} =
1219 "package $pkg; use strict; use utf8;\n" 1383 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1220 . "#line 1 \"$path\"\n{\n" 1384 . "#line 1 \"$path\"\n{\n"
1221 . $source 1385 . $source
1222 . "\n};\n1"; 1386 . "\n};\n1";
1223 1387
1224 $todo{$base} = \%ext; 1388 $todo{$base} = \%ext;
1240 my $msg = $@ ? "$v->{path}: $@\n" 1404 my $msg = $@ ? "$v->{path}: $@\n"
1241 : "$v->{base}: extension inactive.\n"; 1405 : "$v->{base}: extension inactive.\n";
1242 1406
1243 if (exists $v->{meta}{mandatory}) { 1407 if (exists $v->{meta}{mandatory}) {
1244 warn $msg; 1408 warn $msg;
1245 warn "mandatory extension failed to load, exiting.\n"; 1409 cf::cleanup "mandatory extension failed to load, exiting.";
1246 exit 1;
1247 } 1410 }
1248 1411
1249 warn $msg; 1412 warn $msg;
1250 } 1413 }
1251 1414
1265 1428
1266=back 1429=back
1267 1430
1268=head2 CORE EXTENSIONS 1431=head2 CORE EXTENSIONS
1269 1432
1270Functions and methods that extend core crossfire objects. 1433Functions and methods that extend core deliantra objects.
1271 1434
1272=cut 1435=cut
1273 1436
1274package cf::player; 1437package cf::player;
1275 1438
1276use Coro::AIO; 1439use Coro::AIO;
1277 1440
1278=head3 cf::player 1441=head3 cf::player
1279 1442
1280=over 4 1443=over 4
1444
1445=item cf::player::num_playing
1446
1447Returns the official number of playing players, as per the Crossfire metaserver rules.
1448
1449=cut
1450
1451sub num_playing {
1452 scalar grep
1453 $_->ob->map
1454 && !$_->hidden
1455 && !$_->ob->flag (cf::FLAG_WIZ),
1456 cf::player::list
1457}
1281 1458
1282=item cf::player::find $login 1459=item cf::player::find $login
1283 1460
1284Returns the given player object, loading it if necessary (might block). 1461Returns the given player object, loading it if necessary (might block).
1285 1462
1304 1481
1305sub exists($) { 1482sub exists($) {
1306 my ($login) = @_; 1483 my ($login) = @_;
1307 1484
1308 $cf::PLAYER{$login} 1485 $cf::PLAYER{$login}
1309 or cf::sync_job { !aio_stat path $login } 1486 or !aio_stat path $login
1310} 1487}
1311 1488
1312sub find($) { 1489sub find($) {
1313 return $cf::PLAYER{$_[0]} || do { 1490 return $cf::PLAYER{$_[0]} || do {
1314 my $login = $_[0]; 1491 my $login = $_[0];
1324 aio_unlink +(playerdir $login) . "/$login.pl"; 1501 aio_unlink +(playerdir $login) . "/$login.pl";
1325 1502
1326 my $f = new_from_file cf::object::thawer path $login 1503 my $f = new_from_file cf::object::thawer path $login
1327 or return; 1504 or return;
1328 1505
1329 $f->next;
1330 my $pl = cf::player::load_pl $f 1506 my $pl = cf::player::load_pl $f
1331 or return; 1507 or return;
1508
1332 local $cf::PLAYER_LOADING{$login} = $pl; 1509 local $cf::PLAYER_LOADING{$login} = $pl;
1333 $f->resolve_delayed_derefs; 1510 $f->resolve_delayed_derefs;
1334 $cf::PLAYER{$login} = $pl 1511 $cf::PLAYER{$login} = $pl
1335 } 1512 }
1336 } 1513 }
1346 1523
1347 return if $pl->{deny_save}; 1524 return if $pl->{deny_save};
1348 1525
1349 aio_mkdir playerdir $pl, 0770; 1526 aio_mkdir playerdir $pl, 0770;
1350 $pl->{last_save} = $cf::RUNTIME; 1527 $pl->{last_save} = $cf::RUNTIME;
1528
1529 cf::get_slot 0.01;
1351 1530
1352 $pl->save_pl ($path); 1531 $pl->save_pl ($path);
1353 cf::cede_to_tick; 1532 cf::cede_to_tick;
1354} 1533}
1355 1534
1387 my ($pl) = @_; 1566 my ($pl) = @_;
1388 1567
1389 my $name = $pl->ob->name; 1568 my $name = $pl->ob->name;
1390 1569
1391 $pl->{deny_save} = 1; 1570 $pl->{deny_save} = 1;
1392 $pl->password ("*"); # this should lock out the player until we nuked the dir 1571 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1393 1572
1394 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1573 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1395 $pl->deactivate; 1574 $pl->deactivate;
1575 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1576 $pl->ob->check_score;
1396 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1577 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1397 $pl->ns->destroy if $pl->ns; 1578 $pl->ns->destroy if $pl->ns;
1398 1579
1399 my $path = playerdir $pl; 1580 my $path = playerdir $pl;
1400 my $temp = "$path~$cf::RUNTIME~deleting~"; 1581 my $temp = "$path~$cf::RUNTIME~deleting~";
1439 1620
1440 for my $login (@$dirs) { 1621 for my $login (@$dirs) {
1441 my $path = path $login; 1622 my $path = path $login;
1442 1623
1443 # a .pst is a dead give-away for a valid player 1624 # a .pst is a dead give-away for a valid player
1444 unless (-e "$path.pst") { 1625 # if no pst file found, open and chekc for blocked users
1626 if (aio_stat "$path.pst") {
1445 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1627 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1446 aio_read $fh, 0, 512, my $buf, 0 or next; 1628 aio_read $fh, 0, 512, my $buf, 0 or next;
1447 $buf !~ /^password -------------$/m or next; # official not-valid tag 1629 $buf !~ /^password -------------$/m or next; # official not-valid tag
1448 } 1630 }
1449 1631
1480 } 1662 }
1481 1663
1482 \@paths 1664 \@paths
1483} 1665}
1484 1666
1485=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1667=item $protocol_xml = $player->expand_cfpod ($cfpod)
1486 1668
1487Expand crossfire pod fragments into protocol xml. 1669Expand deliantra pod fragments into protocol xml.
1488
1489=cut
1490
1491sub expand_cfpod {
1492 ((my $self), (local $_)) = @_;
1493
1494 # escape & and <
1495 s/&/&amp;/g;
1496 s/(?<![BIUGHT])</&lt;/g;
1497
1498 # this is buggy, it needs to properly take care of nested <'s
1499
1500 1 while
1501 # replace B<>, I<>, U<> etc.
1502 s/B<([^\>]*)>/<b>$1<\/b>/
1503 || s/I<([^\>]*)>/<i>$1<\/i>/
1504 || s/U<([^\>]*)>/<u>$1<\/u>/
1505 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1506 # replace G<male|female> tags
1507 || s{G<([^>|]*)\|([^>]*)>}{
1508 $self->gender ? $2 : $1
1509 }ge
1510 # replace H<hint text>
1511 || s{H<([^\>]*)>}
1512 {
1513 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1514 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1515 "")
1516 [$self->{hintmode}]
1517 }ge;
1518
1519 # create single paragraphs (very hackish)
1520 s/(?<=\S)\n(?=\w)/ /g;
1521
1522 # compress some whitespace
1523 s/\s+\n/\n/g; # ws line-ends
1524 s/\n\n+/\n/g; # double lines
1525 s/^\n+//; # beginning lines
1526 s/\n+$//; # ending lines
1527
1528 $_
1529}
1530
1531sub hintmode {
1532 $_[0]{hintmode} = $_[1] if @_ > 1;
1533 $_[0]{hintmode}
1534}
1535 1670
1536=item $player->ext_reply ($msgid, @msg) 1671=item $player->ext_reply ($msgid, @msg)
1537 1672
1538Sends an ext reply to the player. 1673Sends an ext reply to the player.
1539 1674
1606our $MAX_RESET = 3600; 1741our $MAX_RESET = 3600;
1607our $DEFAULT_RESET = 3000; 1742our $DEFAULT_RESET = 3000;
1608 1743
1609sub generate_random_map { 1744sub generate_random_map {
1610 my ($self, $rmp) = @_; 1745 my ($self, $rmp) = @_;
1746
1747 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1748
1611 # mit "rum" bekleckern, nicht 1749 # mit "rum" bekleckern, nicht
1612 $self->_create_random_map ( 1750 $self->_create_random_map (
1613 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1751 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1614 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1752 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1615 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1753 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1737 1875
1738# the temporary/swap location 1876# the temporary/swap location
1739sub save_path { 1877sub save_path {
1740 my ($self) = @_; 1878 my ($self) = @_;
1741 1879
1742 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1880 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1743 "$TMPDIR/$path.map" 1881 "$TMPDIR/$path.map"
1744} 1882}
1745 1883
1746# the unique path, undef == no special unique path 1884# the unique path, undef == no special unique path
1747sub uniq_path { 1885sub uniq_path {
1748 my ($self) = @_; 1886 my ($self) = @_;
1749 1887
1750 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1888 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1751 "$UNIQUEDIR/$path" 1889 "$UNIQUEDIR/$path"
1752} 1890}
1753 1891
1754# and all this just because we cannot iterate over 1892# and all this just because we cannot iterate over
1755# all maps in C++... 1893# all maps in C++...
1853 1991
1854 cf::lock_wait "map_data:$path";#d#remove 1992 cf::lock_wait "map_data:$path";#d#remove
1855 cf::lock_wait "map_find:$path"; 1993 cf::lock_wait "map_find:$path";
1856 1994
1857 $cf::MAP{$path} || do { 1995 $cf::MAP{$path} || do {
1858 my $guard1 = cf::lock_acquire "map_find:$path";
1859 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 1996 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1997 my $guard2 = cf::lock_acquire "map_find:$path";
1860 1998
1861 my $map = new_from_path cf::map $path 1999 my $map = new_from_path cf::map $path
1862 or return; 2000 or return;
1863 2001
1864 $map->{last_save} = $cf::RUNTIME; 2002 $map->{last_save} = $cf::RUNTIME;
1867 or return; 2005 or return;
1868 2006
1869 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2007 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1870 # doing this can freeze the server in a sync job, obviously 2008 # doing this can freeze the server in a sync job, obviously
1871 #$cf::WAIT_FOR_TICK->wait; 2009 #$cf::WAIT_FOR_TICK->wait;
2010 undef $guard2;
1872 undef $guard1; 2011 undef $guard1;
1873 undef $guard2;
1874 $map->reset; 2012 $map->reset;
1875 return find $path; 2013 return find $path;
1876 } 2014 }
1877 2015
1878 $cf::MAP{$path} = $map 2016 $cf::MAP{$path} = $map
1905 my $f = new_from_file cf::object::thawer $self->{load_path}; 2043 my $f = new_from_file cf::object::thawer $self->{load_path};
1906 $f->skip_block; 2044 $f->skip_block;
1907 $self->_load_objects ($f) 2045 $self->_load_objects ($f)
1908 or return; 2046 or return;
1909 2047
1910 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2048 $self->post_load_original
1911 if delete $self->{load_original}; 2049 if delete $self->{load_original};
1912 2050
1913 if (my $uniq = $self->uniq_path) { 2051 if (my $uniq = $self->uniq_path) {
1914 utf8::encode $uniq; 2052 utf8::encode $uniq;
1915 unless (aio_stat $uniq) { 2053 unless (aio_stat $uniq) {
1941 } 2079 }
1942 2080
1943 $self->{last_save} = $cf::RUNTIME; 2081 $self->{last_save} = $cf::RUNTIME;
1944 $self->last_access ($cf::RUNTIME); 2082 $self->last_access ($cf::RUNTIME);
1945 2083
1946 $self->in_memory (cf::MAP_IN_MEMORY); 2084 $self->in_memory (cf::MAP_ACTIVE);
1947 } 2085 }
1948 2086
1949 $self->post_load; 2087 $self->post_load;
1950} 2088}
1951 2089
2009 my ($path, $origin, $load) = @_; 2147 my ($path, $origin, $load) = @_;
2010 2148
2011 $path = normalise $path, $origin && $origin->{path}; 2149 $path = normalise $path, $origin && $origin->{path};
2012 2150
2013 if (my $map = $cf::MAP{$path}) { 2151 if (my $map = $cf::MAP{$path}) {
2014 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2152 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2015 } 2153 }
2016 2154
2017 $MAP_PREFETCH{$path} |= $load; 2155 $MAP_PREFETCH{$path} |= $load;
2018 2156
2019 $MAP_PREFETCHER ||= cf::async { 2157 $MAP_PREFETCHER ||= cf::async {
2158 $Coro::current->{desc} = "map prefetcher";
2159
2020 while (%MAP_PREFETCH) { 2160 while (%MAP_PREFETCH) {
2021 while (my ($k, $v) = each %MAP_PREFETCH) { 2161 while (my ($k, $v) = each %MAP_PREFETCH) {
2022 if (my $map = find $k) { 2162 if (my $map = find $k) {
2023 $map->load if $v; 2163 $map->load if $v;
2024 } 2164 }
2050 return if $self->{deny_save}; 2190 return if $self->{deny_save};
2051 2191
2052 local $self->{last_access} = $self->last_access;#d# 2192 local $self->{last_access} = $self->last_access;#d#
2053 2193
2054 cf::async { 2194 cf::async {
2195 $Coro::current->{desc} = "map player save";
2055 $_->contr->save for $self->players; 2196 $_->contr->save for $self->players;
2056 }; 2197 };
2198
2199 cf::get_slot 0.02;
2057 2200
2058 if ($uniq) { 2201 if ($uniq) {
2059 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2202 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2060 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2203 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2061 } else { 2204 } else {
2070 $self->save; 2213 $self->save;
2071 2214
2072 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2215 my $lock = cf::lock_acquire "map_data:$self->{path}";
2073 2216
2074 return if $self->players; 2217 return if $self->players;
2075 return if $self->in_memory != cf::MAP_IN_MEMORY; 2218 return if $self->in_memory != cf::MAP_ACTIVE;
2076 return if $self->{deny_save}; 2219 return if $self->{deny_save};
2077 2220
2078 $self->in_memory (cf::MAP_SWAPPED); 2221 $self->in_memory (cf::MAP_SWAPPED);
2079 2222
2080 $self->deactivate; 2223 $self->deactivate;
2198 2341
2199sub unique_maps() { 2342sub unique_maps() {
2200 [ 2343 [
2201 map { 2344 map {
2202 utf8::decode $_; 2345 utf8::decode $_;
2203 /\.map$/ 2346 s/\.map$//; # TODO future compatibility hack
2347 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2348 ? ()
2204 ? normalise $_ 2349 : normalise $_
2205 : ()
2206 } @{ aio_readdir $UNIQUEDIR or [] } 2350 } @{ aio_readdir $UNIQUEDIR or [] }
2207 ] 2351 ]
2208} 2352}
2209 2353
2210package cf;
2211
2212=back 2354=back
2213 2355
2214=head3 cf::object 2356=head3 cf::object
2215 2357
2216=cut 2358=cut
2219 2361
2220=over 4 2362=over 4
2221 2363
2222=item $ob->inv_recursive 2364=item $ob->inv_recursive
2223 2365
2224Returns the inventory of the object _and_ their inventories, recursively. 2366Returns the inventory of the object I<and> their inventories, recursively,
2367but I<not> the object itself.
2225 2368
2226=cut 2369=cut
2227 2370
2228sub inv_recursive_; 2371sub inv_recursive_;
2229sub inv_recursive_ { 2372sub inv_recursive_ {
2234 inv_recursive_ inv $_[0] 2377 inv_recursive_ inv $_[0]
2235} 2378}
2236 2379
2237=item $ref = $ob->ref 2380=item $ref = $ob->ref
2238 2381
2239creates and returns a persistent reference to an objetc that can be stored as a string. 2382Creates and returns a persistent reference to an object that can be stored as a string.
2240 2383
2241=item $ob = cf::object::deref ($refstring) 2384=item $ob = cf::object::deref ($refstring)
2242 2385
2243returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2386returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2244even if the object actually exists. May block. 2387even if the object actually exists. May block.
2246=cut 2389=cut
2247 2390
2248sub deref { 2391sub deref {
2249 my ($ref) = @_; 2392 my ($ref) = @_;
2250 2393
2251 # temporary compatibility#TODO#remove
2252 $ref =~ s{^<}{player/<};
2253
2254 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2394 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2255 my ($uuid, $name) = ($1, $2); 2395 my ($uuid, $name) = ($1, $2);
2256 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2396 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2257 or return; 2397 or return;
2258 $pl->ob->uuid eq $uuid 2398 $pl->ob->uuid eq $uuid
2259 or return; 2399 or return;
2279can be C<undef>. Does the right thing when the player is currently in a 2419can be C<undef>. Does the right thing when the player is currently in a
2280dialogue with the given NPC character. 2420dialogue with the given NPC character.
2281 2421
2282=cut 2422=cut
2283 2423
2424our $SAY_CHANNEL = {
2425 id => "say",
2426 title => "Map",
2427 reply => "say ",
2428 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2429};
2430
2431our $CHAT_CHANNEL = {
2432 id => "chat",
2433 title => "Chat",
2434 reply => "chat ",
2435 tooltip => "Player chat and shouts, global to the server.",
2436};
2437
2284# rough implementation of a future "reply" method that works 2438# rough implementation of a future "reply" method that works
2285# with dialog boxes. 2439# with dialog boxes.
2286#TODO: the first argument must go, split into a $npc->reply_to ( method 2440#TODO: the first argument must go, split into a $npc->reply_to ( method
2287sub cf::object::player::reply($$$;$) { 2441sub cf::object::player::reply($$$;$) {
2288 my ($self, $npc, $msg, $flags) = @_; 2442 my ($self, $npc, $msg, $flags) = @_;
2299 my $dialog = $pl->{npc_dialog}; 2453 my $dialog = $pl->{npc_dialog};
2300 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2454 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2301 2455
2302 } else { 2456 } else {
2303 $msg = $npc->name . " says: $msg" if $npc; 2457 $msg = $npc->name . " says: $msg" if $npc;
2304 $self->message ($msg, $flags); 2458 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2305 } 2459 }
2306 } 2460 }
2307} 2461}
2308 2462
2309=item $object->send_msg ($channel, $msg, $color, [extra...]) 2463=item $object->send_msg ($channel, $msg, $color, [extra...])
2334 2488
2335=item $player_object->enter_link 2489=item $player_object->enter_link
2336 2490
2337Freezes the player and moves him/her to a special map (C<{link}>). 2491Freezes the player and moves him/her to a special map (C<{link}>).
2338 2492
2339The player should be reasonably safe there for short amounts of time. You 2493The player should be reasonably safe there for short amounts of time (e.g.
2340I<MUST> call C<leave_link> as soon as possible, though. 2494for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2495though, as the palyer cannot control the character while it is on the link
2496map.
2341 2497
2342Will never block. 2498Will never block.
2343 2499
2344=item $player_object->leave_link ($map, $x, $y) 2500=item $player_object->leave_link ($map, $x, $y)
2345 2501
2403 2559
2404 $map->load; 2560 $map->load;
2405 $map->load_neighbours; 2561 $map->load_neighbours;
2406 2562
2407 return unless $self->contr->active; 2563 return unless $self->contr->active;
2564 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2408 $self->activate_recursive; 2565 $self->activate_recursive;
2409 2566
2410 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2567 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2411 $self->enter_map ($map, $x, $y); 2568 $self->enter_map ($map, $x, $y);
2412} 2569}
2417her, loading and preparing them map, calling the provided $check callback 2574her, loading and preparing them map, calling the provided $check callback
2418that has to return the map if sucecssful, and then unfreezes the player on 2575that has to return the map if sucecssful, and then unfreezes the player on
2419the new (success) or old (failed) map position. In either case, $done will 2576the new (success) or old (failed) map position. In either case, $done will
2420be called at the end of this process. 2577be called at the end of this process.
2421 2578
2579Note that $check will be called with a potentially non-loaded map, so if
2580it needs a loaded map it has to call C<< ->load >>.
2581
2422=cut 2582=cut
2423 2583
2424our $GOTOGEN; 2584our $GOTOGEN;
2425 2585
2426sub cf::object::player::goto { 2586sub cf::object::player::goto {
2430 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2590 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2431 2591
2432 $self->enter_link; 2592 $self->enter_link;
2433 2593
2434 (async { 2594 (async {
2595 $Coro::current->{desc} = "player::goto $path $x $y";
2596
2597 # *tag paths override both path and x|y
2598 if ($path =~ /^\*(.*)$/) {
2599 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2600 my $ob = $obs[rand @obs];
2601
2602 # see if we actually can go there
2603 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2604 $ob = $obs[rand @obs];
2605 } else {
2606 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2607 }
2608 # else put us there anyways for now #d#
2609
2610 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2611 } else {
2612 ($path, $x, $y) = (undef, undef, undef);
2613 }
2614 }
2615
2435 my $map = eval { 2616 my $map = eval {
2436 my $map = cf::map::find $path; 2617 my $map = defined $path ? cf::map::find $path : undef;
2437 2618
2438 if ($map) { 2619 if ($map) {
2439 $map = $map->customise_for ($self); 2620 $map = $map->customise_for ($self);
2440 $map = $check->($map) if $check && $map; 2621 $map = $check->($map) if $check && $map;
2441 } else { 2622 } else {
2442 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2623 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2443 } 2624 }
2444 2625
2445 $map 2626 $map
2446 }; 2627 };
2447 2628
2483} 2664}
2484 2665
2485sub prepare_random_map { 2666sub prepare_random_map {
2486 my ($exit) = @_; 2667 my ($exit) = @_;
2487 2668
2488 my $guard = cf::lock_acquire "exit_prepare:$exit";
2489
2490 # all this does is basically replace the /! path by 2669 # all this does is basically replace the /! path by
2491 # a new random map path (?random/...) with a seed 2670 # a new random map path (?random/...) with a seed
2492 # that depends on the exit object 2671 # that depends on the exit object
2493 2672
2494 my $rmp = parse_random_map_params $exit->msg; 2673 my $rmp = parse_random_map_params $exit->msg;
2496 if ($exit->map) { 2675 if ($exit->map) {
2497 $rmp->{region} = $exit->region->name; 2676 $rmp->{region} = $exit->region->name;
2498 $rmp->{origin_map} = $exit->map->path; 2677 $rmp->{origin_map} = $exit->map->path;
2499 $rmp->{origin_x} = $exit->x; 2678 $rmp->{origin_x} = $exit->x;
2500 $rmp->{origin_y} = $exit->y; 2679 $rmp->{origin_y} = $exit->y;
2680
2681 $exit->map->touch;
2501 } 2682 }
2502 2683
2503 $rmp->{random_seed} ||= $exit->random_seed; 2684 $rmp->{random_seed} ||= $exit->random_seed;
2504 2685
2505 my $data = cf::to_json $rmp; 2686 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2506 my $md5 = Digest::MD5::md5_hex $data; 2687 my $md5 = Digest::MD5::md5_hex $data;
2507 my $meta = "$RANDOMDIR/$md5.meta"; 2688 my $meta = "$RANDOMDIR/$md5.meta";
2508 2689
2509 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2690 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2510 aio_write $fh, 0, (length $data), $data, 0; 2691 aio_write $fh, 0, (length $data), $data, 0;
2511 undef $fh; 2692 undef $fh;
2512 aio_rename "$meta~", $meta; 2693 aio_rename "$meta~", $meta;
2513 2694
2695 my $slaying = "?random/$md5";
2696
2697 if ($exit->valid) {
2514 $exit->slaying ("?random/$md5"); 2698 $exit->slaying ("?random/$md5");
2515 $exit->msg (undef); 2699 $exit->msg (undef);
2700 }
2516 } 2701 }
2517} 2702}
2518 2703
2519sub cf::object::player::enter_exit { 2704sub cf::object::player::enter_exit {
2520 my ($self, $exit) = @_; 2705 my ($self, $exit) = @_;
2521 2706
2522 return unless $self->type == cf::PLAYER; 2707 return unless $self->type == cf::PLAYER;
2523 2708
2524 if ($exit->slaying eq "/!") {
2525 #TODO: this should de-fi-ni-te-ly not be a sync-job
2526 # the problem is that $exit might not survive long enough
2527 # so it needs to be done right now, right here
2528 cf::sync_job { prepare_random_map $exit };
2529 }
2530
2531 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2532 my $hp = $exit->stats->hp;
2533 my $sp = $exit->stats->sp;
2534
2535 $self->enter_link; 2709 $self->enter_link;
2536 2710
2537 # if exit is damned, update players death & WoR home-position
2538 $self->contr->savebed ($slaying, $hp, $sp)
2539 if $exit->flag (FLAG_DAMNED);
2540
2541 (async { 2711 (async {
2542 $self->deactivate_recursive; # just to be sure 2712 $Coro::current->{desc} = "enter_exit";
2713
2543 unless (eval { 2714 unless (eval {
2715 $self->deactivate_recursive; # just to be sure
2716
2717 # random map handling
2718 {
2719 my $guard = cf::lock_acquire "exit_prepare:$exit";
2720
2721 prepare_random_map $exit
2722 if $exit->slaying eq "/!";
2723 }
2724
2725 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2726 my $x = $exit->stats->hp;
2727 my $y = $exit->stats->sp;
2728
2544 $self->goto ($slaying, $hp, $sp); 2729 $self->goto ($map, $x, $y);
2545 2730
2731 # if exit is damned, update players death & WoR home-position
2732 $self->contr->savebed ($map, $x, $y)
2733 if $exit->flag (cf::FLAG_DAMNED);
2734
2546 1; 2735 1
2547 }) { 2736 }) {
2548 $self->message ("Something went wrong deep within the crossfire server. " 2737 $self->message ("Something went wrong deep within the deliantra server. "
2549 . "I'll try to bring you back to the map you were before. " 2738 . "I'll try to bring you back to the map you were before. "
2550 . "Please report this to the dungeon master!", 2739 . "Please report this to the dungeon master!",
2551 cf::NDI_UNIQUE | cf::NDI_RED); 2740 cf::NDI_UNIQUE | cf::NDI_RED);
2552 2741
2553 warn "ERROR in enter_exit: $@"; 2742 warn "ERROR in enter_exit: $@";
2581the message, with C<log> being the default. If C<$color> is negative, suppress 2770the message, with C<log> being the default. If C<$color> is negative, suppress
2582the message unless the client supports the msg packet. 2771the message unless the client supports the msg packet.
2583 2772
2584=cut 2773=cut
2585 2774
2775# non-persistent channels (usually the info channel)
2586our %CHANNEL = ( 2776our %CHANNEL = (
2587 "c/identify" => { 2777 "c/identify" => {
2588 id => "identify", 2778 id => "infobox",
2589 title => "Identify", 2779 title => "Identify",
2590 reply => undef, 2780 reply => undef,
2591 tooltip => "Items recently identified", 2781 tooltip => "Items recently identified",
2592 }, 2782 },
2593 "c/examine" => { 2783 "c/examine" => {
2594 id => "examine", 2784 id => "infobox",
2595 title => "Examine", 2785 title => "Examine",
2596 reply => undef, 2786 reply => undef,
2597 tooltip => "Signs and other items you examined", 2787 tooltip => "Signs and other items you examined",
2598 }, 2788 },
2789 "c/book" => {
2790 id => "infobox",
2791 title => "Book",
2792 reply => undef,
2793 tooltip => "The contents of a note or book",
2794 },
2795 "c/lookat" => {
2796 id => "infobox",
2797 title => "Look",
2798 reply => undef,
2799 tooltip => "What you saw there",
2800 },
2801 "c/who" => {
2802 id => "infobox",
2803 title => "Players",
2804 reply => undef,
2805 tooltip => "Shows players who are currently online",
2806 },
2807 "c/body" => {
2808 id => "infobox",
2809 title => "Body Parts",
2810 reply => undef,
2811 tooltip => "Shows which body parts you posess and are available",
2812 },
2813 "c/skills" => {
2814 id => "infobox",
2815 title => "Skills",
2816 reply => undef,
2817 tooltip => "Shows your experience per skill and item power",
2818 },
2819 "c/uptime" => {
2820 id => "infobox",
2821 title => "Uptime",
2822 reply => undef,
2823 tooltip => "How long the server has been running since last restart",
2824 },
2825 "c/mapinfo" => {
2826 id => "infobox",
2827 title => "Map Info",
2828 reply => undef,
2829 tooltip => "Information related to the maps",
2830 },
2831 "c/party" => {
2832 id => "party",
2833 title => "Party",
2834 reply => "gsay ",
2835 tooltip => "Messages and chat related to your party",
2836 },
2599); 2837);
2600 2838
2601sub cf::client::send_msg { 2839sub cf::client::send_msg {
2602 my ($self, $channel, $msg, $color, @extra) = @_; 2840 my ($self, $channel, $msg, $color, @extra) = @_;
2603 2841
2604 $msg = $self->pl->expand_cfpod ($msg); 2842 $msg = $self->pl->expand_cfpod ($msg)
2843 unless $color & cf::NDI_VERBATIM;
2605 2844
2606 $color &= cf::NDI_CLIENT_MASK; # just in case... 2845 $color &= cf::NDI_CLIENT_MASK; # just in case...
2607 2846
2608 # check predefined channels, for the benefit of C 2847 # check predefined channels, for the benefit of C
2609 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2848 if ($CHANNEL{$channel}) {
2849 $channel = $CHANNEL{$channel};
2610 2850
2851 $self->ext_msg (channel_info => $channel)
2852 if $self->can_msg;
2853
2854 $channel = $channel->{id};
2855
2611 if (ref $channel) { 2856 } elsif (ref $channel) {
2612 # send meta info to client, if not yet sent 2857 # send meta info to client, if not yet sent
2613 unless (exists $self->{channel}{$channel->{id}}) { 2858 unless (exists $self->{channel}{$channel->{id}}) {
2614 $self->{channel}{$channel->{id}} = $channel; 2859 $self->{channel}{$channel->{id}} = $channel;
2615 $self->ext_msg (channel_info => $channel) 2860 $self->ext_msg (channel_info => $channel)
2616 if $self->can_msg; 2861 if $self->can_msg;
2624 if ($self->can_msg) { 2869 if ($self->can_msg) {
2625 # default colour, mask it out 2870 # default colour, mask it out
2626 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2871 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2627 if $color & cf::NDI_DEF; 2872 if $color & cf::NDI_DEF;
2628 2873
2629 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2874 my $pkt = "msg "
2875 . $self->{json_coder}->encode (
2630 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2876 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2877 );
2878
2879 # try lzf for large packets
2880 $pkt = "lzf " . Compress::LZF::compress $pkt
2881 if 1024 <= length $pkt and $self->{can_lzf};
2882
2883 # split very large packets
2884 if (8192 < length $pkt and $self->{can_lzf}) {
2885 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2886 $pkt = "frag";
2887 }
2888
2889 $self->send_packet ($pkt);
2631 } else { 2890 } else {
2632 if ($color >= 0) { 2891 if ($color >= 0) {
2633 # replace some tags by gcfclient-compatible ones 2892 # replace some tags by gcfclient-compatible ones
2634 for ($msg) { 2893 for ($msg) {
2635 1 while 2894 1 while
2833=pod 3092=pod
2834 3093
2835The following functions and methods are available within a safe environment: 3094The following functions and methods are available within a safe environment:
2836 3095
2837 cf::object 3096 cf::object
2838 contr pay_amount pay_player map x y force_find force_add 3097 contr pay_amount pay_player map x y force_find force_add destroy
2839 insert remove name archname title slaying race decrease_ob_nr 3098 insert remove name archname title slaying race decrease split
2840 3099
2841 cf::object::player 3100 cf::object::player
2842 player 3101 player
2843 3102
2844 cf::player 3103 cf::player
2849 3108
2850=cut 3109=cut
2851 3110
2852for ( 3111for (
2853 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3112 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2854 insert remove inv name archname title slaying race 3113 insert remove inv nrof name archname title slaying race
2855 decrease_ob_nr)], 3114 decrease split destroy change_exp)],
2856 ["cf::object::player" => qw(player)], 3115 ["cf::object::player" => qw(player)],
2857 ["cf::player" => qw(peaceful)], 3116 ["cf::player" => qw(peaceful)],
2858 ["cf::map" => qw(trigger)], 3117 ["cf::map" => qw(trigger)],
2859) { 3118) {
2860 no strict 'refs'; 3119 no strict 'refs';
2965 { 3224 {
2966 my $faces = $facedata->{faceinfo}; 3225 my $faces = $facedata->{faceinfo};
2967 3226
2968 while (my ($face, $info) = each %$faces) { 3227 while (my ($face, $info) = each %$faces) {
2969 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3228 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3229
2970 cf::face::set_visibility $idx, $info->{visibility}; 3230 cf::face::set_visibility $idx, $info->{visibility};
2971 cf::face::set_magicmap $idx, $info->{magicmap}; 3231 cf::face::set_magicmap $idx, $info->{magicmap};
2972 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3232 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2973 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3233 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2974 3234
2975 cf::cede_to_tick; 3235 cf::cede_to_tick;
2976 } 3236 }
2977 3237
2978 while (my ($face, $info) = each %$faces) { 3238 while (my ($face, $info) = each %$faces) {
2979 next unless $info->{smooth}; 3239 next unless $info->{smooth};
3240
2980 my $idx = cf::face::find $face 3241 my $idx = cf::face::find $face
2981 or next; 3242 or next;
3243
2982 if (my $smooth = cf::face::find $info->{smooth}) { 3244 if (my $smooth = cf::face::find $info->{smooth}) {
2983 cf::face::set_smooth $idx, $smooth; 3245 cf::face::set_smooth $idx, $smooth;
2984 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3246 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2985 } else { 3247 } else {
2986 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3248 warn "smooth face '$info->{smooth}' not found for face '$face'";
3004 { 3266 {
3005 # TODO: for gcfclient pleasure, we should give resources 3267 # TODO: for gcfclient pleasure, we should give resources
3006 # that gcfclient doesn't grok a >10000 face index. 3268 # that gcfclient doesn't grok a >10000 face index.
3007 my $res = $facedata->{resource}; 3269 my $res = $facedata->{resource};
3008 3270
3009 my $soundconf = delete $res->{"res/sound.conf"};
3010
3011 while (my ($name, $info) = each %$res) { 3271 while (my ($name, $info) = each %$res) {
3272 if (defined $info->{type}) {
3012 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3273 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3013 my $data; 3274 my $data;
3014 3275
3015 if ($info->{type} & 1) { 3276 if ($info->{type} & 1) {
3016 # prepend meta info 3277 # prepend meta info
3017 3278
3018 my $meta = $enc->encode ({ 3279 my $meta = $enc->encode ({
3019 name => $name, 3280 name => $name,
3020 %{ $info->{meta} || {} }, 3281 %{ $info->{meta} || {} },
3021 }); 3282 });
3022 3283
3023 $data = pack "(w/a*)*", $meta, $info->{data}; 3284 $data = pack "(w/a*)*", $meta, $info->{data};
3285 } else {
3286 $data = $info->{data};
3287 }
3288
3289 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3290 cf::face::set_type $idx, $info->{type};
3024 } else { 3291 } else {
3025 $data = $info->{data}; 3292 $RESOURCE{$name} = $info;
3026 } 3293 }
3027 3294
3028 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3029 cf::face::set_type $idx, $info->{type};
3030
3031 cf::cede_to_tick; 3295 cf::cede_to_tick;
3032 } 3296 }
3033
3034 if ($soundconf) {
3035 $soundconf = $enc->decode (delete $soundconf->{data});
3036
3037 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3038 my $sound = $soundconf->{compat}[$_]
3039 or next;
3040
3041 my $face = cf::face::find "sound/$sound->[1]";
3042 cf::sound::set $sound->[0] => $face;
3043 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3044 }
3045
3046 while (my ($k, $v) = each %{$soundconf->{event}}) {
3047 my $face = cf::face::find "sound/$v";
3048 cf::sound::set $k => $face;
3049 }
3050 }
3051 } 3297 }
3298
3299 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3052 3300
3053 1 3301 1
3054} 3302}
3303
3304cf::global->attach (on_resource_update => sub {
3305 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3306 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3307
3308 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3309 my $sound = $soundconf->{compat}[$_]
3310 or next;
3311
3312 my $face = cf::face::find "sound/$sound->[1]";
3313 cf::sound::set $sound->[0] => $face;
3314 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3315 }
3316
3317 while (my ($k, $v) = each %{$soundconf->{event}}) {
3318 my $face = cf::face::find "sound/$v";
3319 cf::sound::set $k => $face;
3320 }
3321 }
3322});
3055 3323
3056register_exticmd fx_want => sub { 3324register_exticmd fx_want => sub {
3057 my ($ns, $want) = @_; 3325 my ($ns, $want) = @_;
3058 3326
3059 while (my ($k, $v) = each %$want) { 3327 while (my ($k, $v) = each %$want) {
3060 $ns->fx_want ($k, $v); 3328 $ns->fx_want ($k, $v);
3061 } 3329 }
3062}; 3330};
3331
3332sub load_resource_file($) {
3333 my $guard = lock_acquire "load_resource_file";
3334
3335 my $status = load_resource_file_ $_[0];
3336 get_slot 0.1, 100;
3337 cf::arch::commit_load;
3338
3339 $status
3340}
3063 3341
3064sub reload_regions { 3342sub reload_regions {
3065 # HACK to clear player env face cache, we need some signal framework 3343 # HACK to clear player env face cache, we need some signal framework
3066 # for this (global event?) 3344 # for this (global event?)
3067 %ext::player_env::MUSIC_FACE_CACHE = (); 3345 %ext::player_env::MUSIC_FACE_CACHE = ();
3081} 3359}
3082 3360
3083sub reload_archetypes { 3361sub reload_archetypes {
3084 load_resource_file "$DATADIR/archetypes" 3362 load_resource_file "$DATADIR/archetypes"
3085 or die "unable to load archetypes\n"; 3363 or die "unable to load archetypes\n";
3086 #d# NEED to laod twice to resolve forward references
3087 # this really needs to be done in an extra post-pass
3088 # (which needs to be synchronous, so solve it differently)
3089 load_resource_file "$DATADIR/archetypes"
3090 or die "unable to load archetypes\n";
3091} 3364}
3092 3365
3093sub reload_treasures { 3366sub reload_treasures {
3094 load_resource_file "$DATADIR/treasures" 3367 load_resource_file "$DATADIR/treasures"
3095 or die "unable to load treasurelists\n"; 3368 or die "unable to load treasurelists\n";
3096} 3369}
3097 3370
3098sub reload_resources { 3371sub reload_resources {
3099 warn "reloading resource files...\n"; 3372 warn "reloading resource files...\n";
3100 3373
3374 reload_facedata;
3375 reload_archetypes;
3101 reload_regions; 3376 reload_regions;
3102 reload_facedata;
3103 #reload_archetypes;#d#
3104 reload_archetypes;
3105 reload_treasures; 3377 reload_treasures;
3106 3378
3107 warn "finished reloading resource files\n"; 3379 warn "finished reloading resource files\n";
3108}
3109
3110sub init {
3111 reload_resources;
3112} 3380}
3113 3381
3114sub reload_config { 3382sub reload_config {
3115 open my $fh, "<:utf8", "$CONFDIR/config" 3383 open my $fh, "<:utf8", "$CONFDIR/config"
3116 or return; 3384 or return;
3117 3385
3118 local $/; 3386 local $/;
3119 *CFG = YAML::Syck::Load <$fh>; 3387 *CFG = YAML::Load <$fh>;
3120 3388
3121 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3389 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3122 3390
3123 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3391 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3124 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3392 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3130 }; 3398 };
3131 warn $@ if $@; 3399 warn $@ if $@;
3132 } 3400 }
3133} 3401}
3134 3402
3403sub pidfile() {
3404 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3405 or die "$PIDFILE: $!";
3406 flock $fh, &Fcntl::LOCK_EX
3407 or die "$PIDFILE: flock: $!";
3408 $fh
3409}
3410
3411# make sure only one server instance is running at any one time
3412sub atomic {
3413 my $fh = pidfile;
3414
3415 my $pid = <$fh>;
3416 kill 9, $pid if $pid > 0;
3417
3418 seek $fh, 0, 0;
3419 print $fh $$;
3420}
3421
3135sub main { 3422sub main {
3423 cf::init_globals; # initialise logging
3424
3425 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3426 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3427 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3428 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3429
3430 cf::init_experience;
3431 cf::init_anim;
3432 cf::init_attackmess;
3433 cf::init_dynamic;
3434 cf::init_block;
3435
3436 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3437
3136 # we must not ever block the main coroutine 3438 # we must not ever block the main coroutine
3137 local $Coro::idle = sub { 3439 local $Coro::idle = sub {
3138 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3440 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3139 (async { 3441 (async {
3140 Event::one_event; 3442 $Coro::current->{desc} = "IDLE BUG HANDLER";
3443 EV::loop EV::LOOP_ONESHOT;
3141 })->prio (Coro::PRIO_MAX); 3444 })->prio (Coro::PRIO_MAX);
3142 }; 3445 };
3143 3446
3447 evthread_start IO::AIO::poll_fileno;
3448
3449 cf::sync_job {
3450 reload_resources;
3144 reload_config; 3451 reload_config;
3145 db_init; 3452 db_init;
3453
3454 cf::load_settings;
3455 cf::load_materials;
3456 cf::init_uuid;
3457 cf::init_signals;
3458 cf::init_commands;
3459 cf::init_skills;
3460
3461 cf::init_beforeplay;
3462
3463 atomic;
3464
3146 load_extensions; 3465 load_extensions;
3147 3466
3148 $TICK_WATCHER->start; 3467 utime time, time, $RUNTIMEFILE;
3468
3469 # no (long-running) fork's whatsoever before this point(!)
3470 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3471
3472 (pop @POST_INIT)->(0) while @POST_INIT;
3473 };
3474
3149 Event::loop; 3475 EV::loop;
3150} 3476}
3151 3477
3152############################################################################# 3478#############################################################################
3153# initialisation and cleanup 3479# initialisation and cleanup
3154 3480
3155# install some emergency cleanup handlers 3481# install some emergency cleanup handlers
3156BEGIN { 3482BEGIN {
3483 our %SIGWATCHER = ();
3157 for my $signal (qw(INT HUP TERM)) { 3484 for my $signal (qw(INT HUP TERM)) {
3158 Event->signal ( 3485 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3159 reentrant => 0,
3160 data => WF_AUTOCANCEL,
3161 signal => $signal,
3162 prio => 0,
3163 cb => sub {
3164 cf::cleanup "SIG$signal"; 3486 cf::cleanup "SIG$signal";
3165 },
3166 ); 3487 };
3167 } 3488 }
3168} 3489}
3169 3490
3170sub write_runtime { 3491sub write_runtime_sync {
3171 my $runtime = "$LOCALDIR/runtime";
3172
3173 # first touch the runtime file to show we are still running: 3492 # first touch the runtime file to show we are still running:
3174 # the fsync below can take a very very long time. 3493 # the fsync below can take a very very long time.
3175 3494
3176 IO::AIO::aio_utime $runtime, undef, undef; 3495 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3177 3496
3178 my $guard = cf::lock_acquire "write_runtime"; 3497 my $guard = cf::lock_acquire "write_runtime";
3179 3498
3180 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3499 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3181 or return; 3500 or return;
3182 3501
3183 my $value = $cf::RUNTIME + 90 + 10; 3502 my $value = $cf::RUNTIME + 90 + 10;
3184 # 10 is the runtime save interval, for a monotonic clock 3503 # 10 is the runtime save interval, for a monotonic clock
3185 # 60 allows for the watchdog to kill the server. 3504 # 60 allows for the watchdog to kill the server.
3195 aio_utime $fh, undef, undef; 3514 aio_utime $fh, undef, undef;
3196 3515
3197 close $fh 3516 close $fh
3198 or return; 3517 or return;
3199 3518
3200 aio_rename "$runtime~", $runtime 3519 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3201 and return; 3520 and return;
3202 3521
3203 warn "runtime file written.\n"; 3522 warn "runtime file written.\n";
3204 3523
3205 1 3524 1
3525}
3526
3527our $uuid_lock;
3528our $uuid_skip;
3529
3530sub write_uuid_sync($) {
3531 $uuid_skip ||= $_[0];
3532
3533 return if $uuid_lock;
3534 local $uuid_lock = 1;
3535
3536 my $uuid = "$LOCALDIR/uuid";
3537
3538 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3539 or return;
3540
3541 my $value = uuid_seq uuid_cur;
3542
3543 unless ($value) {
3544 warn "cowardly refusing to write zero uuid value!\n";
3545 return;
3546 }
3547
3548 my $value = uuid_str $value + $uuid_skip;
3549 $uuid_skip = 0;
3550
3551 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3552 and return;
3553
3554 # always fsync - this file is important
3555 aio_fsync $fh
3556 and return;
3557
3558 close $fh
3559 or return;
3560
3561 aio_rename "$uuid~", $uuid
3562 and return;
3563
3564 warn "uuid file written ($value).\n";
3565
3566 1
3567
3568}
3569
3570sub write_uuid($$) {
3571 my ($skip, $sync) = @_;
3572
3573 $sync ? write_uuid_sync $skip
3574 : async { write_uuid_sync $skip };
3206} 3575}
3207 3576
3208sub emergency_save() { 3577sub emergency_save() {
3209 my $freeze_guard = cf::freeze_mainloop; 3578 my $freeze_guard = cf::freeze_mainloop;
3210 3579
3211 warn "enter emergency perl save\n"; 3580 warn "emergency_perl_save: enter\n";
3212 3581
3213 cf::sync_job { 3582 cf::sync_job {
3583 # this is a trade-off: we want to be very quick here, so
3584 # save all maps without fsync, and later call a global sync
3585 # (which in turn might be very very slow)
3586 local $USE_FSYNC = 0;
3587
3214 # use a peculiar iteration method to avoid tripping on perl 3588 # use a peculiar iteration method to avoid tripping on perl
3215 # refcount bugs in for. also avoids problems with players 3589 # refcount bugs in for. also avoids problems with players
3216 # and maps saved/destroyed asynchronously. 3590 # and maps saved/destroyed asynchronously.
3217 warn "begin emergency player save\n"; 3591 warn "emergency_perl_save: begin player save\n";
3218 for my $login (keys %cf::PLAYER) { 3592 for my $login (keys %cf::PLAYER) {
3219 my $pl = $cf::PLAYER{$login} or next; 3593 my $pl = $cf::PLAYER{$login} or next;
3220 $pl->valid or next; 3594 $pl->valid or next;
3595 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3221 $pl->save; 3596 $pl->save;
3222 } 3597 }
3223 warn "end emergency player save\n"; 3598 warn "emergency_perl_save: end player save\n";
3224 3599
3225 warn "begin emergency map save\n"; 3600 warn "emergency_perl_save: begin map save\n";
3226 for my $path (keys %cf::MAP) { 3601 for my $path (keys %cf::MAP) {
3227 my $map = $cf::MAP{$path} or next; 3602 my $map = $cf::MAP{$path} or next;
3228 $map->valid or next; 3603 $map->valid or next;
3229 $map->save; 3604 $map->save;
3230 } 3605 }
3231 warn "end emergency map save\n"; 3606 warn "emergency_perl_save: end map save\n";
3232 3607
3233 warn "begin emergency database checkpoint\n"; 3608 warn "emergency_perl_save: begin database checkpoint\n";
3234 BDB::db_env_txn_checkpoint $DB_ENV; 3609 BDB::db_env_txn_checkpoint $DB_ENV;
3235 warn "end emergency database checkpoint\n"; 3610 warn "emergency_perl_save: end database checkpoint\n";
3611
3612 warn "emergency_perl_save: begin write uuid\n";
3613 write_uuid_sync 1;
3614 warn "emergency_perl_save: end write uuid\n";
3236 }; 3615 };
3237 3616
3617 warn "emergency_perl_save: starting sync()\n";
3618 IO::AIO::aio_sync sub {
3619 warn "emergency_perl_save: finished sync()\n";
3620 };
3621
3238 warn "leave emergency perl save\n"; 3622 warn "emergency_perl_save: leave\n";
3239} 3623}
3240 3624
3241sub post_cleanup { 3625sub post_cleanup {
3242 my ($make_core) = @_; 3626 my ($make_core) = @_;
3243 3627
3244 warn Carp::longmess "post_cleanup backtrace" 3628 warn Carp::longmess "post_cleanup backtrace"
3245 if $make_core; 3629 if $make_core;
3630
3631 my $fh = pidfile;
3632 unlink $PIDFILE if <$fh> == $$;
3633}
3634
3635# a safer delete_package, copied from Symbol
3636sub clear_package($) {
3637 my $pkg = shift;
3638
3639 # expand to full symbol table name if needed
3640 unless ($pkg =~ /^main::.*::$/) {
3641 $pkg = "main$pkg" if $pkg =~ /^::/;
3642 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3643 $pkg .= '::' unless $pkg =~ /::$/;
3644 }
3645
3646 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3647 my $stem_symtab = *{$stem}{HASH};
3648
3649 defined $stem_symtab and exists $stem_symtab->{$leaf}
3650 or return;
3651
3652 # clear all symbols
3653 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3654 for my $name (keys %$leaf_symtab) {
3655 _gv_clear *{"$pkg$name"};
3656# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3657 }
3658 warn "cleared package $pkg\n";#d#
3246} 3659}
3247 3660
3248sub do_reload_perl() { 3661sub do_reload_perl() {
3249 # can/must only be called in main 3662 # can/must only be called in main
3250 if ($Coro::current != $Coro::main) { 3663 if ($Coro::current != $Coro::main) {
3251 warn "can only reload from main coroutine"; 3664 warn "can only reload from main coroutine";
3252 return; 3665 return;
3253 } 3666 }
3254 3667
3668 return if $RELOAD++;
3669
3670 my $t1 = EV::time;
3671
3672 while ($RELOAD) {
3255 warn "reloading..."; 3673 warn "reloading...";
3256 3674
3257 warn "entering sync_job"; 3675 warn "entering sync_job";
3258 3676
3259 cf::sync_job { 3677 cf::sync_job {
3260 cf::write_runtime; # external watchdog should not bark 3678 cf::write_runtime_sync; # external watchdog should not bark
3261 cf::emergency_save; 3679 cf::emergency_save;
3262 cf::write_runtime; # external watchdog should not bark 3680 cf::write_runtime_sync; # external watchdog should not bark
3263 3681
3264 warn "syncing database to disk"; 3682 warn "syncing database to disk";
3265 BDB::db_env_txn_checkpoint $DB_ENV; 3683 BDB::db_env_txn_checkpoint $DB_ENV;
3266 3684
3267 # if anything goes wrong in here, we should simply crash as we already saved 3685 # if anything goes wrong in here, we should simply crash as we already saved
3268 3686
3269 warn "cancelling all WF_AUTOCANCEL watchers";
3270 for (Event::all_watchers) {
3271 $_->cancel if $_->data & WF_AUTOCANCEL;
3272 }
3273
3274 warn "flushing outstanding aio requests"; 3687 warn "flushing outstanding aio requests";
3275 for (;;) {
3276 BDB::flush;
3277 IO::AIO::flush;
3278 Coro::cede;
3279 last unless IO::AIO::nreqs || BDB::nreqs; 3688 while (IO::AIO::nreqs || BDB::nreqs) {
3280 warn "iterate..."; 3689 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3281 }
3282
3283 ++$RELOAD;
3284
3285 warn "cancelling all extension coros";
3286 $_->cancel for values %EXT_CORO;
3287 %EXT_CORO = ();
3288
3289 warn "removing commands";
3290 %COMMAND = ();
3291
3292 warn "removing ext/exti commands";
3293 %EXTCMD = ();
3294 %EXTICMD = ();
3295
3296 warn "unloading/nuking all extensions";
3297 for my $pkg (@EXTS) {
3298 warn "... unloading $pkg";
3299
3300 if (my $cb = $pkg->can ("unload")) {
3301 eval {
3302 $cb->($pkg);
3303 1
3304 } or warn "$pkg unloaded, but with errors: $@";
3305 } 3690 }
3306 3691
3307 warn "... nuking $pkg"; 3692 warn "cancelling all extension coros";
3308 Symbol::delete_package $pkg; 3693 $_->cancel for values %EXT_CORO;
3309 } 3694 %EXT_CORO = ();
3310 3695
3311 warn "unloading all perl modules loaded from $LIBDIR"; 3696 warn "removing commands";
3312 while (my ($k, $v) = each %INC) { 3697 %COMMAND = ();
3313 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3314 3698
3699 warn "removing ext/exti commands";
3700 %EXTCMD = ();
3701 %EXTICMD = ();
3702
3703 warn "unloading/nuking all extensions";
3704 for my $pkg (@EXTS) {
3315 warn "... unloading $k"; 3705 warn "... unloading $pkg";
3316 delete $INC{$k};
3317 3706
3318 $k =~ s/\.pm$//;
3319 $k =~ s/\//::/g;
3320
3321 if (my $cb = $k->can ("unload_module")) { 3707 if (my $cb = $pkg->can ("unload")) {
3708 eval {
3322 $cb->(); 3709 $cb->($pkg);
3710 1
3711 } or warn "$pkg unloaded, but with errors: $@";
3712 }
3713
3714 warn "... clearing $pkg";
3715 clear_package $pkg;
3323 } 3716 }
3324 3717
3325 Symbol::delete_package $k; 3718 warn "unloading all perl modules loaded from $LIBDIR";
3719 while (my ($k, $v) = each %INC) {
3720 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3721
3722 warn "... unloading $k";
3723 delete $INC{$k};
3724
3725 $k =~ s/\.pm$//;
3726 $k =~ s/\//::/g;
3727
3728 if (my $cb = $k->can ("unload_module")) {
3729 $cb->();
3730 }
3731
3732 clear_package $k;
3326 } 3733 }
3327 3734
3328 warn "getting rid of safe::, as good as possible"; 3735 warn "getting rid of safe::, as good as possible";
3329 Symbol::delete_package "safe::$_" 3736 clear_package "safe::$_"
3330 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3737 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3331 3738
3332 warn "unloading cf.pm \"a bit\""; 3739 warn "unloading cf.pm \"a bit\"";
3333 delete $INC{"cf.pm"}; 3740 delete $INC{"cf.pm"};
3334 delete $INC{"cf/pod.pm"}; 3741 delete $INC{"cf/pod.pm"};
3335 3742
3336 # don't, removes xs symbols, too, 3743 # don't, removes xs symbols, too,
3337 # and global variables created in xs 3744 # and global variables created in xs
3338 #Symbol::delete_package __PACKAGE__; 3745 #clear_package __PACKAGE__;
3339 3746
3340 warn "unload completed, starting to reload now"; 3747 warn "unload completed, starting to reload now";
3341 3748
3342 warn "reloading cf.pm"; 3749 warn "reloading cf.pm";
3343 require cf; 3750 require cf;
3344 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3751 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3345 3752
3346 warn "loading config and database again"; 3753 warn "loading config and database again";
3347 cf::reload_config; 3754 cf::reload_config;
3348 3755
3349 warn "loading extensions"; 3756 warn "loading extensions";
3350 cf::load_extensions; 3757 cf::load_extensions;
3351 3758
3759 if ($REATTACH_ON_RELOAD) {
3352 warn "reattaching attachments to objects/players"; 3760 warn "reattaching attachments to objects/players";
3353 _global_reattach; # objects, sockets 3761 _global_reattach; # objects, sockets
3354 warn "reattaching attachments to maps"; 3762 warn "reattaching attachments to maps";
3355 reattach $_ for values %MAP; 3763 reattach $_ for values %MAP;
3356 warn "reattaching attachments to players"; 3764 warn "reattaching attachments to players";
3357 reattach $_ for values %PLAYER; 3765 reattach $_ for values %PLAYER;
3766 }
3358 3767
3768 warn "running post_init jobs";
3769 (pop @POST_INIT)->(1) while @POST_INIT;
3770
3359 warn "leaving sync_job"; 3771 warn "leaving sync_job";
3360 3772
3361 1 3773 1
3362 } or do { 3774 } or do {
3363 warn $@; 3775 warn $@;
3364 warn "error while reloading, exiting."; 3776 cf::cleanup "error while reloading, exiting.";
3365 exit 1;
3366 }; 3777 };
3367 3778
3368 warn "reloaded"; 3779 warn "reloaded";
3780 --$RELOAD;
3781 }
3782
3783 $t1 = EV::time - $t1;
3784 warn "reload completed in ${t1}s\n";
3369}; 3785};
3370 3786
3371our $RELOAD_WATCHER; # used only during reload 3787our $RELOAD_WATCHER; # used only during reload
3372 3788
3373sub reload_perl() { 3789sub reload_perl() {
3374 # doing reload synchronously and two reloads happen back-to-back, 3790 # doing reload synchronously and two reloads happen back-to-back,
3375 # coro crashes during coro_state_free->destroy here. 3791 # coro crashes during coro_state_free->destroy here.
3376 3792
3377 $RELOAD_WATCHER ||= Event->timer ( 3793 $RELOAD_WATCHER ||= cf::async {
3378 reentrant => 0, 3794 Coro::AIO::aio_wait cache_extensions;
3379 after => 0, 3795
3380 data => WF_AUTOCANCEL, 3796 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3381 cb => sub {
3382 do_reload_perl; 3797 do_reload_perl;
3383 undef $RELOAD_WATCHER; 3798 undef $RELOAD_WATCHER;
3384 }, 3799 };
3385 ); 3800 };
3386} 3801}
3387 3802
3388register_command "reload" => sub { 3803register_command "reload" => sub {
3389 my ($who, $arg) = @_; 3804 my ($who, $arg) = @_;
3390 3805
3391 if ($who->flag (FLAG_WIZ)) { 3806 if ($who->flag (FLAG_WIZ)) {
3392 $who->message ("reloading server."); 3807 $who->message ("reloading server.");
3808 async {
3809 $Coro::current->{desc} = "perl_reload";
3393 async { reload_perl }; 3810 reload_perl;
3811 };
3394 } 3812 }
3395}; 3813};
3396 3814
3397unshift @INC, $LIBDIR; 3815unshift @INC, $LIBDIR;
3398 3816
3400 3818
3401our @WAIT_FOR_TICK; 3819our @WAIT_FOR_TICK;
3402our @WAIT_FOR_TICK_BEGIN; 3820our @WAIT_FOR_TICK_BEGIN;
3403 3821
3404sub wait_for_tick { 3822sub wait_for_tick {
3405 return unless $TICK_WATCHER->is_active;
3406 return if $Coro::current == $Coro::main; 3823 return if tick_inhibit || $Coro::current == $Coro::main;
3407 3824
3408 my $signal = new Coro::Signal; 3825 my $signal = new Coro::Signal;
3409 push @WAIT_FOR_TICK, $signal; 3826 push @WAIT_FOR_TICK, $signal;
3410 $signal->wait; 3827 $signal->wait;
3411} 3828}
3412 3829
3413sub wait_for_tick_begin { 3830sub wait_for_tick_begin {
3414 return unless $TICK_WATCHER->is_active;
3415 return if $Coro::current == $Coro::main; 3831 return if tick_inhibit || $Coro::current == $Coro::main;
3416 3832
3417 my $signal = new Coro::Signal; 3833 my $signal = new Coro::Signal;
3418 push @WAIT_FOR_TICK_BEGIN, $signal; 3834 push @WAIT_FOR_TICK_BEGIN, $signal;
3419 $signal->wait; 3835 $signal->wait;
3420} 3836}
3421 3837
3422 my $min = 1e6;#d# 3838sub tick {
3423 my $avg = 10;
3424$TICK_WATCHER = Event->timer (
3425 reentrant => 0,
3426 parked => 1,
3427 prio => 0,
3428 at => $NEXT_TICK || $TICK,
3429 data => WF_AUTOCANCEL,
3430 cb => sub {
3431 if ($Coro::current != $Coro::main) { 3839 if ($Coro::current != $Coro::main) {
3432 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3840 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3433 unless ++$bug_warning > 10; 3841 unless ++$bug_warning > 10;
3434 return; 3842 return;
3435 } 3843 }
3436 3844
3437 $NOW = $tick_start = Event::time;
3438
3439 cf::server_tick; # one server iteration 3845 cf::server_tick; # one server iteration
3440 3846
3441 0 && sync_job {#d# 3847 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3442 for(1..10) { 3848 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3443 my $t = Event::time; 3849 Coro::async_pool {
3444 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3850 $Coro::current->{desc} = "runtime saver";
3445 or die; 3851 write_runtime_sync
3446 3852 or warn "ERROR: unable to write runtime file: $!";
3447 $map->width (50);
3448 $map->height (50);
3449 $map->alloc;
3450 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3451 my $t = Event::time - $t;
3452
3453 #next unless $t < 0.0013;#d#
3454 if ($t < $min) {
3455 $min = $t;
3456 }
3457 $avg = $avg * 0.99 + $t * 0.01;
3458 }
3459 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3460 exit 0;
3461 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3462 }; 3853 };
3854 }
3463 3855
3464 $RUNTIME += $TICK;
3465 $NEXT_TICK += $TICK;
3466
3467 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3468 $NEXT_RUNTIME_WRITE = $NOW + 10;
3469 Coro::async_pool {
3470 write_runtime
3471 or warn "ERROR: unable to write runtime file: $!";
3472 };
3473 }
3474
3475# my $AFTER = Event::time;
3476# warn $AFTER - $NOW;#d#
3477
3478 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3856 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3479 $sig->send; 3857 $sig->send;
3480 } 3858 }
3481 while (my $sig = shift @WAIT_FOR_TICK) { 3859 while (my $sig = shift @WAIT_FOR_TICK) {
3482 $sig->send; 3860 $sig->send;
3483 } 3861 }
3484 3862
3485 $NOW = Event::time; 3863 $LOAD = ($NOW - $TICK_START) / $TICK;
3486
3487 # if we are delayed by four ticks or more, skip them all
3488 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3489
3490 $TICK_WATCHER->at ($NEXT_TICK);
3491 $TICK_WATCHER->start;
3492
3493 $LOAD = ($NOW - $tick_start) / $TICK;
3494 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3864 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3495 3865
3496 _post_tick; 3866 if (0) {
3497 3867 if ($NEXT_TICK) {
3498 3868 my $jitter = $TICK_START - $NEXT_TICK;
3869 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3870 warn "jitter $JITTER\n";#d#
3871 }
3499 }, 3872 }
3500); 3873}
3501 3874
3502{ 3875{
3503 BDB::max_poll_time $TICK * 0.1; 3876 # configure BDB
3504 $BDB_POLL_WATCHER = Event->io ( 3877
3505 reentrant => 0,
3506 fd => BDB::poll_fileno,
3507 poll => 'r',
3508 prio => 0,
3509 data => WF_AUTOCANCEL,
3510 cb => \&BDB::poll_cb,
3511 );
3512 BDB::min_parallel 8; 3878 BDB::min_parallel 8;
3513 3879 BDB::max_poll_reqs $TICK * 0.1;
3514 BDB::set_sync_prepare { 3880 $AnyEvent::BDB::WATCHER->priority (1);
3515 my $status;
3516 my $current = $Coro::current;
3517 (
3518 sub {
3519 $status = $!;
3520 $current->ready; undef $current;
3521 },
3522 sub {
3523 Coro::schedule while defined $current;
3524 $! = $status;
3525 },
3526 )
3527 };
3528 3881
3529 unless ($DB_ENV) { 3882 unless ($DB_ENV) {
3530 $DB_ENV = BDB::db_env_create; 3883 $DB_ENV = BDB::db_env_create;
3884 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3885 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3886 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3887 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3888 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3531 3889
3532 cf::sync_job { 3890 cf::sync_job {
3533 eval { 3891 eval {
3534 BDB::db_env_open 3892 BDB::db_env_open
3535 $DB_ENV, 3893 $DB_ENV,
3537 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3895 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3538 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3896 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3539 0666; 3897 0666;
3540 3898
3541 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3899 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3542
3543 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3544 $DB_ENV->set_lk_detect;
3545 }; 3900 };
3546 3901
3547 cf::cleanup "db_env_open(db): $@" if $@; 3902 cf::cleanup "db_env_open(db): $@" if $@;
3548 }; 3903 };
3549 } 3904 }
3905
3906 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3907 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3908 };
3909 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3910 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3911 };
3912 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3913 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3914 };
3550} 3915}
3551 3916
3552{ 3917{
3918 # configure IO::AIO
3919
3553 IO::AIO::min_parallel 8; 3920 IO::AIO::min_parallel 8;
3554
3555 undef $Coro::AIO::WATCHER;
3556 IO::AIO::max_poll_time $TICK * 0.1; 3921 IO::AIO::max_poll_time $TICK * 0.1;
3557 $AIO_POLL_WATCHER = Event->io ( 3922 undef $AnyEvent::AIO::WATCHER;
3558 reentrant => 0,
3559 data => WF_AUTOCANCEL,
3560 fd => IO::AIO::poll_fileno,
3561 poll => 'r',
3562 prio => 6,
3563 cb => \&IO::AIO::poll_cb,
3564 );
3565} 3923}
3566 3924
3567my $_log_backtrace; 3925my $_log_backtrace;
3568 3926
3569sub _log_backtrace { 3927sub _log_backtrace {
3572 $msg =~ s/\n//; 3930 $msg =~ s/\n//;
3573 3931
3574 # limit the # of concurrent backtraces 3932 # limit the # of concurrent backtraces
3575 if ($_log_backtrace < 2) { 3933 if ($_log_backtrace < 2) {
3576 ++$_log_backtrace; 3934 ++$_log_backtrace;
3935 my $perl_bt = Carp::longmess $msg;
3577 async { 3936 async {
3937 $Coro::current->{desc} = "abt $msg";
3938
3578 my @bt = fork_call { 3939 my @bt = fork_call {
3579 @addr = map { sprintf "%x", $_ } @addr; 3940 @addr = map { sprintf "%x", $_ } @addr;
3580 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3941 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3581 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3942 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3582 or die "addr2line: $!"; 3943 or die "addr2line: $!";
3590 } 3951 }
3591 3952
3592 @funcs 3953 @funcs
3593 }; 3954 };
3594 3955
3595 LOG llevInfo, "[ABT] $msg\n"; 3956 LOG llevInfo, "[ABT] $perl_bt\n";
3957 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3596 LOG llevInfo, "[ABT] $_\n" for @bt; 3958 LOG llevInfo, "[ABT] $_\n" for @bt;
3597 --$_log_backtrace; 3959 --$_log_backtrace;
3598 }; 3960 };
3599 } else { 3961 } else {
3600 LOG llevInfo, "[ABT] $msg\n"; 3962 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines