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.298 by root, Sun Jul 8 14:50:07 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;
57use Digest::MD5 ();
34 58
35# configure various modules to our taste 59# configure various modules to our taste
36# 60#
37$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
38Coro::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
39Compress::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
40
41$Event::Eval = 1; # no idea why this is required, but it is
42
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1;
45 64
46$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
47 66
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 68
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
73 93
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 97our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
81 99
82our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 104our $DB_ENV;
84 105
85our %CFG; 106our %CFG;
86 107
87our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 109our $RUNTIME;
110our $NOW;
89 111
90our %PLAYER; # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 113our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
93 115
94# 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 ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 118
97our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
99our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
100 123
101binmode STDOUT; 124binmode STDOUT;
102binmode STDERR; 125binmode STDERR;
103 126
104# read virtual server time, if available 127# read virtual server time, if available
157 180
158The raw value load value from the last tick. 181The raw value load value from the last tick.
159 182
160=item %cf::CFG 183=item %cf::CFG
161 184
162Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 186from wherever your confdir points to.
164 187
165=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
166 189
167These 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
168returns 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
169per 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.
170 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
171=back 200=back
172 201
173=cut 202=cut
174 203
175BEGIN { 204BEGIN {
179 $msg .= "\n" 208 $msg .= "\n"
180 unless $msg =~ /\n$/; 209 unless $msg =~ /\n$/;
181 210
182 $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;
183 212
184 utf8::encode $msg;
185 LOG llevError, $msg; 213 LOG llevError, $msg;
186 }; 214 };
187} 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#?
188 231
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
205)) { 248)) {
206 no strict 'refs'; 249 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 251}
209 252
210$Event::DIED = sub { 253$EV::DIED = sub {
211 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
212}; 255};
213 256
214############################################################################# 257#############################################################################
215 258
238 $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;
239 $d 282 $d
240 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
241} 284}
242 285
243=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
244 287
245Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
246 289
247=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
248 291
249Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
250 293
251=cut 294=cut
252 295
253our $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
254 297
255sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
257 300
258=item cf::lock_wait $string 301=item cf::lock_wait $string
259 302
260Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
261 304
264Wait 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
265a 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,
266for example when the coroutine gets canceled), the lock is automatically 309for example when the coroutine gets canceled), the lock is automatically
267returned. 310returned.
268 311
312Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro.
314
269Lock 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
270uses map_find and cf::map::load uses map_load). 316uses map_find and cf::map::load uses map_load).
271 317
272=item $locked = cf::lock_active $string 318=item $locked = cf::lock_active $string
273 319
274Return 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.
275 321
276=cut 322=cut
277 323
278our %LOCK; 324our %LOCK;
325our %LOCKER;#d#
279 326
280sub lock_wait($) { 327sub lock_wait($) {
281 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#
282 334
283 # wait for lock, if any 335 # wait for lock, if any
284 while ($LOCK{$key}) { 336 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current; 337 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule; 338 Coro::schedule;
292 344
293 # wait, to be sure we are not locked 345 # wait, to be sure we are not locked
294 lock_wait $key; 346 lock_wait $key;
295 347
296 $LOCK{$key} = []; 348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
297 350
298 Coro::guard { 351 Coro::guard {
352 delete $LOCKER{$key};#d#
299 # wake up all waiters, to be on the safe side 353 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} }; 354 $_->ready for @{ delete $LOCK{$key} };
301 } 355 }
302} 356}
303 357
306 360
307 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
308} 362}
309 363
310sub freeze_mainloop { 364sub freeze_mainloop {
311 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
312 366
313 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
314 $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 }
315 }; 428 }
316 $TICK_WATCHER->stop; 429};
317 $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;
318} 443}
319 444
320=item cf::async { BLOCK } 445=item cf::async { BLOCK }
321 446
322Currently the same as Coro::async_pool, meaning you cannot use 447Currently the same as Coro::async_pool, meaning you cannot use
327 452
328BEGIN { *async = \&Coro::async_pool } 453BEGIN { *async = \&Coro::async_pool }
329 454
330=item cf::sync_job { BLOCK } 455=item cf::sync_job { BLOCK }
331 456
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 457The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 458is always able to handle events or runnable, as Deliantra is only
334partly 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
335acceptable. 460acceptable.
336 461
337If 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
338the given BLOCK in another coroutine while waiting for the result. The 463the given BLOCK in another coroutine while waiting for the result. The
343 468
344sub sync_job(&) { 469sub sync_job(&) {
345 my ($job) = @_; 470 my ($job) = @_;
346 471
347 if ($Coro::current == $Coro::main) { 472 if ($Coro::current == $Coro::main) {
348 my $time = Event::time; 473 my $time = EV::time;
349 474
350 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
352 477
353 # TODO: use suspend/resume instead 478 LOG llevError, Carp::longmess "sync job";#d#
354 # (but this is cancel-safe) 479
355 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
356 481
357 my $busy = 1; 482 my $busy = 1;
358 my @res; 483 my @res;
359 484
360 (async { 485 (async {
486 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 487 @res = eval { $job->() };
362 warn $@ if $@; 488 warn $@ if $@;
363 undef $busy; 489 undef $busy;
364 })->prio (Coro::PRIO_MAX); 490 })->prio (Coro::PRIO_MAX);
365 491
366 while ($busy) { 492 while ($busy) {
367 Coro::cede or Event::one_event; 493 if (Coro::nready) {
494 Coro::cede_notself;
495 } else {
496 EV::loop EV::LOOP_ONESHOT;
368 } 497 }
498 }
369 499
370 $time = Event::time - $time; 500 my $time = EV::time - $time;
371 501
372 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374
375 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
376 503
377 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
378 } else { 505 } else {
379 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
380 507
405=item fork_call { }, $args 532=item fork_call { }, $args
406 533
407Executes the given code block with the given arguments in a seperate 534Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 535process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 536Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 537never block itself or use any form of event handling.
411 538
412=cut 539=cut
413 540
414sub fork_call(&@) { 541sub fork_call(&@) {
415 my ($cb, @args) = @_; 542 my ($cb, @args) = @_;
416 543
417# 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,
418# or die "socketpair: $!"; 545 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 546 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 547
422 if (my $pid = fork) { 548 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 warn "pst<$res>" unless $res =~ /^pst/;
427 $res = Coro::Storable::thaw $res;
428
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431 Carp::confess $$res unless "ARRAY" eq ref $res;
432
433 return wantarray ? @$res : $res->[-1];
434 } else {
435 reset_signals; 549 reset_signals;
436 local $SIG{__WARN__}; 550 &$cb
437 local $SIG{__DIE__}; 551 }, @args;
438 local $Coro::idle;
439 $Coro::current->prio (Coro::PRIO_MAX);
440 eval {
441 close $fh1;
442 552
443 my @res = eval { $cb->(@args) }; 553 wantarray ? @res : $res[-1]
554}
444 555
445 open my $fh, ">", \my $buf 556=item $coin = coin_from_name $name
446 or die "fork_call: cannot open fh-to-buf in child : $!";
447 Storable::store_fd +($@ ? \"$@" : \@res), $fh;
448 close $fh;
449 557
450 warn "writing ", length $buf; 558=cut
451 my $x;
452 (length $buf) == ($x = syswrite $fh2, $buf)
453 or warn "error writing ".(length $buf)." != $x\n";
454 close $fh2;
455 };
456 559
457 warn $@ if $@; 560our %coin_alias = (
458 _exit 0; 561 "silver" => "silvercoin",
459 } 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
460} 581}
461 582
462=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
463 584
464Returns a single value from the environment database. 585Returns a single value from the environment database.
466=item cf::db_put $family => $key => $value 587=item cf::db_put $family => $key => $value
467 588
468Stores 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
469data 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).
470 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
471=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}
472 615
473our $DB; 616our $DB;
474 617
475sub db_init { 618sub db_init {
476 unless ($DB) {
477 $DB = BDB::db_create $DB_ENV;
478
479 cf::sync_job { 619 cf::sync_job {
480 eval { 620 $DB ||= db_table "db";
481 $DB->set_flags (BDB::CHKSUM);
482
483 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
484 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
485 cf::cleanup "db_open(db): $!" if $!;
486 };
487 cf::cleanup "db_open(db): $@" if $@;
488 };
489 } 621 };
490} 622}
491 623
492sub db_get($$) { 624sub db_get($$) {
493 my $key = "$_[0]/$_[1]"; 625 my $key = "$_[0]/$_[1]";
494 626
544 if (1) { 676 if (1) {
545 $md5 = 677 $md5 =
546 join "\x00", 678 join "\x00",
547 $processversion, 679 $processversion,
548 map { 680 map {
549 Coro::cede; 681 cf::cede_to_tick;
550 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 682 ($src->[$_], Digest::MD5::md5_hex $data[$_])
551 } 0.. $#$src; 683 } 0.. $#$src;
552 684
553 685
554 my $dbmd5 = db_get cache => "$id/md5"; 686 my $dbmd5 = db_get cache => "$id/md5";
598attach callbacks/event handlers (a collection of which is called an "attachment") 730attach callbacks/event handlers (a collection of which is called an "attachment")
599to it. All such attachable objects support the following methods. 731to it. All such attachable objects support the following methods.
600 732
601In 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>
602C<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
603Crossfire TRT). 735Deliantra).
604 736
605=over 4 737=over 4
606 738
607=item $attachable->attach ($attachment, key => $value...) 739=item $attachable->attach ($attachment, key => $value...)
608 740
860 "; 992 ";
861 die if $@; 993 die if $@;
862} 994}
863 995
864our $override; 996our $override;
865our @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?
866 998
867sub override { 999sub override {
868 $override = 1; 1000 $override = 1;
869 @invoke_results = (); 1001 @INVOKE_RESULTS = (@_);
870} 1002}
871 1003
872sub do_invoke { 1004sub do_invoke {
873 my $event = shift; 1005 my $event = shift;
874 my $callbacks = shift; 1006 my $callbacks = shift;
875 1007
876 @invoke_results = (); 1008 @INVOKE_RESULTS = ();
877 1009
878 local $override; 1010 local $override;
879 1011
880 for (@$callbacks) { 1012 for (@$callbacks) {
881 eval { &{$_->[1]} }; 1013 eval { &{$_->[1]} };
890 } 1022 }
891 1023
892 0 1024 0
893} 1025}
894 1026
895=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
896 1028
897=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
898 1030
899Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
900 1032
901This 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
902removed 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
903results (if you must, access C<@cf::invoke_results> directly). 1035results (if you must, access C<@cf::INVOKE_RESULTS> directly).
904 1036
905=back 1037=back
906 1038
907=cut 1039=cut
908 1040
909############################################################################# 1041#############################################################################
910# 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}
911 1085
912sub reattach { 1086sub reattach {
913 # basically do the same as instantiate, without calling instantiate 1087 # basically do the same as instantiate, without calling instantiate
914 my ($obj) = @_; 1088 my ($obj) = @_;
915 1089
936cf::attachable->attach ( 1110cf::attachable->attach (
937 prio => -1000000, 1111 prio => -1000000,
938 on_instantiate => sub { 1112 on_instantiate => sub {
939 my ($obj, $data) = @_; 1113 my ($obj, $data) = @_;
940 1114
941 $data = from_json $data; 1115 $data = decode_json $data;
942 1116
943 for (@$data) { 1117 for (@$data) {
944 my ($name, $args) = @$_; 1118 my ($name, $args) = @$_;
945 1119
946 $obj->attach ($name, %{$args || {} }); 1120 $obj->attach ($name, %{$args || {} });
962sub object_freezer_save { 1136sub object_freezer_save {
963 my ($filename, $rdata, $objs) = @_; 1137 my ($filename, $rdata, $objs) = @_;
964 1138
965 sync_job { 1139 sync_job {
966 if (length $$rdata) { 1140 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename);
967 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
968 $filename, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
969 1144
970 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
971 chmod SAVE_MODE, $fh; 1146 aio_chmod $fh, SAVE_MODE;
972 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
973 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
974 close $fh; 1149 aio_close $fh;
975 1150
976 if (@$objs) { 1151 if (@$objs) {
977 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) {
978 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
979 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
980 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
981 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
982 close $fh; 1157 aio_close $fh;
983 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
984 } 1159 }
985 } else { 1160 } else {
986 aio_unlink "$filename.pst"; 1161 aio_unlink "$filename.pst";
987 } 1162 }
992 } 1167 }
993 } else { 1168 } else {
994 aio_unlink $filename; 1169 aio_unlink $filename;
995 aio_unlink "$filename.pst"; 1170 aio_unlink "$filename.pst";
996 } 1171 }
997 } 1172 };
998} 1173}
999 1174
1000sub object_freezer_as_string { 1175sub object_freezer_as_string {
1001 my ($rdata, $objs) = @_; 1176 my ($rdata, $objs) = @_;
1002 1177
1014 or return; 1189 or return;
1015 1190
1016 unless (aio_stat "$filename.pst") { 1191 unless (aio_stat "$filename.pst") {
1017 (aio_load "$filename.pst", $av) >= 0 1192 (aio_load "$filename.pst", $av) >= 0
1018 or return; 1193 or return;
1194
1019 $av = eval { (Storable::thaw $av)->{objs} }; 1195 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs};
1020 } 1197 }
1021 1198
1199 utf8::decode (my $decname = $filename);
1022 warn sprintf "loading %s (%d)\n", 1200 warn sprintf "loading %s (%d,%d)\n",
1023 $filename, length $data, scalar @{$av || []}; 1201 $decname, length $data, scalar @{$av || []};
1202
1024 return ($data, $av); 1203 ($data, $av)
1025} 1204}
1026 1205
1027=head2 COMMAND CALLBACKS 1206=head2 COMMAND CALLBACKS
1028 1207
1029=over 4 1208=over 4
1102 my ($pl, $buf) = @_; 1281 my ($pl, $buf) = @_;
1103 1282
1104 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1283 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1105 1284
1106 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
1107 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1293 if (my $cb = $EXTCMD{$type}) {
1108 if (my %reply = $cb->($pl, $msg)) { 1294 @reply = $cb->($pl, @payload);
1109 $pl->ext_reply ($msg->{msgid}, %reply);
1110 }
1111 } 1295 }
1296
1297 $pl->ext_reply ($reply, @reply)
1298 if $reply;
1299
1112 } else { 1300 } else {
1113 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1114 } 1302 }
1115 1303
1116 cf::override; 1304 cf::override;
1169 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1170 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1171 1359
1172 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1173 warn $msg; 1361 warn $msg;
1174 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1175 exit 1;
1176 } 1363 }
1177 1364
1178 warn $msg; 1365 warn $msg;
1179 } 1366 }
1180 1367
1205use Coro::AIO; 1392use Coro::AIO;
1206 1393
1207=head3 cf::player 1394=head3 cf::player
1208 1395
1209=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}
1210 1411
1211=item cf::player::find $login 1412=item cf::player::find $login
1212 1413
1213Returns the given player object, loading it if necessary (might block). 1414Returns the given player object, loading it if necessary (might block).
1214 1415
1250 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1451 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1251 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1452 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1252 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1453 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1253 aio_unlink +(playerdir $login) . "/$login.pl"; 1454 aio_unlink +(playerdir $login) . "/$login.pl";
1254 1455
1255 my $pl = load_pl path $login 1456 my $f = new_from_file cf::object::thawer path $login
1256 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;
1257 $cf::PLAYER{$login} = $pl 1464 $cf::PLAYER{$login} = $pl
1258 } 1465 }
1259 } 1466 }
1260} 1467}
1261 1468
1270 return if $pl->{deny_save}; 1477 return if $pl->{deny_save};
1271 1478
1272 aio_mkdir playerdir $pl, 0770; 1479 aio_mkdir playerdir $pl, 0770;
1273 $pl->{last_save} = $cf::RUNTIME; 1480 $pl->{last_save} = $cf::RUNTIME;
1274 1481
1482 cf::get_slot 0.01;
1483
1275 $pl->save_pl ($path); 1484 $pl->save_pl ($path);
1276 Coro::cede; 1485 cf::cede_to_tick;
1277} 1486}
1278 1487
1279sub new($) { 1488sub new($) {
1280 my ($login) = @_; 1489 my ($login) = @_;
1281 1490
1285 $self->{deny_save} = 1; 1494 $self->{deny_save} = 1;
1286 1495
1287 $cf::PLAYER{$login} = $self; 1496 $cf::PLAYER{$login} = $self;
1288 1497
1289 $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 (@_);
1290} 1509}
1291 1510
1292=item $pl->quit_character 1511=item $pl->quit_character
1293 1512
1294Nukes the player without looking back. If logged in, the connection will 1513Nukes the player without looking back. If logged in, the connection will
1349 or return []; 1568 or return [];
1350 1569
1351 my @logins; 1570 my @logins;
1352 1571
1353 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") {
1354 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1578 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1355 aio_read $fh, 0, 512, my $buf, 0 or next; 1579 aio_read $fh, 0, 512, my $buf, 0 or next;
1356 $buf !~ /^password -------------$/m or next; # official not-valid tag 1580 $buf !~ /^password -------------$/m or next; # official not-valid tag
1581 }
1357 1582
1358 utf8::decode $login; 1583 utf8::decode $login;
1359 push @logins, $login; 1584 push @logins, $login;
1360 } 1585 }
1361 1586
1394 1619
1395Expand crossfire pod fragments into protocol xml. 1620Expand crossfire pod fragments into protocol xml.
1396 1621
1397=cut 1622=cut
1398 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
1399sub expand_cfpod { 1635sub expand_cfpod {
1400 ((my $self), (local $_)) = @_; 1636 my ($self, $pod) = @_;
1401 1637
1402 # escape & and < 1638 my $xml;
1403 s/&/&amp;/g;
1404 s/(?<![BIUGH])</&lt;/g;
1405 1639
1406 # this is buggy, it needs to properly take care of nested <'s 1640 while () {
1641 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1642 $group = $1;
1407 1643
1408 1 while 1644 $group =~ s/&/&amp;/g;
1409 # replace B<>, I<>, U<> etc. 1645 $group =~ s/</&lt;/g;
1410 s/B<([^\>]*)>/<b>$1<\/b>/ 1646
1411 || s/I<([^\>]*)>/<i>$1<\/i>/ 1647 $xml .= $group;
1412 || s/U<([^\>]*)>/<u>$1<\/u>/ 1648 } elsif ($pod =~ m%\G
1413 # replace G<male|female> tags 1649 ([BCGHITU])
1414 || s{G<([^>|]*)\|([^>]*)>}{ 1650 <
1415 $self->gender ? $2 : $1 1651 (?:
1416 }ge 1652 ([^<>]*) (?{ $group = $^N })
1417 # replace H<hint text> 1653 | < $interior >
1418 || s{H<([^\>]*)>} 1654 )
1655 >
1656 %gcsx
1419 { 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") {
1420 ("<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>",
1421 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1676 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1422 "") 1677 "")
1423 [$self->{hintmode}] 1678 [$self->{hintmode}];
1679 } else {
1680 $xml .= "error processing '$code($data)' directive";
1424 }ge; 1681 }
1682 } else {
1683 if ($pod =~ /\G(.+)/) {
1684 warn "parse error while expanding $pod (at $1)";
1685 }
1686 last;
1687 }
1688 }
1425 1689
1690 for ($xml) {
1426 # create single paragraphs (very hackish) 1691 # create single paragraphs (very hackish)
1427 s/(?<=\S)\n(?=\w)/ /g; 1692 s/(?<=\S)\n(?=\w)/ /g;
1428 1693
1429 # compress some whitespace 1694 # compress some whitespace
1430 s/\s+\n/\n/g; # ws line-ends 1695 s/\s+\n/\n/g; # ws line-ends
1431 s/\n\n+/\n/g; # double lines 1696 s/\n\n+/\n/g; # double lines
1432 s/^\n+//; # beginning lines 1697 s/^\n+//; # beginning lines
1433 s/\n+$//; # ending lines 1698 s/\n+$//; # ending lines
1699 }
1434 1700
1435 $_ 1701 $xml
1436} 1702}
1703
1704no re 'eval';
1437 1705
1438sub hintmode { 1706sub hintmode {
1439 $_[0]{hintmode} = $_[1] if @_ > 1; 1707 $_[0]{hintmode} = $_[1] if @_ > 1;
1440 $_[0]{hintmode} 1708 $_[0]{hintmode}
1441} 1709}
1442 1710
1443=item $player->ext_reply ($msgid, %msg) 1711=item $player->ext_reply ($msgid, @msg)
1444 1712
1445Sends an ext reply to the player. 1713Sends an ext reply to the player.
1446 1714
1447=cut 1715=cut
1448 1716
1449sub ext_reply($$%) { 1717sub ext_reply($$@) {
1450 my ($self, $id, %msg) = @_; 1718 my ($self, $id, @msg) = @_;
1451 1719
1452 $msg{msgid} = $id; 1720 $self->ns->ext_reply ($id, @msg)
1453 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1454} 1721}
1455 1722
1456=item $player->ext_event ($type, %msg) 1723=item $player->ext_msg ($type, @msg)
1457 1724
1458Sends an ext event to the client. 1725Sends an ext event to the client.
1459 1726
1460=cut 1727=cut
1461 1728
1462sub ext_event($$%) { 1729sub ext_msg($$@) {
1463 my ($self, $type, %msg) = @_; 1730 my ($self, $type, @msg) = @_;
1464 1731
1465 $self->ns->ext_event ($type, %msg); 1732 $self->ns->ext_msg ($type, @msg);
1466} 1733}
1467 1734
1468=head3 cf::region 1735=head3 cf::region
1469 1736
1470=over 4 1737=over 4
1483 my ($path) = @_; 1750 my ($path) = @_;
1484 1751
1485 my ($match, $specificity); 1752 my ($match, $specificity);
1486 1753
1487 for my $region (list) { 1754 for my $region (list) {
1488 if ($region->match && $path =~ $region->match) { 1755 if ($region->{match} && $path =~ $region->{match}) {
1489 ($match, $specificity) = ($region, $region->specificity) 1756 ($match, $specificity) = ($region, $region->specificity)
1490 if $region->specificity > $specificity; 1757 if $region->specificity > $specificity;
1491 } 1758 }
1492 } 1759 }
1493 1760
1514our $MAX_RESET = 3600; 1781our $MAX_RESET = 3600;
1515our $DEFAULT_RESET = 3000; 1782our $DEFAULT_RESET = 3000;
1516 1783
1517sub generate_random_map { 1784sub generate_random_map {
1518 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
1519 # mit "rum" bekleckern, nicht 1789 # mit "rum" bekleckern, nicht
1520 $self->_create_random_map ( 1790 $self->_create_random_map (
1521 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1791 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1522 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1792 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1523 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1793 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1613 $self->init; # pass $1 etc. 1883 $self->init; # pass $1 etc.
1614 return $self; 1884 return $self;
1615 } 1885 }
1616 } 1886 }
1617 1887
1618 Carp::carp "unable to resolve path '$path' (base '$base')."; 1888 Carp::cluck "unable to resolve path '$path' (base '$base').";
1619 () 1889 ()
1620} 1890}
1621 1891
1622sub init { 1892sub init {
1623 my ($self) = @_; 1893 my ($self) = @_;
1645 1915
1646# the temporary/swap location 1916# the temporary/swap location
1647sub save_path { 1917sub save_path {
1648 my ($self) = @_; 1918 my ($self) = @_;
1649 1919
1650 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1920 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1651 "$TMPDIR/$path.map" 1921 "$TMPDIR/$path.map"
1652} 1922}
1653 1923
1654# the unique path, undef == no special unique path 1924# the unique path, undef == no special unique path
1655sub uniq_path { 1925sub uniq_path {
1656 my ($self) = @_; 1926 my ($self) = @_;
1657 1927
1658 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1659 "$UNIQUEDIR/$path" 1929 "$UNIQUEDIR/$path"
1660} 1930}
1661 1931
1662# and all this just because we cannot iterate over 1932# and all this just because we cannot iterate over
1663# all maps in C++... 1933# all maps in C++...
1686 1956
1687sub load_header_from($) { 1957sub load_header_from($) {
1688 my ($self, $path) = @_; 1958 my ($self, $path) = @_;
1689 1959
1690 utf8::encode $path; 1960 utf8::encode $path;
1691 #aio_open $path, O_RDONLY, 0 1961 my $f = new_from_file cf::object::thawer $path
1692 # or return;
1693
1694 $self->_load_header ($path)
1695 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;
1696 1969
1697 $self->{load_path} = $path; 1970 $self->{load_path} = $path;
1698 1971
1699 1 1972 1
1700} 1973}
1754sub find { 2027sub find {
1755 my ($path, $origin) = @_; 2028 my ($path, $origin) = @_;
1756 2029
1757 $path = normalise $path, $origin && $origin->path; 2030 $path = normalise $path, $origin && $origin->path;
1758 2031
2032 cf::lock_wait "map_data:$path";#d#remove
1759 cf::lock_wait "map_find:$path"; 2033 cf::lock_wait "map_find:$path";
1760 2034
1761 $cf::MAP{$path} || do { 2035 $cf::MAP{$path} || do {
2036 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1762 my $guard = cf::lock_acquire "map_find:$path"; 2037 my $guard2 = cf::lock_acquire "map_find:$path";
2038
1763 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
1764 or return; 2040 or return;
1765 2041
1766 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
1767 2043
1769 or return; 2045 or return;
1770 2046
1771 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1772 # doing this can freeze the server in a sync job, obviously 2048 # doing this can freeze the server in a sync job, obviously
1773 #$cf::WAIT_FOR_TICK->wait; 2049 #$cf::WAIT_FOR_TICK->wait;
2050 undef $guard2;
2051 undef $guard1;
1774 $map->reset; 2052 $map->reset;
1775 undef $guard;
1776 return find $path; 2053 return find $path;
1777 } 2054 }
1778 2055
1779 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
1780 } 2057 }
1789 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
1790 2067
1791 my $path = $self->{path}; 2068 my $path = $self->{path};
1792 2069
1793 { 2070 {
1794 my $guard = cf::lock_acquire "map_load:$path"; 2071 my $guard = cf::lock_acquire "map_data:$path";
1795 2072
2073 return unless $self->valid;
1796 return if $self->in_memory != cf::MAP_SWAPPED; 2074 return unless $self->in_memory == cf::MAP_SWAPPED;
1797 2075
1798 $self->in_memory (cf::MAP_LOADING); 2076 $self->in_memory (cf::MAP_LOADING);
1799 2077
1800 $self->alloc; 2078 $self->alloc;
1801 2079
1802 $self->pre_load; 2080 $self->pre_load;
1803 Coro::cede; 2081 cf::cede_to_tick;
1804 2082
2083 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block;
1805 $self->_load_objects ($self->{load_path}, 1) 2085 $self->_load_objects ($f)
1806 or return; 2086 or return;
1807 2087
1808 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2088 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1809 if delete $self->{load_original}; 2089 if delete $self->{load_original};
1810 2090
1811 if (my $uniq = $self->uniq_path) { 2091 if (my $uniq = $self->uniq_path) {
1812 utf8::encode $uniq; 2092 utf8::encode $uniq;
1813 if (aio_open $uniq, O_RDONLY, 0) { 2093 unless (aio_stat $uniq) {
2094 if (my $f = new_from_file cf::object::thawer $uniq) {
1814 $self->clear_unique_items; 2095 $self->clear_unique_items;
1815 $self->_load_objects ($uniq, 0); 2096 $self->_load_objects ($f);
2097 $f->resolve_delayed_derefs;
2098 }
1816 } 2099 }
1817 } 2100 }
1818 2101
1819 Coro::cede; 2102 $f->resolve_delayed_derefs;
2103
2104 cf::cede_to_tick;
1820 # now do the right thing for maps 2105 # now do the right thing for maps
1821 $self->link_multipart_objects; 2106 $self->link_multipart_objects;
1822 $self->difficulty ($self->estimate_difficulty) 2107 $self->difficulty ($self->estimate_difficulty)
1823 unless $self->difficulty; 2108 unless $self->difficulty;
1824 Coro::cede; 2109 cf::cede_to_tick;
1825 2110
1826 unless ($self->{deny_activate}) { 2111 unless ($self->{deny_activate}) {
1827 $self->decay_objects; 2112 $self->decay_objects;
1828 $self->fix_auto_apply; 2113 $self->fix_auto_apply;
1829 $self->update_buttons; 2114 $self->update_buttons;
1830 Coro::cede; 2115 cf::cede_to_tick;
1831 $self->set_darkness_map; 2116 $self->set_darkness_map;
1832 Coro::cede; 2117 cf::cede_to_tick;
1833 $self->activate; 2118 $self->activate;
1834 } 2119 }
1835 2120
2121 $self->{last_save} = $cf::RUNTIME;
2122 $self->last_access ($cf::RUNTIME);
2123
1836 $self->in_memory (cf::MAP_IN_MEMORY); 2124 $self->in_memory (cf::MAP_ACTIVE);
1837 } 2125 }
1838 2126
1839 $self->post_load; 2127 $self->post_load;
1840} 2128}
1841 2129
1850 2138
1851 $self 2139 $self
1852} 2140}
1853 2141
1854# 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
1855sub load_diag { 2143sub load_neighbours {
1856 my ($map) = @_; 2144 my ($map) = @_;
1857 2145
1858 my @diag; # diagonal neighbours 2146 my @neigh; # diagonal neighbours
1859 2147
1860 for (0 .. 3) { 2148 for (0 .. 3) {
1861 my $neigh = $map->tile_path ($_) 2149 my $neigh = $map->tile_path ($_)
1862 or next; 2150 or next;
1863 $neigh = find $neigh, $map 2151 $neigh = find $neigh, $map
1864 or next; 2152 or next;
1865 $neigh->load; 2153 $neigh->load;
1866 2154
2155 push @neigh,
1867 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2156 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1868 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2157 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1869 } 2158 }
1870 2159
1871 for (@diag) { 2160 for (grep defined $_->[0], @neigh) {
2161 my ($path, $origin) = @$_;
1872 my $neigh = find @$_ 2162 my $neigh = find $path, $origin
1873 or next; 2163 or next;
1874 $neigh->load; 2164 $neigh->load;
1875 } 2165 }
1876} 2166}
1877 2167
1882} 2172}
1883 2173
1884sub do_load_sync { 2174sub do_load_sync {
1885 my ($map) = @_; 2175 my ($map) = @_;
1886 2176
2177 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2178 if $Coro::current == $Coro::main;
2179
1887 cf::sync_job { $map->load }; 2180 cf::sync_job { $map->load };
1888} 2181}
1889 2182
1890our %MAP_PREFETCH; 2183our %MAP_PREFETCH;
1891our $MAP_PREFETCHER = undef; 2184our $MAP_PREFETCHER = undef;
1892 2185
1893sub find_async { 2186sub find_async {
1894 my ($path, $origin) = @_; 2187 my ($path, $origin, $load) = @_;
1895 2188
1896 $path = normalise $path, $origin && $origin->{path}; 2189 $path = normalise $path, $origin && $origin->{path};
1897 2190
1898 if (my $map = $cf::MAP{$path}) { 2191 if (my $map = $cf::MAP{$path}) {
1899 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2192 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1900 } 2193 }
1901 2194
1902 undef $MAP_PREFETCH{$path}; 2195 $MAP_PREFETCH{$path} |= $load;
2196
1903 $MAP_PREFETCHER ||= cf::async { 2197 $MAP_PREFETCHER ||= cf::async {
2198 $Coro::current->{desc} = "map prefetcher";
2199
1904 while (%MAP_PREFETCH) { 2200 while (%MAP_PREFETCH) {
1905 for my $path (keys %MAP_PREFETCH) { 2201 while (my ($k, $v) = each %MAP_PREFETCH) {
1906 my $map = find $path 2202 if (my $map = find $k) {
1907 or next;
1908 $map->load; 2203 $map->load if $v;
2204 }
1909 2205
1910 delete $MAP_PREFETCH{$path}; 2206 delete $MAP_PREFETCH{$k};
1911 } 2207 }
1912 } 2208 }
1913 undef $MAP_PREFETCHER; 2209 undef $MAP_PREFETCHER;
1914 }; 2210 };
1915 $MAP_PREFETCHER->prio (6); 2211 $MAP_PREFETCHER->prio (6);
1918} 2214}
1919 2215
1920sub save { 2216sub save {
1921 my ($self) = @_; 2217 my ($self) = @_;
1922 2218
1923 my $lock = cf::lock_acquire "map_data:" . $self->path; 2219 my $lock = cf::lock_acquire "map_data:$self->{path}";
1924 2220
1925 $self->{last_save} = $cf::RUNTIME; 2221 $self->{last_save} = $cf::RUNTIME;
1926 2222
1927 return unless $self->dirty; 2223 return unless $self->dirty;
1928 2224
1934 return if $self->{deny_save}; 2230 return if $self->{deny_save};
1935 2231
1936 local $self->{last_access} = $self->last_access;#d# 2232 local $self->{last_access} = $self->last_access;#d#
1937 2233
1938 cf::async { 2234 cf::async {
2235 $Coro::current->{desc} = "map player save";
1939 $_->contr->save for $self->players; 2236 $_->contr->save for $self->players;
1940 }; 2237 };
2238
2239 cf::get_slot 0.02;
1941 2240
1942 if ($uniq) { 2241 if ($uniq) {
1943 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2242 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1944 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2243 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1945 } else { 2244 } else {
1951 my ($self) = @_; 2250 my ($self) = @_;
1952 2251
1953 # save first because save cedes 2252 # save first because save cedes
1954 $self->save; 2253 $self->save;
1955 2254
1956 my $lock = cf::lock_acquire "map_data:" . $self->path; 2255 my $lock = cf::lock_acquire "map_data:$self->{path}";
1957 2256
1958 return if $self->players; 2257 return if $self->players;
1959 return if $self->in_memory != cf::MAP_IN_MEMORY; 2258 return if $self->in_memory != cf::MAP_ACTIVE;
1960 return if $self->{deny_save}; 2259 return if $self->{deny_save};
1961 2260
2261 $self->in_memory (cf::MAP_SWAPPED);
2262
2263 $self->deactivate;
2264 $_->clear_links_to ($self) for values %cf::MAP;
1962 $self->clear; 2265 $self->clear;
1963 $self->in_memory (cf::MAP_SWAPPED);
1964} 2266}
1965 2267
1966sub reset_at { 2268sub reset_at {
1967 my ($self) = @_; 2269 my ($self) = @_;
1968 2270
2000 if $uniq; 2302 if $uniq;
2001 } 2303 }
2002 2304
2003 delete $cf::MAP{$self->path}; 2305 delete $cf::MAP{$self->path};
2004 2306
2307 $self->deactivate;
2308 $_->clear_links_to ($self) for values %cf::MAP;
2005 $self->clear; 2309 $self->clear;
2006
2007 $_->clear_links_to ($self) for values %cf::MAP;
2008 2310
2009 $self->unlink_save; 2311 $self->unlink_save;
2010 $self->destroy; 2312 $self->destroy;
2011} 2313}
2012 2314
2013my $nuke_counter = "aaaa"; 2315my $nuke_counter = "aaaa";
2014 2316
2015sub nuke { 2317sub nuke {
2016 my ($self) = @_; 2318 my ($self) = @_;
2017 2319
2320 {
2321 my $lock = cf::lock_acquire "map_data:$self->{path}";
2322
2018 delete $cf::MAP{$self->path}; 2323 delete $cf::MAP{$self->path};
2019 2324
2020 $self->unlink_save; 2325 $self->unlink_save;
2021 2326
2022 bless $self, "cf::map"; 2327 bless $self, "cf::map";
2023 delete $self->{deny_reset}; 2328 delete $self->{deny_reset};
2024 $self->{deny_save} = 1; 2329 $self->{deny_save} = 1;
2025 $self->reset_timeout (1); 2330 $self->reset_timeout (1);
2026 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2331 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2027 2332
2028 $cf::MAP{$self->path} = $self; 2333 $cf::MAP{$self->path} = $self;
2334 }
2029 2335
2030 $self->reset; # polite request, might not happen 2336 $self->reset; # polite request, might not happen
2031} 2337}
2032 2338
2033=item $maps = cf::map::tmp_maps 2339=item $maps = cf::map::tmp_maps
2075 2381
2076sub unique_maps() { 2382sub unique_maps() {
2077 [ 2383 [
2078 map { 2384 map {
2079 utf8::decode $_; 2385 utf8::decode $_;
2080 /\.map$/ 2386 s/\.map$//; # TODO future compatibility hack
2387 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2388 ? ()
2081 ? normalise $_ 2389 : normalise $_
2082 : ()
2083 } @{ aio_readdir $UNIQUEDIR or [] } 2390 } @{ aio_readdir $UNIQUEDIR or [] }
2084 ] 2391 ]
2085} 2392}
2086 2393
2087package cf;
2088
2089=back 2394=back
2090 2395
2091=head3 cf::object 2396=head3 cf::object
2092 2397
2093=cut 2398=cut
2096 2401
2097=over 4 2402=over 4
2098 2403
2099=item $ob->inv_recursive 2404=item $ob->inv_recursive
2100 2405
2101Returns 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.
2102 2408
2103=cut 2409=cut
2104 2410
2105sub inv_recursive_; 2411sub inv_recursive_;
2106sub inv_recursive_ { 2412sub inv_recursive_ {
2109 2415
2110sub inv_recursive { 2416sub inv_recursive {
2111 inv_recursive_ inv $_[0] 2417 inv_recursive_ inv $_[0]
2112} 2418}
2113 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
2114package cf; 2448package cf;
2115 2449
2116=back 2450=back
2117 2451
2118=head3 cf::object::player 2452=head3 cf::object::player
2124Sends 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>
2125can 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
2126dialogue with the given NPC character. 2460dialogue with the given NPC character.
2127 2461
2128=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};
2129 2477
2130# rough implementation of a future "reply" method that works 2478# rough implementation of a future "reply" method that works
2131# with dialog boxes. 2479# with dialog boxes.
2132#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
2133sub cf::object::player::reply($$$;$) { 2481sub cf::object::player::reply($$$;$) {
2140 2488
2141 } else { 2489 } else {
2142 my $pl = $self->contr; 2490 my $pl = $self->contr;
2143 2491
2144 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2492 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2145 my $diag = $pl->{npc_dialog}; 2493 my $dialog = $pl->{npc_dialog};
2146 $diag->{pl}->ext_reply ( 2494 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2147 $diag->{id},
2148 msgtype => "reply",
2149 msg => $diag->{pl}->expand_cfpod ($msg),
2150 add_topics => []
2151 );
2152 2495
2153 } else { 2496 } else {
2154 $msg = $npc->name . " says: $msg" if $npc; 2497 $msg = $npc->name . " says: $msg" if $npc;
2155 $self->message ($msg, $flags); 2498 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2156 } 2499 }
2157 } 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 (@_);
2158} 2511}
2159 2512
2160=item $player_object->may ("access") 2513=item $player_object->may ("access")
2161 2514
2162Returns wether the given player is authorized to access resource "access" 2515Returns wether the given player is authorized to access resource "access"
2241 # use -1 or undef as default coordinates, not 0, 0 2594 # use -1 or undef as default coordinates, not 0, 0
2242 ($x, $y) = ($map->enter_x, $map->enter_y) 2595 ($x, $y) = ($map->enter_x, $map->enter_y)
2243 if $x <=0 && $y <= 0; 2596 if $x <=0 && $y <= 0;
2244 2597
2245 $map->load; 2598 $map->load;
2246 $map->load_diag; 2599 $map->load_neighbours;
2247 2600
2248 return unless $self->contr->active; 2601 return unless $self->contr->active;
2249 $self->activate_recursive; 2602 $self->activate_recursive;
2250 2603
2251 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2604 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2252 $self->enter_map ($map, $x, $y); 2605 $self->enter_map ($map, $x, $y);
2253} 2606}
2254 2607
2255=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2608=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2256 2609
2257Moves 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
2258her, loading and preparing them map, calling the provided $check callback 2611her, loading and preparing them map, calling the provided $check callback
2259that 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
2260the 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.
2261 2615
2262=cut 2616=cut
2263 2617
2264our $GOTOGEN; 2618our $GOTOGEN;
2265 2619
2266sub cf::object::player::goto { 2620sub cf::object::player::goto {
2267 my ($self, $path, $x, $y, $check) = @_; 2621 my ($self, $path, $x, $y, $check, $done) = @_;
2268 2622
2269 # 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
2270 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2624 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2271 2625
2272 $self->enter_link; 2626 $self->enter_link;
2273 2627
2274 (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
2275 my $map = eval { 2650 my $map = eval {
2276 my $map = cf::map::find $path; 2651 my $map = defined $path ? cf::map::find $path : undef;
2277 2652
2278 if ($map) { 2653 if ($map) {
2279 $map = $map->customise_for ($self); 2654 $map = $map->customise_for ($self);
2280 $map = $check->($map) if $check && $map; 2655 $map = $check->($map) if $check && $map;
2281 } else { 2656 } else {
2282 $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);
2283 } 2658 }
2284 2659
2285 $map 2660 $map
2286 }; 2661 };
2287 2662
2292 2667
2293 if ($gen == $self->{_goto_generation}) { 2668 if ($gen == $self->{_goto_generation}) {
2294 delete $self->{_goto_generation}; 2669 delete $self->{_goto_generation};
2295 $self->leave_link ($map, $x, $y); 2670 $self->leave_link ($map, $x, $y);
2296 } 2671 }
2672
2673 $done->() if $done;
2297 })->prio (1); 2674 })->prio (1);
2298} 2675}
2299 2676
2300=item $player_object->enter_exit ($exit_object) 2677=item $player_object->enter_exit ($exit_object)
2301 2678
2321} 2698}
2322 2699
2323sub prepare_random_map { 2700sub prepare_random_map {
2324 my ($exit) = @_; 2701 my ($exit) = @_;
2325 2702
2326 my $guard = cf::lock_acquire "exit_prepare:$exit";
2327
2328 # all this does is basically replace the /! path by 2703 # all this does is basically replace the /! path by
2329 # a new random map path (?random/...) with a seed 2704 # a new random map path (?random/...) with a seed
2330 # that depends on the exit object 2705 # that depends on the exit object
2331 2706
2332 my $rmp = parse_random_map_params $exit->msg; 2707 my $rmp = parse_random_map_params $exit->msg;
2334 if ($exit->map) { 2709 if ($exit->map) {
2335 $rmp->{region} = $exit->region->name; 2710 $rmp->{region} = $exit->region->name;
2336 $rmp->{origin_map} = $exit->map->path; 2711 $rmp->{origin_map} = $exit->map->path;
2337 $rmp->{origin_x} = $exit->x; 2712 $rmp->{origin_x} = $exit->x;
2338 $rmp->{origin_y} = $exit->y; 2713 $rmp->{origin_y} = $exit->y;
2714
2715 $exit->map->touch;
2339 } 2716 }
2340 2717
2341 $rmp->{random_seed} ||= $exit->random_seed; 2718 $rmp->{random_seed} ||= $exit->random_seed;
2342 2719
2343 my $data = cf::to_json $rmp; 2720 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2344 my $md5 = Digest::MD5::md5_hex $data; 2721 my $md5 = Digest::MD5::md5_hex $data;
2345 my $meta = "$RANDOMDIR/$md5.meta"; 2722 my $meta = "$RANDOMDIR/$md5.meta";
2346 2723
2347 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2724 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2348 aio_write $fh, 0, (length $data), $data, 0; 2725 aio_write $fh, 0, (length $data), $data, 0;
2349 undef $fh; 2726 undef $fh;
2350 aio_rename "$meta~", $meta; 2727 aio_rename "$meta~", $meta;
2351 2728
2729 my $slaying = "?random/$md5";
2730
2731 if ($exit->valid) {
2352 $exit->slaying ("?random/$md5"); 2732 $exit->slaying ("?random/$md5");
2353 $exit->msg (undef); 2733 $exit->msg (undef);
2734 }
2354 } 2735 }
2355} 2736}
2356 2737
2357sub cf::object::player::enter_exit { 2738sub cf::object::player::enter_exit {
2358 my ($self, $exit) = @_; 2739 my ($self, $exit) = @_;
2359 2740
2360 return unless $self->type == cf::PLAYER; 2741 return unless $self->type == cf::PLAYER;
2361 2742
2362 if ($exit->slaying eq "/!") {
2363 #TODO: this should de-fi-ni-te-ly not be a sync-job
2364 # the problem is that $exit might not survive long enough
2365 # so it needs to be done right now, right here
2366 cf::sync_job { prepare_random_map $exit };
2367 }
2368
2369 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2370 my $hp = $exit->stats->hp;
2371 my $sp = $exit->stats->sp;
2372
2373 $self->enter_link; 2743 $self->enter_link;
2374 2744
2375 # if exit is damned, update players death & WoR home-position
2376 $self->contr->savebed ($slaying, $hp, $sp)
2377 if $exit->flag (FLAG_DAMNED);
2378
2379 (async { 2745 (async {
2380 $self->deactivate_recursive; # just to be sure 2746 $Coro::current->{desc} = "enter_exit";
2747
2381 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
2382 $self->goto ($slaying, $hp, $sp); 2763 $self->goto ($map, $x, $y);
2383 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
2384 1; 2769 1
2385 }) { 2770 }) {
2386 $self->message ("Something went wrong deep within the crossfire server. " 2771 $self->message ("Something went wrong deep within the crossfire server. "
2387 . "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. "
2388 . "Please report this to the dungeon master!", 2773 . "Please report this to the dungeon master!",
2389 cf::NDI_UNIQUE | cf::NDI_RED); 2774 cf::NDI_UNIQUE | cf::NDI_RED);
2410 2795
2411 utf8::encode $text; 2796 utf8::encode $text;
2412 $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);
2413} 2798}
2414 2799
2415=item $client->send_msg ($color, $type, $msg, [extra...]) 2800=item $client->send_msg ($channel, $msg, $color, [extra...])
2416 2801
2417Send 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
2418client 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
2419the 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
2420the message unless the client supports the msg packet. 2805the message unless the client supports the msg packet.
2421 2806
2422=cut 2807=cut
2423 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
2424sub cf::client::send_msg { 2867sub cf::client::send_msg {
2425 my ($self, $color, $type, $msg, @extra) = @_; 2868 my ($self, $channel, $msg, $color, @extra) = @_;
2426 2869
2427 $msg = $self->pl->expand_cfpod ($msg); 2870 $msg = $self->pl->expand_cfpod ($msg);
2428 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
2429 return unless @extra || length $msg; 2894 return unless @extra || length $msg;
2430 2895
2431 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
2432 $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]));
2433 } else { 2903 } else {
2434 # replace some tags by gcfclient-compatible ones
2435 for ($msg) {
2436 1 while
2437 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2438 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2439 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2440 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2441 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2442 }
2443
2444 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
2445 if (0 && $msg =~ /\[/) { 2919 if (0 && $msg =~ /\[/) {
2920 # COMMAND/INFO
2446 $self->send_packet ("drawextinfo $color 4 0 $msg") 2921 $self->send_packet ("drawextinfo $color 10 8 $msg")
2447 } else { 2922 } else {
2448 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2923 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2449 $self->send_packet ("drawinfo $color $msg") 2924 $self->send_packet ("drawinfo $color $msg")
2450 } 2925 }
2451 } 2926 }
2452 } 2927 }
2453} 2928}
2454 2929
2455=item $client->ext_event ($type, %msg) 2930=item $client->ext_msg ($type, @msg)
2456 2931
2457Sends an ext event to the client. 2932Sends an ext event to the client.
2458 2933
2459=cut 2934=cut
2460 2935
2461sub cf::client::ext_event($$%) { 2936sub cf::client::ext_msg($$@) {
2462 my ($self, $type, %msg) = @_; 2937 my ($self, $type, @msg) = @_;
2463 2938
2939 if ($self->extcmd == 2) {
2940 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2941 } elsif ($self->extcmd == 1) { # TODO: remove
2464 $msg{msgtype} = "event_$type"; 2942 push @msg, msgtype => "event_$type";
2465 $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 }
2466} 2963}
2467 2964
2468=item $success = $client->query ($flags, "text", \&cb) 2965=item $success = $client->query ($flags, "text", \&cb)
2469 2966
2470Queues a query to the client, calling the given callback with 2967Queues a query to the client, calling the given callback with
2525 my ($ns, $buf) = @_; 3022 my ($ns, $buf) = @_;
2526 3023
2527 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3024 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2528 3025
2529 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
2530 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3034 if (my $cb = $EXTICMD{$type}) {
2531 if (my %reply = $cb->($ns, $msg)) { 3035 @reply = $cb->($ns, @payload);
2532 $reply{msgid} = $msg->{msgid};
2533 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2534 }
2535 } 3036 }
3037
3038 $ns->ext_reply ($reply, @reply)
3039 if $reply;
3040
2536 } else { 3041 } else {
2537 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";
2538 } 3043 }
2539 3044
2540 cf::override; 3045 cf::override;
2587our $safe = new Safe "safe"; 3092our $safe = new Safe "safe";
2588our $safe_hole = new Safe::Hole; 3093our $safe_hole = new Safe::Hole;
2589 3094
2590$SIG{FPE} = 'IGNORE'; 3095$SIG{FPE} = 'IGNORE';
2591 3096
2592$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));
2593 3102
2594# here we export the classes and methods available to script code 3103# here we export the classes and methods available to script code
2595 3104
2596=pod 3105=pod
2597 3106
2598The following functions and methods are available within a safe environment: 3107The following functions and methods are available within a safe environment:
2599 3108
2600 cf::object 3109 cf::object
2601 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
2602 insert remove 3111 insert remove name archname title slaying race decrease split
2603 3112
2604 cf::object::player 3113 cf::object::player
2605 player 3114 player
2606 3115
2607 cf::player 3116 cf::player
2612 3121
2613=cut 3122=cut
2614 3123
2615for ( 3124for (
2616 ["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
2617 insert remove)], 3126 insert remove inv name archname title slaying race
3127 decrease split destroy)],
2618 ["cf::object::player" => qw(player)], 3128 ["cf::object::player" => qw(player)],
2619 ["cf::player" => qw(peaceful)], 3129 ["cf::player" => qw(peaceful)],
2620 ["cf::map" => qw(trigger)], 3130 ["cf::map" => qw(trigger)],
2621) { 3131) {
2622 no strict 'refs'; 3132 no strict 'refs';
2698# the server's init and main functions 3208# the server's init and main functions
2699 3209
2700sub load_facedata($) { 3210sub load_facedata($) {
2701 my ($path) = @_; 3211 my ($path) = @_;
2702 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
2703 warn "loading facedata from $path\n"; 3219 warn "loading facedata from $path\n";
2704 3220
2705 my $facedata; 3221 my $facedata;
2706 0 < aio_load $path, $facedata 3222 0 < aio_load $path, $facedata
2707 or die "$path: $!"; 3223 or die "$path: $!";
2709 $facedata = Coro::Storable::thaw $facedata; 3225 $facedata = Coro::Storable::thaw $facedata;
2710 3226
2711 $facedata->{version} == 2 3227 $facedata->{version} == 2
2712 or cf::cleanup "$path: version mismatch, cannot proceed."; 3228 or cf::cleanup "$path: version mismatch, cannot proceed.";
2713 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
2714 { 3237 {
2715 my $faces = $facedata->{faceinfo}; 3238 my $faces = $facedata->{faceinfo};
2716 3239
2717 while (my ($face, $info) = each %$faces) { 3240 while (my ($face, $info) = each %$faces) {
2718 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3241 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3242
2719 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3243 cf::face::set_visibility $idx, $info->{visibility};
3244 cf::face::set_magicmap $idx, $info->{magicmap};
2720 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3245 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2721 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3246 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2722 Coro::cede; 3247
3248 cf::cede_to_tick;
2723 } 3249 }
2724 3250
2725 while (my ($face, $info) = each %$faces) { 3251 while (my ($face, $info) = each %$faces) {
2726 next unless $info->{smooth}; 3252 next unless $info->{smooth};
3253
2727 my $idx = cf::face::find $face 3254 my $idx = cf::face::find $face
2728 or next; 3255 or next;
3256
2729 if (my $smooth = cf::face::find $info->{smooth}) { 3257 if (my $smooth = cf::face::find $info->{smooth}) {
3258 cf::face::set_smooth $idx, $smooth;
2730 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3259 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2731 } else { 3260 } else {
2732 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3261 warn "smooth face '$info->{smooth}' not found for face '$face'";
2733 } 3262 }
2734 Coro::cede; 3263
3264 cf::cede_to_tick;
2735 } 3265 }
2736 } 3266 }
2737 3267
2738 { 3268 {
2739 my $anims = $facedata->{animinfo}; 3269 my $anims = $facedata->{animinfo};
2740 3270
2741 while (my ($anim, $info) = each %$anims) { 3271 while (my ($anim, $info) = each %$anims) {
2742 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3272 cf::anim::set $anim, $info->{frames}, $info->{facings};
2743 Coro::cede; 3273 cf::cede_to_tick;
2744 } 3274 }
2745 3275
2746 cf::anim::invalidate_all; # d'oh 3276 cf::anim::invalidate_all; # d'oh
2747 } 3277 }
2748 3278
3279 {
3280 # TODO: for gcfclient pleasure, we should give resources
3281 # that gcfclient doesn't grok a >10000 face index.
3282 my $res = $facedata->{resource};
3283
3284 while (my ($name, $info) = each %$res) {
3285 if (defined $info->{type}) {
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;
3303 cf::face::set_type $idx, $info->{type};
3304 } else {
3305 $RESOURCE{$name} = $info;
3306 }
3307
3308 cf::cede_to_tick;
3309 }
3310 }
3311
3312 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3313
2749 1 3314 1
2750} 3315}
2751 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
2752sub 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
2753 load_resource_file "$MAPDIR/regions" 3360 load_resource_file "$MAPDIR/regions"
2754 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 }
2755} 3367}
2756 3368
2757sub reload_facedata { 3369sub reload_facedata {
2758 load_facedata "$DATADIR/facedata" 3370 load_facedata "$DATADIR/facedata"
2759 or die "unable to load facedata\n"; 3371 or die "unable to load facedata\n";
2760} 3372}
2761 3373
2762sub reload_archetypes { 3374sub reload_archetypes {
2763 load_resource_file "$DATADIR/archetypes" 3375 load_resource_file "$DATADIR/archetypes"
2764 or die "unable to load archetypes\n"; 3376 or die "unable to load archetypes\n";
2765 #d# NEED to laod twice to resolve forward references
2766 # this really needs to be done in an extra post-pass
2767 # (which needs to be synchronous, so solve it differently)
2768 load_resource_file "$DATADIR/archetypes"
2769 or die "unable to load archetypes\n";
2770} 3377}
2771 3378
2772sub reload_treasures { 3379sub reload_treasures {
2773 load_resource_file "$DATADIR/treasures" 3380 load_resource_file "$DATADIR/treasures"
2774 or die "unable to load treasurelists\n"; 3381 or die "unable to load treasurelists\n";
2775} 3382}
2776 3383
2777sub reload_resources { 3384sub reload_resources {
2778 warn "reloading resource files...\n"; 3385 warn "reloading resource files...\n";
2779 3386
3387 reload_facedata;
3388 reload_archetypes;
2780 reload_regions; 3389 reload_regions;
2781 reload_facedata;
2782 #reload_archetypes;#d#
2783 reload_archetypes;
2784 reload_treasures; 3390 reload_treasures;
2785 3391
2786 warn "finished reloading resource files\n"; 3392 warn "finished reloading resource files\n";
2787} 3393}
2788 3394
2789sub init { 3395sub init {
3396 my $guard = freeze_mainloop;
3397
2790 reload_resources; 3398 reload_resources;
2791} 3399}
2792 3400
2793sub cfg_load { 3401sub reload_config {
2794 open my $fh, "<:utf8", "$CONFDIR/config" 3402 open my $fh, "<:utf8", "$CONFDIR/config"
2795 or return; 3403 or return;
2796 3404
2797 local $/; 3405 local $/;
2798 *CFG = YAML::Syck::Load <$fh>; 3406 *CFG = YAML::Load <$fh>;
2799 3407
2800 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3408 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2801 3409
2802 $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};
2803 $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};
2814sub main { 3422sub main {
2815 # we must not ever block the main coroutine 3423 # we must not ever block the main coroutine
2816 local $Coro::idle = sub { 3424 local $Coro::idle = sub {
2817 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#
2818 (async { 3426 (async {
2819 Event::one_event; 3427 $Coro::current->{desc} = "IDLE BUG HANDLER";
3428 EV::loop EV::LOOP_ONESHOT;
2820 })->prio (Coro::PRIO_MAX); 3429 })->prio (Coro::PRIO_MAX);
2821 }; 3430 };
2822 3431
2823 cfg_load; 3432 {
3433 my $guard = freeze_mainloop;
3434 reload_config;
2824 db_init; 3435 db_init;
2825 load_extensions; 3436 load_extensions;
2826 3437
2827 $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
2828 Event::loop; 3442 EV::loop;
2829} 3443}
2830 3444
2831############################################################################# 3445#############################################################################
2832# initialisation and cleanup 3446# initialisation and cleanup
2833 3447
2834# install some emergency cleanup handlers 3448# install some emergency cleanup handlers
2835BEGIN { 3449BEGIN {
3450 our %SIGWATCHER = ();
2836 for my $signal (qw(INT HUP TERM)) { 3451 for my $signal (qw(INT HUP TERM)) {
2837 Event->signal ( 3452 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2838 reentrant => 0,
2839 data => WF_AUTOCANCEL,
2840 signal => $signal,
2841 prio => 0,
2842 cb => sub {
2843 cf::cleanup "SIG$signal"; 3453 cf::cleanup "SIG$signal";
2844 },
2845 ); 3454 };
2846 } 3455 }
2847} 3456}
2848 3457
2849sub write_runtime { 3458sub write_runtime_sync {
2850 my $runtime = "$LOCALDIR/runtime"; 3459 my $runtime = "$LOCALDIR/runtime";
2851 3460
2852 # first touch the runtime file to show we are still running: 3461 # first touch the runtime file to show we are still running:
2853 # the fsync below can take a very very long time. 3462 # the fsync below can take a very very long time.
2854 3463
2880 and return; 3489 and return;
2881 3490
2882 warn "runtime file written.\n"; 3491 warn "runtime file written.\n";
2883 3492
2884 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 };
2885} 3537}
2886 3538
2887sub emergency_save() { 3539sub emergency_save() {
2888 my $freeze_guard = cf::freeze_mainloop; 3540 my $freeze_guard = cf::freeze_mainloop;
2889 3541
2895 # and maps saved/destroyed asynchronously. 3547 # and maps saved/destroyed asynchronously.
2896 warn "begin emergency player save\n"; 3548 warn "begin emergency player save\n";
2897 for my $login (keys %cf::PLAYER) { 3549 for my $login (keys %cf::PLAYER) {
2898 my $pl = $cf::PLAYER{$login} or next; 3550 my $pl = $cf::PLAYER{$login} or next;
2899 $pl->valid or next; 3551 $pl->valid or next;
3552 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2900 $pl->save; 3553 $pl->save;
2901 } 3554 }
2902 warn "end emergency player save\n"; 3555 warn "end emergency player save\n";
2903 3556
2904 warn "begin emergency map save\n"; 3557 warn "begin emergency map save\n";
2910 warn "end emergency map save\n"; 3563 warn "end emergency map save\n";
2911 3564
2912 warn "begin emergency database checkpoint\n"; 3565 warn "begin emergency database checkpoint\n";
2913 BDB::db_env_txn_checkpoint $DB_ENV; 3566 BDB::db_env_txn_checkpoint $DB_ENV;
2914 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";
2915 }; 3572 };
2916 3573
2917 warn "leave emergency perl save\n"; 3574 warn "leave emergency perl save\n";
2918} 3575}
2919 3576
2934 warn "reloading..."; 3591 warn "reloading...";
2935 3592
2936 warn "entering sync_job"; 3593 warn "entering sync_job";
2937 3594
2938 cf::sync_job { 3595 cf::sync_job {
2939 cf::write_runtime; # external watchdog should not bark 3596 cf::write_runtime_sync; # external watchdog should not bark
2940 cf::emergency_save; 3597 cf::emergency_save;
2941 cf::write_runtime; # external watchdog should not bark 3598 cf::write_runtime_sync; # external watchdog should not bark
2942 3599
2943 warn "syncing database to disk"; 3600 warn "syncing database to disk";
2944 BDB::db_env_txn_checkpoint $DB_ENV; 3601 BDB::db_env_txn_checkpoint $DB_ENV;
2945 3602
2946 # 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
2947
2948 warn "cancelling all WF_AUTOCANCEL watchers";
2949 for (Event::all_watchers) {
2950 $_->cancel if $_->data & WF_AUTOCANCEL;
2951 }
2952 3604
2953 warn "flushing outstanding aio requests"; 3605 warn "flushing outstanding aio requests";
2954 for (;;) { 3606 for (;;) {
2955 BDB::flush; 3607 BDB::flush;
2956 IO::AIO::flush; 3608 IO::AIO::flush;
2957 Coro::cede; 3609 Coro::cede_notself;
2958 last unless IO::AIO::nreqs || BDB::nreqs; 3610 last unless IO::AIO::nreqs || BDB::nreqs;
2959 warn "iterate..."; 3611 warn "iterate...";
2960 } 3612 }
2961 3613
2962 ++$RELOAD; 3614 ++$RELOAD;
3021 warn "reloading cf.pm"; 3673 warn "reloading cf.pm";
3022 require cf; 3674 require cf;
3023 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3675 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3024 3676
3025 warn "loading config and database again"; 3677 warn "loading config and database again";
3026 cf::cfg_load; 3678 cf::reload_config;
3027 3679
3028 warn "loading extensions"; 3680 warn "loading extensions";
3029 cf::load_extensions; 3681 cf::load_extensions;
3030 3682
3031 warn "reattaching attachments to objects/players"; 3683 warn "reattaching attachments to objects/players";
3038 warn "leaving sync_job"; 3690 warn "leaving sync_job";
3039 3691
3040 1 3692 1
3041 } or do { 3693 } or do {
3042 warn $@; 3694 warn $@;
3043 warn "error while reloading, exiting."; 3695 cf::cleanup "error while reloading, exiting.";
3044 exit 1;
3045 }; 3696 };
3046 3697
3047 warn "reloaded"; 3698 warn "reloaded";
3048}; 3699};
3049 3700
3051 3702
3052sub reload_perl() { 3703sub reload_perl() {
3053 # doing reload synchronously and two reloads happen back-to-back, 3704 # doing reload synchronously and two reloads happen back-to-back,
3054 # coro crashes during coro_state_free->destroy here. 3705 # coro crashes during coro_state_free->destroy here.
3055 3706
3056 $RELOAD_WATCHER ||= Event->timer ( 3707 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3057 reentrant => 0,
3058 after => 0,
3059 data => WF_AUTOCANCEL,
3060 cb => sub {
3061 do_reload_perl; 3708 do_reload_perl;
3062 undef $RELOAD_WATCHER; 3709 undef $RELOAD_WATCHER;
3063 },
3064 ); 3710 };
3065} 3711}
3066 3712
3067register_command "reload" => sub { 3713register_command "reload" => sub {
3068 my ($who, $arg) = @_; 3714 my ($who, $arg) = @_;
3069 3715
3070 if ($who->flag (FLAG_WIZ)) { 3716 if ($who->flag (FLAG_WIZ)) {
3071 $who->message ("reloading server."); 3717 $who->message ("reloading server.");
3718 async {
3719 $Coro::current->{desc} = "perl_reload";
3072 async { reload_perl }; 3720 reload_perl;
3721 };
3073 } 3722 }
3074}; 3723};
3075 3724
3076unshift @INC, $LIBDIR; 3725unshift @INC, $LIBDIR;
3077 3726
3079 3728
3080our @WAIT_FOR_TICK; 3729our @WAIT_FOR_TICK;
3081our @WAIT_FOR_TICK_BEGIN; 3730our @WAIT_FOR_TICK_BEGIN;
3082 3731
3083sub wait_for_tick { 3732sub wait_for_tick {
3084 return unless $TICK_WATCHER->is_active;
3085 return if $Coro::current == $Coro::main; 3733 return if tick_inhibit || $Coro::current == $Coro::main;
3086 3734
3087 my $signal = new Coro::Signal; 3735 my $signal = new Coro::Signal;
3088 push @WAIT_FOR_TICK, $signal; 3736 push @WAIT_FOR_TICK, $signal;
3089 $signal->wait; 3737 $signal->wait;
3090} 3738}
3091 3739
3092sub wait_for_tick_begin { 3740sub wait_for_tick_begin {
3093 return unless $TICK_WATCHER->is_active;
3094 return if $Coro::current == $Coro::main; 3741 return if tick_inhibit || $Coro::current == $Coro::main;
3095 3742
3096 my $signal = new Coro::Signal; 3743 my $signal = new Coro::Signal;
3097 push @WAIT_FOR_TICK_BEGIN, $signal; 3744 push @WAIT_FOR_TICK_BEGIN, $signal;
3098 $signal->wait; 3745 $signal->wait;
3099} 3746}
3100 3747
3101 my $min = 1e6;#d# 3748sub tick {
3102 my $avg = 10;
3103$TICK_WATCHER = Event->timer (
3104 reentrant => 0,
3105 parked => 1,
3106 prio => 0,
3107 at => $NEXT_TICK || $TICK,
3108 data => WF_AUTOCANCEL,
3109 cb => sub {
3110 if ($Coro::current != $Coro::main) { 3749 if ($Coro::current != $Coro::main) {
3111 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"
3112 unless ++$bug_warning > 10; 3751 unless ++$bug_warning > 10;
3113 return; 3752 return;
3114 } 3753 }
3115 3754
3116 $NOW = $tick_start = Event::time;
3117
3118 cf::server_tick; # one server iteration 3755 cf::server_tick; # one server iteration
3119 3756
3120 0 && sync_job {#d# 3757 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3121 for(1..10) { 3758 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3122 my $t = Event::time; 3759 Coro::async_pool {
3123 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3760 $Coro::current->{desc} = "runtime saver";
3124 or die; 3761 write_runtime_sync
3125 3762 or warn "ERROR: unable to write runtime file: $!";
3126 $map->width (50);
3127 $map->height (50);
3128 $map->alloc;
3129 $map->_load_objects ("/tmp/x.map", 1);
3130 my $t = Event::time - $t;
3131
3132 #next unless $t < 0.0013;#d#
3133 if ($t < $min) {
3134 $min = $t;
3135 }
3136 $avg = $avg * 0.99 + $t * 0.01;
3137 }
3138 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3139 exit 0;
3140 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3141 }; 3763 };
3764 }
3142 3765
3143 $RUNTIME += $TICK;
3144 $NEXT_TICK += $TICK;
3145
3146 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3147 $NEXT_RUNTIME_WRITE = $NOW + 10;
3148 Coro::async_pool {
3149 write_runtime
3150 or warn "ERROR: unable to write runtime file: $!";
3151 };
3152 }
3153
3154# my $AFTER = Event::time;
3155# warn $AFTER - $NOW;#d#
3156
3157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3766 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3158 $sig->send; 3767 $sig->send;
3159 } 3768 }
3160 while (my $sig = shift @WAIT_FOR_TICK) { 3769 while (my $sig = shift @WAIT_FOR_TICK) {
3161 $sig->send; 3770 $sig->send;
3162 } 3771 }
3163 3772
3164 $NOW = Event::time; 3773 $LOAD = ($NOW - $TICK_START) / $TICK;
3165
3166 # if we are delayed by four ticks or more, skip them all
3167 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3168
3169 $TICK_WATCHER->at ($NEXT_TICK);
3170 $TICK_WATCHER->start;
3171
3172 $LOAD = ($NOW - $tick_start) / $TICK;
3173 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3774 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3174 3775
3175 _post_tick; 3776 if (0) {
3176 3777 if ($NEXT_TICK) {
3177 3778 my $jitter = $TICK_START - $NEXT_TICK;
3779 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3780 warn "jitter $JITTER\n";#d#
3781 }
3178 }, 3782 }
3179); 3783}
3180 3784
3181{ 3785{
3182 BDB::max_poll_time $TICK * 0.1; 3786 # configure BDB
3183 $BDB_POLL_WATCHER = Event->io ( 3787
3184 reentrant => 0,
3185 fd => BDB::poll_fileno,
3186 poll => 'r',
3187 prio => 0,
3188 data => WF_AUTOCANCEL,
3189 cb => \&BDB::poll_cb,
3190 );
3191 BDB::min_parallel 8; 3788 BDB::min_parallel 8;
3192 3789 BDB::max_poll_reqs $TICK * 0.1;
3193 BDB::set_sync_prepare { 3790 $Coro::BDB::WATCHER->priority (1);
3194 my $status;
3195 my $current = $Coro::current;
3196 (
3197 sub {
3198 $status = $!;
3199 $current->ready; undef $current;
3200 },
3201 sub {
3202 Coro::schedule while defined $current;
3203 $! = $status;
3204 },
3205 )
3206 };
3207 3791
3208 unless ($DB_ENV) { 3792 unless ($DB_ENV) {
3209 $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);
3210 3798
3211 cf::sync_job { 3799 cf::sync_job {
3212 eval { 3800 eval {
3213 BDB::db_env_open 3801 BDB::db_env_open
3214 $DB_ENV, 3802 $DB_ENV,
3216 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
3217 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3805 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3218 0666; 3806 0666;
3219 3807
3220 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3808 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3221
3222 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3223 $DB_ENV->set_lk_detect;
3224 }; 3809 };
3225 3810
3226 cf::cleanup "db_env_open(db): $@" if $@; 3811 cf::cleanup "db_env_open(db): $@" if $@;
3227 }; 3812 };
3228 } 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 };
3229} 3824}
3230 3825
3231{ 3826{
3827 # configure IO::AIO
3828
3232 IO::AIO::min_parallel 8; 3829 IO::AIO::min_parallel 8;
3233
3234 undef $Coro::AIO::WATCHER;
3235 IO::AIO::max_poll_time $TICK * 0.1; 3830 IO::AIO::max_poll_time $TICK * 0.1;
3236 $AIO_POLL_WATCHER = Event->io ( 3831 $Coro::AIO::WATCHER->priority (1);
3237 reentrant => 0,
3238 data => WF_AUTOCANCEL,
3239 fd => IO::AIO::poll_fileno,
3240 poll => 'r',
3241 prio => 6,
3242 cb => \&IO::AIO::poll_cb,
3243 );
3244} 3832}
3245 3833
3246my $_log_backtrace; 3834my $_log_backtrace;
3247 3835
3248sub _log_backtrace { 3836sub _log_backtrace {
3252 3840
3253 # limit the # of concurrent backtraces 3841 # limit the # of concurrent backtraces
3254 if ($_log_backtrace < 2) { 3842 if ($_log_backtrace < 2) {
3255 ++$_log_backtrace; 3843 ++$_log_backtrace;
3256 async { 3844 async {
3845 $Coro::current->{desc} = "abt $msg";
3846
3257 my @bt = fork_call { 3847 my @bt = fork_call {
3258 @addr = map { sprintf "%x", $_ } @addr; 3848 @addr = map { sprintf "%x", $_ } @addr;
3259 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3849 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3260 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 |"
3261 or die "addr2line: $!"; 3851 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines