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.287 by root, Mon Jun 25 05:43:45 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
48use JSON::XS 2.01 ();
25use BDB (); 49use BDB ();
26use Data::Dumper; 50use Data::Dumper;
27use Digest::MD5; 51use Digest::MD5;
28use Fcntl; 52use Fcntl;
29use YAML::Syck (); 53use YAML ();
30use IO::AIO 2.32 (); 54use IO::AIO 2.51 ();
31use Time::HiRes; 55use Time::HiRes;
32use Compress::LZF; 56use Compress::LZF;
57use Digest::MD5 ();
33 58
34# configure various modules to our taste 59# configure various modules to our taste
35# 60#
36$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
37Coro::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
38Compress::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
39
40$Event::Eval = 1; # no idea why this is required, but it is
41
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1;
44 64
45$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
46 66
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48 68
67our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
68our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
69our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
70our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
71our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
72 93
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER;
75our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 97our $NEXT_TICK;
78our $NOW;
79our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
80 99
81our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER;
82our $DB_ENV; 104our $DB_ENV;
83 105
84our %CFG; 106our %CFG;
85 107
86our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
87our $RUNTIME; 109our $RUNTIME;
110our $NOW;
88 111
89our %PLAYER; # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
90our %MAP; # all maps 113our (%MAP, %MAP_LOADING ); # all maps
91our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
92 115
93# 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 ∕
94our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
95 118
96our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
97our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
98our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
99 123
100binmode STDOUT; 124binmode STDOUT;
101binmode STDERR; 125binmode STDERR;
102 126
103# read virtual server time, if available 127# read virtual server time, if available
156 180
157The raw value load value from the last tick. 181The raw value load value from the last tick.
158 182
159=item %cf::CFG 183=item %cf::CFG
160 184
161Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
162from wherever your confdir points to. 186from wherever your confdir points to.
163 187
164=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
165 189
166These 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
167returns directly I<after> the tick processing (and consequently, can only wake one process 191returns directly I<after> the tick processing (and consequently, can only wake one process
168per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 192per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
169 193
194=item @cf::INVOKE_RESULTS
195
196This array contains the results of the last C<invoke ()> call. When
197C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call.
199
170=back 200=back
171 201
172=cut 202=cut
173 203
174BEGIN { 204BEGIN {
178 $msg .= "\n" 208 $msg .= "\n"
179 unless $msg =~ /\n$/; 209 unless $msg =~ /\n$/;
180 210
181 $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;
182 212
183 utf8::encode $msg;
184 LOG llevError, $msg; 213 LOG llevError, $msg;
185 }; 214 };
186} 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#?
187 231
188@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
189@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
190@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
191@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
204)) { 248)) {
205 no strict 'refs'; 249 no strict 'refs';
206 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
207} 251}
208 252
209$Event::DIED = sub { 253$EV::DIED = sub {
210 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
211}; 255};
212 256
213############################################################################# 257#############################################################################
214 258
237 $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;
238 $d 282 $d
239 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
240} 284}
241 285
242use JSON::XS ();
243
244=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
245 287
246Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
247 289
248=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
249 291
250Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
251 293
252=cut 294=cut
253 295
254our $json_coder = JSON::XS->new->convert_blessed->utf8; 296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255 297
256sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
257sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
258 300
259=item cf::lock_wait $string 301=item cf::lock_wait $string
260 302
261Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
262 304
265Wait 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
266a 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,
267for example when the coroutine gets canceled), the lock is automatically 309for example when the coroutine gets canceled), the lock is automatically
268returned. 310returned.
269 311
312Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro.
314
270Lock 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
271uses map_find and cf::map::load uses map_load). 316uses map_find and cf::map::load uses map_load).
272 317
273=item $locked = cf::lock_active $string 318=item $locked = cf::lock_active $string
274 319
275Return 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.
276 321
277=cut 322=cut
278 323
279our %LOCK; 324our %LOCK;
325our %LOCKER;#d#
280 326
281sub lock_wait($) { 327sub lock_wait($) {
282 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#
283 334
284 # wait for lock, if any 335 # wait for lock, if any
285 while ($LOCK{$key}) { 336 while ($LOCK{$key}) {
286 push @{ $LOCK{$key} }, $Coro::current; 337 push @{ $LOCK{$key} }, $Coro::current;
287 Coro::schedule; 338 Coro::schedule;
293 344
294 # wait, to be sure we are not locked 345 # wait, to be sure we are not locked
295 lock_wait $key; 346 lock_wait $key;
296 347
297 $LOCK{$key} = []; 348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
298 350
299 Coro::guard { 351 Coro::guard {
352 delete $LOCKER{$key};#d#
300 # wake up all waiters, to be on the safe side 353 # wake up all waiters, to be on the safe side
301 $_->ready for @{ delete $LOCK{$key} }; 354 $_->ready for @{ delete $LOCK{$key} };
302 } 355 }
303} 356}
304 357
307 360
308 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
309} 362}
310 363
311sub freeze_mainloop { 364sub freeze_mainloop {
312 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
313 366
314 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
315 $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 }
316 }; 428 }
317 $TICK_WATCHER->stop; 429};
318 $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;
319} 443}
320 444
321=item cf::async { BLOCK } 445=item cf::async { BLOCK }
322 446
323Currently the same as Coro::async_pool, meaning you cannot use 447Currently the same as Coro::async_pool, meaning you cannot use
328 452
329BEGIN { *async = \&Coro::async_pool } 453BEGIN { *async = \&Coro::async_pool }
330 454
331=item cf::sync_job { BLOCK } 455=item cf::sync_job { BLOCK }
332 456
333The design of Crossfire TRT requires that the main coroutine ($Coro::main) 457The design of Deliantra requires that the main coroutine ($Coro::main)
334is always able to handle events or runnable, as Crossfire TRT is only 458is always able to handle events or runnable, as Deliantra is only
335partly 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
336acceptable. 460acceptable.
337 461
338If 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
339the given BLOCK in another coroutine while waiting for the result. The 463the given BLOCK in another coroutine while waiting for the result. The
344 468
345sub sync_job(&) { 469sub sync_job(&) {
346 my ($job) = @_; 470 my ($job) = @_;
347 471
348 if ($Coro::current == $Coro::main) { 472 if ($Coro::current == $Coro::main) {
349 my $time = Event::time; 473 my $time = EV::time;
350 474
351 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
352 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
353 477
354 # TODO: use suspend/resume instead 478 LOG llevError, Carp::longmess "sync job";#d#
355 # (but this is cancel-safe) 479
356 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
357 481
358 my $busy = 1; 482 my $busy = 1;
359 my @res; 483 my @res;
360 484
361 (async { 485 (async {
486 $Coro::current->desc ("sync job coro");
362 @res = eval { $job->() }; 487 @res = eval { $job->() };
363 warn $@ if $@; 488 warn $@ if $@;
364 undef $busy; 489 undef $busy;
365 })->prio (Coro::PRIO_MAX); 490 })->prio (Coro::PRIO_MAX);
366 491
367 while ($busy) { 492 while ($busy) {
368 Coro::cede or Event::one_event; 493 if (Coro::nready) {
494 Coro::cede_notself;
495 } else {
496 EV::loop EV::LOOP_ONESHOT;
369 } 497 }
498 }
370 499
371 $time = Event::time - $time; 500 my $time = EV::time - $time;
372 501
373 LOG llevError | logBacktrace, Carp::longmess "long sync job"
374 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
375
376 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
377 503
378 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
379 } else { 505 } else {
380 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
381 507
406=item fork_call { }, $args 532=item fork_call { }, $args
407 533
408Executes the given code block with the given arguments in a seperate 534Executes the given code block with the given arguments in a seperate
409process, returning the results. Everything must be serialisable with 535process, returning the results. Everything must be serialisable with
410Coro::Storable. May, of course, block. Note that the executed sub may 536Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 537never block itself or use any form of event handling.
412 538
413=cut 539=cut
414 540
415sub fork_call(&@) { 541sub fork_call(&@) {
416 my ($cb, @args) = @_; 542 my ($cb, @args) = @_;
417 543
418# 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,
419# or die "socketpair: $!"; 545 # otherwise perl prematurely frees the stuff :/
420 pipe my $fh1, my $fh2 546 # TODO: investigate and fix (likely this will be rather laborious)
421 or die "pipe: $!";
422 547
423 if (my $pid = fork) { 548 my @res = Coro::Util::fork_eval {
424 close $fh2;
425
426 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
427 $res = Coro::Storable::thaw $res;
428
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431 die $$res unless "ARRAY" eq ref $res;
432
433 return wantarray ? @$res : $res->[-1];
434 } else {
435 reset_signals; 549 reset_signals;
436 local $SIG{__WARN__}; 550 &$cb
437 local $SIG{__DIE__}; 551 }, @args;
438 eval {
439 close $fh1;
440 552
441 my @res = eval { $cb->(@args) }; 553 wantarray ? @res : $res[-1]
442 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 554}
443 };
444 555
445 warn $@ if $@; 556=item $coin = coin_from_name $name
446 _exit 0; 557
447 } 558=cut
559
560our %coin_alias = (
561 "silver" => "silvercoin",
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
448} 581}
449 582
450=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
451 584
452Returns a single value from the environment database. 585Returns a single value from the environment database.
454=item cf::db_put $family => $key => $value 587=item cf::db_put $family => $key => $value
455 588
456Stores 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
457data 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).
458 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
459=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}
460 615
461our $DB; 616our $DB;
462 617
463sub db_init { 618sub db_init {
464 unless ($DB) {
465 $DB = BDB::db_create $DB_ENV;
466
467 cf::sync_job { 619 cf::sync_job {
468 eval { 620 $DB ||= db_table "db";
469 $DB->set_flags (BDB::CHKSUM);
470
471 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
472 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
473 cf::cleanup "db_open(db): $!" if $!;
474 };
475 cf::cleanup "db_open(db): $@" if $@;
476 };
477 } 621 };
478} 622}
479 623
480sub db_get($$) { 624sub db_get($$) {
481 my $key = "$_[0]/$_[1]"; 625 my $key = "$_[0]/$_[1]";
482 626
532 if (1) { 676 if (1) {
533 $md5 = 677 $md5 =
534 join "\x00", 678 join "\x00",
535 $processversion, 679 $processversion,
536 map { 680 map {
537 Coro::cede; 681 cf::cede_to_tick;
538 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 682 ($src->[$_], Digest::MD5::md5_hex $data[$_])
539 } 0.. $#$src; 683 } 0.. $#$src;
540 684
541 685
542 my $dbmd5 = db_get cache => "$id/md5"; 686 my $dbmd5 = db_get cache => "$id/md5";
586attach callbacks/event handlers (a collection of which is called an "attachment") 730attach callbacks/event handlers (a collection of which is called an "attachment")
587to it. All such attachable objects support the following methods. 731to it. All such attachable objects support the following methods.
588 732
589In 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>
590C<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
591Crossfire TRT). 735Deliantra).
592 736
593=over 4 737=over 4
594 738
595=item $attachable->attach ($attachment, key => $value...) 739=item $attachable->attach ($attachment, key => $value...)
596 740
848 "; 992 ";
849 die if $@; 993 die if $@;
850} 994}
851 995
852our $override; 996our $override;
853our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 997our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
854 998
855sub override { 999sub override {
856 $override = 1; 1000 $override = 1;
857 @invoke_results = (); 1001 @INVOKE_RESULTS = (@_);
858} 1002}
859 1003
860sub do_invoke { 1004sub do_invoke {
861 my $event = shift; 1005 my $event = shift;
862 my $callbacks = shift; 1006 my $callbacks = shift;
863 1007
864 @invoke_results = (); 1008 @INVOKE_RESULTS = ();
865 1009
866 local $override; 1010 local $override;
867 1011
868 for (@$callbacks) { 1012 for (@$callbacks) {
869 eval { &{$_->[1]} }; 1013 eval { &{$_->[1]} };
878 } 1022 }
879 1023
880 0 1024 0
881} 1025}
882 1026
883=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
884 1028
885=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
886 1030
887Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
888 1032
889This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1033This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
890removed in future versions), and there is no public API to access override 1034removed in future versions), and there is no public API to access override
891results (if you must, access C<@cf::invoke_results> directly). 1035results (if you must, access C<@cf::INVOKE_RESULTS> directly).
892 1036
893=back 1037=back
894 1038
895=cut 1039=cut
896 1040
897############################################################################# 1041#############################################################################
898# 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}
899 1085
900sub reattach { 1086sub reattach {
901 # basically do the same as instantiate, without calling instantiate 1087 # basically do the same as instantiate, without calling instantiate
902 my ($obj) = @_; 1088 my ($obj) = @_;
903 1089
924cf::attachable->attach ( 1110cf::attachable->attach (
925 prio => -1000000, 1111 prio => -1000000,
926 on_instantiate => sub { 1112 on_instantiate => sub {
927 my ($obj, $data) = @_; 1113 my ($obj, $data) = @_;
928 1114
929 $data = from_json $data; 1115 $data = decode_json $data;
930 1116
931 for (@$data) { 1117 for (@$data) {
932 my ($name, $args) = @$_; 1118 my ($name, $args) = @$_;
933 1119
934 $obj->attach ($name, %{$args || {} }); 1120 $obj->attach ($name, %{$args || {} });
950sub object_freezer_save { 1136sub object_freezer_save {
951 my ($filename, $rdata, $objs) = @_; 1137 my ($filename, $rdata, $objs) = @_;
952 1138
953 sync_job { 1139 sync_job {
954 if (length $$rdata) { 1140 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename);
955 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
956 $filename, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
957 1144
958 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
959 chmod SAVE_MODE, $fh; 1146 aio_chmod $fh, SAVE_MODE;
960 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
962 close $fh; 1149 aio_close $fh;
963 1150
964 if (@$objs) { 1151 if (@$objs) {
965 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) {
966 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
967 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
968 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
969 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
970 close $fh; 1157 aio_close $fh;
971 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
972 } 1159 }
973 } else { 1160 } else {
974 aio_unlink "$filename.pst"; 1161 aio_unlink "$filename.pst";
975 } 1162 }
980 } 1167 }
981 } else { 1168 } else {
982 aio_unlink $filename; 1169 aio_unlink $filename;
983 aio_unlink "$filename.pst"; 1170 aio_unlink "$filename.pst";
984 } 1171 }
985 } 1172 };
986} 1173}
987 1174
988sub object_freezer_as_string { 1175sub object_freezer_as_string {
989 my ($rdata, $objs) = @_; 1176 my ($rdata, $objs) = @_;
990 1177
1002 or return; 1189 or return;
1003 1190
1004 unless (aio_stat "$filename.pst") { 1191 unless (aio_stat "$filename.pst") {
1005 (aio_load "$filename.pst", $av) >= 0 1192 (aio_load "$filename.pst", $av) >= 0
1006 or return; 1193 or return;
1194
1007 $av = eval { (Storable::thaw $av)->{objs} }; 1195 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs};
1008 } 1197 }
1009 1198
1199 utf8::decode (my $decname = $filename);
1010 warn sprintf "loading %s (%d)\n", 1200 warn sprintf "loading %s (%d,%d)\n",
1011 $filename, length $data, scalar @{$av || []}; 1201 $decname, length $data, scalar @{$av || []};
1202
1012 return ($data, $av); 1203 ($data, $av)
1013} 1204}
1014 1205
1015=head2 COMMAND CALLBACKS 1206=head2 COMMAND CALLBACKS
1016 1207
1017=over 4 1208=over 4
1087 cf::override; 1278 cf::override;
1088 }, 1279 },
1089 on_extcmd => sub { 1280 on_extcmd => sub {
1090 my ($pl, $buf) = @_; 1281 my ($pl, $buf) = @_;
1091 1282
1092 my $msg = eval { from_json $buf }; 1283 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1093 1284
1094 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
1095 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1293 if (my $cb = $EXTCMD{$type}) {
1096 if (my %reply = $cb->($pl, $msg)) { 1294 @reply = $cb->($pl, @payload);
1097 $pl->ext_reply ($msg->{msgid}, %reply);
1098 }
1099 } 1295 }
1296
1297 $pl->ext_reply ($reply, @reply)
1298 if $reply;
1299
1100 } else { 1300 } else {
1101 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1102 } 1302 }
1103 1303
1104 cf::override; 1304 cf::override;
1157 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1158 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1159 1359
1160 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1161 warn $msg; 1361 warn $msg;
1162 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1163 exit 1;
1164 } 1363 }
1165 1364
1166 warn $msg; 1365 warn $msg;
1167 } 1366 }
1168 1367
1193use Coro::AIO; 1392use Coro::AIO;
1194 1393
1195=head3 cf::player 1394=head3 cf::player
1196 1395
1197=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}
1198 1411
1199=item cf::player::find $login 1412=item cf::player::find $login
1200 1413
1201Returns the given player object, loading it if necessary (might block). 1414Returns the given player object, loading it if necessary (might block).
1202 1415
1238 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1451 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1239 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1452 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1240 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1453 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1241 aio_unlink +(playerdir $login) . "/$login.pl"; 1454 aio_unlink +(playerdir $login) . "/$login.pl";
1242 1455
1243 my $pl = load_pl path $login 1456 my $f = new_from_file cf::object::thawer path $login
1244 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;
1245 $cf::PLAYER{$login} = $pl 1464 $cf::PLAYER{$login} = $pl
1246 } 1465 }
1247 } 1466 }
1248} 1467}
1249 1468
1258 return if $pl->{deny_save}; 1477 return if $pl->{deny_save};
1259 1478
1260 aio_mkdir playerdir $pl, 0770; 1479 aio_mkdir playerdir $pl, 0770;
1261 $pl->{last_save} = $cf::RUNTIME; 1480 $pl->{last_save} = $cf::RUNTIME;
1262 1481
1482 cf::get_slot 0.01;
1483
1263 $pl->save_pl ($path); 1484 $pl->save_pl ($path);
1264 Coro::cede; 1485 cf::cede_to_tick;
1265} 1486}
1266 1487
1267sub new($) { 1488sub new($) {
1268 my ($login) = @_; 1489 my ($login) = @_;
1269 1490
1275 $cf::PLAYER{$login} = $self; 1496 $cf::PLAYER{$login} = $self;
1276 1497
1277 $self 1498 $self
1278} 1499}
1279 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
1280=item $pl->quit_character 1511=item $pl->quit_character
1281 1512
1282Nukes the player without looking back. If logged in, the connection will 1513Nukes the player without looking back. If logged in, the connection will
1283be destroyed. May block for a long time. 1514be destroyed. May block for a long time.
1284 1515
1292 $pl->{deny_save} = 1; 1523 $pl->{deny_save} = 1;
1293 $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
1294 1525
1295 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1296 $pl->deactivate; 1527 $pl->deactivate;
1528 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1529 $pl->ob->check_score;
1297 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1530 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1298 $pl->ns->destroy if $pl->ns; 1531 $pl->ns->destroy if $pl->ns;
1299 1532
1300 my $path = playerdir $pl; 1533 my $path = playerdir $pl;
1301 my $temp = "$path~$cf::RUNTIME~deleting~"; 1534 my $temp = "$path~$cf::RUNTIME~deleting~";
1337 or return []; 1570 or return [];
1338 1571
1339 my @logins; 1572 my @logins;
1340 1573
1341 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") {
1342 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1580 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1343 aio_read $fh, 0, 512, my $buf, 0 or next; 1581 aio_read $fh, 0, 512, my $buf, 0 or next;
1344 $buf !~ /^password -------------$/m or next; # official not-valid tag 1582 $buf !~ /^password -------------$/m or next; # official not-valid tag
1583 }
1345 1584
1346 utf8::decode $login; 1585 utf8::decode $login;
1347 push @logins, $login; 1586 push @logins, $login;
1348 } 1587 }
1349 1588
1382 1621
1383Expand crossfire pod fragments into protocol xml. 1622Expand crossfire pod fragments into protocol xml.
1384 1623
1385=cut 1624=cut
1386 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
1387sub expand_cfpod { 1637sub expand_cfpod {
1388 ((my $self), (local $_)) = @_; 1638 my ($self, $pod) = @_;
1389 1639
1390 # escape & and < 1640 my $xml;
1391 s/&/&amp;/g;
1392 s/(?<![BIUGH])</&lt;/g;
1393 1641
1394 # this is buggy, it needs to properly take care of nested <'s 1642 while () {
1643 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1644 $group = $1;
1395 1645
1396 1 while 1646 $group =~ s/&/&amp;/g;
1397 # replace B<>, I<>, U<> etc. 1647 $group =~ s/</&lt;/g;
1398 s/B<([^\>]*)>/<b>$1<\/b>/ 1648
1399 || s/I<([^\>]*)>/<i>$1<\/i>/ 1649 $xml .= $group;
1400 || s/U<([^\>]*)>/<u>$1<\/u>/ 1650 } elsif ($pod =~ m%\G
1401 # replace G<male|female> tags 1651 ([BCGHITU])
1402 || s{G<([^>|]*)\|([^>]*)>}{ 1652 <
1403 $self->gender ? $2 : $1 1653 (?:
1654 ([^<>]*) (?{ $group = $^N })
1655 | < $interior >
1656 )
1657 >
1658 %gcsx
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") {
1677 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1678 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1679 "")
1680 [$self->{hintmode}];
1681 } else {
1682 $xml .= "error processing '$code($data)' directive";
1683 }
1684 } else {
1685 if ($pod =~ /\G(.+)/) {
1686 warn "parse error while expanding $pod (at $1)";
1687 }
1688 last;
1404 }ge 1689 }
1405 # replace H<hint text> 1690 }
1406 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1407 1691
1692 for ($xml) {
1408 # create single paragraphs (very hackish) 1693 # create single paragraphs (very hackish)
1409 s/(?<=\S)\n(?=\w)/ /g; 1694 s/(?<=\S)\n(?=\w)/ /g;
1410 1695
1411 $_ 1696 # compress some whitespace
1412} 1697 s/\s+\n/\n/g; # ws line-ends
1698 s/\n\n+/\n/g; # double lines
1699 s/^\n+//; # beginning lines
1700 s/\n+$//; # ending lines
1701 }
1413 1702
1703 $xml
1704}
1705
1706no re 'eval';
1707
1708sub hintmode {
1709 $_[0]{hintmode} = $_[1] if @_ > 1;
1710 $_[0]{hintmode}
1711}
1712
1414=item $player->ext_reply ($msgid, %msg) 1713=item $player->ext_reply ($msgid, @msg)
1415 1714
1416Sends an ext reply to the player. 1715Sends an ext reply to the player.
1417 1716
1418=cut 1717=cut
1419 1718
1420sub ext_reply($$%) { 1719sub ext_reply($$@) {
1421 my ($self, $id, %msg) = @_; 1720 my ($self, $id, @msg) = @_;
1422 1721
1423 $msg{msgid} = $id; 1722 $self->ns->ext_reply ($id, @msg)
1424 $self->send ("ext " . cf::to_json \%msg);
1425} 1723}
1426 1724
1427=item $player->ext_event ($type, %msg) 1725=item $player->ext_msg ($type, @msg)
1428 1726
1429Sends an ext event to the client. 1727Sends an ext event to the client.
1430 1728
1431=cut 1729=cut
1432 1730
1433sub ext_event($$%) { 1731sub ext_msg($$@) {
1434 my ($self, $type, %msg) = @_; 1732 my ($self, $type, @msg) = @_;
1435 1733
1436 $self->ns->ext_event ($type, %msg); 1734 $self->ns->ext_msg ($type, @msg);
1437} 1735}
1438 1736
1439=head3 cf::region 1737=head3 cf::region
1440 1738
1441=over 4 1739=over 4
1454 my ($path) = @_; 1752 my ($path) = @_;
1455 1753
1456 my ($match, $specificity); 1754 my ($match, $specificity);
1457 1755
1458 for my $region (list) { 1756 for my $region (list) {
1459 if ($region->match && $path =~ $region->match) { 1757 if ($region->{match} && $path =~ $region->{match}) {
1460 ($match, $specificity) = ($region, $region->specificity) 1758 ($match, $specificity) = ($region, $region->specificity)
1461 if $region->specificity > $specificity; 1759 if $region->specificity > $specificity;
1462 } 1760 }
1463 } 1761 }
1464 1762
1485our $MAX_RESET = 3600; 1783our $MAX_RESET = 3600;
1486our $DEFAULT_RESET = 3000; 1784our $DEFAULT_RESET = 3000;
1487 1785
1488sub generate_random_map { 1786sub generate_random_map {
1489 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
1490 # mit "rum" bekleckern, nicht 1791 # mit "rum" bekleckern, nicht
1491 $self->_create_random_map ( 1792 $self->_create_random_map (
1492 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1793 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1493 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1794 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1494 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1795 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1584 $self->init; # pass $1 etc. 1885 $self->init; # pass $1 etc.
1585 return $self; 1886 return $self;
1586 } 1887 }
1587 } 1888 }
1588 1889
1589 Carp::carp "unable to resolve path '$path' (base '$base')."; 1890 Carp::cluck "unable to resolve path '$path' (base '$base').";
1590 () 1891 ()
1591} 1892}
1592 1893
1593sub init { 1894sub init {
1594 my ($self) = @_; 1895 my ($self) = @_;
1616 1917
1617# the temporary/swap location 1918# the temporary/swap location
1618sub save_path { 1919sub save_path {
1619 my ($self) = @_; 1920 my ($self) = @_;
1620 1921
1621 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1622 "$TMPDIR/$path.map" 1923 "$TMPDIR/$path.map"
1623} 1924}
1624 1925
1625# the unique path, undef == no special unique path 1926# the unique path, undef == no special unique path
1626sub uniq_path { 1927sub uniq_path {
1627 my ($self) = @_; 1928 my ($self) = @_;
1628 1929
1629 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1930 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1630 "$UNIQUEDIR/$path" 1931 "$UNIQUEDIR/$path"
1631} 1932}
1632 1933
1633# and all this just because we cannot iterate over 1934# and all this just because we cannot iterate over
1634# all maps in C++... 1935# all maps in C++...
1657 1958
1658sub load_header_from($) { 1959sub load_header_from($) {
1659 my ($self, $path) = @_; 1960 my ($self, $path) = @_;
1660 1961
1661 utf8::encode $path; 1962 utf8::encode $path;
1662 #aio_open $path, O_RDONLY, 0 1963 my $f = new_from_file cf::object::thawer $path
1663 # or return;
1664
1665 $self->_load_header ($path)
1666 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;
1667 1971
1668 $self->{load_path} = $path; 1972 $self->{load_path} = $path;
1669 1973
1670 1 1974 1
1671} 1975}
1725sub find { 2029sub find {
1726 my ($path, $origin) = @_; 2030 my ($path, $origin) = @_;
1727 2031
1728 $path = normalise $path, $origin && $origin->path; 2032 $path = normalise $path, $origin && $origin->path;
1729 2033
2034 cf::lock_wait "map_data:$path";#d#remove
1730 cf::lock_wait "map_find:$path"; 2035 cf::lock_wait "map_find:$path";
1731 2036
1732 $cf::MAP{$path} || do { 2037 $cf::MAP{$path} || do {
2038 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1733 my $guard = cf::lock_acquire "map_find:$path"; 2039 my $guard2 = cf::lock_acquire "map_find:$path";
2040
1734 my $map = new_from_path cf::map $path 2041 my $map = new_from_path cf::map $path
1735 or return; 2042 or return;
1736 2043
1737 $map->{last_save} = $cf::RUNTIME; 2044 $map->{last_save} = $cf::RUNTIME;
1738 2045
1740 or return; 2047 or return;
1741 2048
1742 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2049 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1743 # doing this can freeze the server in a sync job, obviously 2050 # doing this can freeze the server in a sync job, obviously
1744 #$cf::WAIT_FOR_TICK->wait; 2051 #$cf::WAIT_FOR_TICK->wait;
2052 undef $guard2;
2053 undef $guard1;
1745 $map->reset; 2054 $map->reset;
1746 undef $guard;
1747 return find $path; 2055 return find $path;
1748 } 2056 }
1749 2057
1750 $cf::MAP{$path} = $map 2058 $cf::MAP{$path} = $map
1751 } 2059 }
1760 local $self->{deny_reset} = 1; # loading can take a long time 2068 local $self->{deny_reset} = 1; # loading can take a long time
1761 2069
1762 my $path = $self->{path}; 2070 my $path = $self->{path};
1763 2071
1764 { 2072 {
1765 my $guard = cf::lock_acquire "map_load:$path"; 2073 my $guard = cf::lock_acquire "map_data:$path";
1766 2074
2075 return unless $self->valid;
1767 return if $self->in_memory != cf::MAP_SWAPPED; 2076 return unless $self->in_memory == cf::MAP_SWAPPED;
1768 2077
1769 $self->in_memory (cf::MAP_LOADING); 2078 $self->in_memory (cf::MAP_LOADING);
1770 2079
1771 $self->alloc; 2080 $self->alloc;
1772 2081
1773 $self->pre_load; 2082 $self->pre_load;
1774 Coro::cede; 2083 cf::cede_to_tick;
1775 2084
2085 my $f = new_from_file cf::object::thawer $self->{load_path};
2086 $f->skip_block;
1776 $self->_load_objects ($self->{load_path}, 1) 2087 $self->_load_objects ($f)
1777 or return; 2088 or return;
1778 2089
1779 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2090 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1780 if delete $self->{load_original}; 2091 if delete $self->{load_original};
1781 2092
1782 if (my $uniq = $self->uniq_path) { 2093 if (my $uniq = $self->uniq_path) {
1783 utf8::encode $uniq; 2094 utf8::encode $uniq;
1784 if (aio_open $uniq, O_RDONLY, 0) { 2095 unless (aio_stat $uniq) {
2096 if (my $f = new_from_file cf::object::thawer $uniq) {
1785 $self->clear_unique_items; 2097 $self->clear_unique_items;
1786 $self->_load_objects ($uniq, 0); 2098 $self->_load_objects ($f);
2099 $f->resolve_delayed_derefs;
2100 }
1787 } 2101 }
1788 } 2102 }
1789 2103
1790 Coro::cede; 2104 $f->resolve_delayed_derefs;
2105
2106 cf::cede_to_tick;
1791 # now do the right thing for maps 2107 # now do the right thing for maps
1792 $self->link_multipart_objects; 2108 $self->link_multipart_objects;
1793 $self->difficulty ($self->estimate_difficulty) 2109 $self->difficulty ($self->estimate_difficulty)
1794 unless $self->difficulty; 2110 unless $self->difficulty;
1795 Coro::cede; 2111 cf::cede_to_tick;
1796 2112
1797 unless ($self->{deny_activate}) { 2113 unless ($self->{deny_activate}) {
1798 $self->decay_objects; 2114 $self->decay_objects;
1799 $self->fix_auto_apply; 2115 $self->fix_auto_apply;
1800 $self->update_buttons; 2116 $self->update_buttons;
1801 Coro::cede; 2117 cf::cede_to_tick;
1802 $self->set_darkness_map; 2118 $self->set_darkness_map;
1803 Coro::cede; 2119 cf::cede_to_tick;
1804 $self->activate; 2120 $self->activate;
1805 } 2121 }
1806 2122
2123 $self->{last_save} = $cf::RUNTIME;
2124 $self->last_access ($cf::RUNTIME);
2125
1807 $self->in_memory (cf::MAP_IN_MEMORY); 2126 $self->in_memory (cf::MAP_ACTIVE);
1808 } 2127 }
1809 2128
1810 $self->post_load; 2129 $self->post_load;
1811} 2130}
1812 2131
1821 2140
1822 $self 2141 $self
1823} 2142}
1824 2143
1825# 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
1826sub load_diag { 2145sub load_neighbours {
1827 my ($map) = @_; 2146 my ($map) = @_;
1828 2147
1829 my @diag; # diagonal neighbours 2148 my @neigh; # diagonal neighbours
1830 2149
1831 for (0 .. 3) { 2150 for (0 .. 3) {
1832 my $neigh = $map->tile_path ($_) 2151 my $neigh = $map->tile_path ($_)
1833 or next; 2152 or next;
1834 $neigh = find $neigh, $map 2153 $neigh = find $neigh, $map
1835 or next; 2154 or next;
1836 $neigh->load; 2155 $neigh->load;
1837 2156
2157 push @neigh,
1838 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2158 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1839 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2159 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1840 } 2160 }
1841 2161
1842 for (@diag) { 2162 for (grep defined $_->[0], @neigh) {
2163 my ($path, $origin) = @$_;
1843 my $neigh = find @$_ 2164 my $neigh = find $path, $origin
1844 or next; 2165 or next;
1845 $neigh->load; 2166 $neigh->load;
1846 } 2167 }
1847} 2168}
1848 2169
1853} 2174}
1854 2175
1855sub do_load_sync { 2176sub do_load_sync {
1856 my ($map) = @_; 2177 my ($map) = @_;
1857 2178
2179 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2180 if $Coro::current == $Coro::main;
2181
1858 cf::sync_job { $map->load }; 2182 cf::sync_job { $map->load };
1859} 2183}
1860 2184
1861our %MAP_PREFETCH; 2185our %MAP_PREFETCH;
1862our $MAP_PREFETCHER = undef; 2186our $MAP_PREFETCHER = undef;
1863 2187
1864sub find_async { 2188sub find_async {
1865 my ($path, $origin) = @_; 2189 my ($path, $origin, $load) = @_;
1866 2190
1867 $path = normalise $path, $origin && $origin->{path}; 2191 $path = normalise $path, $origin && $origin->{path};
1868 2192
1869 if (my $map = $cf::MAP{$path}) { 2193 if (my $map = $cf::MAP{$path}) {
1870 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2194 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1871 } 2195 }
1872 2196
1873 undef $MAP_PREFETCH{$path}; 2197 $MAP_PREFETCH{$path} |= $load;
2198
1874 $MAP_PREFETCHER ||= cf::async { 2199 $MAP_PREFETCHER ||= cf::async {
2200 $Coro::current->{desc} = "map prefetcher";
2201
1875 while (%MAP_PREFETCH) { 2202 while (%MAP_PREFETCH) {
1876 for my $path (keys %MAP_PREFETCH) { 2203 while (my ($k, $v) = each %MAP_PREFETCH) {
1877 my $map = find $path 2204 if (my $map = find $k) {
1878 or next;
1879 $map->load; 2205 $map->load if $v;
2206 }
1880 2207
1881 delete $MAP_PREFETCH{$path}; 2208 delete $MAP_PREFETCH{$k};
1882 } 2209 }
1883 } 2210 }
1884 undef $MAP_PREFETCHER; 2211 undef $MAP_PREFETCHER;
1885 }; 2212 };
1886 $MAP_PREFETCHER->prio (6); 2213 $MAP_PREFETCHER->prio (6);
1889} 2216}
1890 2217
1891sub save { 2218sub save {
1892 my ($self) = @_; 2219 my ($self) = @_;
1893 2220
1894 my $lock = cf::lock_acquire "map_data:" . $self->path; 2221 my $lock = cf::lock_acquire "map_data:$self->{path}";
1895 2222
1896 $self->{last_save} = $cf::RUNTIME; 2223 $self->{last_save} = $cf::RUNTIME;
1897 2224
1898 return unless $self->dirty; 2225 return unless $self->dirty;
1899 2226
1905 return if $self->{deny_save}; 2232 return if $self->{deny_save};
1906 2233
1907 local $self->{last_access} = $self->last_access;#d# 2234 local $self->{last_access} = $self->last_access;#d#
1908 2235
1909 cf::async { 2236 cf::async {
2237 $Coro::current->{desc} = "map player save";
1910 $_->contr->save for $self->players; 2238 $_->contr->save for $self->players;
1911 }; 2239 };
2240
2241 cf::get_slot 0.02;
1912 2242
1913 if ($uniq) { 2243 if ($uniq) {
1914 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2244 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1915 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2245 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1916 } else { 2246 } else {
1922 my ($self) = @_; 2252 my ($self) = @_;
1923 2253
1924 # save first because save cedes 2254 # save first because save cedes
1925 $self->save; 2255 $self->save;
1926 2256
1927 my $lock = cf::lock_acquire "map_data:" . $self->path; 2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
1928 2258
1929 return if $self->players; 2259 return if $self->players;
1930 return if $self->in_memory != cf::MAP_IN_MEMORY; 2260 return if $self->in_memory != cf::MAP_ACTIVE;
1931 return if $self->{deny_save}; 2261 return if $self->{deny_save};
1932 2262
2263 $self->in_memory (cf::MAP_SWAPPED);
2264
2265 $self->deactivate;
2266 $_->clear_links_to ($self) for values %cf::MAP;
1933 $self->clear; 2267 $self->clear;
1934 $self->in_memory (cf::MAP_SWAPPED);
1935} 2268}
1936 2269
1937sub reset_at { 2270sub reset_at {
1938 my ($self) = @_; 2271 my ($self) = @_;
1939 2272
1971 if $uniq; 2304 if $uniq;
1972 } 2305 }
1973 2306
1974 delete $cf::MAP{$self->path}; 2307 delete $cf::MAP{$self->path};
1975 2308
2309 $self->deactivate;
2310 $_->clear_links_to ($self) for values %cf::MAP;
1976 $self->clear; 2311 $self->clear;
1977
1978 $_->clear_links_to ($self) for values %cf::MAP;
1979 2312
1980 $self->unlink_save; 2313 $self->unlink_save;
1981 $self->destroy; 2314 $self->destroy;
1982} 2315}
1983 2316
1984my $nuke_counter = "aaaa"; 2317my $nuke_counter = "aaaa";
1985 2318
1986sub nuke { 2319sub nuke {
1987 my ($self) = @_; 2320 my ($self) = @_;
1988 2321
2322 {
2323 my $lock = cf::lock_acquire "map_data:$self->{path}";
2324
1989 delete $cf::MAP{$self->path}; 2325 delete $cf::MAP{$self->path};
1990 2326
1991 $self->unlink_save; 2327 $self->unlink_save;
1992 2328
1993 bless $self, "cf::map"; 2329 bless $self, "cf::map";
1994 delete $self->{deny_reset}; 2330 delete $self->{deny_reset};
1995 $self->{deny_save} = 1; 2331 $self->{deny_save} = 1;
1996 $self->reset_timeout (1); 2332 $self->reset_timeout (1);
1997 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2333 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1998 2334
1999 $cf::MAP{$self->path} = $self; 2335 $cf::MAP{$self->path} = $self;
2336 }
2000 2337
2001 $self->reset; # polite request, might not happen 2338 $self->reset; # polite request, might not happen
2002} 2339}
2003 2340
2004=item $maps = cf::map::tmp_maps 2341=item $maps = cf::map::tmp_maps
2046 2383
2047sub unique_maps() { 2384sub unique_maps() {
2048 [ 2385 [
2049 map { 2386 map {
2050 utf8::decode $_; 2387 utf8::decode $_;
2051 /\.map$/ 2388 s/\.map$//; # TODO future compatibility hack
2389 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2390 ? ()
2052 ? normalise $_ 2391 : normalise $_
2053 : ()
2054 } @{ aio_readdir $UNIQUEDIR or [] } 2392 } @{ aio_readdir $UNIQUEDIR or [] }
2055 ] 2393 ]
2056} 2394}
2057 2395
2058package cf;
2059
2060=back 2396=back
2061 2397
2062=head3 cf::object 2398=head3 cf::object
2063 2399
2064=cut 2400=cut
2067 2403
2068=over 4 2404=over 4
2069 2405
2070=item $ob->inv_recursive 2406=item $ob->inv_recursive
2071 2407
2072Returns 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.
2073 2410
2074=cut 2411=cut
2075 2412
2076sub inv_recursive_; 2413sub inv_recursive_;
2077sub inv_recursive_ { 2414sub inv_recursive_ {
2080 2417
2081sub inv_recursive { 2418sub inv_recursive {
2082 inv_recursive_ inv $_[0] 2419 inv_recursive_ inv $_[0]
2083} 2420}
2084 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
2085package cf; 2450package cf;
2086 2451
2087=back 2452=back
2088 2453
2089=head3 cf::object::player 2454=head3 cf::object::player
2095Sends 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>
2096can 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
2097dialogue with the given NPC character. 2462dialogue with the given NPC character.
2098 2463
2099=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};
2100 2479
2101# rough implementation of a future "reply" method that works 2480# rough implementation of a future "reply" method that works
2102# with dialog boxes. 2481# with dialog boxes.
2103#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
2104sub cf::object::player::reply($$$;$) { 2483sub cf::object::player::reply($$$;$) {
2111 2490
2112 } else { 2491 } else {
2113 my $pl = $self->contr; 2492 my $pl = $self->contr;
2114 2493
2115 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2494 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2116 my $diag = $pl->{npc_dialog}; 2495 my $dialog = $pl->{npc_dialog};
2117 $diag->{pl}->ext_reply ( 2496 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2118 $diag->{id},
2119 msgtype => "reply",
2120 msg => $diag->{pl}->expand_cfpod ($msg),
2121 add_topics => []
2122 );
2123 2497
2124 } else { 2498 } else {
2125 $msg = $npc->name . " says: $msg" if $npc; 2499 $msg = $npc->name . " says: $msg" if $npc;
2126 $self->message ($msg, $flags); 2500 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2127 } 2501 }
2128 } 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 (@_);
2129} 2513}
2130 2514
2131=item $player_object->may ("access") 2515=item $player_object->may ("access")
2132 2516
2133Returns wether the given player is authorized to access resource "access" 2517Returns wether the given player is authorized to access resource "access"
2212 # use -1 or undef as default coordinates, not 0, 0 2596 # use -1 or undef as default coordinates, not 0, 0
2213 ($x, $y) = ($map->enter_x, $map->enter_y) 2597 ($x, $y) = ($map->enter_x, $map->enter_y)
2214 if $x <=0 && $y <= 0; 2598 if $x <=0 && $y <= 0;
2215 2599
2216 $map->load; 2600 $map->load;
2217 $map->load_diag; 2601 $map->load_neighbours;
2218 2602
2219 return unless $self->contr->active; 2603 return unless $self->contr->active;
2220 $self->activate_recursive; 2604 $self->activate_recursive;
2221 2605
2222 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2606 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2223 $self->enter_map ($map, $x, $y); 2607 $self->enter_map ($map, $x, $y);
2224} 2608}
2225 2609
2226=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2610=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2227 2611
2228Moves the player to the given map-path and coordinates by first freezing 2612Moves the player to the given map-path and coordinates by first freezing
2229her, loading and preparing them map, calling the provided $check callback 2613her, loading and preparing them map, calling the provided $check callback
2230that has to return the map if sucecssful, and then unfreezes the player on 2614that has to return the map if sucecssful, and then unfreezes the player on
2231the new (success) or old (failed) map position. 2615the new (success) or old (failed) map position. In either case, $done will
2616be called at the end of this process.
2232 2617
2233=cut 2618=cut
2234 2619
2235our $GOTOGEN; 2620our $GOTOGEN;
2236 2621
2237sub cf::object::player::goto { 2622sub cf::object::player::goto {
2238 my ($self, $path, $x, $y, $check) = @_; 2623 my ($self, $path, $x, $y, $check, $done) = @_;
2239 2624
2240 # do generation counting so two concurrent goto's will be executed in-order 2625 # do generation counting so two concurrent goto's will be executed in-order
2241 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2626 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2242 2627
2243 $self->enter_link; 2628 $self->enter_link;
2244 2629
2245 (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
2246 my $map = eval { 2652 my $map = eval {
2247 my $map = cf::map::find $path; 2653 my $map = defined $path ? cf::map::find $path : undef;
2248 2654
2249 if ($map) { 2655 if ($map) {
2250 $map = $map->customise_for ($self); 2656 $map = $map->customise_for ($self);
2251 $map = $check->($map) if $check && $map; 2657 $map = $check->($map) if $check && $map;
2252 } else { 2658 } else {
2253 $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);
2254 } 2660 }
2255 2661
2256 $map 2662 $map
2257 }; 2663 };
2258 2664
2263 2669
2264 if ($gen == $self->{_goto_generation}) { 2670 if ($gen == $self->{_goto_generation}) {
2265 delete $self->{_goto_generation}; 2671 delete $self->{_goto_generation};
2266 $self->leave_link ($map, $x, $y); 2672 $self->leave_link ($map, $x, $y);
2267 } 2673 }
2674
2675 $done->() if $done;
2268 })->prio (1); 2676 })->prio (1);
2269} 2677}
2270 2678
2271=item $player_object->enter_exit ($exit_object) 2679=item $player_object->enter_exit ($exit_object)
2272 2680
2292} 2700}
2293 2701
2294sub prepare_random_map { 2702sub prepare_random_map {
2295 my ($exit) = @_; 2703 my ($exit) = @_;
2296 2704
2297 my $guard = cf::lock_acquire "exit_prepare:$exit";
2298
2299 # all this does is basically replace the /! path by 2705 # all this does is basically replace the /! path by
2300 # a new random map path (?random/...) with a seed 2706 # a new random map path (?random/...) with a seed
2301 # that depends on the exit object 2707 # that depends on the exit object
2302 2708
2303 my $rmp = parse_random_map_params $exit->msg; 2709 my $rmp = parse_random_map_params $exit->msg;
2305 if ($exit->map) { 2711 if ($exit->map) {
2306 $rmp->{region} = $exit->region->name; 2712 $rmp->{region} = $exit->region->name;
2307 $rmp->{origin_map} = $exit->map->path; 2713 $rmp->{origin_map} = $exit->map->path;
2308 $rmp->{origin_x} = $exit->x; 2714 $rmp->{origin_x} = $exit->x;
2309 $rmp->{origin_y} = $exit->y; 2715 $rmp->{origin_y} = $exit->y;
2716
2717 $exit->map->touch;
2310 } 2718 }
2311 2719
2312 $rmp->{random_seed} ||= $exit->random_seed; 2720 $rmp->{random_seed} ||= $exit->random_seed;
2313 2721
2314 my $data = cf::to_json $rmp; 2722 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2315 my $md5 = Digest::MD5::md5_hex $data; 2723 my $md5 = Digest::MD5::md5_hex $data;
2316 my $meta = "$RANDOMDIR/$md5.meta"; 2724 my $meta = "$RANDOMDIR/$md5.meta";
2317 2725
2318 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2726 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2319 aio_write $fh, 0, (length $data), $data, 0; 2727 aio_write $fh, 0, (length $data), $data, 0;
2320 undef $fh; 2728 undef $fh;
2321 aio_rename "$meta~", $meta; 2729 aio_rename "$meta~", $meta;
2322 2730
2731 my $slaying = "?random/$md5";
2732
2733 if ($exit->valid) {
2323 $exit->slaying ("?random/$md5"); 2734 $exit->slaying ("?random/$md5");
2324 $exit->msg (undef); 2735 $exit->msg (undef);
2736 }
2325 } 2737 }
2326} 2738}
2327 2739
2328sub cf::object::player::enter_exit { 2740sub cf::object::player::enter_exit {
2329 my ($self, $exit) = @_; 2741 my ($self, $exit) = @_;
2330 2742
2331 return unless $self->type == cf::PLAYER; 2743 return unless $self->type == cf::PLAYER;
2332 2744
2333 if ($exit->slaying eq "/!") {
2334 #TODO: this should de-fi-ni-te-ly not be a sync-job
2335 # the problem is that $exit might not survive long enough
2336 # so it needs to be done right now, right here
2337 cf::sync_job { prepare_random_map $exit };
2338 }
2339
2340 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2341 my $hp = $exit->stats->hp;
2342 my $sp = $exit->stats->sp;
2343
2344 $self->enter_link; 2745 $self->enter_link;
2345 2746
2346 (async { 2747 (async {
2347 $self->deactivate_recursive; # just to be sure 2748 $Coro::current->{desc} = "enter_exit";
2749
2348 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
2349 $self->goto ($slaying, $hp, $sp); 2765 $self->goto ($map, $x, $y);
2350 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
2351 1; 2771 1
2352 }) { 2772 }) {
2353 $self->message ("Something went wrong deep within the crossfire server. " 2773 $self->message ("Something went wrong deep within the crossfire server. "
2354 . "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. "
2355 . "Please report this to the dungeon master!", 2775 . "Please report this to the dungeon master!",
2356 cf::NDI_UNIQUE | cf::NDI_RED); 2776 cf::NDI_UNIQUE | cf::NDI_RED);
2377 2797
2378 utf8::encode $text; 2798 utf8::encode $text;
2379 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2799 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2380} 2800}
2381 2801
2382=item $client->send_msg ($color, $type, $msg, [extra...]) 2802=item $client->send_msg ($channel, $msg, $color, [extra...])
2383 2803
2384Send a drawinfo or msg packet to the client, formatting the msg for the 2804Send a drawinfo or msg packet to the client, formatting the msg for the
2385client if neccessary. C<$type> should be a string identifying the type of 2805client if neccessary. C<$type> should be a string identifying the type of
2386the 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
2387the message unless the client supports the msg packet. 2807the message unless the client supports the msg packet.
2388 2808
2389=cut 2809=cut
2390 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
2391sub cf::client::send_msg { 2869sub cf::client::send_msg {
2392 my ($self, $color, $type, $msg, @extra) = @_; 2870 my ($self, $channel, $msg, $color, @extra) = @_;
2393 2871
2394 $msg = $self->pl->expand_cfpod ($msg); 2872 $msg = $self->pl->expand_cfpod ($msg);
2395 2873
2874 $color &= cf::NDI_CLIENT_MASK; # just in case...
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
2885 } elsif (ref $channel) {
2886 # send meta info to client, if not yet sent
2887 unless (exists $self->{channel}{$channel->{id}}) {
2888 $self->{channel}{$channel->{id}} = $channel;
2889 $self->ext_msg (channel_info => $channel)
2890 if $self->can_msg;
2891 }
2892
2893 $channel = $channel->{id};
2894 }
2895
2896 return unless @extra || length $msg;
2897
2396 if ($self->can_msg) { 2898 if ($self->can_msg) {
2397 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2899 # default colour, mask it out
2900 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2901 if $color & cf::NDI_DEF;
2902
2903 $self->send_packet ("msg " . $self->{json_coder}->encode (
2904 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2398 } else { 2905 } else {
2399 # replace some tags by gcfclient-compatible ones
2400 for ($msg) {
2401 1 while
2402 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2403 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2404 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2405 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2406 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2407 }
2408
2409 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
2410 if (0 && $msg =~ /\[/) { 2921 if (0 && $msg =~ /\[/) {
2922 # COMMAND/INFO
2411 $self->send_packet ("drawextinfo $color 4 0 $msg") 2923 $self->send_packet ("drawextinfo $color 10 8 $msg")
2412 } else { 2924 } else {
2413 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2925 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2414 $self->send_packet ("drawinfo $color $msg") 2926 $self->send_packet ("drawinfo $color $msg")
2415 } 2927 }
2416 } 2928 }
2417 } 2929 }
2418} 2930}
2419 2931
2420=item $client->ext_event ($type, %msg) 2932=item $client->ext_msg ($type, @msg)
2421 2933
2422Sends an ext event to the client. 2934Sends an ext event to the client.
2423 2935
2424=cut 2936=cut
2425 2937
2426sub cf::client::ext_event($$%) { 2938sub cf::client::ext_msg($$@) {
2427 my ($self, $type, %msg) = @_; 2939 my ($self, $type, @msg) = @_;
2428 2940
2941 if ($self->extcmd == 2) {
2942 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2943 } elsif ($self->extcmd == 1) { # TODO: remove
2429 $msg{msgtype} = "event_$type"; 2944 push @msg, msgtype => "event_$type";
2430 $self->send_packet ("ext " . cf::to_json \%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 }
2431} 2965}
2432 2966
2433=item $success = $client->query ($flags, "text", \&cb) 2967=item $success = $client->query ($flags, "text", \&cb)
2434 2968
2435Queues a query to the client, calling the given callback with 2969Queues a query to the client, calling the given callback with
2458 2992
2459 1 2993 1
2460} 2994}
2461 2995
2462cf::client->attach ( 2996cf::client->attach (
2997 on_connect => sub {
2998 my ($ns) = @_;
2999
3000 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
3001 },
2463 on_reply => sub { 3002 on_reply => sub {
2464 my ($ns, $msg) = @_; 3003 my ($ns, $msg) = @_;
2465 3004
2466 # this weird shuffling is so that direct followup queries 3005 # this weird shuffling is so that direct followup queries
2467 # get handled first 3006 # get handled first
2482 } 3021 }
2483 }, 3022 },
2484 on_exticmd => sub { 3023 on_exticmd => sub {
2485 my ($ns, $buf) = @_; 3024 my ($ns, $buf) = @_;
2486 3025
2487 my $msg = eval { from_json $buf }; 3026 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2488 3027
2489 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
2490 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3036 if (my $cb = $EXTICMD{$type}) {
2491 if (my %reply = $cb->($ns, $msg)) { 3037 @reply = $cb->($ns, @payload);
2492 $reply{msgid} = $msg->{msgid};
2493 $ns->send ("ext " . cf::to_json \%reply);
2494 }
2495 } 3038 }
3039
3040 $ns->ext_reply ($reply, @reply)
3041 if $reply;
3042
2496 } else { 3043 } else {
2497 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";
2498 } 3045 }
2499 3046
2500 cf::override; 3047 cf::override;
2547our $safe = new Safe "safe"; 3094our $safe = new Safe "safe";
2548our $safe_hole = new Safe::Hole; 3095our $safe_hole = new Safe::Hole;
2549 3096
2550$SIG{FPE} = 'IGNORE'; 3097$SIG{FPE} = 'IGNORE';
2551 3098
2552$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));
2553 3104
2554# here we export the classes and methods available to script code 3105# here we export the classes and methods available to script code
2555 3106
2556=pod 3107=pod
2557 3108
2558The following functions and methods are available within a safe environment: 3109The following functions and methods are available within a safe environment:
2559 3110
2560 cf::object contr pay_amount pay_player map 3111 cf::object
3112 contr pay_amount pay_player map x y force_find force_add destroy
3113 insert remove name archname title slaying race decrease split
3114
2561 cf::object::player player 3115 cf::object::player
2562 cf::player peaceful 3116 player
2563 cf::map trigger 3117
3118 cf::player
3119 peaceful
3120
3121 cf::map
3122 trigger
2564 3123
2565=cut 3124=cut
2566 3125
2567for ( 3126for (
2568 ["cf::object" => qw(contr pay_amount pay_player map)], 3127 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3128 insert remove inv nrof name archname title slaying race
3129 decrease split destroy)],
2569 ["cf::object::player" => qw(player)], 3130 ["cf::object::player" => qw(player)],
2570 ["cf::player" => qw(peaceful)], 3131 ["cf::player" => qw(peaceful)],
2571 ["cf::map" => qw(trigger)], 3132 ["cf::map" => qw(trigger)],
2572) { 3133) {
2573 no strict 'refs'; 3134 no strict 'refs';
2649# the server's init and main functions 3210# the server's init and main functions
2650 3211
2651sub load_facedata($) { 3212sub load_facedata($) {
2652 my ($path) = @_; 3213 my ($path) = @_;
2653 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
2654 warn "loading facedata from $path\n"; 3221 warn "loading facedata from $path\n";
2655 3222
2656 my $facedata; 3223 my $facedata;
2657 0 < aio_load $path, $facedata 3224 0 < aio_load $path, $facedata
2658 or die "$path: $!"; 3225 or die "$path: $!";
2660 $facedata = Coro::Storable::thaw $facedata; 3227 $facedata = Coro::Storable::thaw $facedata;
2661 3228
2662 $facedata->{version} == 2 3229 $facedata->{version} == 2
2663 or cf::cleanup "$path: version mismatch, cannot proceed."; 3230 or cf::cleanup "$path: version mismatch, cannot proceed.";
2664 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
2665 { 3239 {
2666 my $faces = $facedata->{faceinfo}; 3240 my $faces = $facedata->{faceinfo};
2667 3241
2668 while (my ($face, $info) = each %$faces) { 3242 while (my ($face, $info) = each %$faces) {
2669 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3243 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3244
2670 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3245 cf::face::set_visibility $idx, $info->{visibility};
3246 cf::face::set_magicmap $idx, $info->{magicmap};
2671 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3247 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2672 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3248 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2673 Coro::cede; 3249
3250 cf::cede_to_tick;
2674 } 3251 }
2675 3252
2676 while (my ($face, $info) = each %$faces) { 3253 while (my ($face, $info) = each %$faces) {
2677 next unless $info->{smooth}; 3254 next unless $info->{smooth};
3255
2678 my $idx = cf::face::find $face 3256 my $idx = cf::face::find $face
2679 or next; 3257 or next;
3258
2680 if (my $smooth = cf::face::find $info->{smooth}) { 3259 if (my $smooth = cf::face::find $info->{smooth}) {
3260 cf::face::set_smooth $idx, $smooth;
2681 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3261 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2682 } else { 3262 } else {
2683 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3263 warn "smooth face '$info->{smooth}' not found for face '$face'";
2684 } 3264 }
2685 Coro::cede; 3265
3266 cf::cede_to_tick;
2686 } 3267 }
2687 } 3268 }
2688 3269
2689 { 3270 {
2690 my $anims = $facedata->{animinfo}; 3271 my $anims = $facedata->{animinfo};
2691 3272
2692 while (my ($anim, $info) = each %$anims) { 3273 while (my ($anim, $info) = each %$anims) {
2693 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3274 cf::anim::set $anim, $info->{frames}, $info->{facings};
2694 Coro::cede; 3275 cf::cede_to_tick;
2695 } 3276 }
2696 3277
2697 cf::anim::invalidate_all; # d'oh 3278 cf::anim::invalidate_all; # d'oh
2698 } 3279 }
2699 3280
3281 {
3282 # TODO: for gcfclient pleasure, we should give resources
3283 # that gcfclient doesn't grok a >10000 face index.
3284 my $res = $facedata->{resource};
3285
3286 while (my ($name, $info) = each %$res) {
3287 if (defined $info->{type}) {
3288 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3289 my $data;
3290
3291 if ($info->{type} & 1) {
3292 # prepend meta info
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};
3306 } else {
3307 $RESOURCE{$name} = $info;
3308 }
3309
3310 cf::cede_to_tick;
3311 }
3312 }
3313
3314 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3315
2700 1 3316 1
2701} 3317}
2702 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
2703sub 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
2704 load_resource_file "$MAPDIR/regions" 3362 load_resource_file "$MAPDIR/regions"
2705 or die "unable to load regions file\n"; 3363 or die "unable to load regions file\n";
3364
3365 for (cf::region::list) {
3366 $_->{match} = qr/$_->{match}/
3367 if exists $_->{match};
3368 }
2706} 3369}
2707 3370
2708sub reload_facedata { 3371sub reload_facedata {
2709 load_facedata "$DATADIR/facedata" 3372 load_facedata "$DATADIR/facedata"
2710 or die "unable to load facedata\n"; 3373 or die "unable to load facedata\n";
2721} 3384}
2722 3385
2723sub reload_resources { 3386sub reload_resources {
2724 warn "reloading resource files...\n"; 3387 warn "reloading resource files...\n";
2725 3388
3389 reload_facedata;
3390 reload_archetypes;
2726 reload_regions; 3391 reload_regions;
2727 reload_facedata;
2728 #reload_archetypes;#d#
2729 reload_archetypes;
2730 reload_treasures; 3392 reload_treasures;
2731 3393
2732 warn "finished reloading resource files\n"; 3394 warn "finished reloading resource files\n";
2733} 3395}
2734 3396
2735sub init { 3397sub init {
3398 my $guard = freeze_mainloop;
3399
2736 reload_resources; 3400 reload_resources;
2737} 3401}
2738 3402
2739sub cfg_load { 3403sub reload_config {
2740 open my $fh, "<:utf8", "$CONFDIR/config" 3404 open my $fh, "<:utf8", "$CONFDIR/config"
2741 or return; 3405 or return;
2742 3406
2743 local $/; 3407 local $/;
2744 *CFG = YAML::Syck::Load <$fh>; 3408 *CFG = YAML::Load <$fh>;
2745 3409
2746 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3410 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2747 3411
2748 $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};
2749 $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};
2760sub main { 3424sub main {
2761 # we must not ever block the main coroutine 3425 # we must not ever block the main coroutine
2762 local $Coro::idle = sub { 3426 local $Coro::idle = sub {
2763 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#
2764 (async { 3428 (async {
2765 Event::one_event; 3429 $Coro::current->{desc} = "IDLE BUG HANDLER";
3430 EV::loop EV::LOOP_ONESHOT;
2766 })->prio (Coro::PRIO_MAX); 3431 })->prio (Coro::PRIO_MAX);
2767 }; 3432 };
2768 3433
2769 cfg_load; 3434 {
3435 my $guard = freeze_mainloop;
3436 reload_config;
2770 db_init; 3437 db_init;
2771 load_extensions; 3438 load_extensions;
2772 3439
2773 $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
2774 Event::loop; 3444 EV::loop;
2775} 3445}
2776 3446
2777############################################################################# 3447#############################################################################
2778# initialisation and cleanup 3448# initialisation and cleanup
2779 3449
2780# install some emergency cleanup handlers 3450# install some emergency cleanup handlers
2781BEGIN { 3451BEGIN {
3452 our %SIGWATCHER = ();
2782 for my $signal (qw(INT HUP TERM)) { 3453 for my $signal (qw(INT HUP TERM)) {
2783 Event->signal ( 3454 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2784 reentrant => 0,
2785 data => WF_AUTOCANCEL,
2786 signal => $signal,
2787 prio => 0,
2788 cb => sub {
2789 cf::cleanup "SIG$signal"; 3455 cf::cleanup "SIG$signal";
2790 },
2791 ); 3456 };
2792 } 3457 }
2793} 3458}
2794 3459
2795sub write_runtime { 3460sub write_runtime_sync {
2796 my $runtime = "$LOCALDIR/runtime"; 3461 my $runtime = "$LOCALDIR/runtime";
2797 3462
2798 # first touch the runtime file to show we are still running: 3463 # first touch the runtime file to show we are still running:
2799 # the fsync below can take a very very long time. 3464 # the fsync below can take a very very long time.
2800 3465
2826 and return; 3491 and return;
2827 3492
2828 warn "runtime file written.\n"; 3493 warn "runtime file written.\n";
2829 3494
2830 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 };
2831} 3539}
2832 3540
2833sub emergency_save() { 3541sub emergency_save() {
2834 my $freeze_guard = cf::freeze_mainloop; 3542 my $freeze_guard = cf::freeze_mainloop;
2835 3543
2841 # and maps saved/destroyed asynchronously. 3549 # and maps saved/destroyed asynchronously.
2842 warn "begin emergency player save\n"; 3550 warn "begin emergency player save\n";
2843 for my $login (keys %cf::PLAYER) { 3551 for my $login (keys %cf::PLAYER) {
2844 my $pl = $cf::PLAYER{$login} or next; 3552 my $pl = $cf::PLAYER{$login} or next;
2845 $pl->valid or next; 3553 $pl->valid or next;
3554 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2846 $pl->save; 3555 $pl->save;
2847 } 3556 }
2848 warn "end emergency player save\n"; 3557 warn "end emergency player save\n";
2849 3558
2850 warn "begin emergency map save\n"; 3559 warn "begin emergency map save\n";
2856 warn "end emergency map save\n"; 3565 warn "end emergency map save\n";
2857 3566
2858 warn "begin emergency database checkpoint\n"; 3567 warn "begin emergency database checkpoint\n";
2859 BDB::db_env_txn_checkpoint $DB_ENV; 3568 BDB::db_env_txn_checkpoint $DB_ENV;
2860 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";
2861 }; 3574 };
2862 3575
2863 warn "leave emergency perl save\n"; 3576 warn "leave emergency perl save\n";
2864} 3577}
2865 3578
2880 warn "reloading..."; 3593 warn "reloading...";
2881 3594
2882 warn "entering sync_job"; 3595 warn "entering sync_job";
2883 3596
2884 cf::sync_job { 3597 cf::sync_job {
2885 cf::write_runtime; # external watchdog should not bark 3598 cf::write_runtime_sync; # external watchdog should not bark
2886 cf::emergency_save; 3599 cf::emergency_save;
2887 cf::write_runtime; # external watchdog should not bark 3600 cf::write_runtime_sync; # external watchdog should not bark
2888 3601
2889 warn "syncing database to disk"; 3602 warn "syncing database to disk";
2890 BDB::db_env_txn_checkpoint $DB_ENV; 3603 BDB::db_env_txn_checkpoint $DB_ENV;
2891 3604
2892 # 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
2893
2894 warn "cancelling all WF_AUTOCANCEL watchers";
2895 for (Event::all_watchers) {
2896 $_->cancel if $_->data & WF_AUTOCANCEL;
2897 }
2898 3606
2899 warn "flushing outstanding aio requests"; 3607 warn "flushing outstanding aio requests";
2900 for (;;) { 3608 for (;;) {
2901 BDB::flush; 3609 BDB::flush;
2902 IO::AIO::flush; 3610 IO::AIO::flush;
2903 Coro::cede; 3611 Coro::cede_notself;
2904 last unless IO::AIO::nreqs || BDB::nreqs; 3612 last unless IO::AIO::nreqs || BDB::nreqs;
2905 warn "iterate..."; 3613 warn "iterate...";
2906 } 3614 }
2907 3615
2908 ++$RELOAD; 3616 ++$RELOAD;
2967 warn "reloading cf.pm"; 3675 warn "reloading cf.pm";
2968 require cf; 3676 require cf;
2969 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3677 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2970 3678
2971 warn "loading config and database again"; 3679 warn "loading config and database again";
2972 cf::cfg_load; 3680 cf::reload_config;
2973 3681
2974 warn "loading extensions"; 3682 warn "loading extensions";
2975 cf::load_extensions; 3683 cf::load_extensions;
2976 3684
2977 warn "reattaching attachments to objects/players"; 3685 warn "reattaching attachments to objects/players";
2984 warn "leaving sync_job"; 3692 warn "leaving sync_job";
2985 3693
2986 1 3694 1
2987 } or do { 3695 } or do {
2988 warn $@; 3696 warn $@;
2989 warn "error while reloading, exiting."; 3697 cf::cleanup "error while reloading, exiting.";
2990 exit 1;
2991 }; 3698 };
2992 3699
2993 warn "reloaded"; 3700 warn "reloaded";
2994}; 3701};
2995 3702
2997 3704
2998sub reload_perl() { 3705sub reload_perl() {
2999 # doing reload synchronously and two reloads happen back-to-back, 3706 # doing reload synchronously and two reloads happen back-to-back,
3000 # coro crashes during coro_state_free->destroy here. 3707 # coro crashes during coro_state_free->destroy here.
3001 3708
3002 $RELOAD_WATCHER ||= Event->timer ( 3709 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3003 reentrant => 0,
3004 after => 0,
3005 data => WF_AUTOCANCEL,
3006 cb => sub {
3007 do_reload_perl; 3710 do_reload_perl;
3008 undef $RELOAD_WATCHER; 3711 undef $RELOAD_WATCHER;
3009 },
3010 ); 3712 };
3011} 3713}
3012 3714
3013register_command "reload" => sub { 3715register_command "reload" => sub {
3014 my ($who, $arg) = @_; 3716 my ($who, $arg) = @_;
3015 3717
3016 if ($who->flag (FLAG_WIZ)) { 3718 if ($who->flag (FLAG_WIZ)) {
3017 $who->message ("reloading server."); 3719 $who->message ("reloading server.");
3720 async {
3721 $Coro::current->{desc} = "perl_reload";
3018 async { reload_perl }; 3722 reload_perl;
3723 };
3019 } 3724 }
3020}; 3725};
3021 3726
3022unshift @INC, $LIBDIR; 3727unshift @INC, $LIBDIR;
3023 3728
3025 3730
3026our @WAIT_FOR_TICK; 3731our @WAIT_FOR_TICK;
3027our @WAIT_FOR_TICK_BEGIN; 3732our @WAIT_FOR_TICK_BEGIN;
3028 3733
3029sub wait_for_tick { 3734sub wait_for_tick {
3030 return unless $TICK_WATCHER->is_active;
3031 return if $Coro::current == $Coro::main; 3735 return if tick_inhibit || $Coro::current == $Coro::main;
3032 3736
3033 my $signal = new Coro::Signal; 3737 my $signal = new Coro::Signal;
3034 push @WAIT_FOR_TICK, $signal; 3738 push @WAIT_FOR_TICK, $signal;
3035 $signal->wait; 3739 $signal->wait;
3036} 3740}
3037 3741
3038sub wait_for_tick_begin { 3742sub wait_for_tick_begin {
3039 return unless $TICK_WATCHER->is_active;
3040 return if $Coro::current == $Coro::main; 3743 return if tick_inhibit || $Coro::current == $Coro::main;
3041 3744
3042 my $signal = new Coro::Signal; 3745 my $signal = new Coro::Signal;
3043 push @WAIT_FOR_TICK_BEGIN, $signal; 3746 push @WAIT_FOR_TICK_BEGIN, $signal;
3044 $signal->wait; 3747 $signal->wait;
3045} 3748}
3046 3749
3047 my $min = 1e6;#d# 3750sub tick {
3048 my $avg = 10;
3049$TICK_WATCHER = Event->timer (
3050 reentrant => 0,
3051 parked => 1,
3052 prio => 0,
3053 at => $NEXT_TICK || $TICK,
3054 data => WF_AUTOCANCEL,
3055 cb => sub {
3056 if ($Coro::current != $Coro::main) { 3751 if ($Coro::current != $Coro::main) {
3057 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"
3058 unless ++$bug_warning > 10; 3753 unless ++$bug_warning > 10;
3059 return; 3754 return;
3060 } 3755 }
3061 3756
3062 $NOW = $tick_start = Event::time;
3063
3064 cf::server_tick; # one server iteration 3757 cf::server_tick; # one server iteration
3065 3758
3066 0 && sync_job {#d# 3759 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3067 for(1..10) { 3760 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3068 my $t = Event::time; 3761 Coro::async_pool {
3069 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3762 $Coro::current->{desc} = "runtime saver";
3070 or die; 3763 write_runtime_sync
3071 3764 or warn "ERROR: unable to write runtime file: $!";
3072 $map->width (50);
3073 $map->height (50);
3074 $map->alloc;
3075 $map->_load_objects ("/tmp/x.map", 1);
3076 my $t = Event::time - $t;
3077
3078 #next unless $t < 0.0013;#d#
3079 if ($t < $min) {
3080 $min = $t;
3081 }
3082 $avg = $avg * 0.99 + $t * 0.01;
3083 }
3084 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3085 exit 0;
3086 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3087 }; 3765 };
3766 }
3088 3767
3089 $RUNTIME += $TICK;
3090 $NEXT_TICK += $TICK;
3091
3092 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3093 $NEXT_RUNTIME_WRITE = $NOW + 10;
3094 Coro::async_pool {
3095 write_runtime
3096 or warn "ERROR: unable to write runtime file: $!";
3097 };
3098 }
3099
3100# my $AFTER = Event::time;
3101# warn $AFTER - $NOW;#d#
3102
3103 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3768 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3104 $sig->send; 3769 $sig->send;
3105 } 3770 }
3106 while (my $sig = shift @WAIT_FOR_TICK) { 3771 while (my $sig = shift @WAIT_FOR_TICK) {
3107 $sig->send; 3772 $sig->send;
3108 } 3773 }
3109 3774
3110 $NOW = Event::time; 3775 $LOAD = ($NOW - $TICK_START) / $TICK;
3111
3112 # if we are delayed by four ticks or more, skip them all
3113 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3114
3115 $TICK_WATCHER->at ($NEXT_TICK);
3116 $TICK_WATCHER->start;
3117
3118 $LOAD = ($NOW - $tick_start) / $TICK;
3119 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3776 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3120 3777
3121 _post_tick; 3778 if (0) {
3122 3779 if ($NEXT_TICK) {
3123 3780 my $jitter = $TICK_START - $NEXT_TICK;
3781 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3782 warn "jitter $JITTER\n";#d#
3783 }
3124 }, 3784 }
3125); 3785}
3126 3786
3127{ 3787{
3128 BDB::max_poll_time $TICK * 0.1; 3788 # configure BDB
3129 $BDB_POLL_WATCHER = Event->io ( 3789
3130 reentrant => 0,
3131 fd => BDB::poll_fileno,
3132 poll => 'r',
3133 prio => 0,
3134 data => WF_AUTOCANCEL,
3135 cb => \&BDB::poll_cb,
3136 );
3137 BDB::min_parallel 8; 3790 BDB::min_parallel 8;
3138 3791 BDB::max_poll_reqs $TICK * 0.1;
3139 BDB::set_sync_prepare { 3792 $Coro::BDB::WATCHER->priority (1);
3140 my $status;
3141 my $current = $Coro::current;
3142 (
3143 sub {
3144 $status = $!;
3145 $current->ready; undef $current;
3146 },
3147 sub {
3148 Coro::schedule while defined $current;
3149 $! = $status;
3150 },
3151 )
3152 };
3153 3793
3154 unless ($DB_ENV) { 3794 unless ($DB_ENV) {
3155 $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);
3156 3800
3157 cf::sync_job { 3801 cf::sync_job {
3158 eval { 3802 eval {
3159 BDB::db_env_open 3803 BDB::db_env_open
3160 $DB_ENV, 3804 $DB_ENV,
3162 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
3163 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3807 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3164 0666; 3808 0666;
3165 3809
3166 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3810 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3167
3168 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3169 $DB_ENV->set_lk_detect;
3170 }; 3811 };
3171 3812
3172 cf::cleanup "db_env_open(db): $@" if $@; 3813 cf::cleanup "db_env_open(db): $@" if $@;
3173 }; 3814 };
3174 } 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 };
3175} 3826}
3176 3827
3177{ 3828{
3829 # configure IO::AIO
3830
3178 IO::AIO::min_parallel 8; 3831 IO::AIO::min_parallel 8;
3179
3180 undef $Coro::AIO::WATCHER;
3181 IO::AIO::max_poll_time $TICK * 0.1; 3832 IO::AIO::max_poll_time $TICK * 0.1;
3182 $AIO_POLL_WATCHER = Event->io ( 3833 $Coro::AIO::WATCHER->priority (1);
3183 reentrant => 0,
3184 data => WF_AUTOCANCEL,
3185 fd => IO::AIO::poll_fileno,
3186 poll => 'r',
3187 prio => 6,
3188 cb => \&IO::AIO::poll_cb,
3189 );
3190} 3834}
3191 3835
3192my $_log_backtrace; 3836my $_log_backtrace;
3193 3837
3194sub _log_backtrace { 3838sub _log_backtrace {
3198 3842
3199 # limit the # of concurrent backtraces 3843 # limit the # of concurrent backtraces
3200 if ($_log_backtrace < 2) { 3844 if ($_log_backtrace < 2) {
3201 ++$_log_backtrace; 3845 ++$_log_backtrace;
3202 async { 3846 async {
3847 $Coro::current->{desc} = "abt $msg";
3848
3203 my @bt = fork_call { 3849 my @bt = fork_call {
3204 @addr = map { sprintf "%x", $_ } @addr; 3850 @addr = map { sprintf "%x", $_ } @addr;
3205 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3851 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3206 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 |"
3207 or die "addr2line: $!"; 3853 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines