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.302 by root, Tue Jul 10 16:23:59 2007 UTC vs.
Revision 1.430 by root, Sun May 4 14:12:37 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV 3.2;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.61 (); 36use Coro 4.50 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
22use Coro::AIO; 43use Coro::AIO;
44use Coro::BDB;
23use Coro::Storable; 45use Coro::Storable;
46use Coro::Util ();
24 47
25use JSON::XS 1.4 (); 48use JSON::XS 2.01 ();
26use BDB (); 49use BDB ();
27use Data::Dumper; 50use Data::Dumper;
28use Digest::MD5; 51use Digest::MD5;
29use Fcntl; 52use Fcntl;
30use YAML::Syck (); 53use YAML ();
31use IO::AIO 2.32 (); 54use IO::AIO 2.51 ();
32use Time::HiRes; 55use Time::HiRes;
33use Compress::LZF; 56use Compress::LZF;
34use Digest::MD5 (); 57use Digest::MD5 ();
35 58
36# configure various modules to our taste 59# configure various modules to our taste
37# 60#
38$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
40Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
41
42$Event::Eval = 1; # no idea why this is required, but it is
43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46 64
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 66
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 68
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
74 93
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 97our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
82 99
83our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 104our $DB_ENV;
85 105
86our %CFG; 106our %CFG;
87 107
88our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 109our $RUNTIME;
110our $NOW;
90 111
91our %PLAYER; # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 113our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
94 115
95# used to convert map paths into valid unix filenames by replacing / by ∕ 116# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 118
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
101 123
102binmode STDOUT; 124binmode STDOUT;
103binmode STDERR; 125binmode STDERR;
104 126
105# read virtual server time, if available 127# read virtual server time, if available
158 180
159The raw value load value from the last tick. 181The raw value load value from the last tick.
160 182
161=item %cf::CFG 183=item %cf::CFG
162 184
163Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 186from wherever your confdir points to.
165 187
166=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
167 189
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 190These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
169returns 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
170per 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.
171 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
172=back 200=back
173 201
174=cut 202=cut
175 203
176BEGIN { 204BEGIN {
180 $msg .= "\n" 208 $msg .= "\n"
181 unless $msg =~ /\n$/; 209 unless $msg =~ /\n$/;
182 210
183 $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;
184 212
185 utf8::encode $msg;
186 LOG llevError, $msg; 213 LOG llevError, $msg;
187 }; 214 };
188} 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#?
189 231
190@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
191@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
192@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
193@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
206)) { 248)) {
207 no strict 'refs'; 249 no strict 'refs';
208 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
209} 251}
210 252
211$Event::DIED = sub { 253$EV::DIED = sub {
212 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
213}; 255};
214 256
215############################################################################# 257#############################################################################
216 258
239 $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;
240 $d 282 $d
241 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
242} 284}
243 285
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->utf8->max_size (1e6); # accept ~1mb max 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
415sub _store_scalar {
416 open my $fh, ">", \my $buf
417 or die "fork_call: cannot open fh-to-buf in child : $!";
418 Storable::store_fd $_[0], $fh;
419 close $fh;
420
421 $buf
422}
423 540
424sub fork_call(&@) { 541sub fork_call(&@) {
425 my ($cb, @args) = @_; 542 my ($cb, @args) = @_;
426 543
427# 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,
428# or die "socketpair: $!"; 545 # otherwise perl prematurely frees the stuff :/
429 pipe my $fh1, my $fh2 546 # TODO: investigate and fix (likely this will be rather laborious)
430 or die "pipe: $!";
431 547
432 if (my $pid = fork) { 548 my @res = Coro::Util::fork_eval {
433 close $fh2;
434
435 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
436 warn "pst<$res>" unless $res =~ /^pst/;
437 $res = Coro::Storable::thaw $res;
438
439 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
440
441 Carp::confess $$res unless "ARRAY" eq ref $res;
442
443 return wantarray ? @$res : $res->[-1];
444 } else {
445 reset_signals; 549 reset_signals;
446 local $SIG{__WARN__}; 550 &$cb
447 local $SIG{__DIE__}; 551 }, @args;
448 # just in case, this hack effectively disables event
449 # in the child. cleaner and slower would be canceling all watchers,
450 # but this works for the time being.
451 local $Coro::idle;
452 $Coro::current->prio (Coro::PRIO_MAX);
453 552
454 eval { 553 wantarray ? @res : $res[-1]
455 close $fh1; 554}
456 555
457 my @res = eval { $cb->(@args) }; 556=item $coin = coin_from_name $name
458 557
459 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 558=cut
460 close $fh2;
461 };
462 559
463 warn $@ if $@; 560our %coin_alias = (
464 _exit 0; 561 "silver" => "silvercoin",
465 } 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
466} 581}
467 582
468=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
469 584
470Returns a single value from the environment database. 585Returns a single value from the environment database.
472=item cf::db_put $family => $key => $value 587=item cf::db_put $family => $key => $value
473 588
474Stores 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
475data 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).
476 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
477=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}
478 615
479our $DB; 616our $DB;
480 617
481sub db_init { 618sub db_init {
482 unless ($DB) {
483 $DB = BDB::db_create $DB_ENV;
484
485 cf::sync_job { 619 cf::sync_job {
486 eval { 620 $DB ||= db_table "db";
487 $DB->set_flags (BDB::CHKSUM);
488
489 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
490 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
491 cf::cleanup "db_open(db): $!" if $!;
492 };
493 cf::cleanup "db_open(db): $@" if $@;
494 };
495 } 621 };
496} 622}
497 623
498sub db_get($$) { 624sub db_get($$) {
499 my $key = "$_[0]/$_[1]"; 625 my $key = "$_[0]/$_[1]";
500 626
550 if (1) { 676 if (1) {
551 $md5 = 677 $md5 =
552 join "\x00", 678 join "\x00",
553 $processversion, 679 $processversion,
554 map { 680 map {
555 Coro::cede; 681 cf::cede_to_tick;
556 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 682 ($src->[$_], Digest::MD5::md5_hex $data[$_])
557 } 0.. $#$src; 683 } 0.. $#$src;
558 684
559 685
560 my $dbmd5 = db_get cache => "$id/md5"; 686 my $dbmd5 = db_get cache => "$id/md5";
604attach callbacks/event handlers (a collection of which is called an "attachment") 730attach callbacks/event handlers (a collection of which is called an "attachment")
605to it. All such attachable objects support the following methods. 731to it. All such attachable objects support the following methods.
606 732
607In 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>
608C<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
609Crossfire TRT). 735Deliantra).
610 736
611=over 4 737=over 4
612 738
613=item $attachable->attach ($attachment, key => $value...) 739=item $attachable->attach ($attachment, key => $value...)
614 740
866 "; 992 ";
867 die if $@; 993 die if $@;
868} 994}
869 995
870our $override; 996our $override;
871our @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?
872 998
873sub override { 999sub override {
874 $override = 1; 1000 $override = 1;
875 @invoke_results = (); 1001 @INVOKE_RESULTS = (@_);
876} 1002}
877 1003
878sub do_invoke { 1004sub do_invoke {
879 my $event = shift; 1005 my $event = shift;
880 my $callbacks = shift; 1006 my $callbacks = shift;
881 1007
882 @invoke_results = (); 1008 @INVOKE_RESULTS = ();
883 1009
884 local $override; 1010 local $override;
885 1011
886 for (@$callbacks) { 1012 for (@$callbacks) {
887 eval { &{$_->[1]} }; 1013 eval { &{$_->[1]} };
896 } 1022 }
897 1023
898 0 1024 0
899} 1025}
900 1026
901=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
902 1028
903=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
904 1030
905Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
906 1032
907This 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
908removed 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
909results (if you must, access C<@cf::invoke_results> directly). 1035results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910 1036
911=back 1037=back
912 1038
913=cut 1039=cut
914 1040
915############################################################################# 1041#############################################################################
916# 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}
917 1085
918sub reattach { 1086sub reattach {
919 # basically do the same as instantiate, without calling instantiate 1087 # basically do the same as instantiate, without calling instantiate
920 my ($obj) = @_; 1088 my ($obj) = @_;
921 1089
942cf::attachable->attach ( 1110cf::attachable->attach (
943 prio => -1000000, 1111 prio => -1000000,
944 on_instantiate => sub { 1112 on_instantiate => sub {
945 my ($obj, $data) = @_; 1113 my ($obj, $data) = @_;
946 1114
947 $data = from_json $data; 1115 $data = decode_json $data;
948 1116
949 for (@$data) { 1117 for (@$data) {
950 my ($name, $args) = @$_; 1118 my ($name, $args) = @$_;
951 1119
952 $obj->attach ($name, %{$args || {} }); 1120 $obj->attach ($name, %{$args || {} });
968sub object_freezer_save { 1136sub object_freezer_save {
969 my ($filename, $rdata, $objs) = @_; 1137 my ($filename, $rdata, $objs) = @_;
970 1138
971 sync_job { 1139 sync_job {
972 if (length $$rdata) { 1140 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename);
973 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
974 $filename, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
975 1144
976 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
977 chmod SAVE_MODE, $fh; 1146 aio_chmod $fh, SAVE_MODE;
978 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
979 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
980 close $fh; 1149 aio_close $fh;
981 1150
982 if (@$objs) { 1151 if (@$objs) {
983 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) {
984 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
985 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
986 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
987 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
988 close $fh; 1157 aio_close $fh;
989 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
990 } 1159 }
991 } else { 1160 } else {
992 aio_unlink "$filename.pst"; 1161 aio_unlink "$filename.pst";
993 } 1162 }
998 } 1167 }
999 } else { 1168 } else {
1000 aio_unlink $filename; 1169 aio_unlink $filename;
1001 aio_unlink "$filename.pst"; 1170 aio_unlink "$filename.pst";
1002 } 1171 }
1003 } 1172 };
1004} 1173}
1005 1174
1006sub object_freezer_as_string { 1175sub object_freezer_as_string {
1007 my ($rdata, $objs) = @_; 1176 my ($rdata, $objs) = @_;
1008 1177
1020 or return; 1189 or return;
1021 1190
1022 unless (aio_stat "$filename.pst") { 1191 unless (aio_stat "$filename.pst") {
1023 (aio_load "$filename.pst", $av) >= 0 1192 (aio_load "$filename.pst", $av) >= 0
1024 or return; 1193 or return;
1194
1025 $av = eval { (Storable::thaw $av)->{objs} }; 1195 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs};
1026 } 1197 }
1027 1198
1199 utf8::decode (my $decname = $filename);
1028 warn sprintf "loading %s (%d)\n", 1200 warn sprintf "loading %s (%d,%d)\n",
1029 $filename, length $data, scalar @{$av || []}; 1201 $decname, length $data, scalar @{$av || []};
1202
1030 return ($data, $av); 1203 ($data, $av)
1031} 1204}
1032 1205
1033=head2 COMMAND CALLBACKS 1206=head2 COMMAND CALLBACKS
1034 1207
1035=over 4 1208=over 4
1108 my ($pl, $buf) = @_; 1281 my ($pl, $buf) = @_;
1109 1282
1110 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1283 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111 1284
1112 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
1113 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1293 if (my $cb = $EXTCMD{$type}) {
1114 if (my %reply = $cb->($pl, $msg)) { 1294 @reply = $cb->($pl, @payload);
1115 $pl->ext_reply ($msg->{msgid}, %reply);
1116 }
1117 } 1295 }
1296
1297 $pl->ext_reply ($reply, @reply)
1298 if $reply;
1299
1118 } else { 1300 } else {
1119 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120 } 1302 }
1121 1303
1122 cf::override; 1304 cf::override;
1175 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1176 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1177 1359
1178 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1179 warn $msg; 1361 warn $msg;
1180 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1181 exit 1;
1182 } 1363 }
1183 1364
1184 warn $msg; 1365 warn $msg;
1185 } 1366 }
1186 1367
1211use Coro::AIO; 1392use Coro::AIO;
1212 1393
1213=head3 cf::player 1394=head3 cf::player
1214 1395
1215=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}
1216 1411
1217=item cf::player::find $login 1412=item cf::player::find $login
1218 1413
1219Returns the given player object, loading it if necessary (might block). 1414Returns the given player object, loading it if necessary (might block).
1220 1415
1256 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1451 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1257 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1452 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1258 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1453 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1259 aio_unlink +(playerdir $login) . "/$login.pl"; 1454 aio_unlink +(playerdir $login) . "/$login.pl";
1260 1455
1261 my $pl = load_pl path $login 1456 my $f = new_from_file cf::object::thawer path $login
1262 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;
1263 $cf::PLAYER{$login} = $pl 1464 $cf::PLAYER{$login} = $pl
1264 } 1465 }
1265 } 1466 }
1266} 1467}
1267 1468
1276 return if $pl->{deny_save}; 1477 return if $pl->{deny_save};
1277 1478
1278 aio_mkdir playerdir $pl, 0770; 1479 aio_mkdir playerdir $pl, 0770;
1279 $pl->{last_save} = $cf::RUNTIME; 1480 $pl->{last_save} = $cf::RUNTIME;
1280 1481
1482 cf::get_slot 0.01;
1483
1281 $pl->save_pl ($path); 1484 $pl->save_pl ($path);
1282 Coro::cede; 1485 cf::cede_to_tick;
1283} 1486}
1284 1487
1285sub new($) { 1488sub new($) {
1286 my ($login) = @_; 1489 my ($login) = @_;
1287 1490
1291 $self->{deny_save} = 1; 1494 $self->{deny_save} = 1;
1292 1495
1293 $cf::PLAYER{$login} = $self; 1496 $cf::PLAYER{$login} = $self;
1294 1497
1295 $self 1498 $self
1499}
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 (@_);
1296} 1509}
1297 1510
1298=item $pl->quit_character 1511=item $pl->quit_character
1299 1512
1300Nukes the player without looking back. If logged in, the connection will 1513Nukes the player without looking back. If logged in, the connection will
1355 or return []; 1568 or return [];
1356 1569
1357 my @logins; 1570 my @logins;
1358 1571
1359 for my $login (@$dirs) { 1572 for my $login (@$dirs) {
1573 my $path = path $login;
1574
1575 # a .pst is a dead give-away for a valid player
1576 # if no pst file found, open and chekc for blocked users
1577 if (aio_stat "$path.pst") {
1360 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1578 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1361 aio_read $fh, 0, 512, my $buf, 0 or next; 1579 aio_read $fh, 0, 512, my $buf, 0 or next;
1362 $buf !~ /^password -------------$/m or next; # official not-valid tag 1580 $buf !~ /^password -------------$/m or next; # official not-valid tag
1581 }
1363 1582
1364 utf8::decode $login; 1583 utf8::decode $login;
1365 push @logins, $login; 1584 push @logins, $login;
1366 } 1585 }
1367 1586
1400 1619
1401Expand crossfire pod fragments into protocol xml. 1620Expand crossfire pod fragments into protocol xml.
1402 1621
1403=cut 1622=cut
1404 1623
1624use re 'eval';
1625
1626my $group;
1627my $interior; $interior = qr{
1628 # match a pod interior sequence sans C<< >>
1629 (?:
1630 \ (.*?)\ (?{ $group = $^N })
1631 | < (??{$interior}) >
1632 )
1633}x;
1634
1405sub expand_cfpod { 1635sub expand_cfpod {
1406 ((my $self), (local $_)) = @_; 1636 my ($self, $pod) = @_;
1407 1637
1408 # escape & and < 1638 my $xml;
1409 s/&/&amp;/g;
1410 s/(?<![BIUGH])</&lt;/g;
1411 1639
1412 # this is buggy, it needs to properly take care of nested <'s 1640 while () {
1641 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1642 $group = $1;
1413 1643
1414 1 while 1644 $group =~ s/&/&amp;/g;
1415 # replace B<>, I<>, U<> etc. 1645 $group =~ s/</&lt;/g;
1416 s/B<([^\>]*)>/<b>$1<\/b>/ 1646
1417 || s/I<([^\>]*)>/<i>$1<\/i>/ 1647 $xml .= $group;
1418 || s/U<([^\>]*)>/<u>$1<\/u>/ 1648 } elsif ($pod =~ m%\G
1419 # replace G<male|female> tags 1649 ([BCGHITU])
1420 || s{G<([^>|]*)\|([^>]*)>}{ 1650 <
1421 $self->gender ? $2 : $1 1651 (?:
1422 }ge 1652 ([^<>]*) (?{ $group = $^N })
1423 # replace H<hint text> 1653 | < $interior >
1424 || s{H<([^\>]*)>} 1654 )
1655 >
1656 %gcsx
1425 { 1657 ) {
1658 my ($code, $data) = ($1, $group);
1659
1660 if ($code eq "B") {
1661 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1662 } elsif ($code eq "I") {
1663 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1664 } elsif ($code eq "U") {
1665 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1666 } elsif ($code eq "C") {
1667 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1668 } elsif ($code eq "T") {
1669 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1670 } elsif ($code eq "G") {
1671 my ($male, $female) = split /\|/, $data;
1672 $data = $self->gender ? $female : $male;
1673 $xml .= expand_cfpod ($self, $data);
1674 } elsif ($code eq "H") {
1426 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1675 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1427 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1676 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1428 "") 1677 "")
1429 [$self->{hintmode}] 1678 [$self->{hintmode}];
1679 } else {
1680 $xml .= "error processing '$code($data)' directive";
1430 }ge; 1681 }
1682 } else {
1683 if ($pod =~ /\G(.+)/) {
1684 warn "parse error while expanding $pod (at $1)";
1685 }
1686 last;
1687 }
1688 }
1431 1689
1690 for ($xml) {
1432 # create single paragraphs (very hackish) 1691 # create single paragraphs (very hackish)
1433 s/(?<=\S)\n(?=\w)/ /g; 1692 s/(?<=\S)\n(?=\w)/ /g;
1434 1693
1435 # compress some whitespace 1694 # compress some whitespace
1436 s/\s+\n/\n/g; # ws line-ends 1695 s/\s+\n/\n/g; # ws line-ends
1437 s/\n\n+/\n/g; # double lines 1696 s/\n\n+/\n/g; # double lines
1438 s/^\n+//; # beginning lines 1697 s/^\n+//; # beginning lines
1439 s/\n+$//; # ending lines 1698 s/\n+$//; # ending lines
1699 }
1440 1700
1441 $_ 1701 $xml
1442} 1702}
1703
1704no re 'eval';
1443 1705
1444sub hintmode { 1706sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1; 1707 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode} 1708 $_[0]{hintmode}
1447} 1709}
1448 1710
1449=item $player->ext_reply ($msgid, %msg) 1711=item $player->ext_reply ($msgid, @msg)
1450 1712
1451Sends an ext reply to the player. 1713Sends an ext reply to the player.
1452 1714
1453=cut 1715=cut
1454 1716
1455sub ext_reply($$%) { 1717sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1718 my ($self, $id, @msg) = @_;
1457 1719
1458 $msg{msgid} = $id; 1720 $self->ns->ext_reply ($id, @msg)
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460} 1721}
1461 1722
1462=item $player->ext_event ($type, %msg) 1723=item $player->ext_msg ($type, @msg)
1463 1724
1464Sends an ext event to the client. 1725Sends an ext event to the client.
1465 1726
1466=cut 1727=cut
1467 1728
1468sub ext_event($$%) { 1729sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1730 my ($self, $type, @msg) = @_;
1470 1731
1471 $self->ns->ext_event ($type, %msg); 1732 $self->ns->ext_msg ($type, @msg);
1472} 1733}
1473 1734
1474=head3 cf::region 1735=head3 cf::region
1475 1736
1476=over 4 1737=over 4
1489 my ($path) = @_; 1750 my ($path) = @_;
1490 1751
1491 my ($match, $specificity); 1752 my ($match, $specificity);
1492 1753
1493 for my $region (list) { 1754 for my $region (list) {
1494 if ($region->match && $path =~ $region->match) { 1755 if ($region->{match} && $path =~ $region->{match}) {
1495 ($match, $specificity) = ($region, $region->specificity) 1756 ($match, $specificity) = ($region, $region->specificity)
1496 if $region->specificity > $specificity; 1757 if $region->specificity > $specificity;
1497 } 1758 }
1498 } 1759 }
1499 1760
1520our $MAX_RESET = 3600; 1781our $MAX_RESET = 3600;
1521our $DEFAULT_RESET = 3000; 1782our $DEFAULT_RESET = 3000;
1522 1783
1523sub generate_random_map { 1784sub generate_random_map {
1524 my ($self, $rmp) = @_; 1785 my ($self, $rmp) = @_;
1786
1787 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1788
1525 # mit "rum" bekleckern, nicht 1789 # mit "rum" bekleckern, nicht
1526 $self->_create_random_map ( 1790 $self->_create_random_map (
1527 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1791 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1528 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1792 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1529 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1793 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1619 $self->init; # pass $1 etc. 1883 $self->init; # pass $1 etc.
1620 return $self; 1884 return $self;
1621 } 1885 }
1622 } 1886 }
1623 1887
1624 Carp::carp "unable to resolve path '$path' (base '$base')."; 1888 Carp::cluck "unable to resolve path '$path' (base '$base').";
1625 () 1889 ()
1626} 1890}
1627 1891
1628sub init { 1892sub init {
1629 my ($self) = @_; 1893 my ($self) = @_;
1651 1915
1652# the temporary/swap location 1916# the temporary/swap location
1653sub save_path { 1917sub save_path {
1654 my ($self) = @_; 1918 my ($self) = @_;
1655 1919
1656 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1920 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1657 "$TMPDIR/$path.map" 1921 "$TMPDIR/$path.map"
1658} 1922}
1659 1923
1660# the unique path, undef == no special unique path 1924# the unique path, undef == no special unique path
1661sub uniq_path { 1925sub uniq_path {
1662 my ($self) = @_; 1926 my ($self) = @_;
1663 1927
1664 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1665 "$UNIQUEDIR/$path" 1929 "$UNIQUEDIR/$path"
1666} 1930}
1667 1931
1668# and all this just because we cannot iterate over 1932# and all this just because we cannot iterate over
1669# all maps in C++... 1933# all maps in C++...
1692 1956
1693sub load_header_from($) { 1957sub load_header_from($) {
1694 my ($self, $path) = @_; 1958 my ($self, $path) = @_;
1695 1959
1696 utf8::encode $path; 1960 utf8::encode $path;
1697 #aio_open $path, O_RDONLY, 0 1961 my $f = new_from_file cf::object::thawer $path
1698 # or return;
1699
1700 $self->_load_header ($path)
1701 or return; 1962 or return;
1963
1964 $self->_load_header ($f)
1965 or return;
1966
1967 local $MAP_LOADING{$self->{path}} = $self;
1968 $f->resolve_delayed_derefs;
1702 1969
1703 $self->{load_path} = $path; 1970 $self->{load_path} = $path;
1704 1971
1705 1 1972 1
1706} 1973}
1760sub find { 2027sub find {
1761 my ($path, $origin) = @_; 2028 my ($path, $origin) = @_;
1762 2029
1763 $path = normalise $path, $origin && $origin->path; 2030 $path = normalise $path, $origin && $origin->path;
1764 2031
2032 cf::lock_wait "map_data:$path";#d#remove
1765 cf::lock_wait "map_find:$path"; 2033 cf::lock_wait "map_find:$path";
1766 2034
1767 $cf::MAP{$path} || do { 2035 $cf::MAP{$path} || do {
2036 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1768 my $guard = cf::lock_acquire "map_find:$path"; 2037 my $guard2 = cf::lock_acquire "map_find:$path";
2038
1769 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
1770 or return; 2040 or return;
1771 2041
1772 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
1773 2043
1775 or return; 2045 or return;
1776 2046
1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778 # doing this can freeze the server in a sync job, obviously 2048 # doing this can freeze the server in a sync job, obviously
1779 #$cf::WAIT_FOR_TICK->wait; 2049 #$cf::WAIT_FOR_TICK->wait;
2050 undef $guard2;
2051 undef $guard1;
1780 $map->reset; 2052 $map->reset;
1781 undef $guard;
1782 return find $path; 2053 return find $path;
1783 } 2054 }
1784 2055
1785 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
1786 } 2057 }
1795 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
1796 2067
1797 my $path = $self->{path}; 2068 my $path = $self->{path};
1798 2069
1799 { 2070 {
1800 my $guard = cf::lock_acquire "map_load:$path"; 2071 my $guard = cf::lock_acquire "map_data:$path";
1801 2072
2073 return unless $self->valid;
1802 return if $self->in_memory != cf::MAP_SWAPPED; 2074 return unless $self->in_memory == cf::MAP_SWAPPED;
1803 2075
1804 $self->in_memory (cf::MAP_LOADING); 2076 $self->in_memory (cf::MAP_LOADING);
1805 2077
1806 $self->alloc; 2078 $self->alloc;
1807 2079
1808 $self->pre_load; 2080 $self->pre_load;
1809 Coro::cede; 2081 cf::cede_to_tick;
1810 2082
2083 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block;
1811 $self->_load_objects ($self->{load_path}, 1) 2085 $self->_load_objects ($f)
1812 or return; 2086 or return;
1813 2087
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2088 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1815 if delete $self->{load_original}; 2089 if delete $self->{load_original};
1816 2090
1817 if (my $uniq = $self->uniq_path) { 2091 if (my $uniq = $self->uniq_path) {
1818 utf8::encode $uniq; 2092 utf8::encode $uniq;
1819 if (aio_open $uniq, O_RDONLY, 0) { 2093 unless (aio_stat $uniq) {
2094 if (my $f = new_from_file cf::object::thawer $uniq) {
1820 $self->clear_unique_items; 2095 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0); 2096 $self->_load_objects ($f);
2097 $f->resolve_delayed_derefs;
2098 }
1822 } 2099 }
1823 } 2100 }
1824 2101
1825 Coro::cede; 2102 $f->resolve_delayed_derefs;
2103
2104 cf::cede_to_tick;
1826 # now do the right thing for maps 2105 # now do the right thing for maps
1827 $self->link_multipart_objects; 2106 $self->link_multipart_objects;
1828 $self->difficulty ($self->estimate_difficulty) 2107 $self->difficulty ($self->estimate_difficulty)
1829 unless $self->difficulty; 2108 unless $self->difficulty;
1830 Coro::cede; 2109 cf::cede_to_tick;
1831 2110
1832 unless ($self->{deny_activate}) { 2111 unless ($self->{deny_activate}) {
1833 $self->decay_objects; 2112 $self->decay_objects;
1834 $self->fix_auto_apply; 2113 $self->fix_auto_apply;
1835 $self->update_buttons; 2114 $self->update_buttons;
1836 Coro::cede; 2115 cf::cede_to_tick;
1837 $self->set_darkness_map; 2116 $self->set_darkness_map;
1838 Coro::cede; 2117 cf::cede_to_tick;
1839 $self->activate; 2118 $self->activate;
1840 } 2119 }
1841 2120
2121 $self->{last_save} = $cf::RUNTIME;
2122 $self->last_access ($cf::RUNTIME);
2123
1842 $self->in_memory (cf::MAP_IN_MEMORY); 2124 $self->in_memory (cf::MAP_ACTIVE);
1843 } 2125 }
1844 2126
1845 $self->post_load; 2127 $self->post_load;
1846} 2128}
1847 2129
1856 2138
1857 $self 2139 $self
1858} 2140}
1859 2141
1860# find and load all maps in the 3x3 area around a map 2142# find and load all maps in the 3x3 area around a map
1861sub load_diag { 2143sub load_neighbours {
1862 my ($map) = @_; 2144 my ($map) = @_;
1863 2145
1864 my @diag; # diagonal neighbours 2146 my @neigh; # diagonal neighbours
1865 2147
1866 for (0 .. 3) { 2148 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_) 2149 my $neigh = $map->tile_path ($_)
1868 or next; 2150 or next;
1869 $neigh = find $neigh, $map 2151 $neigh = find $neigh, $map
1870 or next; 2152 or next;
1871 $neigh->load; 2153 $neigh->load;
1872 2154
2155 push @neigh,
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2156 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2157 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 } 2158 }
1876 2159
1877 for (@diag) { 2160 for (grep defined $_->[0], @neigh) {
2161 my ($path, $origin) = @$_;
1878 my $neigh = find @$_ 2162 my $neigh = find $path, $origin
1879 or next; 2163 or next;
1880 $neigh->load; 2164 $neigh->load;
1881 } 2165 }
1882} 2166}
1883 2167
1888} 2172}
1889 2173
1890sub do_load_sync { 2174sub do_load_sync {
1891 my ($map) = @_; 2175 my ($map) = @_;
1892 2176
2177 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2178 if $Coro::current == $Coro::main;
2179
1893 cf::sync_job { $map->load }; 2180 cf::sync_job { $map->load };
1894} 2181}
1895 2182
1896our %MAP_PREFETCH; 2183our %MAP_PREFETCH;
1897our $MAP_PREFETCHER = undef; 2184our $MAP_PREFETCHER = undef;
1898 2185
1899sub find_async { 2186sub find_async {
1900 my ($path, $origin) = @_; 2187 my ($path, $origin, $load) = @_;
1901 2188
1902 $path = normalise $path, $origin && $origin->{path}; 2189 $path = normalise $path, $origin && $origin->{path};
1903 2190
1904 if (my $map = $cf::MAP{$path}) { 2191 if (my $map = $cf::MAP{$path}) {
1905 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2192 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1906 } 2193 }
1907 2194
1908 undef $MAP_PREFETCH{$path}; 2195 $MAP_PREFETCH{$path} |= $load;
2196
1909 $MAP_PREFETCHER ||= cf::async { 2197 $MAP_PREFETCHER ||= cf::async {
2198 $Coro::current->{desc} = "map prefetcher";
2199
1910 while (%MAP_PREFETCH) { 2200 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 2201 while (my ($k, $v) = each %MAP_PREFETCH) {
1912 my $map = find $path 2202 if (my $map = find $k) {
1913 or next;
1914 $map->load; 2203 $map->load if $v;
2204 }
1915 2205
1916 delete $MAP_PREFETCH{$path}; 2206 delete $MAP_PREFETCH{$k};
1917 } 2207 }
1918 } 2208 }
1919 undef $MAP_PREFETCHER; 2209 undef $MAP_PREFETCHER;
1920 }; 2210 };
1921 $MAP_PREFETCHER->prio (6); 2211 $MAP_PREFETCHER->prio (6);
1924} 2214}
1925 2215
1926sub save { 2216sub save {
1927 my ($self) = @_; 2217 my ($self) = @_;
1928 2218
1929 my $lock = cf::lock_acquire "map_data:" . $self->path; 2219 my $lock = cf::lock_acquire "map_data:$self->{path}";
1930 2220
1931 $self->{last_save} = $cf::RUNTIME; 2221 $self->{last_save} = $cf::RUNTIME;
1932 2222
1933 return unless $self->dirty; 2223 return unless $self->dirty;
1934 2224
1940 return if $self->{deny_save}; 2230 return if $self->{deny_save};
1941 2231
1942 local $self->{last_access} = $self->last_access;#d# 2232 local $self->{last_access} = $self->last_access;#d#
1943 2233
1944 cf::async { 2234 cf::async {
2235 $Coro::current->{desc} = "map player save";
1945 $_->contr->save for $self->players; 2236 $_->contr->save for $self->players;
1946 }; 2237 };
2238
2239 cf::get_slot 0.02;
1947 2240
1948 if ($uniq) { 2241 if ($uniq) {
1949 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2242 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1950 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2243 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1951 } else { 2244 } else {
1957 my ($self) = @_; 2250 my ($self) = @_;
1958 2251
1959 # save first because save cedes 2252 # save first because save cedes
1960 $self->save; 2253 $self->save;
1961 2254
1962 my $lock = cf::lock_acquire "map_data:" . $self->path; 2255 my $lock = cf::lock_acquire "map_data:$self->{path}";
1963 2256
1964 return if $self->players; 2257 return if $self->players;
1965 return if $self->in_memory != cf::MAP_IN_MEMORY; 2258 return if $self->in_memory != cf::MAP_ACTIVE;
1966 return if $self->{deny_save}; 2259 return if $self->{deny_save};
1967 2260
2261 $self->in_memory (cf::MAP_SWAPPED);
2262
2263 $self->deactivate;
2264 $_->clear_links_to ($self) for values %cf::MAP;
1968 $self->clear; 2265 $self->clear;
1969 $self->in_memory (cf::MAP_SWAPPED);
1970} 2266}
1971 2267
1972sub reset_at { 2268sub reset_at {
1973 my ($self) = @_; 2269 my ($self) = @_;
1974 2270
2006 if $uniq; 2302 if $uniq;
2007 } 2303 }
2008 2304
2009 delete $cf::MAP{$self->path}; 2305 delete $cf::MAP{$self->path};
2010 2306
2307 $self->deactivate;
2308 $_->clear_links_to ($self) for values %cf::MAP;
2011 $self->clear; 2309 $self->clear;
2012
2013 $_->clear_links_to ($self) for values %cf::MAP;
2014 2310
2015 $self->unlink_save; 2311 $self->unlink_save;
2016 $self->destroy; 2312 $self->destroy;
2017} 2313}
2018 2314
2019my $nuke_counter = "aaaa"; 2315my $nuke_counter = "aaaa";
2020 2316
2021sub nuke { 2317sub nuke {
2022 my ($self) = @_; 2318 my ($self) = @_;
2023 2319
2320 {
2321 my $lock = cf::lock_acquire "map_data:$self->{path}";
2322
2024 delete $cf::MAP{$self->path}; 2323 delete $cf::MAP{$self->path};
2025 2324
2026 $self->unlink_save; 2325 $self->unlink_save;
2027 2326
2028 bless $self, "cf::map"; 2327 bless $self, "cf::map";
2029 delete $self->{deny_reset}; 2328 delete $self->{deny_reset};
2030 $self->{deny_save} = 1; 2329 $self->{deny_save} = 1;
2031 $self->reset_timeout (1); 2330 $self->reset_timeout (1);
2032 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2331 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033 2332
2034 $cf::MAP{$self->path} = $self; 2333 $cf::MAP{$self->path} = $self;
2334 }
2035 2335
2036 $self->reset; # polite request, might not happen 2336 $self->reset; # polite request, might not happen
2037} 2337}
2038 2338
2039=item $maps = cf::map::tmp_maps 2339=item $maps = cf::map::tmp_maps
2081 2381
2082sub unique_maps() { 2382sub unique_maps() {
2083 [ 2383 [
2084 map { 2384 map {
2085 utf8::decode $_; 2385 utf8::decode $_;
2086 /\.map$/ 2386 s/\.map$//; # TODO future compatibility hack
2387 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2388 ? ()
2087 ? normalise $_ 2389 : normalise $_
2088 : ()
2089 } @{ aio_readdir $UNIQUEDIR or [] } 2390 } @{ aio_readdir $UNIQUEDIR or [] }
2090 ] 2391 ]
2091} 2392}
2092 2393
2093package cf;
2094
2095=back 2394=back
2096 2395
2097=head3 cf::object 2396=head3 cf::object
2098 2397
2099=cut 2398=cut
2102 2401
2103=over 4 2402=over 4
2104 2403
2105=item $ob->inv_recursive 2404=item $ob->inv_recursive
2106 2405
2107Returns the inventory of the object _and_ their inventories, recursively. 2406Returns the inventory of the object I<and> their inventories, recursively,
2407but I<not> the object itself.
2108 2408
2109=cut 2409=cut
2110 2410
2111sub inv_recursive_; 2411sub inv_recursive_;
2112sub inv_recursive_ { 2412sub inv_recursive_ {
2115 2415
2116sub inv_recursive { 2416sub inv_recursive {
2117 inv_recursive_ inv $_[0] 2417 inv_recursive_ inv $_[0]
2118} 2418}
2119 2419
2420=item $ref = $ob->ref
2421
2422Creates and returns a persistent reference to an object that can be stored as a string.
2423
2424=item $ob = cf::object::deref ($refstring)
2425
2426returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2427even if the object actually exists. May block.
2428
2429=cut
2430
2431sub deref {
2432 my ($ref) = @_;
2433
2434 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2435 my ($uuid, $name) = ($1, $2);
2436 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2437 or return;
2438 $pl->ob->uuid eq $uuid
2439 or return;
2440
2441 $pl->ob
2442 } else {
2443 warn "$ref: cannot resolve object reference\n";
2444 undef
2445 }
2446}
2447
2120package cf; 2448package cf;
2121 2449
2122=back 2450=back
2123 2451
2124=head3 cf::object::player 2452=head3 cf::object::player
2130Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2458Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2131can be C<undef>. Does the right thing when the player is currently in a 2459can be C<undef>. Does the right thing when the player is currently in a
2132dialogue with the given NPC character. 2460dialogue with the given NPC character.
2133 2461
2134=cut 2462=cut
2463
2464our $SAY_CHANNEL = {
2465 id => "say",
2466 title => "Map",
2467 reply => "say ",
2468 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2469};
2470
2471our $CHAT_CHANNEL = {
2472 id => "chat",
2473 title => "Chat",
2474 reply => "chat ",
2475 tooltip => "Player chat and shouts, global to the server.",
2476};
2135 2477
2136# rough implementation of a future "reply" method that works 2478# rough implementation of a future "reply" method that works
2137# with dialog boxes. 2479# with dialog boxes.
2138#TODO: the first argument must go, split into a $npc->reply_to ( method 2480#TODO: the first argument must go, split into a $npc->reply_to ( method
2139sub cf::object::player::reply($$$;$) { 2481sub cf::object::player::reply($$$;$) {
2146 2488
2147 } else { 2489 } else {
2148 my $pl = $self->contr; 2490 my $pl = $self->contr;
2149 2491
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2492 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2493 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2494 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158 2495
2159 } else { 2496 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2497 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2498 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2162 } 2499 }
2163 } 2500 }
2501}
2502
2503=item $object->send_msg ($channel, $msg, $color, [extra...])
2504
2505=cut
2506
2507sub cf::object::send_msg {
2508 my $pl = shift->contr
2509 or return;
2510 $pl->send_msg (@_);
2164} 2511}
2165 2512
2166=item $player_object->may ("access") 2513=item $player_object->may ("access")
2167 2514
2168Returns wether the given player is authorized to access resource "access" 2515Returns wether the given player is authorized to access resource "access"
2247 # use -1 or undef as default coordinates, not 0, 0 2594 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2595 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2596 if $x <=0 && $y <= 0;
2250 2597
2251 $map->load; 2598 $map->load;
2252 $map->load_diag; 2599 $map->load_neighbours;
2253 2600
2254 return unless $self->contr->active; 2601 return unless $self->contr->active;
2255 $self->activate_recursive; 2602 $self->activate_recursive;
2256 2603
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2604 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258 $self->enter_map ($map, $x, $y); 2605 $self->enter_map ($map, $x, $y);
2259} 2606}
2260 2607
2261=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2608=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2262 2609
2263Moves the player to the given map-path and coordinates by first freezing 2610Moves the player to the given map-path and coordinates by first freezing
2264her, loading and preparing them map, calling the provided $check callback 2611her, loading and preparing them map, calling the provided $check callback
2265that has to return the map if sucecssful, and then unfreezes the player on 2612that has to return the map if sucecssful, and then unfreezes the player on
2266the new (success) or old (failed) map position. 2613the new (success) or old (failed) map position. In either case, $done will
2614be called at the end of this process.
2267 2615
2268=cut 2616=cut
2269 2617
2270our $GOTOGEN; 2618our $GOTOGEN;
2271 2619
2272sub cf::object::player::goto { 2620sub cf::object::player::goto {
2273 my ($self, $path, $x, $y, $check) = @_; 2621 my ($self, $path, $x, $y, $check, $done) = @_;
2274 2622
2275 # do generation counting so two concurrent goto's will be executed in-order 2623 # do generation counting so two concurrent goto's will be executed in-order
2276 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2624 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2277 2625
2278 $self->enter_link; 2626 $self->enter_link;
2279 2627
2280 (async { 2628 (async {
2629 $Coro::current->{desc} = "player::goto $path $x $y";
2630
2631 # *tag paths override both path and x|y
2632 if ($path =~ /^\*(.*)$/) {
2633 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2634 my $ob = $obs[rand @obs];
2635
2636 # see if we actually can go there
2637 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2638 $ob = $obs[rand @obs];
2639 } else {
2640 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2641 }
2642 # else put us there anyways for now #d#
2643
2644 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2645 } else {
2646 ($path, $x, $y) = (undef, undef, undef);
2647 }
2648 }
2649
2281 my $map = eval { 2650 my $map = eval {
2282 my $map = cf::map::find $path; 2651 my $map = defined $path ? cf::map::find $path : undef;
2283 2652
2284 if ($map) { 2653 if ($map) {
2285 $map = $map->customise_for ($self); 2654 $map = $map->customise_for ($self);
2286 $map = $check->($map) if $check && $map; 2655 $map = $check->($map) if $check && $map;
2287 } else { 2656 } else {
2288 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2657 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2289 } 2658 }
2290 2659
2291 $map 2660 $map
2292 }; 2661 };
2293 2662
2298 2667
2299 if ($gen == $self->{_goto_generation}) { 2668 if ($gen == $self->{_goto_generation}) {
2300 delete $self->{_goto_generation}; 2669 delete $self->{_goto_generation};
2301 $self->leave_link ($map, $x, $y); 2670 $self->leave_link ($map, $x, $y);
2302 } 2671 }
2672
2673 $done->() if $done;
2303 })->prio (1); 2674 })->prio (1);
2304} 2675}
2305 2676
2306=item $player_object->enter_exit ($exit_object) 2677=item $player_object->enter_exit ($exit_object)
2307 2678
2327} 2698}
2328 2699
2329sub prepare_random_map { 2700sub prepare_random_map {
2330 my ($exit) = @_; 2701 my ($exit) = @_;
2331 2702
2332 my $guard = cf::lock_acquire "exit_prepare:$exit";
2333
2334 # all this does is basically replace the /! path by 2703 # all this does is basically replace the /! path by
2335 # a new random map path (?random/...) with a seed 2704 # a new random map path (?random/...) with a seed
2336 # that depends on the exit object 2705 # that depends on the exit object
2337 2706
2338 my $rmp = parse_random_map_params $exit->msg; 2707 my $rmp = parse_random_map_params $exit->msg;
2340 if ($exit->map) { 2709 if ($exit->map) {
2341 $rmp->{region} = $exit->region->name; 2710 $rmp->{region} = $exit->region->name;
2342 $rmp->{origin_map} = $exit->map->path; 2711 $rmp->{origin_map} = $exit->map->path;
2343 $rmp->{origin_x} = $exit->x; 2712 $rmp->{origin_x} = $exit->x;
2344 $rmp->{origin_y} = $exit->y; 2713 $rmp->{origin_y} = $exit->y;
2714
2715 $exit->map->touch;
2345 } 2716 }
2346 2717
2347 $rmp->{random_seed} ||= $exit->random_seed; 2718 $rmp->{random_seed} ||= $exit->random_seed;
2348 2719
2349 my $data = cf::to_json $rmp; 2720 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2350 my $md5 = Digest::MD5::md5_hex $data; 2721 my $md5 = Digest::MD5::md5_hex $data;
2351 my $meta = "$RANDOMDIR/$md5.meta"; 2722 my $meta = "$RANDOMDIR/$md5.meta";
2352 2723
2353 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2724 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2354 aio_write $fh, 0, (length $data), $data, 0; 2725 aio_write $fh, 0, (length $data), $data, 0;
2355 undef $fh; 2726 undef $fh;
2356 aio_rename "$meta~", $meta; 2727 aio_rename "$meta~", $meta;
2357 2728
2729 my $slaying = "?random/$md5";
2730
2731 if ($exit->valid) {
2358 $exit->slaying ("?random/$md5"); 2732 $exit->slaying ("?random/$md5");
2359 $exit->msg (undef); 2733 $exit->msg (undef);
2734 }
2360 } 2735 }
2361} 2736}
2362 2737
2363sub cf::object::player::enter_exit { 2738sub cf::object::player::enter_exit {
2364 my ($self, $exit) = @_; 2739 my ($self, $exit) = @_;
2365 2740
2366 return unless $self->type == cf::PLAYER; 2741 return unless $self->type == cf::PLAYER;
2367 2742
2368 if ($exit->slaying eq "/!") {
2369 #TODO: this should de-fi-ni-te-ly not be a sync-job
2370 # the problem is that $exit might not survive long enough
2371 # so it needs to be done right now, right here
2372 cf::sync_job { prepare_random_map $exit };
2373 }
2374
2375 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2376 my $hp = $exit->stats->hp;
2377 my $sp = $exit->stats->sp;
2378
2379 $self->enter_link; 2743 $self->enter_link;
2380 2744
2381 # if exit is damned, update players death & WoR home-position
2382 $self->contr->savebed ($slaying, $hp, $sp)
2383 if $exit->flag (FLAG_DAMNED);
2384
2385 (async { 2745 (async {
2386 $self->deactivate_recursive; # just to be sure 2746 $Coro::current->{desc} = "enter_exit";
2747
2387 unless (eval { 2748 unless (eval {
2749 $self->deactivate_recursive; # just to be sure
2750
2751 # random map handling
2752 {
2753 my $guard = cf::lock_acquire "exit_prepare:$exit";
2754
2755 prepare_random_map $exit
2756 if $exit->slaying eq "/!";
2757 }
2758
2759 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2760 my $x = $exit->stats->hp;
2761 my $y = $exit->stats->sp;
2762
2388 $self->goto ($slaying, $hp, $sp); 2763 $self->goto ($map, $x, $y);
2389 2764
2765 # if exit is damned, update players death & WoR home-position
2766 $self->contr->savebed ($map, $x, $y)
2767 if $exit->flag (cf::FLAG_DAMNED);
2768
2390 1; 2769 1
2391 }) { 2770 }) {
2392 $self->message ("Something went wrong deep within the crossfire server. " 2771 $self->message ("Something went wrong deep within the crossfire server. "
2393 . "I'll try to bring you back to the map you were before. " 2772 . "I'll try to bring you back to the map you were before. "
2394 . "Please report this to the dungeon master!", 2773 . "Please report this to the dungeon master!",
2395 cf::NDI_UNIQUE | cf::NDI_RED); 2774 cf::NDI_UNIQUE | cf::NDI_RED);
2416 2795
2417 utf8::encode $text; 2796 utf8::encode $text;
2418 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2797 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2419} 2798}
2420 2799
2421=item $client->send_msg ($color, $type, $msg, [extra...]) 2800=item $client->send_msg ($channel, $msg, $color, [extra...])
2422 2801
2423Send a drawinfo or msg packet to the client, formatting the msg for the 2802Send a drawinfo or msg packet to the client, formatting the msg for the
2424client if neccessary. C<$type> should be a string identifying the type of 2803client if neccessary. C<$type> should be a string identifying the type of
2425the message, with C<log> being the default. If C<$color> is negative, suppress 2804the message, with C<log> being the default. If C<$color> is negative, suppress
2426the message unless the client supports the msg packet. 2805the message unless the client supports the msg packet.
2427 2806
2428=cut 2807=cut
2429 2808
2809# non-persistent channels (usually the info channel)
2810our %CHANNEL = (
2811 "c/identify" => {
2812 id => "infobox",
2813 title => "Identify",
2814 reply => undef,
2815 tooltip => "Items recently identified",
2816 },
2817 "c/examine" => {
2818 id => "infobox",
2819 title => "Examine",
2820 reply => undef,
2821 tooltip => "Signs and other items you examined",
2822 },
2823 "c/book" => {
2824 id => "infobox",
2825 title => "Book",
2826 reply => undef,
2827 tooltip => "The contents of a note or book",
2828 },
2829 "c/lookat" => {
2830 id => "infobox",
2831 title => "Look",
2832 reply => undef,
2833 tooltip => "What you saw there",
2834 },
2835 "c/who" => {
2836 id => "infobox",
2837 title => "Players",
2838 reply => undef,
2839 tooltip => "Shows players who are currently online",
2840 },
2841 "c/body" => {
2842 id => "infobox",
2843 title => "Body Parts",
2844 reply => undef,
2845 tooltip => "Shows which body parts you posess and are available",
2846 },
2847 "c/uptime" => {
2848 id => "infobox",
2849 title => "Uptime",
2850 reply => undef,
2851 tooltip => "How long the server has been running since last restart",
2852 },
2853 "c/mapinfo" => {
2854 id => "infobox",
2855 title => "Map Info",
2856 reply => undef,
2857 tooltip => "Information related to the maps",
2858 },
2859 "c/party" => {
2860 id => "party",
2861 title => "Party",
2862 reply => "gsay ",
2863 tooltip => "Messages and chat related to your party",
2864 },
2865);
2866
2430sub cf::client::send_msg { 2867sub cf::client::send_msg {
2431 my ($self, $color, $type, $msg, @extra) = @_; 2868 my ($self, $channel, $msg, $color, @extra) = @_;
2432 2869
2433 $msg = $self->pl->expand_cfpod ($msg); 2870 $msg = $self->pl->expand_cfpod ($msg);
2434 2871
2872 $color &= cf::NDI_CLIENT_MASK; # just in case...
2873
2874 # check predefined channels, for the benefit of C
2875 if ($CHANNEL{$channel}) {
2876 $channel = $CHANNEL{$channel};
2877
2878 $self->ext_msg (channel_info => $channel)
2879 if $self->can_msg;
2880
2881 $channel = $channel->{id};
2882
2883 } elsif (ref $channel) {
2884 # send meta info to client, if not yet sent
2885 unless (exists $self->{channel}{$channel->{id}}) {
2886 $self->{channel}{$channel->{id}} = $channel;
2887 $self->ext_msg (channel_info => $channel)
2888 if $self->can_msg;
2889 }
2890
2891 $channel = $channel->{id};
2892 }
2893
2435 return unless @extra || length $msg; 2894 return unless @extra || length $msg;
2436 2895
2437 if ($self->can_msg) { 2896 if ($self->can_msg) {
2897 # default colour, mask it out
2898 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2899 if $color & cf::NDI_DEF;
2900
2438 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2901 $self->send_packet ("msg " . $self->{json_coder}->encode (
2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2439 } else { 2903 } else {
2440 # replace some tags by gcfclient-compatible ones
2441 for ($msg) {
2442 1 while
2443 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2444 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2445 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2446 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2447 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2448 }
2449
2450 if ($color >= 0) { 2904 if ($color >= 0) {
2905 # replace some tags by gcfclient-compatible ones
2906 for ($msg) {
2907 1 while
2908 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2909 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2910 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2911 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2912 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2913 }
2914
2915 $color &= cf::NDI_COLOR_MASK;
2916
2917 utf8::encode $msg;
2918
2451 if (0 && $msg =~ /\[/) { 2919 if (0 && $msg =~ /\[/) {
2920 # COMMAND/INFO
2452 $self->send_packet ("drawextinfo $color 4 0 $msg") 2921 $self->send_packet ("drawextinfo $color 10 8 $msg")
2453 } else { 2922 } else {
2454 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2923 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2455 $self->send_packet ("drawinfo $color $msg") 2924 $self->send_packet ("drawinfo $color $msg")
2456 } 2925 }
2457 } 2926 }
2458 } 2927 }
2459} 2928}
2460 2929
2461=item $client->ext_event ($type, %msg) 2930=item $client->ext_msg ($type, @msg)
2462 2931
2463Sends an ext event to the client. 2932Sends an ext event to the client.
2464 2933
2465=cut 2934=cut
2466 2935
2467sub cf::client::ext_event($$%) { 2936sub cf::client::ext_msg($$@) {
2468 my ($self, $type, %msg) = @_; 2937 my ($self, $type, @msg) = @_;
2469 2938
2939 if ($self->extcmd == 2) {
2940 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2941 } elsif ($self->extcmd == 1) { # TODO: remove
2470 $msg{msgtype} = "event_$type"; 2942 push @msg, msgtype => "event_$type";
2471 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2943 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2944 }
2945}
2946
2947=item $client->ext_reply ($msgid, @msg)
2948
2949Sends an ext reply to the client.
2950
2951=cut
2952
2953sub cf::client::ext_reply($$@) {
2954 my ($self, $id, @msg) = @_;
2955
2956 if ($self->extcmd == 2) {
2957 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2958 } elsif ($self->extcmd == 1) {
2959 #TODO: version 1, remove
2960 unshift @msg, msgtype => "reply", msgid => $id;
2961 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2962 }
2472} 2963}
2473 2964
2474=item $success = $client->query ($flags, "text", \&cb) 2965=item $success = $client->query ($flags, "text", \&cb)
2475 2966
2476Queues a query to the client, calling the given callback with 2967Queues a query to the client, calling the given callback with
2531 my ($ns, $buf) = @_; 3022 my ($ns, $buf) = @_;
2532 3023
2533 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3024 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2534 3025
2535 if (ref $msg) { 3026 if (ref $msg) {
3027 my ($type, $reply, @payload) =
3028 "ARRAY" eq ref $msg
3029 ? @$msg
3030 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3031
3032 my @reply;
3033
2536 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3034 if (my $cb = $EXTICMD{$type}) {
2537 if (my %reply = $cb->($ns, $msg)) { 3035 @reply = $cb->($ns, @payload);
2538 $reply{msgid} = $msg->{msgid};
2539 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2540 }
2541 } 3036 }
3037
3038 $ns->ext_reply ($reply, @reply)
3039 if $reply;
3040
2542 } else { 3041 } else {
2543 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3042 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2544 } 3043 }
2545 3044
2546 cf::override; 3045 cf::override;
2593our $safe = new Safe "safe"; 3092our $safe = new Safe "safe";
2594our $safe_hole = new Safe::Hole; 3093our $safe_hole = new Safe::Hole;
2595 3094
2596$SIG{FPE} = 'IGNORE'; 3095$SIG{FPE} = 'IGNORE';
2597 3096
2598$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3097$safe->permit_only (Opcode::opset qw(
3098 :base_core :base_mem :base_orig :base_math
3099 grepstart grepwhile mapstart mapwhile
3100 sort time
3101));
2599 3102
2600# here we export the classes and methods available to script code 3103# here we export the classes and methods available to script code
2601 3104
2602=pod 3105=pod
2603 3106
2604The following functions and methods are available within a safe environment: 3107The following functions and methods are available within a safe environment:
2605 3108
2606 cf::object 3109 cf::object
2607 contr pay_amount pay_player map x y force_find force_add 3110 contr pay_amount pay_player map x y force_find force_add destroy
2608 insert remove 3111 insert remove name archname title slaying race decrease split
2609 3112
2610 cf::object::player 3113 cf::object::player
2611 player 3114 player
2612 3115
2613 cf::player 3116 cf::player
2618 3121
2619=cut 3122=cut
2620 3123
2621for ( 3124for (
2622 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3125 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2623 insert remove)], 3126 insert remove inv name archname title slaying race
3127 decrease split destroy)],
2624 ["cf::object::player" => qw(player)], 3128 ["cf::object::player" => qw(player)],
2625 ["cf::player" => qw(peaceful)], 3129 ["cf::player" => qw(peaceful)],
2626 ["cf::map" => qw(trigger)], 3130 ["cf::map" => qw(trigger)],
2627) { 3131) {
2628 no strict 'refs'; 3132 no strict 'refs';
2704# the server's init and main functions 3208# the server's init and main functions
2705 3209
2706sub load_facedata($) { 3210sub load_facedata($) {
2707 my ($path) = @_; 3211 my ($path) = @_;
2708 3212
3213 # HACK to clear player env face cache, we need some signal framework
3214 # for this (global event?)
3215 %ext::player_env::MUSIC_FACE_CACHE = ();
3216
3217 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3218
2709 warn "loading facedata from $path\n"; 3219 warn "loading facedata from $path\n";
2710 3220
2711 my $facedata; 3221 my $facedata;
2712 0 < aio_load $path, $facedata 3222 0 < aio_load $path, $facedata
2713 or die "$path: $!"; 3223 or die "$path: $!";
2715 $facedata = Coro::Storable::thaw $facedata; 3225 $facedata = Coro::Storable::thaw $facedata;
2716 3226
2717 $facedata->{version} == 2 3227 $facedata->{version} == 2
2718 or cf::cleanup "$path: version mismatch, cannot proceed."; 3228 or cf::cleanup "$path: version mismatch, cannot proceed.";
2719 3229
3230 # patch in the exptable
3231 $facedata->{resource}{"res/exp_table"} = {
3232 type => FT_RSRC,
3233 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3234 };
3235 cf::cede_to_tick;
3236
2720 { 3237 {
2721 my $faces = $facedata->{faceinfo}; 3238 my $faces = $facedata->{faceinfo};
2722 3239
2723 while (my ($face, $info) = each %$faces) { 3240 while (my ($face, $info) = each %$faces) {
2724 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3241 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3242
2725 cf::face::set_visibility $idx, $info->{visibility}; 3243 cf::face::set_visibility $idx, $info->{visibility};
2726 cf::face::set_magicmap $idx, $info->{magicmap}; 3244 cf::face::set_magicmap $idx, $info->{magicmap};
2727 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3245 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2728 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3246 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2729 3247
2730 cf::cede_to_tick; 3248 cf::cede_to_tick;
2731 } 3249 }
2732 3250
2733 while (my ($face, $info) = each %$faces) { 3251 while (my ($face, $info) = each %$faces) {
2734 next unless $info->{smooth}; 3252 next unless $info->{smooth};
3253
2735 my $idx = cf::face::find $face 3254 my $idx = cf::face::find $face
2736 or next; 3255 or next;
3256
2737 if (my $smooth = cf::face::find $info->{smooth}) { 3257 if (my $smooth = cf::face::find $info->{smooth}) {
2738 cf::face::set_smooth $idx, $smooth; 3258 cf::face::set_smooth $idx, $smooth;
2739 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3259 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2740 } else { 3260 } else {
2741 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3261 warn "smooth face '$info->{smooth}' not found for face '$face'";
2758 3278
2759 { 3279 {
2760 # TODO: for gcfclient pleasure, we should give resources 3280 # TODO: for gcfclient pleasure, we should give resources
2761 # that gcfclient doesn't grok a >10000 face index. 3281 # that gcfclient doesn't grok a >10000 face index.
2762 my $res = $facedata->{resource}; 3282 my $res = $facedata->{resource};
2763 my $enc = JSON::XS->new->utf8->canonical;
2764 3283
2765 while (my ($name, $info) = each %$res) { 3284 while (my ($name, $info) = each %$res) {
2766 my $meta = $enc->encode ({ 3285 if (defined $info->{type}) {
2767 name => $name,
2768 type => $info->{type},
2769 copyright => $info->{copyright},
2770 });
2771 my $data = pack "(w/a*)*", $meta, $info->{data};
2772 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2773
2774 use Data::Dumper; warn Dumper substr $data, 0, 100;#d#
2775
2776 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3286 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3287 my $data;
3288
3289 if ($info->{type} & 1) {
3290 # prepend meta info
3291
3292 my $meta = $enc->encode ({
3293 name => $name,
3294 %{ $info->{meta} || {} },
3295 });
3296
3297 $data = pack "(w/a*)*", $meta, $info->{data};
3298 } else {
3299 $data = $info->{data};
3300 }
3301
3302 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2777 cf::face::set_type $idx, 1; 3303 cf::face::set_type $idx, $info->{type};
2778 cf::face::set_data $idx, 0, $data, $chk; 3304 } else {
3305 $RESOURCE{$name} = $info;
3306 }
2779 3307
2780 # TODO
2781 cf::cede_to_tick; 3308 cf::cede_to_tick;
2782 } 3309 }
2783 } 3310 }
2784 3311
3312 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3313
2785 1 3314 1
2786} 3315}
2787 3316
3317cf::global->attach (on_resource_update => sub {
3318 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3319 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3320
3321 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3322 my $sound = $soundconf->{compat}[$_]
3323 or next;
3324
3325 my $face = cf::face::find "sound/$sound->[1]";
3326 cf::sound::set $sound->[0] => $face;
3327 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3328 }
3329
3330 while (my ($k, $v) = each %{$soundconf->{event}}) {
3331 my $face = cf::face::find "sound/$v";
3332 cf::sound::set $k => $face;
3333 }
3334 }
3335});
3336
3337register_exticmd fx_want => sub {
3338 my ($ns, $want) = @_;
3339
3340 while (my ($k, $v) = each %$want) {
3341 $ns->fx_want ($k, $v);
3342 }
3343};
3344
3345sub load_resource_file($) {
3346 my $guard = lock_acquire "load_resource_file";
3347
3348 my $status = load_resource_file_ $_[0];
3349 get_slot 0.1, 100;
3350 cf::arch::commit_load;
3351
3352 $status
3353}
3354
2788sub reload_regions { 3355sub reload_regions {
3356 # HACK to clear player env face cache, we need some signal framework
3357 # for this (global event?)
3358 %ext::player_env::MUSIC_FACE_CACHE = ();
3359
2789 load_resource_file "$MAPDIR/regions" 3360 load_resource_file "$MAPDIR/regions"
2790 or die "unable to load regions file\n"; 3361 or die "unable to load regions file\n";
3362
3363 for (cf::region::list) {
3364 $_->{match} = qr/$_->{match}/
3365 if exists $_->{match};
3366 }
2791} 3367}
2792 3368
2793sub reload_facedata { 3369sub reload_facedata {
2794 load_facedata "$DATADIR/facedata" 3370 load_facedata "$DATADIR/facedata"
2795 or die "unable to load facedata\n"; 3371 or die "unable to load facedata\n";
2796} 3372}
2797 3373
2798sub reload_archetypes { 3374sub reload_archetypes {
2799 load_resource_file "$DATADIR/archetypes" 3375 load_resource_file "$DATADIR/archetypes"
2800 or die "unable to load archetypes\n"; 3376 or die "unable to load archetypes\n";
2801 #d# NEED to laod twice to resolve forward references
2802 # this really needs to be done in an extra post-pass
2803 # (which needs to be synchronous, so solve it differently)
2804 load_resource_file "$DATADIR/archetypes"
2805 or die "unable to load archetypes\n";
2806} 3377}
2807 3378
2808sub reload_treasures { 3379sub reload_treasures {
2809 load_resource_file "$DATADIR/treasures" 3380 load_resource_file "$DATADIR/treasures"
2810 or die "unable to load treasurelists\n"; 3381 or die "unable to load treasurelists\n";
2811} 3382}
2812 3383
2813sub reload_resources { 3384sub reload_resources {
2814 warn "reloading resource files...\n"; 3385 warn "reloading resource files...\n";
2815 3386
3387 reload_facedata;
3388 reload_archetypes;
2816 reload_regions; 3389 reload_regions;
2817 reload_facedata;
2818 #reload_archetypes;#d#
2819 reload_archetypes;
2820 reload_treasures; 3390 reload_treasures;
2821 3391
2822 warn "finished reloading resource files\n"; 3392 warn "finished reloading resource files\n";
2823} 3393}
2824 3394
2825sub init { 3395sub init {
3396 my $guard = freeze_mainloop;
3397
2826 reload_resources; 3398 reload_resources;
2827} 3399}
2828 3400
2829sub cfg_load { 3401sub reload_config {
2830 open my $fh, "<:utf8", "$CONFDIR/config" 3402 open my $fh, "<:utf8", "$CONFDIR/config"
2831 or return; 3403 or return;
2832 3404
2833 local $/; 3405 local $/;
2834 *CFG = YAML::Syck::Load <$fh>; 3406 *CFG = YAML::Load <$fh>;
2835 3407
2836 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3408 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2837 3409
2838 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3410 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2839 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3411 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2850sub main { 3422sub main {
2851 # we must not ever block the main coroutine 3423 # we must not ever block the main coroutine
2852 local $Coro::idle = sub { 3424 local $Coro::idle = sub {
2853 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3425 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2854 (async { 3426 (async {
2855 Event::one_event; 3427 $Coro::current->{desc} = "IDLE BUG HANDLER";
3428 EV::loop EV::LOOP_ONESHOT;
2856 })->prio (Coro::PRIO_MAX); 3429 })->prio (Coro::PRIO_MAX);
2857 }; 3430 };
2858 3431
2859 cfg_load; 3432 {
3433 my $guard = freeze_mainloop;
3434 reload_config;
2860 db_init; 3435 db_init;
2861 load_extensions; 3436 load_extensions;
2862 3437
2863 $TICK_WATCHER->start; 3438 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3439 evthread_start IO::AIO::poll_fileno;
3440 }
3441
2864 Event::loop; 3442 EV::loop;
2865} 3443}
2866 3444
2867############################################################################# 3445#############################################################################
2868# initialisation and cleanup 3446# initialisation and cleanup
2869 3447
2870# install some emergency cleanup handlers 3448# install some emergency cleanup handlers
2871BEGIN { 3449BEGIN {
3450 our %SIGWATCHER = ();
2872 for my $signal (qw(INT HUP TERM)) { 3451 for my $signal (qw(INT HUP TERM)) {
2873 Event->signal ( 3452 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2874 reentrant => 0,
2875 data => WF_AUTOCANCEL,
2876 signal => $signal,
2877 prio => 0,
2878 cb => sub {
2879 cf::cleanup "SIG$signal"; 3453 cf::cleanup "SIG$signal";
2880 },
2881 ); 3454 };
2882 } 3455 }
2883} 3456}
2884 3457
2885sub write_runtime { 3458sub write_runtime_sync {
2886 my $runtime = "$LOCALDIR/runtime"; 3459 my $runtime = "$LOCALDIR/runtime";
2887 3460
2888 # first touch the runtime file to show we are still running: 3461 # first touch the runtime file to show we are still running:
2889 # the fsync below can take a very very long time. 3462 # the fsync below can take a very very long time.
2890 3463
2916 and return; 3489 and return;
2917 3490
2918 warn "runtime file written.\n"; 3491 warn "runtime file written.\n";
2919 3492
2920 1 3493 1
3494}
3495
3496our $uuid_lock;
3497our $uuid_skip;
3498
3499sub write_uuid_sync($) {
3500 $uuid_skip ||= $_[0];
3501
3502 return if $uuid_lock;
3503 local $uuid_lock = 1;
3504
3505 my $uuid = "$LOCALDIR/uuid";
3506
3507 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3508 or return;
3509
3510 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3511 $uuid_skip = 0;
3512
3513 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3514 and return;
3515
3516 # always fsync - this file is important
3517 aio_fsync $fh
3518 and return;
3519
3520 close $fh
3521 or return;
3522
3523 aio_rename "$uuid~", $uuid
3524 and return;
3525
3526 warn "uuid file written ($value).\n";
3527
3528 1
3529
3530}
3531
3532sub write_uuid($$) {
3533 my ($skip, $sync) = @_;
3534
3535 $sync ? write_uuid_sync $skip
3536 : async { write_uuid_sync $skip };
2921} 3537}
2922 3538
2923sub emergency_save() { 3539sub emergency_save() {
2924 my $freeze_guard = cf::freeze_mainloop; 3540 my $freeze_guard = cf::freeze_mainloop;
2925 3541
2931 # and maps saved/destroyed asynchronously. 3547 # and maps saved/destroyed asynchronously.
2932 warn "begin emergency player save\n"; 3548 warn "begin emergency player save\n";
2933 for my $login (keys %cf::PLAYER) { 3549 for my $login (keys %cf::PLAYER) {
2934 my $pl = $cf::PLAYER{$login} or next; 3550 my $pl = $cf::PLAYER{$login} or next;
2935 $pl->valid or next; 3551 $pl->valid or next;
3552 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2936 $pl->save; 3553 $pl->save;
2937 } 3554 }
2938 warn "end emergency player save\n"; 3555 warn "end emergency player save\n";
2939 3556
2940 warn "begin emergency map save\n"; 3557 warn "begin emergency map save\n";
2946 warn "end emergency map save\n"; 3563 warn "end emergency map save\n";
2947 3564
2948 warn "begin emergency database checkpoint\n"; 3565 warn "begin emergency database checkpoint\n";
2949 BDB::db_env_txn_checkpoint $DB_ENV; 3566 BDB::db_env_txn_checkpoint $DB_ENV;
2950 warn "end emergency database checkpoint\n"; 3567 warn "end emergency database checkpoint\n";
3568
3569 warn "begin write uuid\n";
3570 write_uuid_sync 1;
3571 warn "end write uuid\n";
2951 }; 3572 };
2952 3573
2953 warn "leave emergency perl save\n"; 3574 warn "leave emergency perl save\n";
2954} 3575}
2955 3576
2970 warn "reloading..."; 3591 warn "reloading...";
2971 3592
2972 warn "entering sync_job"; 3593 warn "entering sync_job";
2973 3594
2974 cf::sync_job { 3595 cf::sync_job {
2975 cf::write_runtime; # external watchdog should not bark 3596 cf::write_runtime_sync; # external watchdog should not bark
2976 cf::emergency_save; 3597 cf::emergency_save;
2977 cf::write_runtime; # external watchdog should not bark 3598 cf::write_runtime_sync; # external watchdog should not bark
2978 3599
2979 warn "syncing database to disk"; 3600 warn "syncing database to disk";
2980 BDB::db_env_txn_checkpoint $DB_ENV; 3601 BDB::db_env_txn_checkpoint $DB_ENV;
2981 3602
2982 # if anything goes wrong in here, we should simply crash as we already saved 3603 # if anything goes wrong in here, we should simply crash as we already saved
2983
2984 warn "cancelling all WF_AUTOCANCEL watchers";
2985 for (Event::all_watchers) {
2986 $_->cancel if $_->data & WF_AUTOCANCEL;
2987 }
2988 3604
2989 warn "flushing outstanding aio requests"; 3605 warn "flushing outstanding aio requests";
2990 for (;;) { 3606 for (;;) {
2991 BDB::flush; 3607 BDB::flush;
2992 IO::AIO::flush; 3608 IO::AIO::flush;
2993 Coro::cede; 3609 Coro::cede_notself;
2994 last unless IO::AIO::nreqs || BDB::nreqs; 3610 last unless IO::AIO::nreqs || BDB::nreqs;
2995 warn "iterate..."; 3611 warn "iterate...";
2996 } 3612 }
2997 3613
2998 ++$RELOAD; 3614 ++$RELOAD;
3057 warn "reloading cf.pm"; 3673 warn "reloading cf.pm";
3058 require cf; 3674 require cf;
3059 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3675 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3060 3676
3061 warn "loading config and database again"; 3677 warn "loading config and database again";
3062 cf::cfg_load; 3678 cf::reload_config;
3063 3679
3064 warn "loading extensions"; 3680 warn "loading extensions";
3065 cf::load_extensions; 3681 cf::load_extensions;
3066 3682
3067 warn "reattaching attachments to objects/players"; 3683 warn "reattaching attachments to objects/players";
3074 warn "leaving sync_job"; 3690 warn "leaving sync_job";
3075 3691
3076 1 3692 1
3077 } or do { 3693 } or do {
3078 warn $@; 3694 warn $@;
3079 warn "error while reloading, exiting."; 3695 cf::cleanup "error while reloading, exiting.";
3080 exit 1;
3081 }; 3696 };
3082 3697
3083 warn "reloaded"; 3698 warn "reloaded";
3084}; 3699};
3085 3700
3087 3702
3088sub reload_perl() { 3703sub reload_perl() {
3089 # doing reload synchronously and two reloads happen back-to-back, 3704 # doing reload synchronously and two reloads happen back-to-back,
3090 # coro crashes during coro_state_free->destroy here. 3705 # coro crashes during coro_state_free->destroy here.
3091 3706
3092 $RELOAD_WATCHER ||= Event->timer ( 3707 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3093 reentrant => 0,
3094 after => 0,
3095 data => WF_AUTOCANCEL,
3096 cb => sub {
3097 do_reload_perl; 3708 do_reload_perl;
3098 undef $RELOAD_WATCHER; 3709 undef $RELOAD_WATCHER;
3099 },
3100 ); 3710 };
3101} 3711}
3102 3712
3103register_command "reload" => sub { 3713register_command "reload" => sub {
3104 my ($who, $arg) = @_; 3714 my ($who, $arg) = @_;
3105 3715
3106 if ($who->flag (FLAG_WIZ)) { 3716 if ($who->flag (FLAG_WIZ)) {
3107 $who->message ("reloading server."); 3717 $who->message ("reloading server.");
3718 async {
3719 $Coro::current->{desc} = "perl_reload";
3108 async { reload_perl }; 3720 reload_perl;
3721 };
3109 } 3722 }
3110}; 3723};
3111 3724
3112unshift @INC, $LIBDIR; 3725unshift @INC, $LIBDIR;
3113 3726
3115 3728
3116our @WAIT_FOR_TICK; 3729our @WAIT_FOR_TICK;
3117our @WAIT_FOR_TICK_BEGIN; 3730our @WAIT_FOR_TICK_BEGIN;
3118 3731
3119sub wait_for_tick { 3732sub wait_for_tick {
3120 return unless $TICK_WATCHER->is_active;
3121 return if $Coro::current == $Coro::main; 3733 return if tick_inhibit || $Coro::current == $Coro::main;
3122 3734
3123 my $signal = new Coro::Signal; 3735 my $signal = new Coro::Signal;
3124 push @WAIT_FOR_TICK, $signal; 3736 push @WAIT_FOR_TICK, $signal;
3125 $signal->wait; 3737 $signal->wait;
3126} 3738}
3127 3739
3128sub wait_for_tick_begin { 3740sub wait_for_tick_begin {
3129 return unless $TICK_WATCHER->is_active;
3130 return if $Coro::current == $Coro::main; 3741 return if tick_inhibit || $Coro::current == $Coro::main;
3131 3742
3132 my $signal = new Coro::Signal; 3743 my $signal = new Coro::Signal;
3133 push @WAIT_FOR_TICK_BEGIN, $signal; 3744 push @WAIT_FOR_TICK_BEGIN, $signal;
3134 $signal->wait; 3745 $signal->wait;
3135} 3746}
3136 3747
3137 my $min = 1e6;#d# 3748sub tick {
3138 my $avg = 10;
3139$TICK_WATCHER = Event->timer (
3140 reentrant => 0,
3141 parked => 1,
3142 prio => 0,
3143 at => $NEXT_TICK || $TICK,
3144 data => WF_AUTOCANCEL,
3145 cb => sub {
3146 if ($Coro::current != $Coro::main) { 3749 if ($Coro::current != $Coro::main) {
3147 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3750 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3148 unless ++$bug_warning > 10; 3751 unless ++$bug_warning > 10;
3149 return; 3752 return;
3150 } 3753 }
3151 3754
3152 $NOW = $tick_start = Event::time;
3153
3154 cf::server_tick; # one server iteration 3755 cf::server_tick; # one server iteration
3155 3756
3156 0 && sync_job {#d# 3757 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3157 for(1..10) { 3758 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3158 my $t = Event::time; 3759 Coro::async_pool {
3159 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3760 $Coro::current->{desc} = "runtime saver";
3160 or die; 3761 write_runtime_sync
3161 3762 or warn "ERROR: unable to write runtime file: $!";
3162 $map->width (50);
3163 $map->height (50);
3164 $map->alloc;
3165 $map->_load_objects ("/tmp/x.map", 1);
3166 my $t = Event::time - $t;
3167
3168 #next unless $t < 0.0013;#d#
3169 if ($t < $min) {
3170 $min = $t;
3171 }
3172 $avg = $avg * 0.99 + $t * 0.01;
3173 }
3174 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3175 exit 0;
3176 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3177 }; 3763 };
3764 }
3178 3765
3179 $RUNTIME += $TICK;
3180 $NEXT_TICK += $TICK;
3181
3182 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3183 $NEXT_RUNTIME_WRITE = $NOW + 10;
3184 Coro::async_pool {
3185 write_runtime
3186 or warn "ERROR: unable to write runtime file: $!";
3187 };
3188 }
3189
3190# my $AFTER = Event::time;
3191# warn $AFTER - $NOW;#d#
3192
3193 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3766 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3194 $sig->send; 3767 $sig->send;
3195 } 3768 }
3196 while (my $sig = shift @WAIT_FOR_TICK) { 3769 while (my $sig = shift @WAIT_FOR_TICK) {
3197 $sig->send; 3770 $sig->send;
3198 } 3771 }
3199 3772
3200 $NOW = Event::time; 3773 $LOAD = ($NOW - $TICK_START) / $TICK;
3201
3202 # if we are delayed by four ticks or more, skip them all
3203 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3204
3205 $TICK_WATCHER->at ($NEXT_TICK);
3206 $TICK_WATCHER->start;
3207
3208 $LOAD = ($NOW - $tick_start) / $TICK;
3209 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3774 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3210 3775
3211 _post_tick; 3776 if (0) {
3212 3777 if ($NEXT_TICK) {
3213 3778 my $jitter = $TICK_START - $NEXT_TICK;
3779 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3780 warn "jitter $JITTER\n";#d#
3781 }
3214 }, 3782 }
3215); 3783}
3216 3784
3217{ 3785{
3218 BDB::max_poll_time $TICK * 0.1; 3786 # configure BDB
3219 $BDB_POLL_WATCHER = Event->io ( 3787
3220 reentrant => 0,
3221 fd => BDB::poll_fileno,
3222 poll => 'r',
3223 prio => 0,
3224 data => WF_AUTOCANCEL,
3225 cb => \&BDB::poll_cb,
3226 );
3227 BDB::min_parallel 8; 3788 BDB::min_parallel 8;
3228 3789 BDB::max_poll_reqs $TICK * 0.1;
3229 BDB::set_sync_prepare { 3790 $Coro::BDB::WATCHER->priority (1);
3230 my $status;
3231 my $current = $Coro::current;
3232 (
3233 sub {
3234 $status = $!;
3235 $current->ready; undef $current;
3236 },
3237 sub {
3238 Coro::schedule while defined $current;
3239 $! = $status;
3240 },
3241 )
3242 };
3243 3791
3244 unless ($DB_ENV) { 3792 unless ($DB_ENV) {
3245 $DB_ENV = BDB::db_env_create; 3793 $DB_ENV = BDB::db_env_create;
3794 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3795 | BDB::LOG_AUTOREMOVE, 1);
3796 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3797 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3246 3798
3247 cf::sync_job { 3799 cf::sync_job {
3248 eval { 3800 eval {
3249 BDB::db_env_open 3801 BDB::db_env_open
3250 $DB_ENV, 3802 $DB_ENV,
3252 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3804 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3253 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3805 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3254 0666; 3806 0666;
3255 3807
3256 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3808 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3257
3258 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3259 $DB_ENV->set_lk_detect;
3260 }; 3809 };
3261 3810
3262 cf::cleanup "db_env_open(db): $@" if $@; 3811 cf::cleanup "db_env_open(db): $@" if $@;
3263 }; 3812 };
3264 } 3813 }
3814
3815 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3816 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3817 };
3818 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3819 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3820 };
3821 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3822 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3823 };
3265} 3824}
3266 3825
3267{ 3826{
3827 # configure IO::AIO
3828
3268 IO::AIO::min_parallel 8; 3829 IO::AIO::min_parallel 8;
3269
3270 undef $Coro::AIO::WATCHER;
3271 IO::AIO::max_poll_time $TICK * 0.1; 3830 IO::AIO::max_poll_time $TICK * 0.1;
3272 $AIO_POLL_WATCHER = Event->io ( 3831 $Coro::AIO::WATCHER->priority (1);
3273 reentrant => 0,
3274 data => WF_AUTOCANCEL,
3275 fd => IO::AIO::poll_fileno,
3276 poll => 'r',
3277 prio => 6,
3278 cb => \&IO::AIO::poll_cb,
3279 );
3280} 3832}
3281 3833
3282my $_log_backtrace; 3834my $_log_backtrace;
3283 3835
3284sub _log_backtrace { 3836sub _log_backtrace {
3288 3840
3289 # limit the # of concurrent backtraces 3841 # limit the # of concurrent backtraces
3290 if ($_log_backtrace < 2) { 3842 if ($_log_backtrace < 2) {
3291 ++$_log_backtrace; 3843 ++$_log_backtrace;
3292 async { 3844 async {
3845 $Coro::current->{desc} = "abt $msg";
3846
3293 my @bt = fork_call { 3847 my @bt = fork_call {
3294 @addr = map { sprintf "%x", $_ } @addr; 3848 @addr = map { sprintf "%x", $_ } @addr;
3295 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3849 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3296 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3850 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3297 or die "addr2line: $!"; 3851 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines