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.311 by root, Fri Jul 20 16:11:10 2007 UTC vs.
Revision 1.432 by root, Mon May 5 22:38:47 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 3.2;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.61 (); 36use Coro 4.50 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
22use Coro::AIO; 43use Coro::AIO;
44use Coro::BDB;
23use Coro::Storable; 45use Coro::Storable;
46use Coro::Util ();
24 47
25use JSON::XS 1.4 (); 48use JSON::XS 2.01 ();
26use BDB (); 49use BDB ();
27use Data::Dumper; 50use Data::Dumper;
28use Digest::MD5; 51use Digest::MD5;
29use Fcntl; 52use Fcntl;
30use YAML::Syck (); 53use YAML ();
31use IO::AIO 2.32 (); 54use IO::AIO 2.51 ();
32use Time::HiRes; 55use Time::HiRes;
33use Compress::LZF; 56use Compress::LZF;
34use Digest::MD5 (); 57use Digest::MD5 ();
35 58
36# configure various modules to our taste 59# configure various modules to our taste
37# 60#
38$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
40Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
41
42$Event::Eval = 1; # no idea why this is required, but it is
43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46 64
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 66
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 68
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
74 93
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 97our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
82 99
83our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 104our $DB_ENV;
85 105
86our %CFG; 106our %CFG;
87 107
88our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 109our $RUNTIME;
110our $NOW;
90 111
91our %PLAYER; # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 113our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
94 115
95# used to convert map paths into valid unix filenames by replacing / by ∕ 116# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 118
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
101 123
102binmode STDOUT; 124binmode STDOUT;
103binmode STDERR; 125binmode STDERR;
104 126
105# read virtual server time, if available 127# read virtual server time, if available
158 180
159The raw value load value from the last tick. 181The raw value load value from the last tick.
160 182
161=item %cf::CFG 183=item %cf::CFG
162 184
163Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 186from wherever your confdir points to.
165 187
166=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
167 189
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 190These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
186 $msg .= "\n" 208 $msg .= "\n"
187 unless $msg =~ /\n$/; 209 unless $msg =~ /\n$/;
188 210
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 212
191 utf8::encode $msg;
192 LOG llevError, $msg; 213 LOG llevError, $msg;
193 }; 214 };
194} 215}
216
217$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "=="
219
220 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d#
223 }#d#
224
225 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate
228};
229
230$SIG{__DIE__} = sub { }; #d#?
195 231
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
212)) { 248)) {
213 no strict 'refs'; 249 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 251}
216 252
217$Event::DIED = sub { 253$EV::DIED = sub {
218 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
219}; 255};
220 256
221############################################################################# 257#############################################################################
222 258
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 281 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 282 $d
247 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
248} 284}
249 285
250=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
251 287
252Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
253 289
254=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
255 291
256Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
257 293
258=cut 294=cut
259 295
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 297
262sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
264 300
265=item cf::lock_wait $string 301=item cf::lock_wait $string
266 302
267Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
268 304
271Wait until the given lock is available and then acquires it and returns 307Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 308a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 309for example when the coroutine gets canceled), the lock is automatically
274returned. 310returned.
275 311
312Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro.
314
276Lock names should begin with a unique identifier (for example, cf::map::find 315Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 316uses map_find and cf::map::load uses map_load).
278 317
279=item $locked = cf::lock_active $string 318=item $locked = cf::lock_active $string
280 319
281Return true if the lock is currently active, i.e. somebody has locked it. 320Return true if the lock is currently active, i.e. somebody has locked it.
282 321
283=cut 322=cut
284 323
285our %LOCK; 324our %LOCK;
325our %LOCKER;#d#
286 326
287sub lock_wait($) { 327sub lock_wait($) {
288 my ($key) = @_; 328 my ($key) = @_;
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
289 334
290 # wait for lock, if any 335 # wait for lock, if any
291 while ($LOCK{$key}) { 336 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 337 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 338 Coro::schedule;
299 344
300 # wait, to be sure we are not locked 345 # wait, to be sure we are not locked
301 lock_wait $key; 346 lock_wait $key;
302 347
303 $LOCK{$key} = []; 348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
304 350
305 Coro::guard { 351 Coro::guard {
352 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 353 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 354 $_->ready for @{ delete $LOCK{$key} };
308 } 355 }
309} 356}
310 357
313 360
314 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
315} 362}
316 363
317sub freeze_mainloop { 364sub freeze_mainloop {
318 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
319 366
320 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
321 $TICK_WATCHER->start; 368}
369
370=item cf::periodic $interval, $cb
371
372Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer.
374
375=cut
376
377sub periodic($$) {
378 my ($interval, $cb) = @_;
379
380 my $start = rand List::Util::min 180, $interval;
381
382 EV::periodic $start, $interval, 0, $cb
383}
384
385=item cf::get_slot $time[, $priority[, $name]]
386
387Allocate $time seconds of blocking CPU time at priority C<$priority>:
388This call blocks and returns only when you have at least C<$time> seconds
389of cpu time till the next tick. The slot is only valid till the next cede.
390
391The optional C<$name> can be used to identify the job to run. It might be
392used for statistical purposes and should identify the same time-class.
393
394Useful for short background jobs.
395
396=cut
397
398our @SLOT_QUEUE;
399our $SLOT_QUEUE;
400
401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
405 my $signal = new Coro::Signal;
406
407 while () {
408 next_job:
409 my $avail = cf::till_tick;
410 if ($avail > 0.01) {
411 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) {
413 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send;
415 Coro::cede;
416 goto next_job;
417 }
418 }
419 }
420
421 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait;
425 } else {
426 Coro::schedule;
427 }
322 }; 428 }
323 $TICK_WATCHER->stop; 429};
324 $guard 430
431sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main;
433
434 my ($time, $pri, $name) = @_;
435
436 $time = $TICK * .6 if $time > $TICK * .6;
437 my $sig = new Coro::Signal;
438
439 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
440 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
441 $SLOT_QUEUE->ready;
442 $sig->wait;
325} 443}
326 444
327=item cf::async { BLOCK } 445=item cf::async { BLOCK }
328 446
329Currently the same as Coro::async_pool, meaning you cannot use 447Currently the same as Coro::async_pool, meaning you cannot use
334 452
335BEGIN { *async = \&Coro::async_pool } 453BEGIN { *async = \&Coro::async_pool }
336 454
337=item cf::sync_job { BLOCK } 455=item cf::sync_job { BLOCK }
338 456
339The design of Crossfire TRT requires that the main coroutine ($Coro::main) 457The design of Deliantra requires that the main coroutine ($Coro::main)
340is always able to handle events or runnable, as Crossfire TRT is only 458is always able to handle events or runnable, as Deliantra is only
341partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 459partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
342acceptable. 460acceptable.
343 461
344If it must be done, put the blocking parts into C<sync_job>. This will run 462If it must be done, put the blocking parts into C<sync_job>. This will run
345the given BLOCK in another coroutine while waiting for the result. The 463the given BLOCK in another coroutine while waiting for the result. The
350 468
351sub sync_job(&) { 469sub sync_job(&) {
352 my ($job) = @_; 470 my ($job) = @_;
353 471
354 if ($Coro::current == $Coro::main) { 472 if ($Coro::current == $Coro::main) {
355 my $time = Event::time; 473 my $time = EV::time;
356 474
357 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
358 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
359 477
360 # TODO: use suspend/resume instead 478 LOG llevError, Carp::longmess "sync job";#d#
361 # (but this is cancel-safe) 479
362 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
363 481
364 my $busy = 1; 482 my $busy = 1;
365 my @res; 483 my @res;
366 484
367 (async { 485 (async {
486 $Coro::current->desc ("sync job coro");
368 @res = eval { $job->() }; 487 @res = eval { $job->() };
369 warn $@ if $@; 488 warn $@ if $@;
370 undef $busy; 489 undef $busy;
371 })->prio (Coro::PRIO_MAX); 490 })->prio (Coro::PRIO_MAX);
372 491
373 while ($busy) { 492 while ($busy) {
374 Coro::cede or Event::one_event; 493 if (Coro::nready) {
494 Coro::cede_notself;
495 } else {
496 EV::loop EV::LOOP_ONESHOT;
375 } 497 }
498 }
376 499
377 $time = Event::time - $time; 500 my $time = EV::time - $time;
378 501
379 LOG llevError | logBacktrace, Carp::longmess "long sync job"
380 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
381
382 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
383 503
384 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
385 } else { 505 } else {
386 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
387 507
412=item fork_call { }, $args 532=item fork_call { }, $args
413 533
414Executes the given code block with the given arguments in a seperate 534Executes the given code block with the given arguments in a seperate
415process, returning the results. Everything must be serialisable with 535process, returning the results. Everything must be serialisable with
416Coro::Storable. May, of course, block. Note that the executed sub may 536Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling. 537never block itself or use any form of event handling.
418 538
419=cut 539=cut
420
421sub _store_scalar {
422 open my $fh, ">", \my $buf
423 or die "fork_call: cannot open fh-to-buf in child : $!";
424 Storable::store_fd $_[0], $fh;
425 close $fh;
426
427 $buf
428}
429 540
430sub fork_call(&@) { 541sub fork_call(&@) {
431 my ($cb, @args) = @_; 542 my ($cb, @args) = @_;
432 543
433# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 544 # we seemingly have to make a local copy of the whole thing,
434# or die "socketpair: $!"; 545 # otherwise perl prematurely frees the stuff :/
435 pipe my $fh1, my $fh2 546 # TODO: investigate and fix (likely this will be rather laborious)
436 or die "pipe: $!";
437 547
438 if (my $pid = fork) { 548 my @res = Coro::Util::fork_eval {
439 close $fh2;
440
441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
443 $res = Coro::Storable::thaw $res;
444
445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447 Carp::confess $$res unless "ARRAY" eq ref $res;
448
449 return wantarray ? @$res : $res->[-1];
450 } else {
451 reset_signals; 549 reset_signals;
452 local $SIG{__WARN__}; 550 &$cb
453 local $SIG{__DIE__}; 551 }, @args;
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459 552
460 eval { 553 wantarray ? @res : $res[-1]
461 close $fh1; 554}
462 555
463 my @res = eval { $cb->(@args) }; 556=item $coin = coin_from_name $name
464 557
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 558=cut
466 close $fh2;
467 };
468 559
469 warn $@ if $@; 560our %coin_alias = (
470 _exit 0; 561 "silver" => "silvercoin",
471 } 562 "silvercoin" => "silvercoin",
563 "silvercoins" => "silvercoin",
564 "gold" => "goldcoin",
565 "goldcoin" => "goldcoin",
566 "goldcoins" => "goldcoin",
567 "platinum" => "platinacoin",
568 "platinumcoin" => "platinacoin",
569 "platinumcoins" => "platinacoin",
570 "platina" => "platinacoin",
571 "platinacoin" => "platinacoin",
572 "platinacoins" => "platinacoin",
573 "royalty" => "royalty",
574 "royalties" => "royalty",
575);
576
577sub coin_from_name($) {
578 $coin_alias{$_[0]}
579 ? cf::arch::find $coin_alias{$_[0]}
580 : undef
472} 581}
473 582
474=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
475 584
476Returns a single value from the environment database. 585Returns a single value from the environment database.
478=item cf::db_put $family => $key => $value 587=item cf::db_put $family => $key => $value
479 588
480Stores the given C<$value> in the family. It can currently store binary 589Stores the given C<$value> in the family. It can currently store binary
481data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 590data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
482 591
592=item $db = cf::db_table "name"
593
594Create and/or open a new database table. The string must not be "db" and must be unique
595within each server.
596
483=cut 597=cut
598
599sub db_table($) {
600 my ($name) = @_;
601 my $db = BDB::db_create $DB_ENV;
602
603 eval {
604 $db->set_flags (BDB::CHKSUM);
605
606 utf8::encode $name;
607 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
608 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
609 cf::cleanup "db_open(db): $!" if $!;
610 };
611 cf::cleanup "db_open(db): $@" if $@;
612
613 $db
614}
484 615
485our $DB; 616our $DB;
486 617
487sub db_init { 618sub db_init {
488 unless ($DB) {
489 $DB = BDB::db_create $DB_ENV;
490
491 cf::sync_job { 619 cf::sync_job {
492 eval { 620 $DB ||= db_table "db";
493 $DB->set_flags (BDB::CHKSUM);
494
495 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
496 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
497 cf::cleanup "db_open(db): $!" if $!;
498 };
499 cf::cleanup "db_open(db): $@" if $@;
500 };
501 } 621 };
502} 622}
503 623
504sub db_get($$) { 624sub db_get($$) {
505 my $key = "$_[0]/$_[1]"; 625 my $key = "$_[0]/$_[1]";
506 626
556 if (1) { 676 if (1) {
557 $md5 = 677 $md5 =
558 join "\x00", 678 join "\x00",
559 $processversion, 679 $processversion,
560 map { 680 map {
561 Coro::cede; 681 cf::cede_to_tick;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 682 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src; 683 } 0.. $#$src;
564 684
565 685
566 my $dbmd5 = db_get cache => "$id/md5"; 686 my $dbmd5 = db_get cache => "$id/md5";
610attach callbacks/event handlers (a collection of which is called an "attachment") 730attach callbacks/event handlers (a collection of which is called an "attachment")
611to it. All such attachable objects support the following methods. 731to it. All such attachable objects support the following methods.
612 732
613In the following description, CLASS can be any of C<global>, C<object> 733In the following description, CLASS can be any of C<global>, C<object>
614C<player>, C<client> or C<map> (i.e. the attachable objects in 734C<player>, C<client> or C<map> (i.e. the attachable objects in
615Crossfire TRT). 735Deliantra).
616 736
617=over 4 737=over 4
618 738
619=item $attachable->attach ($attachment, key => $value...) 739=item $attachable->attach ($attachment, key => $value...)
620 740
902 } 1022 }
903 1023
904 0 1024 0
905} 1025}
906 1026
907=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
908 1028
909=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
910 1030
911Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
912 1032
918 1038
919=cut 1039=cut
920 1040
921############################################################################# 1041#############################################################################
922# object support 1042# object support
1043
1044sub _object_equal($$);
1045sub _object_equal($$) {
1046 my ($a, $b) = @_;
1047
1048 return 0 unless (ref $a) eq (ref $b);
1049
1050 if ("HASH" eq ref $a) {
1051 my @ka = keys %$a;
1052 my @kb = keys %$b;
1053
1054 return 0 if @ka != @kb;
1055
1056 for (0 .. $#ka) {
1057 return 0 unless $ka[$_] eq $kb[$_];
1058 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1059 }
1060
1061 } elsif ("ARRAY" eq ref $a) {
1062
1063 return 0 if @$a != @$b;
1064
1065 for (0 .. $#$a) {
1066 return 0 unless _object_equal $a->[$_], $b->[$_];
1067 }
1068
1069 } elsif ($a ne $b) {
1070 return 0;
1071 }
1072
1073 1
1074}
1075
1076our $SLOW_MERGES;#d#
1077sub _can_merge {
1078 my ($ob1, $ob2) = @_;
1079
1080 ++$SLOW_MERGES;#d#
1081
1082 # we do the slow way here
1083 return _object_equal $ob1, $ob2
1084}
923 1085
924sub reattach { 1086sub reattach {
925 # basically do the same as instantiate, without calling instantiate 1087 # basically do the same as instantiate, without calling instantiate
926 my ($obj) = @_; 1088 my ($obj) = @_;
927 1089
948cf::attachable->attach ( 1110cf::attachable->attach (
949 prio => -1000000, 1111 prio => -1000000,
950 on_instantiate => sub { 1112 on_instantiate => sub {
951 my ($obj, $data) = @_; 1113 my ($obj, $data) = @_;
952 1114
953 $data = from_json $data; 1115 $data = decode_json $data;
954 1116
955 for (@$data) { 1117 for (@$data) {
956 my ($name, $args) = @$_; 1118 my ($name, $args) = @$_;
957 1119
958 $obj->attach ($name, %{$args || {} }); 1120 $obj->attach ($name, %{$args || {} });
974sub object_freezer_save { 1136sub object_freezer_save {
975 my ($filename, $rdata, $objs) = @_; 1137 my ($filename, $rdata, $objs) = @_;
976 1138
977 sync_job { 1139 sync_job {
978 if (length $$rdata) { 1140 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename);
979 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
980 $filename, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
981 1144
982 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
983 chmod SAVE_MODE, $fh; 1146 aio_chmod $fh, SAVE_MODE;
984 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
985 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
986 close $fh; 1149 aio_close $fh;
987 1150
988 if (@$objs) { 1151 if (@$objs) {
989 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
990 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
991 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
992 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
993 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
994 close $fh; 1157 aio_close $fh;
995 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
996 } 1159 }
997 } else { 1160 } else {
998 aio_unlink "$filename.pst"; 1161 aio_unlink "$filename.pst";
999 } 1162 }
1004 } 1167 }
1005 } else { 1168 } else {
1006 aio_unlink $filename; 1169 aio_unlink $filename;
1007 aio_unlink "$filename.pst"; 1170 aio_unlink "$filename.pst";
1008 } 1171 }
1009 } 1172 };
1010} 1173}
1011 1174
1012sub object_freezer_as_string { 1175sub object_freezer_as_string {
1013 my ($rdata, $objs) = @_; 1176 my ($rdata, $objs) = @_;
1014 1177
1026 or return; 1189 or return;
1027 1190
1028 unless (aio_stat "$filename.pst") { 1191 unless (aio_stat "$filename.pst") {
1029 (aio_load "$filename.pst", $av) >= 0 1192 (aio_load "$filename.pst", $av) >= 0
1030 or return; 1193 or return;
1194
1031 $av = eval { (Storable::thaw $av)->{objs} }; 1195 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs};
1032 } 1197 }
1033 1198
1199 utf8::decode (my $decname = $filename);
1034 warn sprintf "loading %s (%d)\n", 1200 warn sprintf "loading %s (%d,%d)\n",
1035 $filename, length $data, scalar @{$av || []}; 1201 $decname, length $data, scalar @{$av || []};
1202
1036 return ($data, $av); 1203 ($data, $av)
1037} 1204}
1038 1205
1039=head2 COMMAND CALLBACKS 1206=head2 COMMAND CALLBACKS
1040 1207
1041=over 4 1208=over 4
1114 my ($pl, $buf) = @_; 1281 my ($pl, $buf) = @_;
1115 1282
1116 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1283 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1117 1284
1118 if (ref $msg) { 1285 if (ref $msg) {
1286 my ($type, $reply, @payload) =
1287 "ARRAY" eq ref $msg
1288 ? @$msg
1289 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1290
1291 my @reply;
1292
1119 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1293 if (my $cb = $EXTCMD{$type}) {
1120 if (my %reply = $cb->($pl, $msg)) { 1294 @reply = $cb->($pl, @payload);
1121 $pl->ext_reply ($msg->{msgid}, %reply);
1122 }
1123 } 1295 }
1296
1297 $pl->ext_reply ($reply, @reply)
1298 if $reply;
1299
1124 } else { 1300 } else {
1125 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1126 } 1302 }
1127 1303
1128 cf::override; 1304 cf::override;
1181 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1182 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1183 1359
1184 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1185 warn $msg; 1361 warn $msg;
1186 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1187 exit 1;
1188 } 1363 }
1189 1364
1190 warn $msg; 1365 warn $msg;
1191 } 1366 }
1192 1367
1217use Coro::AIO; 1392use Coro::AIO;
1218 1393
1219=head3 cf::player 1394=head3 cf::player
1220 1395
1221=over 4 1396=over 4
1397
1398=item cf::player::num_playing
1399
1400Returns the official number of playing players, as per the Crossfire metaserver rules.
1401
1402=cut
1403
1404sub num_playing {
1405 scalar grep
1406 $_->ob->map
1407 && !$_->hidden
1408 && !$_->ob->flag (cf::FLAG_WIZ),
1409 cf::player::list
1410}
1222 1411
1223=item cf::player::find $login 1412=item cf::player::find $login
1224 1413
1225Returns the given player object, loading it if necessary (might block). 1414Returns the given player object, loading it if necessary (might block).
1226 1415
1262 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1451 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1263 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1452 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1264 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1453 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1265 aio_unlink +(playerdir $login) . "/$login.pl"; 1454 aio_unlink +(playerdir $login) . "/$login.pl";
1266 1455
1267 my $pl = load_pl path $login 1456 my $f = new_from_file cf::object::thawer path $login
1268 or return; 1457 or return;
1458
1459 my $pl = cf::player::load_pl $f
1460 or return;
1461
1462 local $cf::PLAYER_LOADING{$login} = $pl;
1463 $f->resolve_delayed_derefs;
1269 $cf::PLAYER{$login} = $pl 1464 $cf::PLAYER{$login} = $pl
1270 } 1465 }
1271 } 1466 }
1272} 1467}
1273 1468
1282 return if $pl->{deny_save}; 1477 return if $pl->{deny_save};
1283 1478
1284 aio_mkdir playerdir $pl, 0770; 1479 aio_mkdir playerdir $pl, 0770;
1285 $pl->{last_save} = $cf::RUNTIME; 1480 $pl->{last_save} = $cf::RUNTIME;
1286 1481
1482 cf::get_slot 0.01;
1483
1287 $pl->save_pl ($path); 1484 $pl->save_pl ($path);
1288 Coro::cede; 1485 cf::cede_to_tick;
1289} 1486}
1290 1487
1291sub new($) { 1488sub new($) {
1292 my ($login) = @_; 1489 my ($login) = @_;
1293 1490
1299 $cf::PLAYER{$login} = $self; 1496 $cf::PLAYER{$login} = $self;
1300 1497
1301 $self 1498 $self
1302} 1499}
1303 1500
1501=item $player->send_msg ($channel, $msg, $color, [extra...])
1502
1503=cut
1504
1505sub send_msg {
1506 my $ns = shift->ns
1507 or return;
1508 $ns->send_msg (@_);
1509}
1510
1304=item $pl->quit_character 1511=item $pl->quit_character
1305 1512
1306Nukes the player without looking back. If logged in, the connection will 1513Nukes the player without looking back. If logged in, the connection will
1307be destroyed. May block for a long time. 1514be destroyed. May block for a long time.
1308 1515
1316 $pl->{deny_save} = 1; 1523 $pl->{deny_save} = 1;
1317 $pl->password ("*"); # this should lock out the player until we nuked the dir 1524 $pl->password ("*"); # this should lock out the player until we nuked the dir
1318 1525
1319 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1320 $pl->deactivate; 1527 $pl->deactivate;
1528 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1529 $pl->ob->check_score;
1321 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1530 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1322 $pl->ns->destroy if $pl->ns; 1531 $pl->ns->destroy if $pl->ns;
1323 1532
1324 my $path = playerdir $pl; 1533 my $path = playerdir $pl;
1325 my $temp = "$path~$cf::RUNTIME~deleting~"; 1534 my $temp = "$path~$cf::RUNTIME~deleting~";
1361 or return []; 1570 or return [];
1362 1571
1363 my @logins; 1572 my @logins;
1364 1573
1365 for my $login (@$dirs) { 1574 for my $login (@$dirs) {
1575 my $path = path $login;
1576
1577 # a .pst is a dead give-away for a valid player
1578 # if no pst file found, open and chekc for blocked users
1579 if (aio_stat "$path.pst") {
1366 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1580 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1367 aio_read $fh, 0, 512, my $buf, 0 or next; 1581 aio_read $fh, 0, 512, my $buf, 0 or next;
1368 $buf !~ /^password -------------$/m or next; # official not-valid tag 1582 $buf !~ /^password -------------$/m or next; # official not-valid tag
1583 }
1369 1584
1370 utf8::decode $login; 1585 utf8::decode $login;
1371 push @logins, $login; 1586 push @logins, $login;
1372 } 1587 }
1373 1588
1406 1621
1407Expand crossfire pod fragments into protocol xml. 1622Expand crossfire pod fragments into protocol xml.
1408 1623
1409=cut 1624=cut
1410 1625
1626use re 'eval';
1627
1628my $group;
1629my $interior; $interior = qr{
1630 # match a pod interior sequence sans C<< >>
1631 (?:
1632 \ (.*?)\ (?{ $group = $^N })
1633 | < (??{$interior}) >
1634 )
1635}x;
1636
1411sub expand_cfpod { 1637sub expand_cfpod {
1412 ((my $self), (local $_)) = @_; 1638 my ($self, $pod) = @_;
1413 1639
1414 # escape & and < 1640 my $xml;
1415 s/&/&amp;/g;
1416 s/(?<![BIUGH])</&lt;/g;
1417 1641
1418 # this is buggy, it needs to properly take care of nested <'s 1642 while () {
1643 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1644 $group = $1;
1419 1645
1420 1 while 1646 $group =~ s/&/&amp;/g;
1421 # replace B<>, I<>, U<> etc. 1647 $group =~ s/</&lt;/g;
1422 s/B<([^\>]*)>/<b>$1<\/b>/ 1648
1423 || s/I<([^\>]*)>/<i>$1<\/i>/ 1649 $xml .= $group;
1424 || s/U<([^\>]*)>/<u>$1<\/u>/ 1650 } elsif ($pod =~ m%\G
1425 # replace G<male|female> tags 1651 ([BCGHITU])
1426 || s{G<([^>|]*)\|([^>]*)>}{ 1652 <
1427 $self->gender ? $2 : $1 1653 (?:
1428 }ge 1654 ([^<>]*) (?{ $group = $^N })
1429 # replace H<hint text> 1655 | < $interior >
1430 || s{H<([^\>]*)>} 1656 )
1657 >
1658 %gcsx
1431 { 1659 ) {
1660 my ($code, $data) = ($1, $group);
1661
1662 if ($code eq "B") {
1663 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1664 } elsif ($code eq "I") {
1665 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1666 } elsif ($code eq "U") {
1667 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1668 } elsif ($code eq "C") {
1669 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1670 } elsif ($code eq "T") {
1671 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1672 } elsif ($code eq "G") {
1673 my ($male, $female) = split /\|/, $data;
1674 $data = $self->gender ? $female : $male;
1675 $xml .= expand_cfpod ($self, $data);
1676 } elsif ($code eq "H") {
1432 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1677 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1433 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1678 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1434 "") 1679 "")
1435 [$self->{hintmode}] 1680 [$self->{hintmode}];
1681 } else {
1682 $xml .= "error processing '$code($data)' directive";
1436 }ge; 1683 }
1684 } else {
1685 if ($pod =~ /\G(.+)/) {
1686 warn "parse error while expanding $pod (at $1)";
1687 }
1688 last;
1689 }
1690 }
1437 1691
1692 for ($xml) {
1438 # create single paragraphs (very hackish) 1693 # create single paragraphs (very hackish)
1439 s/(?<=\S)\n(?=\w)/ /g; 1694 s/(?<=\S)\n(?=\w)/ /g;
1440 1695
1441 # compress some whitespace 1696 # compress some whitespace
1442 s/\s+\n/\n/g; # ws line-ends 1697 s/\s+\n/\n/g; # ws line-ends
1443 s/\n\n+/\n/g; # double lines 1698 s/\n\n+/\n/g; # double lines
1444 s/^\n+//; # beginning lines 1699 s/^\n+//; # beginning lines
1445 s/\n+$//; # ending lines 1700 s/\n+$//; # ending lines
1701 }
1446 1702
1447 $_ 1703 $xml
1448} 1704}
1705
1706no re 'eval';
1449 1707
1450sub hintmode { 1708sub hintmode {
1451 $_[0]{hintmode} = $_[1] if @_ > 1; 1709 $_[0]{hintmode} = $_[1] if @_ > 1;
1452 $_[0]{hintmode} 1710 $_[0]{hintmode}
1453} 1711}
1454 1712
1455=item $player->ext_reply ($msgid, %msg) 1713=item $player->ext_reply ($msgid, @msg)
1456 1714
1457Sends an ext reply to the player. 1715Sends an ext reply to the player.
1458 1716
1459=cut 1717=cut
1460 1718
1461sub ext_reply($$%) { 1719sub ext_reply($$@) {
1462 my ($self, $id, %msg) = @_; 1720 my ($self, $id, @msg) = @_;
1463 1721
1464 $msg{msgid} = $id; 1722 $self->ns->ext_reply ($id, @msg)
1465 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1466} 1723}
1467 1724
1468=item $player->ext_event ($type, %msg) 1725=item $player->ext_msg ($type, @msg)
1469 1726
1470Sends an ext event to the client. 1727Sends an ext event to the client.
1471 1728
1472=cut 1729=cut
1473 1730
1474sub ext_event($$%) { 1731sub ext_msg($$@) {
1475 my ($self, $type, %msg) = @_; 1732 my ($self, $type, @msg) = @_;
1476 1733
1477 $self->ns->ext_event ($type, %msg); 1734 $self->ns->ext_msg ($type, @msg);
1478} 1735}
1479 1736
1480=head3 cf::region 1737=head3 cf::region
1481 1738
1482=over 4 1739=over 4
1526our $MAX_RESET = 3600; 1783our $MAX_RESET = 3600;
1527our $DEFAULT_RESET = 3000; 1784our $DEFAULT_RESET = 3000;
1528 1785
1529sub generate_random_map { 1786sub generate_random_map {
1530 my ($self, $rmp) = @_; 1787 my ($self, $rmp) = @_;
1788
1789 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1790
1531 # mit "rum" bekleckern, nicht 1791 # mit "rum" bekleckern, nicht
1532 $self->_create_random_map ( 1792 $self->_create_random_map (
1533 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1793 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1534 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1794 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1535 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1795 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1657 1917
1658# the temporary/swap location 1918# the temporary/swap location
1659sub save_path { 1919sub save_path {
1660 my ($self) = @_; 1920 my ($self) = @_;
1661 1921
1662 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1663 "$TMPDIR/$path.map" 1923 "$TMPDIR/$path.map"
1664} 1924}
1665 1925
1666# the unique path, undef == no special unique path 1926# the unique path, undef == no special unique path
1667sub uniq_path { 1927sub uniq_path {
1668 my ($self) = @_; 1928 my ($self) = @_;
1669 1929
1670 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1930 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1671 "$UNIQUEDIR/$path" 1931 "$UNIQUEDIR/$path"
1672} 1932}
1673 1933
1674# and all this just because we cannot iterate over 1934# and all this just because we cannot iterate over
1675# all maps in C++... 1935# all maps in C++...
1698 1958
1699sub load_header_from($) { 1959sub load_header_from($) {
1700 my ($self, $path) = @_; 1960 my ($self, $path) = @_;
1701 1961
1702 utf8::encode $path; 1962 utf8::encode $path;
1703 #aio_open $path, O_RDONLY, 0 1963 my $f = new_from_file cf::object::thawer $path
1704 # or return;
1705
1706 $self->_load_header ($path)
1707 or return; 1964 or return;
1965
1966 $self->_load_header ($f)
1967 or return;
1968
1969 local $MAP_LOADING{$self->{path}} = $self;
1970 $f->resolve_delayed_derefs;
1708 1971
1709 $self->{load_path} = $path; 1972 $self->{load_path} = $path;
1710 1973
1711 1 1974 1
1712} 1975}
1766sub find { 2029sub find {
1767 my ($path, $origin) = @_; 2030 my ($path, $origin) = @_;
1768 2031
1769 $path = normalise $path, $origin && $origin->path; 2032 $path = normalise $path, $origin && $origin->path;
1770 2033
2034 cf::lock_wait "map_data:$path";#d#remove
1771 cf::lock_wait "map_find:$path"; 2035 cf::lock_wait "map_find:$path";
1772 2036
1773 $cf::MAP{$path} || do { 2037 $cf::MAP{$path} || do {
2038 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1774 my $guard = cf::lock_acquire "map_find:$path"; 2039 my $guard2 = cf::lock_acquire "map_find:$path";
2040
1775 my $map = new_from_path cf::map $path 2041 my $map = new_from_path cf::map $path
1776 or return; 2042 or return;
1777 2043
1778 $map->{last_save} = $cf::RUNTIME; 2044 $map->{last_save} = $cf::RUNTIME;
1779 2045
1781 or return; 2047 or return;
1782 2048
1783 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2049 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1784 # doing this can freeze the server in a sync job, obviously 2050 # doing this can freeze the server in a sync job, obviously
1785 #$cf::WAIT_FOR_TICK->wait; 2051 #$cf::WAIT_FOR_TICK->wait;
2052 undef $guard2;
2053 undef $guard1;
1786 $map->reset; 2054 $map->reset;
1787 undef $guard;
1788 return find $path; 2055 return find $path;
1789 } 2056 }
1790 2057
1791 $cf::MAP{$path} = $map 2058 $cf::MAP{$path} = $map
1792 } 2059 }
1801 local $self->{deny_reset} = 1; # loading can take a long time 2068 local $self->{deny_reset} = 1; # loading can take a long time
1802 2069
1803 my $path = $self->{path}; 2070 my $path = $self->{path};
1804 2071
1805 { 2072 {
1806 my $guard = cf::lock_acquire "map_load:$path"; 2073 my $guard = cf::lock_acquire "map_data:$path";
1807 2074
2075 return unless $self->valid;
1808 return if $self->in_memory != cf::MAP_SWAPPED; 2076 return unless $self->in_memory == cf::MAP_SWAPPED;
1809 2077
1810 $self->in_memory (cf::MAP_LOADING); 2078 $self->in_memory (cf::MAP_LOADING);
1811 2079
1812 $self->alloc; 2080 $self->alloc;
1813 2081
1814 $self->pre_load; 2082 $self->pre_load;
1815 Coro::cede; 2083 cf::cede_to_tick;
1816 2084
2085 my $f = new_from_file cf::object::thawer $self->{load_path};
2086 $f->skip_block;
1817 $self->_load_objects ($self->{load_path}, 1) 2087 $self->_load_objects ($f)
1818 or return; 2088 or return;
1819 2089
1820 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2090 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1821 if delete $self->{load_original}; 2091 if delete $self->{load_original};
1822 2092
1823 if (my $uniq = $self->uniq_path) { 2093 if (my $uniq = $self->uniq_path) {
1824 utf8::encode $uniq; 2094 utf8::encode $uniq;
1825 if (aio_open $uniq, O_RDONLY, 0) { 2095 unless (aio_stat $uniq) {
2096 if (my $f = new_from_file cf::object::thawer $uniq) {
1826 $self->clear_unique_items; 2097 $self->clear_unique_items;
1827 $self->_load_objects ($uniq, 0); 2098 $self->_load_objects ($f);
2099 $f->resolve_delayed_derefs;
2100 }
1828 } 2101 }
1829 } 2102 }
1830 2103
1831 Coro::cede; 2104 $f->resolve_delayed_derefs;
2105
2106 cf::cede_to_tick;
1832 # now do the right thing for maps 2107 # now do the right thing for maps
1833 $self->link_multipart_objects; 2108 $self->link_multipart_objects;
1834 $self->difficulty ($self->estimate_difficulty) 2109 $self->difficulty ($self->estimate_difficulty)
1835 unless $self->difficulty; 2110 unless $self->difficulty;
1836 Coro::cede; 2111 cf::cede_to_tick;
1837 2112
1838 unless ($self->{deny_activate}) { 2113 unless ($self->{deny_activate}) {
1839 $self->decay_objects; 2114 $self->decay_objects;
1840 $self->fix_auto_apply; 2115 $self->fix_auto_apply;
1841 $self->update_buttons; 2116 $self->update_buttons;
1842 Coro::cede; 2117 cf::cede_to_tick;
1843 $self->set_darkness_map; 2118 $self->set_darkness_map;
1844 Coro::cede; 2119 cf::cede_to_tick;
1845 $self->activate; 2120 $self->activate;
1846 } 2121 }
1847 2122
2123 $self->{last_save} = $cf::RUNTIME;
2124 $self->last_access ($cf::RUNTIME);
2125
1848 $self->in_memory (cf::MAP_IN_MEMORY); 2126 $self->in_memory (cf::MAP_ACTIVE);
1849 } 2127 }
1850 2128
1851 $self->post_load; 2129 $self->post_load;
1852} 2130}
1853 2131
1862 2140
1863 $self 2141 $self
1864} 2142}
1865 2143
1866# find and load all maps in the 3x3 area around a map 2144# find and load all maps in the 3x3 area around a map
1867sub load_diag { 2145sub load_neighbours {
1868 my ($map) = @_; 2146 my ($map) = @_;
1869 2147
1870 my @diag; # diagonal neighbours 2148 my @neigh; # diagonal neighbours
1871 2149
1872 for (0 .. 3) { 2150 for (0 .. 3) {
1873 my $neigh = $map->tile_path ($_) 2151 my $neigh = $map->tile_path ($_)
1874 or next; 2152 or next;
1875 $neigh = find $neigh, $map 2153 $neigh = find $neigh, $map
1876 or next; 2154 or next;
1877 $neigh->load; 2155 $neigh->load;
1878 2156
2157 push @neigh,
1879 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2158 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1880 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2159 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1881 } 2160 }
1882 2161
1883 for (@diag) { 2162 for (grep defined $_->[0], @neigh) {
2163 my ($path, $origin) = @$_;
1884 my $neigh = find @$_ 2164 my $neigh = find $path, $origin
1885 or next; 2165 or next;
1886 $neigh->load; 2166 $neigh->load;
1887 } 2167 }
1888} 2168}
1889 2169
1894} 2174}
1895 2175
1896sub do_load_sync { 2176sub do_load_sync {
1897 my ($map) = @_; 2177 my ($map) = @_;
1898 2178
2179 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2180 if $Coro::current == $Coro::main;
2181
1899 cf::sync_job { $map->load }; 2182 cf::sync_job { $map->load };
1900} 2183}
1901 2184
1902our %MAP_PREFETCH; 2185our %MAP_PREFETCH;
1903our $MAP_PREFETCHER = undef; 2186our $MAP_PREFETCHER = undef;
1904 2187
1905sub find_async { 2188sub find_async {
1906 my ($path, $origin) = @_; 2189 my ($path, $origin, $load) = @_;
1907 2190
1908 $path = normalise $path, $origin && $origin->{path}; 2191 $path = normalise $path, $origin && $origin->{path};
1909 2192
1910 if (my $map = $cf::MAP{$path}) { 2193 if (my $map = $cf::MAP{$path}) {
1911 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2194 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1912 } 2195 }
1913 2196
1914 undef $MAP_PREFETCH{$path}; 2197 $MAP_PREFETCH{$path} |= $load;
2198
1915 $MAP_PREFETCHER ||= cf::async { 2199 $MAP_PREFETCHER ||= cf::async {
2200 $Coro::current->{desc} = "map prefetcher";
2201
1916 while (%MAP_PREFETCH) { 2202 while (%MAP_PREFETCH) {
1917 for my $path (keys %MAP_PREFETCH) { 2203 while (my ($k, $v) = each %MAP_PREFETCH) {
1918 if (my $map = find $path) { 2204 if (my $map = find $k) {
1919 $map->load; 2205 $map->load if $v;
1920 } 2206 }
1921 2207
1922 delete $MAP_PREFETCH{$path}; 2208 delete $MAP_PREFETCH{$k};
1923 } 2209 }
1924 } 2210 }
1925 undef $MAP_PREFETCHER; 2211 undef $MAP_PREFETCHER;
1926 }; 2212 };
1927 $MAP_PREFETCHER->prio (6); 2213 $MAP_PREFETCHER->prio (6);
1930} 2216}
1931 2217
1932sub save { 2218sub save {
1933 my ($self) = @_; 2219 my ($self) = @_;
1934 2220
1935 my $lock = cf::lock_acquire "map_data:" . $self->path; 2221 my $lock = cf::lock_acquire "map_data:$self->{path}";
1936 2222
1937 $self->{last_save} = $cf::RUNTIME; 2223 $self->{last_save} = $cf::RUNTIME;
1938 2224
1939 return unless $self->dirty; 2225 return unless $self->dirty;
1940 2226
1946 return if $self->{deny_save}; 2232 return if $self->{deny_save};
1947 2233
1948 local $self->{last_access} = $self->last_access;#d# 2234 local $self->{last_access} = $self->last_access;#d#
1949 2235
1950 cf::async { 2236 cf::async {
2237 $Coro::current->{desc} = "map player save";
1951 $_->contr->save for $self->players; 2238 $_->contr->save for $self->players;
1952 }; 2239 };
2240
2241 cf::get_slot 0.02;
1953 2242
1954 if ($uniq) { 2243 if ($uniq) {
1955 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2244 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1956 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2245 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1957 } else { 2246 } else {
1963 my ($self) = @_; 2252 my ($self) = @_;
1964 2253
1965 # save first because save cedes 2254 # save first because save cedes
1966 $self->save; 2255 $self->save;
1967 2256
1968 my $lock = cf::lock_acquire "map_data:" . $self->path; 2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
1969 2258
1970 return if $self->players; 2259 return if $self->players;
1971 return if $self->in_memory != cf::MAP_IN_MEMORY; 2260 return if $self->in_memory != cf::MAP_ACTIVE;
1972 return if $self->{deny_save}; 2261 return if $self->{deny_save};
1973 2262
2263 $self->in_memory (cf::MAP_SWAPPED);
2264
2265 $self->deactivate;
2266 $_->clear_links_to ($self) for values %cf::MAP;
1974 $self->clear; 2267 $self->clear;
1975 $self->in_memory (cf::MAP_SWAPPED);
1976} 2268}
1977 2269
1978sub reset_at { 2270sub reset_at {
1979 my ($self) = @_; 2271 my ($self) = @_;
1980 2272
2012 if $uniq; 2304 if $uniq;
2013 } 2305 }
2014 2306
2015 delete $cf::MAP{$self->path}; 2307 delete $cf::MAP{$self->path};
2016 2308
2309 $self->deactivate;
2310 $_->clear_links_to ($self) for values %cf::MAP;
2017 $self->clear; 2311 $self->clear;
2018
2019 $_->clear_links_to ($self) for values %cf::MAP;
2020 2312
2021 $self->unlink_save; 2313 $self->unlink_save;
2022 $self->destroy; 2314 $self->destroy;
2023} 2315}
2024 2316
2025my $nuke_counter = "aaaa"; 2317my $nuke_counter = "aaaa";
2026 2318
2027sub nuke { 2319sub nuke {
2028 my ($self) = @_; 2320 my ($self) = @_;
2029 2321
2322 {
2323 my $lock = cf::lock_acquire "map_data:$self->{path}";
2324
2030 delete $cf::MAP{$self->path}; 2325 delete $cf::MAP{$self->path};
2031 2326
2032 $self->unlink_save; 2327 $self->unlink_save;
2033 2328
2034 bless $self, "cf::map"; 2329 bless $self, "cf::map";
2035 delete $self->{deny_reset}; 2330 delete $self->{deny_reset};
2036 $self->{deny_save} = 1; 2331 $self->{deny_save} = 1;
2037 $self->reset_timeout (1); 2332 $self->reset_timeout (1);
2038 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2333 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2039 2334
2040 $cf::MAP{$self->path} = $self; 2335 $cf::MAP{$self->path} = $self;
2336 }
2041 2337
2042 $self->reset; # polite request, might not happen 2338 $self->reset; # polite request, might not happen
2043} 2339}
2044 2340
2045=item $maps = cf::map::tmp_maps 2341=item $maps = cf::map::tmp_maps
2087 2383
2088sub unique_maps() { 2384sub unique_maps() {
2089 [ 2385 [
2090 map { 2386 map {
2091 utf8::decode $_; 2387 utf8::decode $_;
2092 /\.map$/ 2388 s/\.map$//; # TODO future compatibility hack
2389 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2390 ? ()
2093 ? normalise $_ 2391 : normalise $_
2094 : ()
2095 } @{ aio_readdir $UNIQUEDIR or [] } 2392 } @{ aio_readdir $UNIQUEDIR or [] }
2096 ] 2393 ]
2097} 2394}
2098 2395
2099package cf;
2100
2101=back 2396=back
2102 2397
2103=head3 cf::object 2398=head3 cf::object
2104 2399
2105=cut 2400=cut
2108 2403
2109=over 4 2404=over 4
2110 2405
2111=item $ob->inv_recursive 2406=item $ob->inv_recursive
2112 2407
2113Returns the inventory of the object _and_ their inventories, recursively. 2408Returns the inventory of the object I<and> their inventories, recursively,
2409but I<not> the object itself.
2114 2410
2115=cut 2411=cut
2116 2412
2117sub inv_recursive_; 2413sub inv_recursive_;
2118sub inv_recursive_ { 2414sub inv_recursive_ {
2121 2417
2122sub inv_recursive { 2418sub inv_recursive {
2123 inv_recursive_ inv $_[0] 2419 inv_recursive_ inv $_[0]
2124} 2420}
2125 2421
2422=item $ref = $ob->ref
2423
2424Creates and returns a persistent reference to an object that can be stored as a string.
2425
2426=item $ob = cf::object::deref ($refstring)
2427
2428returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2429even if the object actually exists. May block.
2430
2431=cut
2432
2433sub deref {
2434 my ($ref) = @_;
2435
2436 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2437 my ($uuid, $name) = ($1, $2);
2438 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2439 or return;
2440 $pl->ob->uuid eq $uuid
2441 or return;
2442
2443 $pl->ob
2444 } else {
2445 warn "$ref: cannot resolve object reference\n";
2446 undef
2447 }
2448}
2449
2126package cf; 2450package cf;
2127 2451
2128=back 2452=back
2129 2453
2130=head3 cf::object::player 2454=head3 cf::object::player
2136Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2460Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2137can be C<undef>. Does the right thing when the player is currently in a 2461can be C<undef>. Does the right thing when the player is currently in a
2138dialogue with the given NPC character. 2462dialogue with the given NPC character.
2139 2463
2140=cut 2464=cut
2465
2466our $SAY_CHANNEL = {
2467 id => "say",
2468 title => "Map",
2469 reply => "say ",
2470 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2471};
2472
2473our $CHAT_CHANNEL = {
2474 id => "chat",
2475 title => "Chat",
2476 reply => "chat ",
2477 tooltip => "Player chat and shouts, global to the server.",
2478};
2141 2479
2142# rough implementation of a future "reply" method that works 2480# rough implementation of a future "reply" method that works
2143# with dialog boxes. 2481# with dialog boxes.
2144#TODO: the first argument must go, split into a $npc->reply_to ( method 2482#TODO: the first argument must go, split into a $npc->reply_to ( method
2145sub cf::object::player::reply($$$;$) { 2483sub cf::object::player::reply($$$;$) {
2152 2490
2153 } else { 2491 } else {
2154 my $pl = $self->contr; 2492 my $pl = $self->contr;
2155 2493
2156 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2494 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2157 my $diag = $pl->{npc_dialog}; 2495 my $dialog = $pl->{npc_dialog};
2158 $diag->{pl}->ext_reply ( 2496 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2159 $diag->{id},
2160 msgtype => "reply",
2161 msg => $diag->{pl}->expand_cfpod ($msg),
2162 add_topics => []
2163 );
2164 2497
2165 } else { 2498 } else {
2166 $msg = $npc->name . " says: $msg" if $npc; 2499 $msg = $npc->name . " says: $msg" if $npc;
2167 $self->message ($msg, $flags); 2500 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2168 } 2501 }
2169 } 2502 }
2503}
2504
2505=item $object->send_msg ($channel, $msg, $color, [extra...])
2506
2507=cut
2508
2509sub cf::object::send_msg {
2510 my $pl = shift->contr
2511 or return;
2512 $pl->send_msg (@_);
2170} 2513}
2171 2514
2172=item $player_object->may ("access") 2515=item $player_object->may ("access")
2173 2516
2174Returns wether the given player is authorized to access resource "access" 2517Returns wether the given player is authorized to access resource "access"
2253 # use -1 or undef as default coordinates, not 0, 0 2596 # use -1 or undef as default coordinates, not 0, 0
2254 ($x, $y) = ($map->enter_x, $map->enter_y) 2597 ($x, $y) = ($map->enter_x, $map->enter_y)
2255 if $x <=0 && $y <= 0; 2598 if $x <=0 && $y <= 0;
2256 2599
2257 $map->load; 2600 $map->load;
2258 $map->load_diag; 2601 $map->load_neighbours;
2259 2602
2260 return unless $self->contr->active; 2603 return unless $self->contr->active;
2261 $self->activate_recursive; 2604 $self->activate_recursive;
2262 2605
2263 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2606 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2283 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2626 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2284 2627
2285 $self->enter_link; 2628 $self->enter_link;
2286 2629
2287 (async { 2630 (async {
2631 $Coro::current->{desc} = "player::goto $path $x $y";
2632
2633 # *tag paths override both path and x|y
2634 if ($path =~ /^\*(.*)$/) {
2635 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2636 my $ob = $obs[rand @obs];
2637
2638 # see if we actually can go there
2639 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2640 $ob = $obs[rand @obs];
2641 } else {
2642 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2643 }
2644 # else put us there anyways for now #d#
2645
2646 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2647 } else {
2648 ($path, $x, $y) = (undef, undef, undef);
2649 }
2650 }
2651
2288 my $map = eval { 2652 my $map = eval {
2289 my $map = cf::map::find $path; 2653 my $map = defined $path ? cf::map::find $path : undef;
2290 2654
2291 if ($map) { 2655 if ($map) {
2292 $map = $map->customise_for ($self); 2656 $map = $map->customise_for ($self);
2293 $map = $check->($map) if $check && $map; 2657 $map = $check->($map) if $check && $map;
2294 } else { 2658 } else {
2295 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2659 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2296 } 2660 }
2297 2661
2298 $map 2662 $map
2299 }; 2663 };
2300 2664
2336} 2700}
2337 2701
2338sub prepare_random_map { 2702sub prepare_random_map {
2339 my ($exit) = @_; 2703 my ($exit) = @_;
2340 2704
2341 my $guard = cf::lock_acquire "exit_prepare:$exit";
2342
2343 # all this does is basically replace the /! path by 2705 # all this does is basically replace the /! path by
2344 # a new random map path (?random/...) with a seed 2706 # a new random map path (?random/...) with a seed
2345 # that depends on the exit object 2707 # that depends on the exit object
2346 2708
2347 my $rmp = parse_random_map_params $exit->msg; 2709 my $rmp = parse_random_map_params $exit->msg;
2349 if ($exit->map) { 2711 if ($exit->map) {
2350 $rmp->{region} = $exit->region->name; 2712 $rmp->{region} = $exit->region->name;
2351 $rmp->{origin_map} = $exit->map->path; 2713 $rmp->{origin_map} = $exit->map->path;
2352 $rmp->{origin_x} = $exit->x; 2714 $rmp->{origin_x} = $exit->x;
2353 $rmp->{origin_y} = $exit->y; 2715 $rmp->{origin_y} = $exit->y;
2716
2717 $exit->map->touch;
2354 } 2718 }
2355 2719
2356 $rmp->{random_seed} ||= $exit->random_seed; 2720 $rmp->{random_seed} ||= $exit->random_seed;
2357 2721
2358 my $data = cf::to_json $rmp; 2722 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2359 my $md5 = Digest::MD5::md5_hex $data; 2723 my $md5 = Digest::MD5::md5_hex $data;
2360 my $meta = "$RANDOMDIR/$md5.meta"; 2724 my $meta = "$RANDOMDIR/$md5.meta";
2361 2725
2362 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2726 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2363 aio_write $fh, 0, (length $data), $data, 0; 2727 aio_write $fh, 0, (length $data), $data, 0;
2364 undef $fh; 2728 undef $fh;
2365 aio_rename "$meta~", $meta; 2729 aio_rename "$meta~", $meta;
2366 2730
2731 my $slaying = "?random/$md5";
2732
2733 if ($exit->valid) {
2367 $exit->slaying ("?random/$md5"); 2734 $exit->slaying ("?random/$md5");
2368 $exit->msg (undef); 2735 $exit->msg (undef);
2736 }
2369 } 2737 }
2370} 2738}
2371 2739
2372sub cf::object::player::enter_exit { 2740sub cf::object::player::enter_exit {
2373 my ($self, $exit) = @_; 2741 my ($self, $exit) = @_;
2374 2742
2375 return unless $self->type == cf::PLAYER; 2743 return unless $self->type == cf::PLAYER;
2376 2744
2377 if ($exit->slaying eq "/!") {
2378 #TODO: this should de-fi-ni-te-ly not be a sync-job
2379 # the problem is that $exit might not survive long enough
2380 # so it needs to be done right now, right here
2381 cf::sync_job { prepare_random_map $exit };
2382 }
2383
2384 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2385 my $hp = $exit->stats->hp;
2386 my $sp = $exit->stats->sp;
2387
2388 $self->enter_link; 2745 $self->enter_link;
2389 2746
2390 # if exit is damned, update players death & WoR home-position
2391 $self->contr->savebed ($slaying, $hp, $sp)
2392 if $exit->flag (FLAG_DAMNED);
2393
2394 (async { 2747 (async {
2395 $self->deactivate_recursive; # just to be sure 2748 $Coro::current->{desc} = "enter_exit";
2749
2396 unless (eval { 2750 unless (eval {
2751 $self->deactivate_recursive; # just to be sure
2752
2753 # random map handling
2754 {
2755 my $guard = cf::lock_acquire "exit_prepare:$exit";
2756
2757 prepare_random_map $exit
2758 if $exit->slaying eq "/!";
2759 }
2760
2761 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2762 my $x = $exit->stats->hp;
2763 my $y = $exit->stats->sp;
2764
2397 $self->goto ($slaying, $hp, $sp); 2765 $self->goto ($map, $x, $y);
2398 2766
2767 # if exit is damned, update players death & WoR home-position
2768 $self->contr->savebed ($map, $x, $y)
2769 if $exit->flag (cf::FLAG_DAMNED);
2770
2399 1; 2771 1
2400 }) { 2772 }) {
2401 $self->message ("Something went wrong deep within the crossfire server. " 2773 $self->message ("Something went wrong deep within the crossfire server. "
2402 . "I'll try to bring you back to the map you were before. " 2774 . "I'll try to bring you back to the map you were before. "
2403 . "Please report this to the dungeon master!", 2775 . "Please report this to the dungeon master!",
2404 cf::NDI_UNIQUE | cf::NDI_RED); 2776 cf::NDI_UNIQUE | cf::NDI_RED);
2434the message, with C<log> being the default. If C<$color> is negative, suppress 2806the message, with C<log> being the default. If C<$color> is negative, suppress
2435the message unless the client supports the msg packet. 2807the message unless the client supports the msg packet.
2436 2808
2437=cut 2809=cut
2438 2810
2811# non-persistent channels (usually the info channel)
2812our %CHANNEL = (
2813 "c/identify" => {
2814 id => "infobox",
2815 title => "Identify",
2816 reply => undef,
2817 tooltip => "Items recently identified",
2818 },
2819 "c/examine" => {
2820 id => "infobox",
2821 title => "Examine",
2822 reply => undef,
2823 tooltip => "Signs and other items you examined",
2824 },
2825 "c/book" => {
2826 id => "infobox",
2827 title => "Book",
2828 reply => undef,
2829 tooltip => "The contents of a note or book",
2830 },
2831 "c/lookat" => {
2832 id => "infobox",
2833 title => "Look",
2834 reply => undef,
2835 tooltip => "What you saw there",
2836 },
2837 "c/who" => {
2838 id => "infobox",
2839 title => "Players",
2840 reply => undef,
2841 tooltip => "Shows players who are currently online",
2842 },
2843 "c/body" => {
2844 id => "infobox",
2845 title => "Body Parts",
2846 reply => undef,
2847 tooltip => "Shows which body parts you posess and are available",
2848 },
2849 "c/uptime" => {
2850 id => "infobox",
2851 title => "Uptime",
2852 reply => undef,
2853 tooltip => "How long the server has been running since last restart",
2854 },
2855 "c/mapinfo" => {
2856 id => "infobox",
2857 title => "Map Info",
2858 reply => undef,
2859 tooltip => "Information related to the maps",
2860 },
2861 "c/party" => {
2862 id => "party",
2863 title => "Party",
2864 reply => "gsay ",
2865 tooltip => "Messages and chat related to your party",
2866 },
2867);
2868
2439sub cf::client::send_msg { 2869sub cf::client::send_msg {
2440 my ($self, $channel, $msg, $color, @extra) = @_; 2870 my ($self, $channel, $msg, $color, @extra) = @_;
2441 2871
2442 $msg = $self->pl->expand_cfpod ($msg); 2872 $msg = $self->pl->expand_cfpod ($msg);
2443 2873
2444 return unless @extra || length $msg;
2445
2446 $color &= ~cf::NDI_UNIQUE; # just in case... 2874 $color &= cf::NDI_CLIENT_MASK; # just in case...
2447 2875
2876 # check predefined channels, for the benefit of C
2877 if ($CHANNEL{$channel}) {
2878 $channel = $CHANNEL{$channel};
2879
2880 $self->ext_msg (channel_info => $channel)
2881 if $self->can_msg;
2882
2883 $channel = $channel->{id};
2884
2448 if (ref $channel) { 2885 } elsif (ref $channel) {
2449 # send meta info to client, if not yet sent 2886 # send meta info to client, if not yet sent
2450 unless (exists $self->{channel}{$channel->{id}}) { 2887 unless (exists $self->{channel}{$channel->{id}}) {
2451 $self->{channel}{$channel->{id}} = $channel; 2888 $self->{channel}{$channel->{id}} = $channel;
2452 $self->ext_event (channel_info => %$channel); 2889 $self->ext_msg (channel_info => $channel)
2890 if $self->can_msg;
2453 } 2891 }
2454 2892
2455 $channel = $channel->{id}; 2893 $channel = $channel->{id};
2456 } 2894 }
2457 2895
2896 return unless @extra || length $msg;
2897
2458 if ($self->can_msg) { 2898 if ($self->can_msg) {
2899 # default colour, mask it out
2900 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2901 if $color & cf::NDI_DEF;
2902
2459 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2903 $self->send_packet ("msg " . $self->{json_coder}->encode (
2904 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2460 } else { 2905 } else {
2461 # replace some tags by gcfclient-compatible ones
2462 for ($msg) {
2463 1 while
2464 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2465 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2466 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2467 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2468 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2469 }
2470
2471 if ($color >= 0) { 2906 if ($color >= 0) {
2907 # replace some tags by gcfclient-compatible ones
2908 for ($msg) {
2909 1 while
2910 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2911 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2912 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2913 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2914 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2915 }
2916
2917 $color &= cf::NDI_COLOR_MASK;
2918
2919 utf8::encode $msg;
2920
2472 if (0 && $msg =~ /\[/) { 2921 if (0 && $msg =~ /\[/) {
2922 # COMMAND/INFO
2473 $self->send_packet ("drawextinfo $color 4 0 $msg") 2923 $self->send_packet ("drawextinfo $color 10 8 $msg")
2474 } else { 2924 } else {
2475 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2925 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2476 $self->send_packet ("drawinfo $color $msg") 2926 $self->send_packet ("drawinfo $color $msg")
2477 } 2927 }
2478 } 2928 }
2479 } 2929 }
2480} 2930}
2481 2931
2482=item $client->ext_event ($type, %msg) 2932=item $client->ext_msg ($type, @msg)
2483 2933
2484Sends an ext event to the client. 2934Sends an ext event to the client.
2485 2935
2486=cut 2936=cut
2487 2937
2488sub cf::client::ext_event($$%) { 2938sub cf::client::ext_msg($$@) {
2489 my ($self, $type, %msg) = @_; 2939 my ($self, $type, @msg) = @_;
2490 2940
2491 return unless $self->extcmd; 2941 if ($self->extcmd == 2) {
2492 2942 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2943 } elsif ($self->extcmd == 1) { # TODO: remove
2493 $msg{msgtype} = "event_$type"; 2944 push @msg, msgtype => "event_$type";
2494 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2945 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2946 }
2947}
2948
2949=item $client->ext_reply ($msgid, @msg)
2950
2951Sends an ext reply to the client.
2952
2953=cut
2954
2955sub cf::client::ext_reply($$@) {
2956 my ($self, $id, @msg) = @_;
2957
2958 if ($self->extcmd == 2) {
2959 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2960 } elsif ($self->extcmd == 1) {
2961 #TODO: version 1, remove
2962 unshift @msg, msgtype => "reply", msgid => $id;
2963 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2964 }
2495} 2965}
2496 2966
2497=item $success = $client->query ($flags, "text", \&cb) 2967=item $success = $client->query ($flags, "text", \&cb)
2498 2968
2499Queues a query to the client, calling the given callback with 2969Queues a query to the client, calling the given callback with
2554 my ($ns, $buf) = @_; 3024 my ($ns, $buf) = @_;
2555 3025
2556 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3026 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2557 3027
2558 if (ref $msg) { 3028 if (ref $msg) {
3029 my ($type, $reply, @payload) =
3030 "ARRAY" eq ref $msg
3031 ? @$msg
3032 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3033
3034 my @reply;
3035
2559 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3036 if (my $cb = $EXTICMD{$type}) {
2560 if (my %reply = $cb->($ns, $msg)) { 3037 @reply = $cb->($ns, @payload);
2561 $reply{msgid} = $msg->{msgid};
2562 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2563 }
2564 } 3038 }
3039
3040 $ns->ext_reply ($reply, @reply)
3041 if $reply;
3042
2565 } else { 3043 } else {
2566 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3044 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2567 } 3045 }
2568 3046
2569 cf::override; 3047 cf::override;
2616our $safe = new Safe "safe"; 3094our $safe = new Safe "safe";
2617our $safe_hole = new Safe::Hole; 3095our $safe_hole = new Safe::Hole;
2618 3096
2619$SIG{FPE} = 'IGNORE'; 3097$SIG{FPE} = 'IGNORE';
2620 3098
2621$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3099$safe->permit_only (Opcode::opset qw(
3100 :base_core :base_mem :base_orig :base_math
3101 grepstart grepwhile mapstart mapwhile
3102 sort time
3103));
2622 3104
2623# here we export the classes and methods available to script code 3105# here we export the classes and methods available to script code
2624 3106
2625=pod 3107=pod
2626 3108
2627The following functions and methods are available within a safe environment: 3109The following functions and methods are available within a safe environment:
2628 3110
2629 cf::object 3111 cf::object
2630 contr pay_amount pay_player map x y force_find force_add 3112 contr pay_amount pay_player map x y force_find force_add destroy
2631 insert remove 3113 insert remove name archname title slaying race decrease split
2632 3114
2633 cf::object::player 3115 cf::object::player
2634 player 3116 player
2635 3117
2636 cf::player 3118 cf::player
2641 3123
2642=cut 3124=cut
2643 3125
2644for ( 3126for (
2645 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3127 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2646 insert remove)], 3128 insert remove inv nrof name archname title slaying race
3129 decrease split destroy)],
2647 ["cf::object::player" => qw(player)], 3130 ["cf::object::player" => qw(player)],
2648 ["cf::player" => qw(peaceful)], 3131 ["cf::player" => qw(peaceful)],
2649 ["cf::map" => qw(trigger)], 3132 ["cf::map" => qw(trigger)],
2650) { 3133) {
2651 no strict 'refs'; 3134 no strict 'refs';
2727# the server's init and main functions 3210# the server's init and main functions
2728 3211
2729sub load_facedata($) { 3212sub load_facedata($) {
2730 my ($path) = @_; 3213 my ($path) = @_;
2731 3214
3215 # HACK to clear player env face cache, we need some signal framework
3216 # for this (global event?)
3217 %ext::player_env::MUSIC_FACE_CACHE = ();
3218
3219 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3220
2732 warn "loading facedata from $path\n"; 3221 warn "loading facedata from $path\n";
2733 3222
2734 my $facedata; 3223 my $facedata;
2735 0 < aio_load $path, $facedata 3224 0 < aio_load $path, $facedata
2736 or die "$path: $!"; 3225 or die "$path: $!";
2738 $facedata = Coro::Storable::thaw $facedata; 3227 $facedata = Coro::Storable::thaw $facedata;
2739 3228
2740 $facedata->{version} == 2 3229 $facedata->{version} == 2
2741 or cf::cleanup "$path: version mismatch, cannot proceed."; 3230 or cf::cleanup "$path: version mismatch, cannot proceed.";
2742 3231
3232 # patch in the exptable
3233 $facedata->{resource}{"res/exp_table"} = {
3234 type => FT_RSRC,
3235 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3236 };
3237 cf::cede_to_tick;
3238
2743 { 3239 {
2744 my $faces = $facedata->{faceinfo}; 3240 my $faces = $facedata->{faceinfo};
2745 3241
2746 while (my ($face, $info) = each %$faces) { 3242 while (my ($face, $info) = each %$faces) {
2747 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3243 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3244
2748 cf::face::set_visibility $idx, $info->{visibility}; 3245 cf::face::set_visibility $idx, $info->{visibility};
2749 cf::face::set_magicmap $idx, $info->{magicmap}; 3246 cf::face::set_magicmap $idx, $info->{magicmap};
2750 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3247 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2751 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3248 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2752 3249
2753 cf::cede_to_tick; 3250 cf::cede_to_tick;
2754 } 3251 }
2755 3252
2756 while (my ($face, $info) = each %$faces) { 3253 while (my ($face, $info) = each %$faces) {
2757 next unless $info->{smooth}; 3254 next unless $info->{smooth};
3255
2758 my $idx = cf::face::find $face 3256 my $idx = cf::face::find $face
2759 or next; 3257 or next;
3258
2760 if (my $smooth = cf::face::find $info->{smooth}) { 3259 if (my $smooth = cf::face::find $info->{smooth}) {
2761 cf::face::set_smooth $idx, $smooth; 3260 cf::face::set_smooth $idx, $smooth;
2762 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3261 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2763 } else { 3262 } else {
2764 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3263 warn "smooth face '$info->{smooth}' not found for face '$face'";
2781 3280
2782 { 3281 {
2783 # TODO: for gcfclient pleasure, we should give resources 3282 # TODO: for gcfclient pleasure, we should give resources
2784 # that gcfclient doesn't grok a >10000 face index. 3283 # that gcfclient doesn't grok a >10000 face index.
2785 my $res = $facedata->{resource}; 3284 my $res = $facedata->{resource};
2786 my $enc = JSON::XS->new->utf8->canonical;
2787 3285
2788 while (my ($name, $info) = each %$res) { 3286 while (my ($name, $info) = each %$res) {
2789 my $meta = $enc->encode ({ 3287 if (defined $info->{type}) {
2790 name => $name,
2791 type => $info->{type},
2792 copyright => $info->{copyright}, #TODO#
2793 });
2794
2795 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3288 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3289 my $data;
2796 3290
2797 if ($name =~ /\.jpg$/) { 3291 if ($info->{type} & 1) {
2798 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3292 # prepend meta info
2799 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3293
3294 my $meta = $enc->encode ({
3295 name => $name,
3296 %{ $info->{meta} || {} },
3297 });
3298
3299 $data = pack "(w/a*)*", $meta, $info->{data};
3300 } else {
3301 $data = $info->{data};
3302 }
3303
3304 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3305 cf::face::set_type $idx, $info->{type};
2800 } else { 3306 } else {
2801 my $data = pack "(w/a*)*", $meta, $info->{data}; 3307 $RESOURCE{$name} = $info;
2802 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2803
2804 cf::face::set_type $idx, 1;
2805 cf::face::set_data $idx, 0, $data, $chk;
2806 } 3308 }
2807 3309
2808 cf::cede_to_tick; 3310 cf::cede_to_tick;
2809 } 3311 }
2810 } 3312 }
2811 3313
3314 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3315
2812 1 3316 1
2813} 3317}
2814 3318
3319cf::global->attach (on_resource_update => sub {
3320 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3321 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3322
3323 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3324 my $sound = $soundconf->{compat}[$_]
3325 or next;
3326
3327 my $face = cf::face::find "sound/$sound->[1]";
3328 cf::sound::set $sound->[0] => $face;
3329 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3330 }
3331
3332 while (my ($k, $v) = each %{$soundconf->{event}}) {
3333 my $face = cf::face::find "sound/$v";
3334 cf::sound::set $k => $face;
3335 }
3336 }
3337});
3338
3339register_exticmd fx_want => sub {
3340 my ($ns, $want) = @_;
3341
3342 while (my ($k, $v) = each %$want) {
3343 $ns->fx_want ($k, $v);
3344 }
3345};
3346
3347sub load_resource_file($) {
3348 my $guard = lock_acquire "load_resource_file";
3349
3350 my $status = load_resource_file_ $_[0];
3351 get_slot 0.1, 100;
3352 cf::arch::commit_load;
3353
3354 $status
3355}
3356
2815sub reload_regions { 3357sub reload_regions {
3358 # HACK to clear player env face cache, we need some signal framework
3359 # for this (global event?)
3360 %ext::player_env::MUSIC_FACE_CACHE = ();
3361
2816 load_resource_file "$MAPDIR/regions" 3362 load_resource_file "$MAPDIR/regions"
2817 or die "unable to load regions file\n"; 3363 or die "unable to load regions file\n";
2818 3364
2819 for (cf::region::list) { 3365 for (cf::region::list) {
2820 $_->{match} = qr/$_->{match}/ 3366 $_->{match} = qr/$_->{match}/
2828} 3374}
2829 3375
2830sub reload_archetypes { 3376sub reload_archetypes {
2831 load_resource_file "$DATADIR/archetypes" 3377 load_resource_file "$DATADIR/archetypes"
2832 or die "unable to load archetypes\n"; 3378 or die "unable to load archetypes\n";
2833 #d# NEED to laod twice to resolve forward references
2834 # this really needs to be done in an extra post-pass
2835 # (which needs to be synchronous, so solve it differently)
2836 load_resource_file "$DATADIR/archetypes"
2837 or die "unable to load archetypes\n";
2838} 3379}
2839 3380
2840sub reload_treasures { 3381sub reload_treasures {
2841 load_resource_file "$DATADIR/treasures" 3382 load_resource_file "$DATADIR/treasures"
2842 or die "unable to load treasurelists\n"; 3383 or die "unable to load treasurelists\n";
2843} 3384}
2844 3385
2845sub reload_resources { 3386sub reload_resources {
2846 warn "reloading resource files...\n"; 3387 warn "reloading resource files...\n";
2847 3388
3389 reload_facedata;
3390 reload_archetypes;
2848 reload_regions; 3391 reload_regions;
2849 reload_facedata;
2850 #reload_archetypes;#d#
2851 reload_archetypes;
2852 reload_treasures; 3392 reload_treasures;
2853 3393
2854 warn "finished reloading resource files\n"; 3394 warn "finished reloading resource files\n";
2855} 3395}
2856 3396
2857sub init { 3397sub init {
3398 my $guard = freeze_mainloop;
3399
2858 reload_resources; 3400 reload_resources;
2859} 3401}
2860 3402
2861sub cfg_load { 3403sub reload_config {
2862 open my $fh, "<:utf8", "$CONFDIR/config" 3404 open my $fh, "<:utf8", "$CONFDIR/config"
2863 or return; 3405 or return;
2864 3406
2865 local $/; 3407 local $/;
2866 *CFG = YAML::Syck::Load <$fh>; 3408 *CFG = YAML::Load <$fh>;
2867 3409
2868 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3410 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2869 3411
2870 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3412 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2871 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3413 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2882sub main { 3424sub main {
2883 # we must not ever block the main coroutine 3425 # we must not ever block the main coroutine
2884 local $Coro::idle = sub { 3426 local $Coro::idle = sub {
2885 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3427 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2886 (async { 3428 (async {
2887 Event::one_event; 3429 $Coro::current->{desc} = "IDLE BUG HANDLER";
3430 EV::loop EV::LOOP_ONESHOT;
2888 })->prio (Coro::PRIO_MAX); 3431 })->prio (Coro::PRIO_MAX);
2889 }; 3432 };
2890 3433
2891 cfg_load; 3434 {
3435 my $guard = freeze_mainloop;
3436 reload_config;
2892 db_init; 3437 db_init;
2893 load_extensions; 3438 load_extensions;
2894 3439
2895 $TICK_WATCHER->start; 3440 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3441 evthread_start IO::AIO::poll_fileno;
3442 }
3443
2896 Event::loop; 3444 EV::loop;
2897} 3445}
2898 3446
2899############################################################################# 3447#############################################################################
2900# initialisation and cleanup 3448# initialisation and cleanup
2901 3449
2902# install some emergency cleanup handlers 3450# install some emergency cleanup handlers
2903BEGIN { 3451BEGIN {
3452 our %SIGWATCHER = ();
2904 for my $signal (qw(INT HUP TERM)) { 3453 for my $signal (qw(INT HUP TERM)) {
2905 Event->signal ( 3454 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2906 reentrant => 0,
2907 data => WF_AUTOCANCEL,
2908 signal => $signal,
2909 prio => 0,
2910 cb => sub {
2911 cf::cleanup "SIG$signal"; 3455 cf::cleanup "SIG$signal";
2912 },
2913 ); 3456 };
2914 } 3457 }
2915} 3458}
2916 3459
2917sub write_runtime { 3460sub write_runtime_sync {
2918 my $runtime = "$LOCALDIR/runtime"; 3461 my $runtime = "$LOCALDIR/runtime";
2919 3462
2920 # first touch the runtime file to show we are still running: 3463 # first touch the runtime file to show we are still running:
2921 # the fsync below can take a very very long time. 3464 # the fsync below can take a very very long time.
2922 3465
2948 and return; 3491 and return;
2949 3492
2950 warn "runtime file written.\n"; 3493 warn "runtime file written.\n";
2951 3494
2952 1 3495 1
3496}
3497
3498our $uuid_lock;
3499our $uuid_skip;
3500
3501sub write_uuid_sync($) {
3502 $uuid_skip ||= $_[0];
3503
3504 return if $uuid_lock;
3505 local $uuid_lock = 1;
3506
3507 my $uuid = "$LOCALDIR/uuid";
3508
3509 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3510 or return;
3511
3512 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3513 $uuid_skip = 0;
3514
3515 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3516 and return;
3517
3518 # always fsync - this file is important
3519 aio_fsync $fh
3520 and return;
3521
3522 close $fh
3523 or return;
3524
3525 aio_rename "$uuid~", $uuid
3526 and return;
3527
3528 warn "uuid file written ($value).\n";
3529
3530 1
3531
3532}
3533
3534sub write_uuid($$) {
3535 my ($skip, $sync) = @_;
3536
3537 $sync ? write_uuid_sync $skip
3538 : async { write_uuid_sync $skip };
2953} 3539}
2954 3540
2955sub emergency_save() { 3541sub emergency_save() {
2956 my $freeze_guard = cf::freeze_mainloop; 3542 my $freeze_guard = cf::freeze_mainloop;
2957 3543
2963 # and maps saved/destroyed asynchronously. 3549 # and maps saved/destroyed asynchronously.
2964 warn "begin emergency player save\n"; 3550 warn "begin emergency player save\n";
2965 for my $login (keys %cf::PLAYER) { 3551 for my $login (keys %cf::PLAYER) {
2966 my $pl = $cf::PLAYER{$login} or next; 3552 my $pl = $cf::PLAYER{$login} or next;
2967 $pl->valid or next; 3553 $pl->valid or next;
3554 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2968 $pl->save; 3555 $pl->save;
2969 } 3556 }
2970 warn "end emergency player save\n"; 3557 warn "end emergency player save\n";
2971 3558
2972 warn "begin emergency map save\n"; 3559 warn "begin emergency map save\n";
2978 warn "end emergency map save\n"; 3565 warn "end emergency map save\n";
2979 3566
2980 warn "begin emergency database checkpoint\n"; 3567 warn "begin emergency database checkpoint\n";
2981 BDB::db_env_txn_checkpoint $DB_ENV; 3568 BDB::db_env_txn_checkpoint $DB_ENV;
2982 warn "end emergency database checkpoint\n"; 3569 warn "end emergency database checkpoint\n";
3570
3571 warn "begin write uuid\n";
3572 write_uuid_sync 1;
3573 warn "end write uuid\n";
2983 }; 3574 };
2984 3575
2985 warn "leave emergency perl save\n"; 3576 warn "leave emergency perl save\n";
2986} 3577}
2987 3578
3002 warn "reloading..."; 3593 warn "reloading...";
3003 3594
3004 warn "entering sync_job"; 3595 warn "entering sync_job";
3005 3596
3006 cf::sync_job { 3597 cf::sync_job {
3007 cf::write_runtime; # external watchdog should not bark 3598 cf::write_runtime_sync; # external watchdog should not bark
3008 cf::emergency_save; 3599 cf::emergency_save;
3009 cf::write_runtime; # external watchdog should not bark 3600 cf::write_runtime_sync; # external watchdog should not bark
3010 3601
3011 warn "syncing database to disk"; 3602 warn "syncing database to disk";
3012 BDB::db_env_txn_checkpoint $DB_ENV; 3603 BDB::db_env_txn_checkpoint $DB_ENV;
3013 3604
3014 # if anything goes wrong in here, we should simply crash as we already saved 3605 # if anything goes wrong in here, we should simply crash as we already saved
3015
3016 warn "cancelling all WF_AUTOCANCEL watchers";
3017 for (Event::all_watchers) {
3018 $_->cancel if $_->data & WF_AUTOCANCEL;
3019 }
3020 3606
3021 warn "flushing outstanding aio requests"; 3607 warn "flushing outstanding aio requests";
3022 for (;;) { 3608 for (;;) {
3023 BDB::flush; 3609 BDB::flush;
3024 IO::AIO::flush; 3610 IO::AIO::flush;
3025 Coro::cede; 3611 Coro::cede_notself;
3026 last unless IO::AIO::nreqs || BDB::nreqs; 3612 last unless IO::AIO::nreqs || BDB::nreqs;
3027 warn "iterate..."; 3613 warn "iterate...";
3028 } 3614 }
3029 3615
3030 ++$RELOAD; 3616 ++$RELOAD;
3089 warn "reloading cf.pm"; 3675 warn "reloading cf.pm";
3090 require cf; 3676 require cf;
3091 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3677 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3092 3678
3093 warn "loading config and database again"; 3679 warn "loading config and database again";
3094 cf::cfg_load; 3680 cf::reload_config;
3095 3681
3096 warn "loading extensions"; 3682 warn "loading extensions";
3097 cf::load_extensions; 3683 cf::load_extensions;
3098 3684
3099 warn "reattaching attachments to objects/players"; 3685 warn "reattaching attachments to objects/players";
3106 warn "leaving sync_job"; 3692 warn "leaving sync_job";
3107 3693
3108 1 3694 1
3109 } or do { 3695 } or do {
3110 warn $@; 3696 warn $@;
3111 warn "error while reloading, exiting."; 3697 cf::cleanup "error while reloading, exiting.";
3112 exit 1;
3113 }; 3698 };
3114 3699
3115 warn "reloaded"; 3700 warn "reloaded";
3116}; 3701};
3117 3702
3119 3704
3120sub reload_perl() { 3705sub reload_perl() {
3121 # doing reload synchronously and two reloads happen back-to-back, 3706 # doing reload synchronously and two reloads happen back-to-back,
3122 # coro crashes during coro_state_free->destroy here. 3707 # coro crashes during coro_state_free->destroy here.
3123 3708
3124 $RELOAD_WATCHER ||= Event->timer ( 3709 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3125 reentrant => 0,
3126 after => 0,
3127 data => WF_AUTOCANCEL,
3128 cb => sub {
3129 do_reload_perl; 3710 do_reload_perl;
3130 undef $RELOAD_WATCHER; 3711 undef $RELOAD_WATCHER;
3131 },
3132 ); 3712 };
3133} 3713}
3134 3714
3135register_command "reload" => sub { 3715register_command "reload" => sub {
3136 my ($who, $arg) = @_; 3716 my ($who, $arg) = @_;
3137 3717
3138 if ($who->flag (FLAG_WIZ)) { 3718 if ($who->flag (FLAG_WIZ)) {
3139 $who->message ("reloading server."); 3719 $who->message ("reloading server.");
3720 async {
3721 $Coro::current->{desc} = "perl_reload";
3140 async { reload_perl }; 3722 reload_perl;
3723 };
3141 } 3724 }
3142}; 3725};
3143 3726
3144unshift @INC, $LIBDIR; 3727unshift @INC, $LIBDIR;
3145 3728
3147 3730
3148our @WAIT_FOR_TICK; 3731our @WAIT_FOR_TICK;
3149our @WAIT_FOR_TICK_BEGIN; 3732our @WAIT_FOR_TICK_BEGIN;
3150 3733
3151sub wait_for_tick { 3734sub wait_for_tick {
3152 return unless $TICK_WATCHER->is_active;
3153 return if $Coro::current == $Coro::main; 3735 return if tick_inhibit || $Coro::current == $Coro::main;
3154 3736
3155 my $signal = new Coro::Signal; 3737 my $signal = new Coro::Signal;
3156 push @WAIT_FOR_TICK, $signal; 3738 push @WAIT_FOR_TICK, $signal;
3157 $signal->wait; 3739 $signal->wait;
3158} 3740}
3159 3741
3160sub wait_for_tick_begin { 3742sub wait_for_tick_begin {
3161 return unless $TICK_WATCHER->is_active;
3162 return if $Coro::current == $Coro::main; 3743 return if tick_inhibit || $Coro::current == $Coro::main;
3163 3744
3164 my $signal = new Coro::Signal; 3745 my $signal = new Coro::Signal;
3165 push @WAIT_FOR_TICK_BEGIN, $signal; 3746 push @WAIT_FOR_TICK_BEGIN, $signal;
3166 $signal->wait; 3747 $signal->wait;
3167} 3748}
3168 3749
3169 my $min = 1e6;#d# 3750sub tick {
3170 my $avg = 10;
3171$TICK_WATCHER = Event->timer (
3172 reentrant => 0,
3173 parked => 1,
3174 prio => 0,
3175 at => $NEXT_TICK || $TICK,
3176 data => WF_AUTOCANCEL,
3177 cb => sub {
3178 if ($Coro::current != $Coro::main) { 3751 if ($Coro::current != $Coro::main) {
3179 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3752 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3180 unless ++$bug_warning > 10; 3753 unless ++$bug_warning > 10;
3181 return; 3754 return;
3182 } 3755 }
3183 3756
3184 $NOW = $tick_start = Event::time;
3185
3186 cf::server_tick; # one server iteration 3757 cf::server_tick; # one server iteration
3187 3758
3188 0 && sync_job {#d# 3759 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3189 for(1..10) { 3760 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3190 my $t = Event::time; 3761 Coro::async_pool {
3191 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3762 $Coro::current->{desc} = "runtime saver";
3192 or die; 3763 write_runtime_sync
3193 3764 or warn "ERROR: unable to write runtime file: $!";
3194 $map->width (50);
3195 $map->height (50);
3196 $map->alloc;
3197 $map->_load_objects ("/tmp/x.map", 1);
3198 my $t = Event::time - $t;
3199
3200 #next unless $t < 0.0013;#d#
3201 if ($t < $min) {
3202 $min = $t;
3203 }
3204 $avg = $avg * 0.99 + $t * 0.01;
3205 }
3206 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3207 exit 0;
3208 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3209 }; 3765 };
3766 }
3210 3767
3211 $RUNTIME += $TICK;
3212 $NEXT_TICK += $TICK;
3213
3214 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3215 $NEXT_RUNTIME_WRITE = $NOW + 10;
3216 Coro::async_pool {
3217 write_runtime
3218 or warn "ERROR: unable to write runtime file: $!";
3219 };
3220 }
3221
3222# my $AFTER = Event::time;
3223# warn $AFTER - $NOW;#d#
3224
3225 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3768 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3226 $sig->send; 3769 $sig->send;
3227 } 3770 }
3228 while (my $sig = shift @WAIT_FOR_TICK) { 3771 while (my $sig = shift @WAIT_FOR_TICK) {
3229 $sig->send; 3772 $sig->send;
3230 } 3773 }
3231 3774
3232 $NOW = Event::time; 3775 $LOAD = ($NOW - $TICK_START) / $TICK;
3233
3234 # if we are delayed by four ticks or more, skip them all
3235 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3236
3237 $TICK_WATCHER->at ($NEXT_TICK);
3238 $TICK_WATCHER->start;
3239
3240 $LOAD = ($NOW - $tick_start) / $TICK;
3241 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3776 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3242 3777
3243 _post_tick; 3778 if (0) {
3244 3779 if ($NEXT_TICK) {
3245 3780 my $jitter = $TICK_START - $NEXT_TICK;
3781 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3782 warn "jitter $JITTER\n";#d#
3783 }
3246 }, 3784 }
3247); 3785}
3248 3786
3249{ 3787{
3250 BDB::max_poll_time $TICK * 0.1; 3788 # configure BDB
3251 $BDB_POLL_WATCHER = Event->io ( 3789
3252 reentrant => 0,
3253 fd => BDB::poll_fileno,
3254 poll => 'r',
3255 prio => 0,
3256 data => WF_AUTOCANCEL,
3257 cb => \&BDB::poll_cb,
3258 );
3259 BDB::min_parallel 8; 3790 BDB::min_parallel 8;
3260 3791 BDB::max_poll_reqs $TICK * 0.1;
3261 BDB::set_sync_prepare { 3792 $Coro::BDB::WATCHER->priority (1);
3262 my $status;
3263 my $current = $Coro::current;
3264 (
3265 sub {
3266 $status = $!;
3267 $current->ready; undef $current;
3268 },
3269 sub {
3270 Coro::schedule while defined $current;
3271 $! = $status;
3272 },
3273 )
3274 };
3275 3793
3276 unless ($DB_ENV) { 3794 unless ($DB_ENV) {
3277 $DB_ENV = BDB::db_env_create; 3795 $DB_ENV = BDB::db_env_create;
3796 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3797 | BDB::LOG_AUTOREMOVE, 1);
3798 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3799 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3278 3800
3279 cf::sync_job { 3801 cf::sync_job {
3280 eval { 3802 eval {
3281 BDB::db_env_open 3803 BDB::db_env_open
3282 $DB_ENV, 3804 $DB_ENV,
3284 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3806 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3285 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3807 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3286 0666; 3808 0666;
3287 3809
3288 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3810 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3289
3290 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3291 $DB_ENV->set_lk_detect;
3292 }; 3811 };
3293 3812
3294 cf::cleanup "db_env_open(db): $@" if $@; 3813 cf::cleanup "db_env_open(db): $@" if $@;
3295 }; 3814 };
3296 } 3815 }
3816
3817 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3818 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3819 };
3820 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3821 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3822 };
3823 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3824 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3825 };
3297} 3826}
3298 3827
3299{ 3828{
3829 # configure IO::AIO
3830
3300 IO::AIO::min_parallel 8; 3831 IO::AIO::min_parallel 8;
3301
3302 undef $Coro::AIO::WATCHER;
3303 IO::AIO::max_poll_time $TICK * 0.1; 3832 IO::AIO::max_poll_time $TICK * 0.1;
3304 $AIO_POLL_WATCHER = Event->io ( 3833 $Coro::AIO::WATCHER->priority (1);
3305 reentrant => 0,
3306 data => WF_AUTOCANCEL,
3307 fd => IO::AIO::poll_fileno,
3308 poll => 'r',
3309 prio => 6,
3310 cb => \&IO::AIO::poll_cb,
3311 );
3312} 3834}
3313 3835
3314my $_log_backtrace; 3836my $_log_backtrace;
3315 3837
3316sub _log_backtrace { 3838sub _log_backtrace {
3320 3842
3321 # limit the # of concurrent backtraces 3843 # limit the # of concurrent backtraces
3322 if ($_log_backtrace < 2) { 3844 if ($_log_backtrace < 2) {
3323 ++$_log_backtrace; 3845 ++$_log_backtrace;
3324 async { 3846 async {
3847 $Coro::current->{desc} = "abt $msg";
3848
3325 my @bt = fork_call { 3849 my @bt = fork_call {
3326 @addr = map { sprintf "%x", $_ } @addr; 3850 @addr = map { sprintf "%x", $_ } @addr;
3327 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3851 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3328 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3852 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3329 or die "addr2line: $!"; 3853 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines