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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines