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.356 by root, Tue Sep 4 05:43:21 2007 UTC vs.
Revision 1.435 by root, Thu May 29 03:33:20 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
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.64 (); 36use Coro ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::AnyEvent;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
43use Coro::AnyEvent;
22use Coro::AIO; 44use Coro::AIO;
45use Coro::BDB;
23use Coro::Storable; 46use Coro::Storable;
24use Coro::Util (); 47use Coro::Util ();
25 48
26use JSON::XS (); 49use JSON::XS 2.01 ();
27use BDB (); 50use BDB ();
28use Data::Dumper; 51use Data::Dumper;
29use Digest::MD5; 52use Digest::MD5;
30use Fcntl; 53use Fcntl;
31use YAML::Syck (); 54use YAML ();
32use IO::AIO 2.32 (); 55use IO::AIO ();
33use Time::HiRes; 56use Time::HiRes;
34use Compress::LZF; 57use Compress::LZF;
35use Digest::MD5 (); 58use Digest::MD5 ();
59
60AnyEvent::detect;
36 61
37# configure various modules to our taste 62# configure various modules to our taste
38# 63#
39$Storable::canonical = 1; # reduce rsync transfers 64$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 65Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 66Compress::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 67
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 68$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 69
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 71
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 90our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 92our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 93our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 94our $BDBDIR = "$LOCALDIR/db";
95our %RESOURCE;
75 96
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 97our $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 98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 99our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 100our $USE_FSYNC = 1; # use fsync to write maps - default off
83 101
102our $BDB_DEADLOCK_WATCHER;
103our $BDB_CHECKPOINT_WATCHER;
84our $BDB_POLL_WATCHER; 104our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 105our $DB_ENV;
86 106
87our %CFG; 107our %CFG;
88 108
89our $UPTIME; $UPTIME ||= time; 109our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 110our $RUNTIME;
111our $NOW;
91 112
92our (%PLAYER, %PLAYER_LOADING); # all users 113our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # all maps 114our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 115our $LINK_MAP; # the special {link} map, which is always available
95 116
96# used to convert map paths into valid unix filenames by replacing / by ∕ 117# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 118our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 119
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 120our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 121our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 123our $TICK_START; # for load detecting purposes
102 124
103binmode STDOUT; 125binmode STDOUT;
104binmode STDERR; 126binmode STDERR;
105 127
106# read virtual server time, if available 128# read virtual server time, if available
159 181
160The raw value load value from the last tick. 182The raw value load value from the last tick.
161 183
162=item %cf::CFG 184=item %cf::CFG
163 185
164Configuration for the server, loaded from C</etc/crossfire/config>, or 186Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 187from wherever your confdir points to.
166 188
167=item cf::wait_for_tick, cf::wait_for_tick_begin 189=item cf::wait_for_tick, cf::wait_for_tick_begin
168 190
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 191These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
187 $msg .= "\n" 209 $msg .= "\n"
188 unless $msg =~ /\n$/; 210 unless $msg =~ /\n$/;
189 211
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 212 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 213
192 utf8::encode $msg;
193 LOG llevError, $msg; 214 LOG llevError, $msg;
194 }; 215 };
195} 216}
217
218$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "=="
220
221 if ($Coro::current == $Coro::main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d#
224 }#d#
225
226 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate
229};
230
231$SIG{__DIE__} = sub { }; #d#?
196 232
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
213)) { 249)) {
214 no strict 'refs'; 250 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 252}
217 253
218$Event::DIED = sub { 254$EV::DIED = sub {
219 warn "error in event callback: @_"; 255 warn "error in event callback: @_";
220}; 256};
221 257
222############################################################################# 258#############################################################################
223 259
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 282 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 283 $d
248 } || "[unable to dump $_[0]: '$@']"; 284 } || "[unable to dump $_[0]: '$@']";
249} 285}
250 286
251=item $ref = cf::from_json $json 287=item $ref = cf::decode_json $json
252 288
253Converts a JSON string into the corresponding perl data structure. 289Converts a JSON string into the corresponding perl data structure.
254 290
255=item $json = cf::to_json $ref 291=item $json = cf::encode_json $ref
256 292
257Converts a perl data structure into its JSON representation. 293Converts a perl data structure into its JSON representation.
258 294
259=cut 295=cut
260 296
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 297our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 298
263sub to_json ($) { $json_coder->encode ($_[0]) } 299sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 300sub decode_json($) { $json_coder->decode ($_[0]) }
265 301
266=item cf::lock_wait $string 302=item cf::lock_wait $string
267 303
268Wait until the given lock is available. See cf::lock_acquire. 304Wait until the given lock is available. See cf::lock_acquire.
269 305
285Return true if the lock is currently active, i.e. somebody has locked it. 321Return true if the lock is currently active, i.e. somebody has locked it.
286 322
287=cut 323=cut
288 324
289our %LOCK; 325our %LOCK;
326our %LOCKER;#d#
290 327
291sub lock_wait($) { 328sub lock_wait($) {
292 my ($key) = @_; 329 my ($key) = @_;
330
331 if ($LOCKER{$key} == $Coro::current) {#d#
332 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
333 return;#d#
334 }#d#
293 335
294 # wait for lock, if any 336 # wait for lock, if any
295 while ($LOCK{$key}) { 337 while ($LOCK{$key}) {
296 push @{ $LOCK{$key} }, $Coro::current; 338 push @{ $LOCK{$key} }, $Coro::current;
297 Coro::schedule; 339 Coro::schedule;
303 345
304 # wait, to be sure we are not locked 346 # wait, to be sure we are not locked
305 lock_wait $key; 347 lock_wait $key;
306 348
307 $LOCK{$key} = []; 349 $LOCK{$key} = [];
350 $LOCKER{$key} = $Coro::current;#d#
308 351
309 Coro::guard { 352 Coro::guard {
353 delete $LOCKER{$key};#d#
310 # wake up all waiters, to be on the safe side 354 # wake up all waiters, to be on the safe side
311 $_->ready for @{ delete $LOCK{$key} }; 355 $_->ready for @{ delete $LOCK{$key} };
312 } 356 }
313} 357}
314 358
317 361
318 ! ! $LOCK{$key} 362 ! ! $LOCK{$key}
319} 363}
320 364
321sub freeze_mainloop { 365sub freeze_mainloop {
322 return unless $TICK_WATCHER->is_active; 366 tick_inhibit_inc;
323 367
324 my $guard = Coro::guard { 368 Coro::guard \&tick_inhibit_dec;
325 $TICK_WATCHER->start; 369}
326 }; 370
327 $TICK_WATCHER->stop; 371=item cf::periodic $interval, $cb
328 $guard 372
373Like EV::periodic, but randomly selects a starting point so that the actions
374get spread over timer.
375
376=cut
377
378sub periodic($$) {
379 my ($interval, $cb) = @_;
380
381 my $start = rand List::Util::min 180, $interval;
382
383 EV::periodic $start, $interval, 0, $cb
329} 384}
330 385
331=item cf::get_slot $time[, $priority[, $name]] 386=item cf::get_slot $time[, $priority[, $name]]
332 387
333Allocate $time seconds of blocking CPU time at priority C<$priority>: 388Allocate $time seconds of blocking CPU time at priority C<$priority>:
344our @SLOT_QUEUE; 399our @SLOT_QUEUE;
345our $SLOT_QUEUE; 400our $SLOT_QUEUE;
346 401
347$SLOT_QUEUE->cancel if $SLOT_QUEUE; 402$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async { 403$SLOT_QUEUE = Coro::async {
404 $Coro::current->desc ("timeslot manager");
405
349 my $signal = new Coro::Signal; 406 my $signal = new Coro::Signal;
350 407
351 while () { 408 while () {
352 next_job: 409 next_job:
353 my $avail = cf::till_tick; 410 my $avail = cf::till_tick;
361 } 418 }
362 } 419 }
363 } 420 }
364 421
365 if (@SLOT_QUEUE) { 422 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive 423 # we do not use wait_for_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal; 424 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait; 425 $signal->wait;
369 } else { 426 } else {
370 Coro::schedule; 427 Coro::schedule;
371 } 428 }
372 } 429 }
373}; 430};
374 431
375sub get_slot($;$$) { 432sub get_slot($;$$) {
433 return if tick_inhibit || $Coro::current == $Coro::main;
434
376 my ($time, $pri, $name) = @_; 435 my ($time, $pri, $name) = @_;
377 436
378 $time = $TICK * .6 if $time > $TICK * .6; 437 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal; 438 my $sig = new Coro::Signal;
380 439
394 453
395BEGIN { *async = \&Coro::async_pool } 454BEGIN { *async = \&Coro::async_pool }
396 455
397=item cf::sync_job { BLOCK } 456=item cf::sync_job { BLOCK }
398 457
399The design of Crossfire TRT requires that the main coroutine ($Coro::main) 458The design of Deliantra requires that the main coroutine ($Coro::main)
400is always able to handle events or runnable, as Crossfire TRT is only 459is always able to handle events or runnable, as Deliantra is only
401partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 460partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
402acceptable. 461acceptable.
403 462
404If it must be done, put the blocking parts into C<sync_job>. This will run 463If it must be done, put the blocking parts into C<sync_job>. This will run
405the given BLOCK in another coroutine while waiting for the result. The 464the given BLOCK in another coroutine while waiting for the result. The
410 469
411sub sync_job(&) { 470sub sync_job(&) {
412 my ($job) = @_; 471 my ($job) = @_;
413 472
414 if ($Coro::current == $Coro::main) { 473 if ($Coro::current == $Coro::main) {
415 my $time = Event::time; 474 my $time = EV::time;
416 475
417 # this is the main coro, too bad, we have to block 476 # this is the main coro, too bad, we have to block
418 # till the operation succeeds, freezing the server :/ 477 # till the operation succeeds, freezing the server :/
419 478
420 # TODO: use suspend/resume instead 479 LOG llevError, Carp::longmess "sync job";#d#
421 # (but this is cancel-safe) 480
422 my $freeze_guard = freeze_mainloop; 481 my $freeze_guard = freeze_mainloop;
423 482
424 my $busy = 1; 483 my $busy = 1;
425 my @res; 484 my @res;
426 485
427 (async { 486 (async {
487 $Coro::current->desc ("sync job coro");
428 @res = eval { $job->() }; 488 @res = eval { $job->() };
429 warn $@ if $@; 489 warn $@ if $@;
430 undef $busy; 490 undef $busy;
431 })->prio (Coro::PRIO_MAX); 491 })->prio (Coro::PRIO_MAX);
432 492
433 while ($busy) { 493 while ($busy) {
434 Coro::cede or Event::one_event; 494 if (Coro::nready) {
495 Coro::cede_notself;
496 } else {
497 EV::loop EV::LOOP_ONESHOT;
435 } 498 }
499 }
436 500
437 $time = Event::time - $time; 501 my $time = EV::time - $time;
438 502
439 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441
442 $tick_start += $time; # do not account sync jobs to server load 503 $TICK_START += $time; # do not account sync jobs to server load
443 504
444 wantarray ? @res : $res[0] 505 wantarray ? @res : $res[0]
445 } else { 506 } else {
446 # we are in another coroutine, how wonderful, everything just works 507 # we are in another coroutine, how wonderful, everything just works
447 508
472=item fork_call { }, $args 533=item fork_call { }, $args
473 534
474Executes the given code block with the given arguments in a seperate 535Executes the given code block with the given arguments in a seperate
475process, returning the results. Everything must be serialisable with 536process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may 537Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling. 538never block itself or use any form of event handling.
478 539
479=cut 540=cut
480 541
481sub fork_call(&@) { 542sub fork_call(&@) {
482 my ($cb, @args) = @_; 543 my ($cb, @args) = @_;
491 }, @args; 552 }, @args;
492 553
493 wantarray ? @res : $res[-1] 554 wantarray ? @res : $res[-1]
494} 555}
495 556
557=item $coin = coin_from_name $name
558
559=cut
560
561our %coin_alias = (
562 "silver" => "silvercoin",
563 "silvercoin" => "silvercoin",
564 "silvercoins" => "silvercoin",
565 "gold" => "goldcoin",
566 "goldcoin" => "goldcoin",
567 "goldcoins" => "goldcoin",
568 "platinum" => "platinacoin",
569 "platinumcoin" => "platinacoin",
570 "platinumcoins" => "platinacoin",
571 "platina" => "platinacoin",
572 "platinacoin" => "platinacoin",
573 "platinacoins" => "platinacoin",
574 "royalty" => "royalty",
575 "royalties" => "royalty",
576);
577
578sub coin_from_name($) {
579 $coin_alias{$_[0]}
580 ? cf::arch::find $coin_alias{$_[0]}
581 : undef
582}
583
496=item $value = cf::db_get $family => $key 584=item $value = cf::db_get $family => $key
497 585
498Returns a single value from the environment database. 586Returns a single value from the environment database.
499 587
500=item cf::db_put $family => $key => $value 588=item cf::db_put $family => $key => $value
501 589
502Stores the given C<$value> in the family. It can currently store binary 590Stores the given C<$value> in the family. It can currently store binary
503data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 591data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504 592
593=item $db = cf::db_table "name"
594
595Create and/or open a new database table. The string must not be "db" and must be unique
596within each server.
597
505=cut 598=cut
599
600sub db_table($) {
601 my ($name) = @_;
602 my $db = BDB::db_create $DB_ENV;
603
604 eval {
605 $db->set_flags (BDB::CHKSUM);
606
607 utf8::encode $name;
608 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
609 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
610 cf::cleanup "db_open(db): $!" if $!;
611 };
612 cf::cleanup "db_open(db): $@" if $@;
613
614 $db
615}
506 616
507our $DB; 617our $DB;
508 618
509sub db_init { 619sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job { 620 cf::sync_job {
514 eval { 621 $DB ||= db_table "db";
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
523 } 622 };
524} 623}
525 624
526sub db_get($$) { 625sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 626 my $key = "$_[0]/$_[1]";
528 627
632attach callbacks/event handlers (a collection of which is called an "attachment") 731attach callbacks/event handlers (a collection of which is called an "attachment")
633to it. All such attachable objects support the following methods. 732to it. All such attachable objects support the following methods.
634 733
635In the following description, CLASS can be any of C<global>, C<object> 734In the following description, CLASS can be any of C<global>, C<object>
636C<player>, C<client> or C<map> (i.e. the attachable objects in 735C<player>, C<client> or C<map> (i.e. the attachable objects in
637Crossfire TRT). 736Deliantra).
638 737
639=over 4 738=over 4
640 739
641=item $attachable->attach ($attachment, key => $value...) 740=item $attachable->attach ($attachment, key => $value...)
642 741
924 } 1023 }
925 1024
926 0 1025 0
927} 1026}
928 1027
929=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1028=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
930 1029
931=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
932 1031
933Generate an object-specific event with the given arguments. 1032Generate an object-specific event with the given arguments.
934 1033
940 1039
941=cut 1040=cut
942 1041
943############################################################################# 1042#############################################################################
944# object support 1043# object support
945#
946 1044
1045sub _object_equal($$);
1046sub _object_equal($$) {
1047 my ($a, $b) = @_;
1048
1049 return 0 unless (ref $a) eq (ref $b);
1050
1051 if ("HASH" eq ref $a) {
1052 my @ka = keys %$a;
1053 my @kb = keys %$b;
1054
1055 return 0 if @ka != @kb;
1056
1057 for (0 .. $#ka) {
1058 return 0 unless $ka[$_] eq $kb[$_];
1059 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1060 }
1061
1062 } elsif ("ARRAY" eq ref $a) {
1063
1064 return 0 if @$a != @$b;
1065
1066 for (0 .. $#$a) {
1067 return 0 unless _object_equal $a->[$_], $b->[$_];
1068 }
1069
1070 } elsif ($a ne $b) {
1071 return 0;
1072 }
1073
1074 1
1075}
1076
1077our $SLOW_MERGES;#d#
947sub _can_merge { 1078sub _can_merge {
948 my ($ob1, $ob2) = @_; 1079 my ($ob1, $ob2) = @_;
949 1080
950 local $Storable::canonical = 1; 1081 ++$SLOW_MERGES;#d#
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953 1082
954 $fob1 eq $fob2 1083 # we do the slow way here
1084 return _object_equal $ob1, $ob2
955} 1085}
956 1086
957sub reattach { 1087sub reattach {
958 # basically do the same as instantiate, without calling instantiate 1088 # basically do the same as instantiate, without calling instantiate
959 my ($obj) = @_; 1089 my ($obj) = @_;
981cf::attachable->attach ( 1111cf::attachable->attach (
982 prio => -1000000, 1112 prio => -1000000,
983 on_instantiate => sub { 1113 on_instantiate => sub {
984 my ($obj, $data) = @_; 1114 my ($obj, $data) = @_;
985 1115
986 $data = from_json $data; 1116 $data = decode_json $data;
987 1117
988 for (@$data) { 1118 for (@$data) {
989 my ($name, $args) = @$_; 1119 my ($name, $args) = @$_;
990 1120
991 $obj->attach ($name, %{$args || {} }); 1121 $obj->attach ($name, %{$args || {} });
1005); 1135);
1006 1136
1007sub object_freezer_save { 1137sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1138 my ($filename, $rdata, $objs) = @_;
1009 1139
1010 my $guard = cf::lock_acquire "io";
1011
1012 sync_job { 1140 sync_job {
1013 if (length $$rdata) { 1141 if (length $$rdata) {
1142 utf8::decode (my $decname = $filename);
1014 warn sprintf "saving %s (%d,%d)\n", 1143 warn sprintf "saving %s (%d,%d)\n",
1015 $filename, length $$rdata, scalar @$objs; 1144 $decname, length $$rdata, scalar @$objs;
1016 1145
1017 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1018 chmod SAVE_MODE, $fh; 1147 aio_chmod $fh, SAVE_MODE;
1019 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1020 aio_fsync $fh if $cf::USE_FSYNC; 1149 aio_fsync $fh if $cf::USE_FSYNC;
1021 close $fh; 1150 aio_close $fh;
1022 1151
1023 if (@$objs) { 1152 if (@$objs) {
1024 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1153 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1025 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
1026 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1027 aio_write $fh, 0, (length $data), $data, 0; 1156 aio_write $fh, 0, (length $data), $data, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1157 aio_fsync $fh if $cf::USE_FSYNC;
1029 close $fh; 1158 aio_close $fh;
1030 aio_rename "$filename.pst~", "$filename.pst"; 1159 aio_rename "$filename.pst~", "$filename.pst";
1031 } 1160 }
1032 } else { 1161 } else {
1033 aio_unlink "$filename.pst"; 1162 aio_unlink "$filename.pst";
1034 } 1163 }
1040 } else { 1169 } else {
1041 aio_unlink $filename; 1170 aio_unlink $filename;
1042 aio_unlink "$filename.pst"; 1171 aio_unlink "$filename.pst";
1043 } 1172 }
1044 }; 1173 };
1045
1046 undef $guard;
1047} 1174}
1048 1175
1049sub object_freezer_as_string { 1176sub object_freezer_as_string {
1050 my ($rdata, $objs) = @_; 1177 my ($rdata, $objs) = @_;
1051 1178
1056 1183
1057sub object_thawer_load { 1184sub object_thawer_load {
1058 my ($filename) = @_; 1185 my ($filename) = @_;
1059 1186
1060 my ($data, $av); 1187 my ($data, $av);
1061
1062 my $guard = cf::lock_acquire "io";
1063 1188
1064 (aio_load $filename, $data) >= 0 1189 (aio_load $filename, $data) >= 0
1065 or return; 1190 or return;
1066 1191
1067 unless (aio_stat "$filename.pst") { 1192 unless (aio_stat "$filename.pst") {
1068 (aio_load "$filename.pst", $av) >= 0 1193 (aio_load "$filename.pst", $av) >= 0
1069 or return; 1194 or return;
1070 1195
1071 undef $guard;
1072 $av = eval { (Storable::thaw $av)->{objs} }; 1196 my $st = eval { Coro::Storable::thaw $av };
1197 $av = $st->{objs};
1073 } 1198 }
1074 1199
1200 utf8::decode (my $decname = $filename);
1075 warn sprintf "loading %s (%d)\n", 1201 warn sprintf "loading %s (%d,%d)\n",
1076 $filename, length $data, scalar @{$av || []}; 1202 $decname, length $data, scalar @{$av || []};
1077 1203
1078 ($data, $av) 1204 ($data, $av)
1079} 1205}
1080 1206
1081=head2 COMMAND CALLBACKS 1207=head2 COMMAND CALLBACKS
1232 my $msg = $@ ? "$v->{path}: $@\n" 1358 my $msg = $@ ? "$v->{path}: $@\n"
1233 : "$v->{base}: extension inactive.\n"; 1359 : "$v->{base}: extension inactive.\n";
1234 1360
1235 if (exists $v->{meta}{mandatory}) { 1361 if (exists $v->{meta}{mandatory}) {
1236 warn $msg; 1362 warn $msg;
1237 warn "mandatory extension failed to load, exiting.\n"; 1363 cf::cleanup "mandatory extension failed to load, exiting.";
1238 exit 1;
1239 } 1364 }
1240 1365
1241 warn $msg; 1366 warn $msg;
1242 } 1367 }
1243 1368
1268use Coro::AIO; 1393use Coro::AIO;
1269 1394
1270=head3 cf::player 1395=head3 cf::player
1271 1396
1272=over 4 1397=over 4
1398
1399=item cf::player::num_playing
1400
1401Returns the official number of playing players, as per the Crossfire metaserver rules.
1402
1403=cut
1404
1405sub num_playing {
1406 scalar grep
1407 $_->ob->map
1408 && !$_->hidden
1409 && !$_->ob->flag (cf::FLAG_WIZ),
1410 cf::player::list
1411}
1273 1412
1274=item cf::player::find $login 1413=item cf::player::find $login
1275 1414
1276Returns the given player object, loading it if necessary (might block). 1415Returns the given player object, loading it if necessary (might block).
1277 1416
1316 aio_unlink +(playerdir $login) . "/$login.pl"; 1455 aio_unlink +(playerdir $login) . "/$login.pl";
1317 1456
1318 my $f = new_from_file cf::object::thawer path $login 1457 my $f = new_from_file cf::object::thawer path $login
1319 or return; 1458 or return;
1320 1459
1321 $f->next;
1322 my $pl = cf::player::load_pl $f 1460 my $pl = cf::player::load_pl $f
1323 or return; 1461 or return;
1462
1324 local $cf::PLAYER_LOADING{$login} = $pl; 1463 local $cf::PLAYER_LOADING{$login} = $pl;
1325 $f->resolve_delayed_derefs; 1464 $f->resolve_delayed_derefs;
1326 $cf::PLAYER{$login} = $pl 1465 $cf::PLAYER{$login} = $pl
1327 } 1466 }
1328 } 1467 }
1338 1477
1339 return if $pl->{deny_save}; 1478 return if $pl->{deny_save};
1340 1479
1341 aio_mkdir playerdir $pl, 0770; 1480 aio_mkdir playerdir $pl, 0770;
1342 $pl->{last_save} = $cf::RUNTIME; 1481 $pl->{last_save} = $cf::RUNTIME;
1482
1483 cf::get_slot 0.01;
1343 1484
1344 $pl->save_pl ($path); 1485 $pl->save_pl ($path);
1345 cf::cede_to_tick; 1486 cf::cede_to_tick;
1346} 1487}
1347 1488
1383 $pl->{deny_save} = 1; 1524 $pl->{deny_save} = 1;
1384 $pl->password ("*"); # this should lock out the player until we nuked the dir 1525 $pl->password ("*"); # this should lock out the player until we nuked the dir
1385 1526
1386 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1387 $pl->deactivate; 1528 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score;
1388 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1531 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1389 $pl->ns->destroy if $pl->ns; 1532 $pl->ns->destroy if $pl->ns;
1390 1533
1391 my $path = playerdir $pl; 1534 my $path = playerdir $pl;
1392 my $temp = "$path~$cf::RUNTIME~deleting~"; 1535 my $temp = "$path~$cf::RUNTIME~deleting~";
1431 1574
1432 for my $login (@$dirs) { 1575 for my $login (@$dirs) {
1433 my $path = path $login; 1576 my $path = path $login;
1434 1577
1435 # a .pst is a dead give-away for a valid player 1578 # a .pst is a dead give-away for a valid player
1436 unless (-e "$path.pst") { 1579 # if no pst file found, open and chekc for blocked users
1580 if (aio_stat "$path.pst") {
1437 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1581 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1438 aio_read $fh, 0, 512, my $buf, 0 or next; 1582 aio_read $fh, 0, 512, my $buf, 0 or next;
1439 $buf !~ /^password -------------$/m or next; # official not-valid tag 1583 $buf !~ /^password -------------$/m or next; # official not-valid tag
1440 } 1584 }
1441 1585
1478 1622
1479Expand crossfire pod fragments into protocol xml. 1623Expand crossfire pod fragments into protocol xml.
1480 1624
1481=cut 1625=cut
1482 1626
1627use re 'eval';
1628
1629my $group;
1630my $interior; $interior = qr{
1631 # match a pod interior sequence sans C<< >>
1632 (?:
1633 \ (.*?)\ (?{ $group = $^N })
1634 | < (??{$interior}) >
1635 )
1636}x;
1637
1483sub expand_cfpod { 1638sub expand_cfpod {
1484 ((my $self), (local $_)) = @_; 1639 my ($self, $pod) = @_;
1485 1640
1486 # escape & and < 1641 my $xml;
1487 s/&/&amp;/g;
1488 s/(?<![BIUGHT])</&lt;/g;
1489 1642
1490 # this is buggy, it needs to properly take care of nested <'s 1643 while () {
1644 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1645 $group = $1;
1491 1646
1492 1 while 1647 $group =~ s/&/&amp;/g;
1493 # replace B<>, I<>, U<> etc. 1648 $group =~ s/</&lt;/g;
1494 s/B<([^\>]*)>/<b>$1<\/b>/ 1649
1495 || s/I<([^\>]*)>/<i>$1<\/i>/ 1650 $xml .= $group;
1496 || s/U<([^\>]*)>/<u>$1<\/u>/ 1651 } elsif ($pod =~ m%\G
1497 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1652 ([BCGHITU])
1498 # replace G<male|female> tags 1653 <
1499 || s{G<([^>|]*)\|([^>]*)>}{ 1654 (?:
1500 $self->gender ? $2 : $1 1655 ([^<>]*) (?{ $group = $^N })
1501 }ge 1656 | < $interior >
1502 # replace H<hint text> 1657 )
1503 || s{H<([^\>]*)>} 1658 >
1659 %gcsx
1504 { 1660 ) {
1661 my ($code, $data) = ($1, $group);
1662
1663 if ($code eq "B") {
1664 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1665 } elsif ($code eq "I") {
1666 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1667 } elsif ($code eq "U") {
1668 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1669 } elsif ($code eq "C") {
1670 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1671 } elsif ($code eq "T") {
1672 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1673 } elsif ($code eq "G") {
1674 my ($male, $female) = split /\|/, $data;
1675 $data = $self->gender ? $female : $male;
1676 $xml .= expand_cfpod ($self, $data);
1677 } elsif ($code eq "H") {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1678 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1679 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "") 1680 "")
1508 [$self->{hintmode}] 1681 [$self->{hintmode}];
1682 } else {
1683 $xml .= "error processing '$code($data)' directive";
1509 }ge; 1684 }
1685 } else {
1686 if ($pod =~ /\G(.+)/) {
1687 warn "parse error while expanding $pod (at $1)";
1688 }
1689 last;
1690 }
1691 }
1510 1692
1693 for ($xml) {
1511 # create single paragraphs (very hackish) 1694 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g; 1695 s/(?<=\S)\n(?=\w)/ /g;
1513 1696
1514 # compress some whitespace 1697 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends 1698 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines 1699 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines 1700 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines 1701 s/\n+$//; # ending lines
1702 }
1519 1703
1520 $_ 1704 $xml
1521} 1705}
1706
1707no re 'eval';
1522 1708
1523sub hintmode { 1709sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1; 1710 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode} 1711 $_[0]{hintmode}
1526} 1712}
1598our $MAX_RESET = 3600; 1784our $MAX_RESET = 3600;
1599our $DEFAULT_RESET = 3000; 1785our $DEFAULT_RESET = 3000;
1600 1786
1601sub generate_random_map { 1787sub generate_random_map {
1602 my ($self, $rmp) = @_; 1788 my ($self, $rmp) = @_;
1789
1790 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1791
1603 # mit "rum" bekleckern, nicht 1792 # mit "rum" bekleckern, nicht
1604 $self->_create_random_map ( 1793 $self->_create_random_map (
1605 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1606 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1607 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1729 1918
1730# the temporary/swap location 1919# the temporary/swap location
1731sub save_path { 1920sub save_path {
1732 my ($self) = @_; 1921 my ($self) = @_;
1733 1922
1734 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1923 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1735 "$TMPDIR/$path.map" 1924 "$TMPDIR/$path.map"
1736} 1925}
1737 1926
1738# the unique path, undef == no special unique path 1927# the unique path, undef == no special unique path
1739sub uniq_path { 1928sub uniq_path {
1740 my ($self) = @_; 1929 my ($self) = @_;
1741 1930
1742 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1743 "$UNIQUEDIR/$path" 1932 "$UNIQUEDIR/$path"
1744} 1933}
1745 1934
1746# and all this just because we cannot iterate over 1935# and all this just because we cannot iterate over
1747# all maps in C++... 1936# all maps in C++...
1841sub find { 2030sub find {
1842 my ($path, $origin) = @_; 2031 my ($path, $origin) = @_;
1843 2032
1844 $path = normalise $path, $origin && $origin->path; 2033 $path = normalise $path, $origin && $origin->path;
1845 2034
2035 cf::lock_wait "map_data:$path";#d#remove
1846 cf::lock_wait "map_find:$path"; 2036 cf::lock_wait "map_find:$path";
1847 2037
1848 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
2039 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1849 my $guard = cf::lock_acquire "map_find:$path"; 2040 my $guard2 = cf::lock_acquire "map_find:$path";
2041
1850 my $map = new_from_path cf::map $path 2042 my $map = new_from_path cf::map $path
1851 or return; 2043 or return;
1852 2044
1853 $map->{last_save} = $cf::RUNTIME; 2045 $map->{last_save} = $cf::RUNTIME;
1854 2046
1856 or return; 2048 or return;
1857 2049
1858 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2050 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1859 # doing this can freeze the server in a sync job, obviously 2051 # doing this can freeze the server in a sync job, obviously
1860 #$cf::WAIT_FOR_TICK->wait; 2052 #$cf::WAIT_FOR_TICK->wait;
2053 undef $guard2;
2054 undef $guard1;
1861 $map->reset; 2055 $map->reset;
1862 undef $guard;
1863 return find $path; 2056 return find $path;
1864 } 2057 }
1865 2058
1866 $cf::MAP{$path} = $map 2059 $cf::MAP{$path} = $map
1867 } 2060 }
1876 local $self->{deny_reset} = 1; # loading can take a long time 2069 local $self->{deny_reset} = 1; # loading can take a long time
1877 2070
1878 my $path = $self->{path}; 2071 my $path = $self->{path};
1879 2072
1880 { 2073 {
1881 my $guard1 = cf::lock_acquire "map_data:$path"; 2074 my $guard = cf::lock_acquire "map_data:$path";
1882 my $guard2 = cf::lock_acquire "map_load:$path";
1883 2075
2076 return unless $self->valid;
1884 return if $self->in_memory != cf::MAP_SWAPPED; 2077 return unless $self->in_memory == cf::MAP_SWAPPED;
1885 2078
1886 $self->in_memory (cf::MAP_LOADING); 2079 $self->in_memory (cf::MAP_LOADING);
1887 2080
1888 $self->alloc; 2081 $self->alloc;
1889 2082
1929 } 2122 }
1930 2123
1931 $self->{last_save} = $cf::RUNTIME; 2124 $self->{last_save} = $cf::RUNTIME;
1932 $self->last_access ($cf::RUNTIME); 2125 $self->last_access ($cf::RUNTIME);
1933 2126
1934 $self->in_memory (cf::MAP_IN_MEMORY); 2127 $self->in_memory (cf::MAP_ACTIVE);
1935 } 2128 }
1936 2129
1937 $self->post_load; 2130 $self->post_load;
1938} 2131}
1939 2132
1997 my ($path, $origin, $load) = @_; 2190 my ($path, $origin, $load) = @_;
1998 2191
1999 $path = normalise $path, $origin && $origin->{path}; 2192 $path = normalise $path, $origin && $origin->{path};
2000 2193
2001 if (my $map = $cf::MAP{$path}) { 2194 if (my $map = $cf::MAP{$path}) {
2002 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2195 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2003 } 2196 }
2004 2197
2005 $MAP_PREFETCH{$path} |= $load; 2198 $MAP_PREFETCH{$path} |= $load;
2006 2199
2007 $MAP_PREFETCHER ||= cf::async { 2200 $MAP_PREFETCHER ||= cf::async {
2201 $Coro::current->{desc} = "map prefetcher";
2202
2008 while (%MAP_PREFETCH) { 2203 while (%MAP_PREFETCH) {
2009 while (my ($k, $v) = each %MAP_PREFETCH) { 2204 while (my ($k, $v) = each %MAP_PREFETCH) {
2010 if (my $map = find $k) { 2205 if (my $map = find $k) {
2011 $map->load if $v; 2206 $map->load if $v;
2012 } 2207 }
2038 return if $self->{deny_save}; 2233 return if $self->{deny_save};
2039 2234
2040 local $self->{last_access} = $self->last_access;#d# 2235 local $self->{last_access} = $self->last_access;#d#
2041 2236
2042 cf::async { 2237 cf::async {
2238 $Coro::current->{desc} = "map player save";
2043 $_->contr->save for $self->players; 2239 $_->contr->save for $self->players;
2044 }; 2240 };
2241
2242 cf::get_slot 0.02;
2045 2243
2046 if ($uniq) { 2244 if ($uniq) {
2047 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2048 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2246 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2049 } else { 2247 } else {
2058 $self->save; 2256 $self->save;
2059 2257
2060 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2258 my $lock = cf::lock_acquire "map_data:$self->{path}";
2061 2259
2062 return if $self->players; 2260 return if $self->players;
2063 return if $self->in_memory != cf::MAP_IN_MEMORY; 2261 return if $self->in_memory != cf::MAP_ACTIVE;
2064 return if $self->{deny_save}; 2262 return if $self->{deny_save};
2065 2263
2264 $self->in_memory (cf::MAP_SWAPPED);
2265
2266 $self->deactivate;
2267 $_->clear_links_to ($self) for values %cf::MAP;
2066 $self->clear; 2268 $self->clear;
2067 $self->in_memory (cf::MAP_SWAPPED);
2068} 2269}
2069 2270
2070sub reset_at { 2271sub reset_at {
2071 my ($self) = @_; 2272 my ($self) = @_;
2072 2273
2104 if $uniq; 2305 if $uniq;
2105 } 2306 }
2106 2307
2107 delete $cf::MAP{$self->path}; 2308 delete $cf::MAP{$self->path};
2108 2309
2310 $self->deactivate;
2311 $_->clear_links_to ($self) for values %cf::MAP;
2109 $self->clear; 2312 $self->clear;
2110
2111 $_->clear_links_to ($self) for values %cf::MAP;
2112 2313
2113 $self->unlink_save; 2314 $self->unlink_save;
2114 $self->destroy; 2315 $self->destroy;
2115} 2316}
2116 2317
2183 2384
2184sub unique_maps() { 2385sub unique_maps() {
2185 [ 2386 [
2186 map { 2387 map {
2187 utf8::decode $_; 2388 utf8::decode $_;
2188 /\.map$/ 2389 s/\.map$//; # TODO future compatibility hack
2390 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2391 ? ()
2189 ? normalise $_ 2392 : normalise $_
2190 : ()
2191 } @{ aio_readdir $UNIQUEDIR or [] } 2393 } @{ aio_readdir $UNIQUEDIR or [] }
2192 ] 2394 ]
2193} 2395}
2194 2396
2195package cf;
2196
2197=back 2397=back
2198 2398
2199=head3 cf::object 2399=head3 cf::object
2200 2400
2201=cut 2401=cut
2204 2404
2205=over 4 2405=over 4
2206 2406
2207=item $ob->inv_recursive 2407=item $ob->inv_recursive
2208 2408
2209Returns the inventory of the object _and_ their inventories, recursively. 2409Returns the inventory of the object I<and> their inventories, recursively,
2410but I<not> the object itself.
2210 2411
2211=cut 2412=cut
2212 2413
2213sub inv_recursive_; 2414sub inv_recursive_;
2214sub inv_recursive_ { 2415sub inv_recursive_ {
2219 inv_recursive_ inv $_[0] 2420 inv_recursive_ inv $_[0]
2220} 2421}
2221 2422
2222=item $ref = $ob->ref 2423=item $ref = $ob->ref
2223 2424
2224creates and returns a persistent reference to an objetc that can be stored as a string. 2425Creates and returns a persistent reference to an object that can be stored as a string.
2225 2426
2226=item $ob = cf::object::deref ($refstring) 2427=item $ob = cf::object::deref ($refstring)
2227 2428
2228returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2429returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2229even if the object actually exists. May block. 2430even if the object actually exists. May block.
2231=cut 2432=cut
2232 2433
2233sub deref { 2434sub deref {
2234 my ($ref) = @_; 2435 my ($ref) = @_;
2235 2436
2236 # temporary compatibility#TODO#remove
2237 $ref =~ s{^<}{player/<};
2238
2239 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2437 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2240 my ($uuid, $name) = ($1, $2); 2438 my ($uuid, $name) = ($1, $2);
2241 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2439 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2242 or return; 2440 or return;
2243 $pl->ob->uuid eq $uuid 2441 $pl->ob->uuid eq $uuid
2244 or return; 2442 or return;
2264can be C<undef>. Does the right thing when the player is currently in a 2462can be C<undef>. Does the right thing when the player is currently in a
2265dialogue with the given NPC character. 2463dialogue with the given NPC character.
2266 2464
2267=cut 2465=cut
2268 2466
2467our $SAY_CHANNEL = {
2468 id => "say",
2469 title => "Map",
2470 reply => "say ",
2471 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2472};
2473
2474our $CHAT_CHANNEL = {
2475 id => "chat",
2476 title => "Chat",
2477 reply => "chat ",
2478 tooltip => "Player chat and shouts, global to the server.",
2479};
2480
2269# rough implementation of a future "reply" method that works 2481# rough implementation of a future "reply" method that works
2270# with dialog boxes. 2482# with dialog boxes.
2271#TODO: the first argument must go, split into a $npc->reply_to ( method 2483#TODO: the first argument must go, split into a $npc->reply_to ( method
2272sub cf::object::player::reply($$$;$) { 2484sub cf::object::player::reply($$$;$) {
2273 my ($self, $npc, $msg, $flags) = @_; 2485 my ($self, $npc, $msg, $flags) = @_;
2284 my $dialog = $pl->{npc_dialog}; 2496 my $dialog = $pl->{npc_dialog};
2285 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2497 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2286 2498
2287 } else { 2499 } else {
2288 $msg = $npc->name . " says: $msg" if $npc; 2500 $msg = $npc->name . " says: $msg" if $npc;
2289 $self->message ($msg, $flags); 2501 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2290 } 2502 }
2291 } 2503 }
2292} 2504}
2293 2505
2294=item $object->send_msg ($channel, $msg, $color, [extra...]) 2506=item $object->send_msg ($channel, $msg, $color, [extra...])
2415 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2627 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2416 2628
2417 $self->enter_link; 2629 $self->enter_link;
2418 2630
2419 (async { 2631 (async {
2632 $Coro::current->{desc} = "player::goto $path $x $y";
2633
2634 # *tag paths override both path and x|y
2635 if ($path =~ /^\*(.*)$/) {
2636 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2637 my $ob = $obs[rand @obs];
2638
2639 # see if we actually can go there
2640 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2641 $ob = $obs[rand @obs];
2642 } else {
2643 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2644 }
2645 # else put us there anyways for now #d#
2646
2647 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2648 } else {
2649 ($path, $x, $y) = (undef, undef, undef);
2650 }
2651 }
2652
2420 my $map = eval { 2653 my $map = eval {
2421 my $map = cf::map::find $path; 2654 my $map = defined $path ? cf::map::find $path : undef;
2422 2655
2423 if ($map) { 2656 if ($map) {
2424 $map = $map->customise_for ($self); 2657 $map = $map->customise_for ($self);
2425 $map = $check->($map) if $check && $map; 2658 $map = $check->($map) if $check && $map;
2426 } else { 2659 } else {
2427 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2660 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2428 } 2661 }
2429 2662
2430 $map 2663 $map
2431 }; 2664 };
2432 2665
2468} 2701}
2469 2702
2470sub prepare_random_map { 2703sub prepare_random_map {
2471 my ($exit) = @_; 2704 my ($exit) = @_;
2472 2705
2473 my $guard = cf::lock_acquire "exit_prepare:$exit";
2474
2475 # all this does is basically replace the /! path by 2706 # all this does is basically replace the /! path by
2476 # a new random map path (?random/...) with a seed 2707 # a new random map path (?random/...) with a seed
2477 # that depends on the exit object 2708 # that depends on the exit object
2478 2709
2479 my $rmp = parse_random_map_params $exit->msg; 2710 my $rmp = parse_random_map_params $exit->msg;
2481 if ($exit->map) { 2712 if ($exit->map) {
2482 $rmp->{region} = $exit->region->name; 2713 $rmp->{region} = $exit->region->name;
2483 $rmp->{origin_map} = $exit->map->path; 2714 $rmp->{origin_map} = $exit->map->path;
2484 $rmp->{origin_x} = $exit->x; 2715 $rmp->{origin_x} = $exit->x;
2485 $rmp->{origin_y} = $exit->y; 2716 $rmp->{origin_y} = $exit->y;
2717
2718 $exit->map->touch;
2486 } 2719 }
2487 2720
2488 $rmp->{random_seed} ||= $exit->random_seed; 2721 $rmp->{random_seed} ||= $exit->random_seed;
2489 2722
2490 my $data = cf::to_json $rmp; 2723 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2491 my $md5 = Digest::MD5::md5_hex $data; 2724 my $md5 = Digest::MD5::md5_hex $data;
2492 my $meta = "$RANDOMDIR/$md5.meta"; 2725 my $meta = "$RANDOMDIR/$md5.meta";
2493 2726
2494 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2727 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2495 aio_write $fh, 0, (length $data), $data, 0; 2728 aio_write $fh, 0, (length $data), $data, 0;
2496 undef $fh; 2729 undef $fh;
2497 aio_rename "$meta~", $meta; 2730 aio_rename "$meta~", $meta;
2498 2731
2732 my $slaying = "?random/$md5";
2733
2734 if ($exit->valid) {
2499 $exit->slaying ("?random/$md5"); 2735 $exit->slaying ("?random/$md5");
2500 $exit->msg (undef); 2736 $exit->msg (undef);
2737 }
2501 } 2738 }
2502} 2739}
2503 2740
2504sub cf::object::player::enter_exit { 2741sub cf::object::player::enter_exit {
2505 my ($self, $exit) = @_; 2742 my ($self, $exit) = @_;
2506 2743
2507 return unless $self->type == cf::PLAYER; 2744 return unless $self->type == cf::PLAYER;
2508 2745
2509 if ($exit->slaying eq "/!") {
2510 #TODO: this should de-fi-ni-te-ly not be a sync-job
2511 # the problem is that $exit might not survive long enough
2512 # so it needs to be done right now, right here
2513 cf::sync_job { prepare_random_map $exit };
2514 }
2515
2516 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2517 my $hp = $exit->stats->hp;
2518 my $sp = $exit->stats->sp;
2519
2520 $self->enter_link; 2746 $self->enter_link;
2521 2747
2522 # if exit is damned, update players death & WoR home-position
2523 $self->contr->savebed ($slaying, $hp, $sp)
2524 if $exit->flag (FLAG_DAMNED);
2525
2526 (async { 2748 (async {
2527 $self->deactivate_recursive; # just to be sure 2749 $Coro::current->{desc} = "enter_exit";
2750
2528 unless (eval { 2751 unless (eval {
2752 $self->deactivate_recursive; # just to be sure
2753
2754 # random map handling
2755 {
2756 my $guard = cf::lock_acquire "exit_prepare:$exit";
2757
2758 prepare_random_map $exit
2759 if $exit->slaying eq "/!";
2760 }
2761
2762 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2763 my $x = $exit->stats->hp;
2764 my $y = $exit->stats->sp;
2765
2529 $self->goto ($slaying, $hp, $sp); 2766 $self->goto ($map, $x, $y);
2530 2767
2768 # if exit is damned, update players death & WoR home-position
2769 $self->contr->savebed ($map, $x, $y)
2770 if $exit->flag (cf::FLAG_DAMNED);
2771
2531 1; 2772 1
2532 }) { 2773 }) {
2533 $self->message ("Something went wrong deep within the crossfire server. " 2774 $self->message ("Something went wrong deep within the crossfire server. "
2534 . "I'll try to bring you back to the map you were before. " 2775 . "I'll try to bring you back to the map you were before. "
2535 . "Please report this to the dungeon master!", 2776 . "Please report this to the dungeon master!",
2536 cf::NDI_UNIQUE | cf::NDI_RED); 2777 cf::NDI_UNIQUE | cf::NDI_RED);
2566the message, with C<log> being the default. If C<$color> is negative, suppress 2807the message, with C<log> being the default. If C<$color> is negative, suppress
2567the message unless the client supports the msg packet. 2808the message unless the client supports the msg packet.
2568 2809
2569=cut 2810=cut
2570 2811
2812# non-persistent channels (usually the info channel)
2571our %CHANNEL = ( 2813our %CHANNEL = (
2572 "c/identify" => { 2814 "c/identify" => {
2573 id => "identify", 2815 id => "infobox",
2574 title => "Identify", 2816 title => "Identify",
2575 reply => undef, 2817 reply => undef,
2576 tooltip => "Items recently identified", 2818 tooltip => "Items recently identified",
2577 }, 2819 },
2578 "c/examine" => { 2820 "c/examine" => {
2579 id => "examine", 2821 id => "infobox",
2580 title => "Examine", 2822 title => "Examine",
2581 reply => undef, 2823 reply => undef,
2582 tooltip => "Signs and other items you examined", 2824 tooltip => "Signs and other items you examined",
2583 }, 2825 },
2826 "c/book" => {
2827 id => "infobox",
2828 title => "Book",
2829 reply => undef,
2830 tooltip => "The contents of a note or book",
2831 },
2832 "c/lookat" => {
2833 id => "infobox",
2834 title => "Look",
2835 reply => undef,
2836 tooltip => "What you saw there",
2837 },
2838 "c/who" => {
2839 id => "infobox",
2840 title => "Players",
2841 reply => undef,
2842 tooltip => "Shows players who are currently online",
2843 },
2844 "c/body" => {
2845 id => "infobox",
2846 title => "Body Parts",
2847 reply => undef,
2848 tooltip => "Shows which body parts you posess and are available",
2849 },
2850 "c/uptime" => {
2851 id => "infobox",
2852 title => "Uptime",
2853 reply => undef,
2854 tooltip => "How long the server has been running since last restart",
2855 },
2856 "c/mapinfo" => {
2857 id => "infobox",
2858 title => "Map Info",
2859 reply => undef,
2860 tooltip => "Information related to the maps",
2861 },
2862 "c/party" => {
2863 id => "party",
2864 title => "Party",
2865 reply => "gsay ",
2866 tooltip => "Messages and chat related to your party",
2867 },
2584); 2868);
2585 2869
2586sub cf::client::send_msg { 2870sub cf::client::send_msg {
2587 my ($self, $channel, $msg, $color, @extra) = @_; 2871 my ($self, $channel, $msg, $color, @extra) = @_;
2588 2872
2589 $msg = $self->pl->expand_cfpod ($msg); 2873 $msg = $self->pl->expand_cfpod ($msg);
2590 2874
2591 $color &= cf::NDI_CLIENT_MASK; # just in case... 2875 $color &= cf::NDI_CLIENT_MASK; # just in case...
2592 2876
2593 # check predefined channels, for the benefit of C 2877 # check predefined channels, for the benefit of C
2594 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2878 if ($CHANNEL{$channel}) {
2879 $channel = $CHANNEL{$channel};
2595 2880
2881 $self->ext_msg (channel_info => $channel)
2882 if $self->can_msg;
2883
2884 $channel = $channel->{id};
2885
2596 if (ref $channel) { 2886 } elsif (ref $channel) {
2597 # send meta info to client, if not yet sent 2887 # send meta info to client, if not yet sent
2598 unless (exists $self->{channel}{$channel->{id}}) { 2888 unless (exists $self->{channel}{$channel->{id}}) {
2599 $self->{channel}{$channel->{id}} = $channel; 2889 $self->{channel}{$channel->{id}} = $channel;
2600 $self->ext_msg (channel_info => $channel) 2890 $self->ext_msg (channel_info => $channel)
2601 if $self->can_msg; 2891 if $self->can_msg;
2818=pod 3108=pod
2819 3109
2820The following functions and methods are available within a safe environment: 3110The following functions and methods are available within a safe environment:
2821 3111
2822 cf::object 3112 cf::object
2823 contr pay_amount pay_player map x y force_find force_add 3113 contr pay_amount pay_player map x y force_find force_add destroy
2824 insert remove name archname title slaying race decrease_ob_nr 3114 insert remove name archname title slaying race decrease split
2825 3115
2826 cf::object::player 3116 cf::object::player
2827 player 3117 player
2828 3118
2829 cf::player 3119 cf::player
2834 3124
2835=cut 3125=cut
2836 3126
2837for ( 3127for (
2838 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3128 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2839 insert remove inv name archname title slaying race 3129 insert remove inv nrof name archname title slaying race
2840 decrease_ob_nr)], 3130 decrease split destroy)],
2841 ["cf::object::player" => qw(player)], 3131 ["cf::object::player" => qw(player)],
2842 ["cf::player" => qw(peaceful)], 3132 ["cf::player" => qw(peaceful)],
2843 ["cf::map" => qw(trigger)], 3133 ["cf::map" => qw(trigger)],
2844) { 3134) {
2845 no strict 'refs'; 3135 no strict 'refs';
2950 { 3240 {
2951 my $faces = $facedata->{faceinfo}; 3241 my $faces = $facedata->{faceinfo};
2952 3242
2953 while (my ($face, $info) = each %$faces) { 3243 while (my ($face, $info) = each %$faces) {
2954 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3244 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3245
2955 cf::face::set_visibility $idx, $info->{visibility}; 3246 cf::face::set_visibility $idx, $info->{visibility};
2956 cf::face::set_magicmap $idx, $info->{magicmap}; 3247 cf::face::set_magicmap $idx, $info->{magicmap};
2957 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3248 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2958 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3249 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2959 3250
2960 cf::cede_to_tick; 3251 cf::cede_to_tick;
2961 } 3252 }
2962 3253
2963 while (my ($face, $info) = each %$faces) { 3254 while (my ($face, $info) = each %$faces) {
2964 next unless $info->{smooth}; 3255 next unless $info->{smooth};
3256
2965 my $idx = cf::face::find $face 3257 my $idx = cf::face::find $face
2966 or next; 3258 or next;
3259
2967 if (my $smooth = cf::face::find $info->{smooth}) { 3260 if (my $smooth = cf::face::find $info->{smooth}) {
2968 cf::face::set_smooth $idx, $smooth; 3261 cf::face::set_smooth $idx, $smooth;
2969 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3262 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2970 } else { 3263 } else {
2971 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3264 warn "smooth face '$info->{smooth}' not found for face '$face'";
2989 { 3282 {
2990 # TODO: for gcfclient pleasure, we should give resources 3283 # TODO: for gcfclient pleasure, we should give resources
2991 # that gcfclient doesn't grok a >10000 face index. 3284 # that gcfclient doesn't grok a >10000 face index.
2992 my $res = $facedata->{resource}; 3285 my $res = $facedata->{resource};
2993 3286
2994 my $soundconf = delete $res->{"res/sound.conf"};
2995
2996 while (my ($name, $info) = each %$res) { 3287 while (my ($name, $info) = each %$res) {
3288 if (defined $info->{type}) {
2997 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3289 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2998 my $data; 3290 my $data;
2999 3291
3000 if ($info->{type} & 1) { 3292 if ($info->{type} & 1) {
3001 # prepend meta info 3293 # prepend meta info
3002 3294
3003 my $meta = $enc->encode ({ 3295 my $meta = $enc->encode ({
3004 name => $name, 3296 name => $name,
3005 %{ $info->{meta} || {} }, 3297 %{ $info->{meta} || {} },
3006 }); 3298 });
3007 3299
3008 $data = pack "(w/a*)*", $meta, $info->{data}; 3300 $data = pack "(w/a*)*", $meta, $info->{data};
3301 } else {
3302 $data = $info->{data};
3303 }
3304
3305 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3306 cf::face::set_type $idx, $info->{type};
3009 } else { 3307 } else {
3010 $data = $info->{data}; 3308 $RESOURCE{$name} = $info;
3011 } 3309 }
3012 3310
3013 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3014 cf::face::set_type $idx, $info->{type};
3015
3016 cf::cede_to_tick; 3311 cf::cede_to_tick;
3017 } 3312 }
3018
3019 if ($soundconf) {
3020 $soundconf = $enc->decode (delete $soundconf->{data});
3021
3022 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3023 my $sound = $soundconf->{compat}[$_]
3024 or next;
3025
3026 my $face = cf::face::find "sound/$sound->[1]";
3027 cf::sound::set $sound->[0] => $face;
3028 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3029 }
3030
3031 while (my ($k, $v) = each %{$soundconf->{event}}) {
3032 my $face = cf::face::find "sound/$v";
3033 cf::sound::set $k => $face;
3034 }
3035 }
3036 } 3313 }
3314
3315 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3037 3316
3038 1 3317 1
3039} 3318}
3319
3320cf::global->attach (on_resource_update => sub {
3321 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3322 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3323
3324 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3325 my $sound = $soundconf->{compat}[$_]
3326 or next;
3327
3328 my $face = cf::face::find "sound/$sound->[1]";
3329 cf::sound::set $sound->[0] => $face;
3330 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3331 }
3332
3333 while (my ($k, $v) = each %{$soundconf->{event}}) {
3334 my $face = cf::face::find "sound/$v";
3335 cf::sound::set $k => $face;
3336 }
3337 }
3338});
3040 3339
3041register_exticmd fx_want => sub { 3340register_exticmd fx_want => sub {
3042 my ($ns, $want) = @_; 3341 my ($ns, $want) = @_;
3043 3342
3044 while (my ($k, $v) = each %$want) { 3343 while (my ($k, $v) = each %$want) {
3045 $ns->fx_want ($k, $v); 3344 $ns->fx_want ($k, $v);
3046 } 3345 }
3047}; 3346};
3347
3348sub load_resource_file($) {
3349 my $guard = lock_acquire "load_resource_file";
3350
3351 my $status = load_resource_file_ $_[0];
3352 get_slot 0.1, 100;
3353 cf::arch::commit_load;
3354
3355 $status
3356}
3048 3357
3049sub reload_regions { 3358sub reload_regions {
3050 # HACK to clear player env face cache, we need some signal framework 3359 # HACK to clear player env face cache, we need some signal framework
3051 # for this (global event?) 3360 # for this (global event?)
3052 %ext::player_env::MUSIC_FACE_CACHE = (); 3361 %ext::player_env::MUSIC_FACE_CACHE = ();
3066} 3375}
3067 3376
3068sub reload_archetypes { 3377sub reload_archetypes {
3069 load_resource_file "$DATADIR/archetypes" 3378 load_resource_file "$DATADIR/archetypes"
3070 or die "unable to load archetypes\n"; 3379 or die "unable to load archetypes\n";
3071 #d# NEED to laod twice to resolve forward references
3072 # this really needs to be done in an extra post-pass
3073 # (which needs to be synchronous, so solve it differently)
3074 load_resource_file "$DATADIR/archetypes"
3075 or die "unable to load archetypes\n";
3076} 3380}
3077 3381
3078sub reload_treasures { 3382sub reload_treasures {
3079 load_resource_file "$DATADIR/treasures" 3383 load_resource_file "$DATADIR/treasures"
3080 or die "unable to load treasurelists\n"; 3384 or die "unable to load treasurelists\n";
3081} 3385}
3082 3386
3083sub reload_resources { 3387sub reload_resources {
3084 warn "reloading resource files...\n"; 3388 warn "reloading resource files...\n";
3085 3389
3390 reload_facedata;
3391 reload_archetypes;
3086 reload_regions; 3392 reload_regions;
3087 reload_facedata;
3088 #reload_archetypes;#d#
3089 reload_archetypes;
3090 reload_treasures; 3393 reload_treasures;
3091 3394
3092 warn "finished reloading resource files\n"; 3395 warn "finished reloading resource files\n";
3093} 3396}
3094 3397
3095sub init { 3398sub init {
3399 my $guard = freeze_mainloop;
3400
3401 evthread_start IO::AIO::poll_fileno;
3402
3096 reload_resources; 3403 reload_resources;
3097} 3404}
3098 3405
3099sub reload_config { 3406sub reload_config {
3100 open my $fh, "<:utf8", "$CONFDIR/config" 3407 open my $fh, "<:utf8", "$CONFDIR/config"
3101 or return; 3408 or return;
3102 3409
3103 local $/; 3410 local $/;
3104 *CFG = YAML::Syck::Load <$fh>; 3411 *CFG = YAML::Load <$fh>;
3105 3412
3106 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3413 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3107 3414
3108 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3415 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3109 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3416 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3120sub main { 3427sub main {
3121 # we must not ever block the main coroutine 3428 # we must not ever block the main coroutine
3122 local $Coro::idle = sub { 3429 local $Coro::idle = sub {
3123 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3430 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3124 (async { 3431 (async {
3125 Event::one_event; 3432 $Coro::current->{desc} = "IDLE BUG HANDLER";
3433 EV::loop EV::LOOP_ONESHOT;
3126 })->prio (Coro::PRIO_MAX); 3434 })->prio (Coro::PRIO_MAX);
3127 }; 3435 };
3128 3436
3437 {
3438 my $guard = freeze_mainloop;
3129 reload_config; 3439 reload_config;
3130 db_init; 3440 db_init;
3131 load_extensions; 3441 load_extensions;
3132 3442
3133 $TICK_WATCHER->start; 3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3444 }
3445
3134 Event::loop; 3446 EV::loop;
3135} 3447}
3136 3448
3137############################################################################# 3449#############################################################################
3138# initialisation and cleanup 3450# initialisation and cleanup
3139 3451
3140# install some emergency cleanup handlers 3452# install some emergency cleanup handlers
3141BEGIN { 3453BEGIN {
3454 our %SIGWATCHER = ();
3142 for my $signal (qw(INT HUP TERM)) { 3455 for my $signal (qw(INT HUP TERM)) {
3143 Event->signal ( 3456 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3144 reentrant => 0,
3145 data => WF_AUTOCANCEL,
3146 signal => $signal,
3147 prio => 0,
3148 cb => sub {
3149 cf::cleanup "SIG$signal"; 3457 cf::cleanup "SIG$signal";
3150 },
3151 ); 3458 };
3152 } 3459 }
3153} 3460}
3154 3461
3155sub write_runtime { 3462sub write_runtime_sync {
3156 my $runtime = "$LOCALDIR/runtime"; 3463 my $runtime = "$LOCALDIR/runtime";
3157 3464
3158 # first touch the runtime file to show we are still running: 3465 # first touch the runtime file to show we are still running:
3159 # the fsync below can take a very very long time. 3466 # the fsync below can take a very very long time.
3160 3467
3186 and return; 3493 and return;
3187 3494
3188 warn "runtime file written.\n"; 3495 warn "runtime file written.\n";
3189 3496
3190 1 3497 1
3498}
3499
3500our $uuid_lock;
3501our $uuid_skip;
3502
3503sub write_uuid_sync($) {
3504 $uuid_skip ||= $_[0];
3505
3506 return if $uuid_lock;
3507 local $uuid_lock = 1;
3508
3509 my $uuid = "$LOCALDIR/uuid";
3510
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return;
3513
3514 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3515 $uuid_skip = 0;
3516
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return;
3519
3520 # always fsync - this file is important
3521 aio_fsync $fh
3522 and return;
3523
3524 close $fh
3525 or return;
3526
3527 aio_rename "$uuid~", $uuid
3528 and return;
3529
3530 warn "uuid file written ($value).\n";
3531
3532 1
3533
3534}
3535
3536sub write_uuid($$) {
3537 my ($skip, $sync) = @_;
3538
3539 $sync ? write_uuid_sync $skip
3540 : async { write_uuid_sync $skip };
3191} 3541}
3192 3542
3193sub emergency_save() { 3543sub emergency_save() {
3194 my $freeze_guard = cf::freeze_mainloop; 3544 my $freeze_guard = cf::freeze_mainloop;
3195 3545
3201 # and maps saved/destroyed asynchronously. 3551 # and maps saved/destroyed asynchronously.
3202 warn "begin emergency player save\n"; 3552 warn "begin emergency player save\n";
3203 for my $login (keys %cf::PLAYER) { 3553 for my $login (keys %cf::PLAYER) {
3204 my $pl = $cf::PLAYER{$login} or next; 3554 my $pl = $cf::PLAYER{$login} or next;
3205 $pl->valid or next; 3555 $pl->valid or next;
3556 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3206 $pl->save; 3557 $pl->save;
3207 } 3558 }
3208 warn "end emergency player save\n"; 3559 warn "end emergency player save\n";
3209 3560
3210 warn "begin emergency map save\n"; 3561 warn "begin emergency map save\n";
3216 warn "end emergency map save\n"; 3567 warn "end emergency map save\n";
3217 3568
3218 warn "begin emergency database checkpoint\n"; 3569 warn "begin emergency database checkpoint\n";
3219 BDB::db_env_txn_checkpoint $DB_ENV; 3570 BDB::db_env_txn_checkpoint $DB_ENV;
3220 warn "end emergency database checkpoint\n"; 3571 warn "end emergency database checkpoint\n";
3572
3573 warn "begin write uuid\n";
3574 write_uuid_sync 1;
3575 warn "end write uuid\n";
3221 }; 3576 };
3222 3577
3223 warn "leave emergency perl save\n"; 3578 warn "leave emergency perl save\n";
3224} 3579}
3225 3580
3240 warn "reloading..."; 3595 warn "reloading...";
3241 3596
3242 warn "entering sync_job"; 3597 warn "entering sync_job";
3243 3598
3244 cf::sync_job { 3599 cf::sync_job {
3245 cf::write_runtime; # external watchdog should not bark 3600 cf::write_runtime_sync; # external watchdog should not bark
3246 cf::emergency_save; 3601 cf::emergency_save;
3247 cf::write_runtime; # external watchdog should not bark 3602 cf::write_runtime_sync; # external watchdog should not bark
3248 3603
3249 warn "syncing database to disk"; 3604 warn "syncing database to disk";
3250 BDB::db_env_txn_checkpoint $DB_ENV; 3605 BDB::db_env_txn_checkpoint $DB_ENV;
3251 3606
3252 # if anything goes wrong in here, we should simply crash as we already saved 3607 # if anything goes wrong in here, we should simply crash as we already saved
3253
3254 warn "cancelling all WF_AUTOCANCEL watchers";
3255 for (Event::all_watchers) {
3256 $_->cancel if $_->data & WF_AUTOCANCEL;
3257 }
3258 3608
3259 warn "flushing outstanding aio requests"; 3609 warn "flushing outstanding aio requests";
3260 for (;;) { 3610 for (;;) {
3261 BDB::flush; 3611 BDB::flush;
3262 IO::AIO::flush; 3612 IO::AIO::flush;
3263 Coro::cede; 3613 Coro::cede_notself;
3264 last unless IO::AIO::nreqs || BDB::nreqs; 3614 last unless IO::AIO::nreqs || BDB::nreqs;
3265 warn "iterate..."; 3615 warn "iterate...";
3266 } 3616 }
3267 3617
3268 ++$RELOAD; 3618 ++$RELOAD;
3344 warn "leaving sync_job"; 3694 warn "leaving sync_job";
3345 3695
3346 1 3696 1
3347 } or do { 3697 } or do {
3348 warn $@; 3698 warn $@;
3349 warn "error while reloading, exiting."; 3699 cf::cleanup "error while reloading, exiting.";
3350 exit 1;
3351 }; 3700 };
3352 3701
3353 warn "reloaded"; 3702 warn "reloaded";
3354}; 3703};
3355 3704
3357 3706
3358sub reload_perl() { 3707sub reload_perl() {
3359 # doing reload synchronously and two reloads happen back-to-back, 3708 # doing reload synchronously and two reloads happen back-to-back,
3360 # coro crashes during coro_state_free->destroy here. 3709 # coro crashes during coro_state_free->destroy here.
3361 3710
3362 $RELOAD_WATCHER ||= Event->timer ( 3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3363 reentrant => 0,
3364 after => 0,
3365 data => WF_AUTOCANCEL,
3366 cb => sub {
3367 do_reload_perl; 3712 do_reload_perl;
3368 undef $RELOAD_WATCHER; 3713 undef $RELOAD_WATCHER;
3369 },
3370 ); 3714 };
3371} 3715}
3372 3716
3373register_command "reload" => sub { 3717register_command "reload" => sub {
3374 my ($who, $arg) = @_; 3718 my ($who, $arg) = @_;
3375 3719
3376 if ($who->flag (FLAG_WIZ)) { 3720 if ($who->flag (FLAG_WIZ)) {
3377 $who->message ("reloading server."); 3721 $who->message ("reloading server.");
3722 async {
3723 $Coro::current->{desc} = "perl_reload";
3378 async { reload_perl }; 3724 reload_perl;
3725 };
3379 } 3726 }
3380}; 3727};
3381 3728
3382unshift @INC, $LIBDIR; 3729unshift @INC, $LIBDIR;
3383 3730
3385 3732
3386our @WAIT_FOR_TICK; 3733our @WAIT_FOR_TICK;
3387our @WAIT_FOR_TICK_BEGIN; 3734our @WAIT_FOR_TICK_BEGIN;
3388 3735
3389sub wait_for_tick { 3736sub wait_for_tick {
3390 return unless $TICK_WATCHER->is_active;
3391 return if $Coro::current == $Coro::main; 3737 return if tick_inhibit || $Coro::current == $Coro::main;
3392 3738
3393 my $signal = new Coro::Signal; 3739 my $signal = new Coro::Signal;
3394 push @WAIT_FOR_TICK, $signal; 3740 push @WAIT_FOR_TICK, $signal;
3395 $signal->wait; 3741 $signal->wait;
3396} 3742}
3397 3743
3398sub wait_for_tick_begin { 3744sub wait_for_tick_begin {
3399 return unless $TICK_WATCHER->is_active;
3400 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
3401 3746
3402 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
3403 push @WAIT_FOR_TICK_BEGIN, $signal; 3748 push @WAIT_FOR_TICK_BEGIN, $signal;
3404 $signal->wait; 3749 $signal->wait;
3405} 3750}
3406 3751
3407 my $min = 1e6;#d# 3752sub tick {
3408 my $avg = 10;
3409$TICK_WATCHER = Event->timer (
3410 reentrant => 0,
3411 parked => 1,
3412 prio => 0,
3413 at => $NEXT_TICK || $TICK,
3414 data => WF_AUTOCANCEL,
3415 cb => sub {
3416 if ($Coro::current != $Coro::main) { 3753 if ($Coro::current != $Coro::main) {
3417 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3754 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3418 unless ++$bug_warning > 10; 3755 unless ++$bug_warning > 10;
3419 return; 3756 return;
3420 } 3757 }
3421 3758
3422 $NOW = $tick_start = Event::time;
3423
3424 cf::server_tick; # one server iteration 3759 cf::server_tick; # one server iteration
3425 3760
3426 0 && sync_job {#d# 3761 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3427 for(1..10) { 3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3428 my $t = Event::time; 3763 Coro::async_pool {
3429 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3764 $Coro::current->{desc} = "runtime saver";
3430 or die; 3765 write_runtime_sync
3431 3766 or warn "ERROR: unable to write runtime file: $!";
3432 $map->width (50);
3433 $map->height (50);
3434 $map->alloc;
3435 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3436 my $t = Event::time - $t;
3437
3438 #next unless $t < 0.0013;#d#
3439 if ($t < $min) {
3440 $min = $t;
3441 }
3442 $avg = $avg * 0.99 + $t * 0.01;
3443 }
3444 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3445 exit 0;
3446 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3447 }; 3767 };
3768 }
3448 3769
3449 $RUNTIME += $TICK;
3450 $NEXT_TICK += $TICK;
3451
3452 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3453 $NEXT_RUNTIME_WRITE = $NOW + 10;
3454 Coro::async_pool {
3455 write_runtime
3456 or warn "ERROR: unable to write runtime file: $!";
3457 };
3458 }
3459
3460# my $AFTER = Event::time;
3461# warn $AFTER - $NOW;#d#
3462
3463 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3770 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3464 $sig->send; 3771 $sig->send;
3465 } 3772 }
3466 while (my $sig = shift @WAIT_FOR_TICK) { 3773 while (my $sig = shift @WAIT_FOR_TICK) {
3467 $sig->send; 3774 $sig->send;
3468 } 3775 }
3469 3776
3470 $NOW = Event::time; 3777 $LOAD = ($NOW - $TICK_START) / $TICK;
3471
3472 # if we are delayed by four ticks or more, skip them all
3473 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3474
3475 $TICK_WATCHER->at ($NEXT_TICK);
3476 $TICK_WATCHER->start;
3477
3478 $LOAD = ($NOW - $tick_start) / $TICK;
3479 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3778 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3480 3779
3481 _post_tick; 3780 if (0) {
3482 3781 if ($NEXT_TICK) {
3483 3782 my $jitter = $TICK_START - $NEXT_TICK;
3783 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3784 warn "jitter $JITTER\n";#d#
3785 }
3484 }, 3786 }
3485); 3787}
3486 3788
3487{ 3789{
3488 BDB::max_poll_time $TICK * 0.1; 3790 # configure BDB
3489 $BDB_POLL_WATCHER = Event->io ( 3791
3490 reentrant => 0,
3491 fd => BDB::poll_fileno,
3492 poll => 'r',
3493 prio => 0,
3494 data => WF_AUTOCANCEL,
3495 cb => \&BDB::poll_cb,
3496 );
3497 BDB::min_parallel 8; 3792 BDB::min_parallel 8;
3498 3793 BDB::max_poll_reqs $TICK * 0.1;
3499 BDB::set_sync_prepare { 3794 $AnyEvent::BDB::WATCHER->priority (1);
3500 my $status;
3501 my $current = $Coro::current;
3502 (
3503 sub {
3504 $status = $!;
3505 $current->ready; undef $current;
3506 },
3507 sub {
3508 Coro::schedule while defined $current;
3509 $! = $status;
3510 },
3511 )
3512 };
3513 3795
3514 unless ($DB_ENV) { 3796 unless ($DB_ENV) {
3515 $DB_ENV = BDB::db_env_create; 3797 $DB_ENV = BDB::db_env_create;
3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3799 | BDB::LOG_AUTOREMOVE, 1);
3800 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3801 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3516 3802
3517 cf::sync_job { 3803 cf::sync_job {
3518 eval { 3804 eval {
3519 BDB::db_env_open 3805 BDB::db_env_open
3520 $DB_ENV, 3806 $DB_ENV,
3522 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3808 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3523 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3809 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3524 0666; 3810 0666;
3525 3811
3526 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3812 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3527
3528 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3529 $DB_ENV->set_lk_detect;
3530 }; 3813 };
3531 3814
3532 cf::cleanup "db_env_open(db): $@" if $@; 3815 cf::cleanup "db_env_open(db): $@" if $@;
3533 }; 3816 };
3534 } 3817 }
3818
3819 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3820 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3821 };
3822 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3823 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3824 };
3825 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3826 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3827 };
3535} 3828}
3536 3829
3537{ 3830{
3831 # configure IO::AIO
3832
3538 IO::AIO::min_parallel 8; 3833 IO::AIO::min_parallel 8;
3539
3540 undef $Coro::AIO::WATCHER;
3541 IO::AIO::max_poll_time $TICK * 0.1; 3834 IO::AIO::max_poll_time $TICK * 0.1;
3542 $AIO_POLL_WATCHER = Event->io ( 3835 undef $AnyEvent::AIO::WATCHER;
3543 reentrant => 0,
3544 data => WF_AUTOCANCEL,
3545 fd => IO::AIO::poll_fileno,
3546 poll => 'r',
3547 prio => 6,
3548 cb => \&IO::AIO::poll_cb,
3549 );
3550} 3836}
3551 3837
3552my $_log_backtrace; 3838my $_log_backtrace;
3553 3839
3554sub _log_backtrace { 3840sub _log_backtrace {
3558 3844
3559 # limit the # of concurrent backtraces 3845 # limit the # of concurrent backtraces
3560 if ($_log_backtrace < 2) { 3846 if ($_log_backtrace < 2) {
3561 ++$_log_backtrace; 3847 ++$_log_backtrace;
3562 async { 3848 async {
3849 $Coro::current->{desc} = "abt $msg";
3850
3563 my @bt = fork_call { 3851 my @bt = fork_call {
3564 @addr = map { sprintf "%x", $_ } @addr; 3852 @addr = map { sprintf "%x", $_ } @addr;
3565 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3853 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3566 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3854 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3567 or die "addr2line: $!"; 3855 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines