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.291 by root, Tue Jul 3 00:54:44 2007 UTC vs.
Revision 1.431 by elmex, Sun May 4 19:27:27 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 $res = Coro::Storable::thaw $res;
427
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals; 549 reset_signals;
435 local $SIG{__WARN__}; 550 &$cb
436 local $SIG{__DIE__}; 551 }, @args;
437 eval {
438 close $fh1;
439 552
440 my @res = eval { $cb->(@args) }; 553 wantarray ? @res : $res[-1]
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 554}
442 };
443 555
444 warn $@ if $@; 556=item $coin = coin_from_name $name
445 _exit 0; 557
446 } 558=cut
559
560our %coin_alias = (
561 "silver" => "silvercoin",
562 "silvercoin" => "silvercoin",
563 "silvercoins" => "silvercoin",
564 "gold" => "goldcoin",
565 "goldcoin" => "goldcoin",
566 "goldcoins" => "goldcoin",
567 "platinum" => "platinacoin",
568 "platinumcoin" => "platinacoin",
569 "platinumcoins" => "platinacoin",
570 "platina" => "platinacoin",
571 "platinacoin" => "platinacoin",
572 "platinacoins" => "platinacoin",
573 "royalty" => "royalty",
574 "royalties" => "royalty",
575);
576
577sub coin_from_name($) {
578 $coin_alias{$_[0]}
579 ? cf::arch::find $coin_alias{$_[0]}
580 : undef
447} 581}
448 582
449=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
450 584
451Returns a single value from the environment database. 585Returns a single value from the environment database.
453=item cf::db_put $family => $key => $value 587=item cf::db_put $family => $key => $value
454 588
455Stores 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
456data 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).
457 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
458=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}
459 615
460our $DB; 616our $DB;
461 617
462sub db_init { 618sub db_init {
463 unless ($DB) {
464 $DB = BDB::db_create $DB_ENV;
465
466 cf::sync_job { 619 cf::sync_job {
467 eval { 620 $DB ||= db_table "db";
468 $DB->set_flags (BDB::CHKSUM);
469
470 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
472 cf::cleanup "db_open(db): $!" if $!;
473 };
474 cf::cleanup "db_open(db): $@" if $@;
475 };
476 } 621 };
477} 622}
478 623
479sub db_get($$) { 624sub db_get($$) {
480 my $key = "$_[0]/$_[1]"; 625 my $key = "$_[0]/$_[1]";
481 626
531 if (1) { 676 if (1) {
532 $md5 = 677 $md5 =
533 join "\x00", 678 join "\x00",
534 $processversion, 679 $processversion,
535 map { 680 map {
536 Coro::cede; 681 cf::cede_to_tick;
537 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 682 ($src->[$_], Digest::MD5::md5_hex $data[$_])
538 } 0.. $#$src; 683 } 0.. $#$src;
539 684
540 685
541 my $dbmd5 = db_get cache => "$id/md5"; 686 my $dbmd5 = db_get cache => "$id/md5";
585attach callbacks/event handlers (a collection of which is called an "attachment") 730attach callbacks/event handlers (a collection of which is called an "attachment")
586to it. All such attachable objects support the following methods. 731to it. All such attachable objects support the following methods.
587 732
588In 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>
589C<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
590Crossfire TRT). 735Deliantra).
591 736
592=over 4 737=over 4
593 738
594=item $attachable->attach ($attachment, key => $value...) 739=item $attachable->attach ($attachment, key => $value...)
595 740
847 "; 992 ";
848 die if $@; 993 die if $@;
849} 994}
850 995
851our $override; 996our $override;
852our @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?
853 998
854sub override { 999sub override {
855 $override = 1; 1000 $override = 1;
856 @invoke_results = (); 1001 @INVOKE_RESULTS = (@_);
857} 1002}
858 1003
859sub do_invoke { 1004sub do_invoke {
860 my $event = shift; 1005 my $event = shift;
861 my $callbacks = shift; 1006 my $callbacks = shift;
862 1007
863 @invoke_results = (); 1008 @INVOKE_RESULTS = ();
864 1009
865 local $override; 1010 local $override;
866 1011
867 for (@$callbacks) { 1012 for (@$callbacks) {
868 eval { &{$_->[1]} }; 1013 eval { &{$_->[1]} };
877 } 1022 }
878 1023
879 0 1024 0
880} 1025}
881 1026
882=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
883 1028
884=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
885 1030
886Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
887 1032
888This 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
889removed 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
890results (if you must, access C<@cf::invoke_results> directly). 1035results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 1036
892=back 1037=back
893 1038
894=cut 1039=cut
895 1040
896############################################################################# 1041#############################################################################
897# 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}
898 1085
899sub reattach { 1086sub reattach {
900 # basically do the same as instantiate, without calling instantiate 1087 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 1088 my ($obj) = @_;
902 1089
923cf::attachable->attach ( 1110cf::attachable->attach (
924 prio => -1000000, 1111 prio => -1000000,
925 on_instantiate => sub { 1112 on_instantiate => sub {
926 my ($obj, $data) = @_; 1113 my ($obj, $data) = @_;
927 1114
928 $data = from_json $data; 1115 $data = decode_json $data;
929 1116
930 for (@$data) { 1117 for (@$data) {
931 my ($name, $args) = @$_; 1118 my ($name, $args) = @$_;
932 1119
933 $obj->attach ($name, %{$args || {} }); 1120 $obj->attach ($name, %{$args || {} });
949sub object_freezer_save { 1136sub object_freezer_save {
950 my ($filename, $rdata, $objs) = @_; 1137 my ($filename, $rdata, $objs) = @_;
951 1138
952 sync_job { 1139 sync_job {
953 if (length $$rdata) { 1140 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename);
954 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
955 $filename, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
956 1144
957 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1146 aio_chmod $fh, SAVE_MODE;
959 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
961 close $fh; 1149 aio_close $fh;
962 1150
963 if (@$objs) { 1151 if (@$objs) {
964 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) {
965 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
966 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
967 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
968 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
969 close $fh; 1157 aio_close $fh;
970 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
971 } 1159 }
972 } else { 1160 } else {
973 aio_unlink "$filename.pst"; 1161 aio_unlink "$filename.pst";
974 } 1162 }
979 } 1167 }
980 } else { 1168 } else {
981 aio_unlink $filename; 1169 aio_unlink $filename;
982 aio_unlink "$filename.pst"; 1170 aio_unlink "$filename.pst";
983 } 1171 }
984 } 1172 };
985} 1173}
986 1174
987sub object_freezer_as_string { 1175sub object_freezer_as_string {
988 my ($rdata, $objs) = @_; 1176 my ($rdata, $objs) = @_;
989 1177
1001 or return; 1189 or return;
1002 1190
1003 unless (aio_stat "$filename.pst") { 1191 unless (aio_stat "$filename.pst") {
1004 (aio_load "$filename.pst", $av) >= 0 1192 (aio_load "$filename.pst", $av) >= 0
1005 or return; 1193 or return;
1194
1006 $av = eval { (Storable::thaw $av)->{objs} }; 1195 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs};
1007 } 1197 }
1008 1198
1199 utf8::decode (my $decname = $filename);
1009 warn sprintf "loading %s (%d)\n", 1200 warn sprintf "loading %s (%d,%d)\n",
1010 $filename, length $data, scalar @{$av || []}; 1201 $decname, length $data, scalar @{$av || []};
1202
1011 return ($data, $av); 1203 ($data, $av)
1012} 1204}
1013 1205
1014=head2 COMMAND CALLBACKS 1206=head2 COMMAND CALLBACKS
1015 1207
1016=over 4 1208=over 4
1089 my ($pl, $buf) = @_; 1281 my ($pl, $buf) = @_;
1090 1282
1091 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1283 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1284
1093 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
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1293 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1294 @reply = $cb->($pl, @payload);
1096 $pl->ext_reply ($msg->{msgid}, %reply);
1097 }
1098 } 1295 }
1296
1297 $pl->ext_reply ($reply, @reply)
1298 if $reply;
1299
1099 } else { 1300 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1302 }
1102 1303
1103 cf::override; 1304 cf::override;
1156 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1157 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1158 1359
1159 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1160 warn $msg; 1361 warn $msg;
1161 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1162 exit 1;
1163 } 1363 }
1164 1364
1165 warn $msg; 1365 warn $msg;
1166 } 1366 }
1167 1367
1192use Coro::AIO; 1392use Coro::AIO;
1193 1393
1194=head3 cf::player 1394=head3 cf::player
1195 1395
1196=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}
1197 1411
1198=item cf::player::find $login 1412=item cf::player::find $login
1199 1413
1200Returns the given player object, loading it if necessary (might block). 1414Returns the given player object, loading it if necessary (might block).
1201 1415
1237 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1451 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1452 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1453 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240 aio_unlink +(playerdir $login) . "/$login.pl"; 1454 aio_unlink +(playerdir $login) . "/$login.pl";
1241 1455
1242 my $pl = load_pl path $login 1456 my $f = new_from_file cf::object::thawer path $login
1243 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;
1244 $cf::PLAYER{$login} = $pl 1464 $cf::PLAYER{$login} = $pl
1245 } 1465 }
1246 } 1466 }
1247} 1467}
1248 1468
1257 return if $pl->{deny_save}; 1477 return if $pl->{deny_save};
1258 1478
1259 aio_mkdir playerdir $pl, 0770; 1479 aio_mkdir playerdir $pl, 0770;
1260 $pl->{last_save} = $cf::RUNTIME; 1480 $pl->{last_save} = $cf::RUNTIME;
1261 1481
1482 cf::get_slot 0.01;
1483
1262 $pl->save_pl ($path); 1484 $pl->save_pl ($path);
1263 Coro::cede; 1485 cf::cede_to_tick;
1264} 1486}
1265 1487
1266sub new($) { 1488sub new($) {
1267 my ($login) = @_; 1489 my ($login) = @_;
1268 1490
1272 $self->{deny_save} = 1; 1494 $self->{deny_save} = 1;
1273 1495
1274 $cf::PLAYER{$login} = $self; 1496 $cf::PLAYER{$login} = $self;
1275 1497
1276 $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 (@_);
1277} 1509}
1278 1510
1279=item $pl->quit_character 1511=item $pl->quit_character
1280 1512
1281Nukes the player without looking back. If logged in, the connection will 1513Nukes the player without looking back. If logged in, the connection will
1336 or return []; 1568 or return [];
1337 1569
1338 my @logins; 1570 my @logins;
1339 1571
1340 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") {
1341 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1578 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342 aio_read $fh, 0, 512, my $buf, 0 or next; 1579 aio_read $fh, 0, 512, my $buf, 0 or next;
1343 $buf !~ /^password -------------$/m or next; # official not-valid tag 1580 $buf !~ /^password -------------$/m or next; # official not-valid tag
1581 }
1344 1582
1345 utf8::decode $login; 1583 utf8::decode $login;
1346 push @logins, $login; 1584 push @logins, $login;
1347 } 1585 }
1348 1586
1381 1619
1382Expand crossfire pod fragments into protocol xml. 1620Expand crossfire pod fragments into protocol xml.
1383 1621
1384=cut 1622=cut
1385 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
1386sub expand_cfpod { 1635sub expand_cfpod {
1387 ((my $self), (local $_)) = @_; 1636 my ($self, $pod) = @_;
1388 1637
1389 # escape & and < 1638 my $xml;
1390 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g;
1392 1639
1393 # this is buggy, it needs to properly take care of nested <'s 1640 while () {
1641 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1642 $group = $1;
1394 1643
1395 1 while 1644 $group =~ s/&/&amp;/g;
1396 # replace B<>, I<>, U<> etc. 1645 $group =~ s/</&lt;/g;
1397 s/B<([^\>]*)>/<b>$1<\/b>/ 1646
1398 || s/I<([^\>]*)>/<i>$1<\/i>/ 1647 $xml .= $group;
1399 || s/U<([^\>]*)>/<u>$1<\/u>/ 1648 } elsif ($pod =~ m%\G
1400 # replace G<male|female> tags 1649 ([BCGHITU])
1401 || s{G<([^>|]*)\|([^>]*)>}{ 1650 <
1402 $self->gender ? $2 : $1 1651 (?:
1403 }ge 1652 ([^<>]*) (?{ $group = $^N })
1404 # replace H<hint text> 1653 | < $interior >
1405 || s{H<([^\>]*)>} 1654 )
1655 >
1656 %gcsx
1406 { 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") {
1407 ("<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>",
1408 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1676 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1409 "") 1677 "")
1410 [$self->{hintmode}] 1678 [$self->{hintmode}];
1679 } else {
1680 $xml .= "error processing '$code($data)' directive";
1411 }ge; 1681 }
1682 } else {
1683 if ($pod =~ /\G(.+)/) {
1684 warn "parse error while expanding $pod (at $1)";
1685 }
1686 last;
1687 }
1688 }
1412 1689
1690 for ($xml) {
1413 # create single paragraphs (very hackish) 1691 # create single paragraphs (very hackish)
1414 s/(?<=\S)\n(?=\w)/ /g; 1692 s/(?<=\S)\n(?=\w)/ /g;
1415 1693
1416 # compress some whitespace 1694 # compress some whitespace
1417 1 while s/\s*\n\s*\n\s*/\n/; 1695 s/\s+\n/\n/g; # ws line-ends
1696 s/\n\n+/\n/g; # double lines
1697 s/^\n+//; # beginning lines
1698 s/\n+$//; # ending lines
1699 }
1418 1700
1419 $_ 1701 $xml
1420} 1702}
1703
1704no re 'eval';
1421 1705
1422sub hintmode { 1706sub hintmode {
1423 warn "hm<$_[0] $_[1]>\n";#d#
1424 $_[0]{hintmode} = $_[1] if @_ > 1; 1707 $_[0]{hintmode} = $_[1] if @_ > 1;
1425 $_[0]{hintmode} 1708 $_[0]{hintmode}
1426} 1709}
1427 1710
1428=item $player->ext_reply ($msgid, %msg) 1711=item $player->ext_reply ($msgid, @msg)
1429 1712
1430Sends an ext reply to the player. 1713Sends an ext reply to the player.
1431 1714
1432=cut 1715=cut
1433 1716
1434sub ext_reply($$%) { 1717sub ext_reply($$@) {
1435 my ($self, $id, %msg) = @_; 1718 my ($self, $id, @msg) = @_;
1436 1719
1437 $msg{msgid} = $id; 1720 $self->ns->ext_reply ($id, @msg)
1438 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1439} 1721}
1440 1722
1441=item $player->ext_event ($type, %msg) 1723=item $player->ext_msg ($type, @msg)
1442 1724
1443Sends an ext event to the client. 1725Sends an ext event to the client.
1444 1726
1445=cut 1727=cut
1446 1728
1447sub ext_event($$%) { 1729sub ext_msg($$@) {
1448 my ($self, $type, %msg) = @_; 1730 my ($self, $type, @msg) = @_;
1449 1731
1450 $self->ns->ext_event ($type, %msg); 1732 $self->ns->ext_msg ($type, @msg);
1451} 1733}
1452 1734
1453=head3 cf::region 1735=head3 cf::region
1454 1736
1455=over 4 1737=over 4
1468 my ($path) = @_; 1750 my ($path) = @_;
1469 1751
1470 my ($match, $specificity); 1752 my ($match, $specificity);
1471 1753
1472 for my $region (list) { 1754 for my $region (list) {
1473 if ($region->match && $path =~ $region->match) { 1755 if ($region->{match} && $path =~ $region->{match}) {
1474 ($match, $specificity) = ($region, $region->specificity) 1756 ($match, $specificity) = ($region, $region->specificity)
1475 if $region->specificity > $specificity; 1757 if $region->specificity > $specificity;
1476 } 1758 }
1477 } 1759 }
1478 1760
1499our $MAX_RESET = 3600; 1781our $MAX_RESET = 3600;
1500our $DEFAULT_RESET = 3000; 1782our $DEFAULT_RESET = 3000;
1501 1783
1502sub generate_random_map { 1784sub generate_random_map {
1503 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
1504 # mit "rum" bekleckern, nicht 1789 # mit "rum" bekleckern, nicht
1505 $self->_create_random_map ( 1790 $self->_create_random_map (
1506 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1791 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1507 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1792 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1508 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1793 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1598 $self->init; # pass $1 etc. 1883 $self->init; # pass $1 etc.
1599 return $self; 1884 return $self;
1600 } 1885 }
1601 } 1886 }
1602 1887
1603 Carp::carp "unable to resolve path '$path' (base '$base')."; 1888 Carp::cluck "unable to resolve path '$path' (base '$base').";
1604 () 1889 ()
1605} 1890}
1606 1891
1607sub init { 1892sub init {
1608 my ($self) = @_; 1893 my ($self) = @_;
1630 1915
1631# the temporary/swap location 1916# the temporary/swap location
1632sub save_path { 1917sub save_path {
1633 my ($self) = @_; 1918 my ($self) = @_;
1634 1919
1635 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1920 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1636 "$TMPDIR/$path.map" 1921 "$TMPDIR/$path.map"
1637} 1922}
1638 1923
1639# the unique path, undef == no special unique path 1924# the unique path, undef == no special unique path
1640sub uniq_path { 1925sub uniq_path {
1641 my ($self) = @_; 1926 my ($self) = @_;
1642 1927
1643 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1644 "$UNIQUEDIR/$path" 1929 "$UNIQUEDIR/$path"
1645} 1930}
1646 1931
1647# and all this just because we cannot iterate over 1932# and all this just because we cannot iterate over
1648# all maps in C++... 1933# all maps in C++...
1671 1956
1672sub load_header_from($) { 1957sub load_header_from($) {
1673 my ($self, $path) = @_; 1958 my ($self, $path) = @_;
1674 1959
1675 utf8::encode $path; 1960 utf8::encode $path;
1676 #aio_open $path, O_RDONLY, 0 1961 my $f = new_from_file cf::object::thawer $path
1677 # or return;
1678
1679 $self->_load_header ($path)
1680 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;
1681 1969
1682 $self->{load_path} = $path; 1970 $self->{load_path} = $path;
1683 1971
1684 1 1972 1
1685} 1973}
1739sub find { 2027sub find {
1740 my ($path, $origin) = @_; 2028 my ($path, $origin) = @_;
1741 2029
1742 $path = normalise $path, $origin && $origin->path; 2030 $path = normalise $path, $origin && $origin->path;
1743 2031
2032 cf::lock_wait "map_data:$path";#d#remove
1744 cf::lock_wait "map_find:$path"; 2033 cf::lock_wait "map_find:$path";
1745 2034
1746 $cf::MAP{$path} || do { 2035 $cf::MAP{$path} || do {
2036 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1747 my $guard = cf::lock_acquire "map_find:$path"; 2037 my $guard2 = cf::lock_acquire "map_find:$path";
2038
1748 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
1749 or return; 2040 or return;
1750 2041
1751 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
1752 2043
1754 or return; 2045 or return;
1755 2046
1756 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1757 # doing this can freeze the server in a sync job, obviously 2048 # doing this can freeze the server in a sync job, obviously
1758 #$cf::WAIT_FOR_TICK->wait; 2049 #$cf::WAIT_FOR_TICK->wait;
2050 undef $guard2;
2051 undef $guard1;
1759 $map->reset; 2052 $map->reset;
1760 undef $guard;
1761 return find $path; 2053 return find $path;
1762 } 2054 }
1763 2055
1764 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
1765 } 2057 }
1774 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
1775 2067
1776 my $path = $self->{path}; 2068 my $path = $self->{path};
1777 2069
1778 { 2070 {
1779 my $guard = cf::lock_acquire "map_load:$path"; 2071 my $guard = cf::lock_acquire "map_data:$path";
1780 2072
2073 return unless $self->valid;
1781 return if $self->in_memory != cf::MAP_SWAPPED; 2074 return unless $self->in_memory == cf::MAP_SWAPPED;
1782 2075
1783 $self->in_memory (cf::MAP_LOADING); 2076 $self->in_memory (cf::MAP_LOADING);
1784 2077
1785 $self->alloc; 2078 $self->alloc;
1786 2079
1787 $self->pre_load; 2080 $self->pre_load;
1788 Coro::cede; 2081 cf::cede_to_tick;
1789 2082
2083 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block;
1790 $self->_load_objects ($self->{load_path}, 1) 2085 $self->_load_objects ($f)
1791 or return; 2086 or return;
1792 2087
1793 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2088 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1794 if delete $self->{load_original}; 2089 if delete $self->{load_original};
1795 2090
1796 if (my $uniq = $self->uniq_path) { 2091 if (my $uniq = $self->uniq_path) {
1797 utf8::encode $uniq; 2092 utf8::encode $uniq;
1798 if (aio_open $uniq, O_RDONLY, 0) { 2093 unless (aio_stat $uniq) {
2094 if (my $f = new_from_file cf::object::thawer $uniq) {
1799 $self->clear_unique_items; 2095 $self->clear_unique_items;
1800 $self->_load_objects ($uniq, 0); 2096 $self->_load_objects ($f);
2097 $f->resolve_delayed_derefs;
2098 }
1801 } 2099 }
1802 } 2100 }
1803 2101
1804 Coro::cede; 2102 $f->resolve_delayed_derefs;
2103
2104 cf::cede_to_tick;
1805 # now do the right thing for maps 2105 # now do the right thing for maps
1806 $self->link_multipart_objects; 2106 $self->link_multipart_objects;
1807 $self->difficulty ($self->estimate_difficulty) 2107 $self->difficulty ($self->estimate_difficulty)
1808 unless $self->difficulty; 2108 unless $self->difficulty;
1809 Coro::cede; 2109 cf::cede_to_tick;
1810 2110
1811 unless ($self->{deny_activate}) { 2111 unless ($self->{deny_activate}) {
1812 $self->decay_objects; 2112 $self->decay_objects;
1813 $self->fix_auto_apply; 2113 $self->fix_auto_apply;
1814 $self->update_buttons; 2114 $self->update_buttons;
1815 Coro::cede; 2115 cf::cede_to_tick;
1816 $self->set_darkness_map; 2116 $self->set_darkness_map;
1817 Coro::cede; 2117 cf::cede_to_tick;
1818 $self->activate; 2118 $self->activate;
1819 } 2119 }
1820 2120
2121 $self->{last_save} = $cf::RUNTIME;
2122 $self->last_access ($cf::RUNTIME);
2123
1821 $self->in_memory (cf::MAP_IN_MEMORY); 2124 $self->in_memory (cf::MAP_ACTIVE);
1822 } 2125 }
1823 2126
1824 $self->post_load; 2127 $self->post_load;
1825} 2128}
1826 2129
1835 2138
1836 $self 2139 $self
1837} 2140}
1838 2141
1839# 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
1840sub load_diag { 2143sub load_neighbours {
1841 my ($map) = @_; 2144 my ($map) = @_;
1842 2145
1843 my @diag; # diagonal neighbours 2146 my @neigh; # diagonal neighbours
1844 2147
1845 for (0 .. 3) { 2148 for (0 .. 3) {
1846 my $neigh = $map->tile_path ($_) 2149 my $neigh = $map->tile_path ($_)
1847 or next; 2150 or next;
1848 $neigh = find $neigh, $map 2151 $neigh = find $neigh, $map
1849 or next; 2152 or next;
1850 $neigh->load; 2153 $neigh->load;
1851 2154
2155 push @neigh,
1852 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2156 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1853 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2157 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1854 } 2158 }
1855 2159
1856 for (@diag) { 2160 for (grep defined $_->[0], @neigh) {
2161 my ($path, $origin) = @$_;
1857 my $neigh = find @$_ 2162 my $neigh = find $path, $origin
1858 or next; 2163 or next;
1859 $neigh->load; 2164 $neigh->load;
1860 } 2165 }
1861} 2166}
1862 2167
1867} 2172}
1868 2173
1869sub do_load_sync { 2174sub do_load_sync {
1870 my ($map) = @_; 2175 my ($map) = @_;
1871 2176
2177 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2178 if $Coro::current == $Coro::main;
2179
1872 cf::sync_job { $map->load }; 2180 cf::sync_job { $map->load };
1873} 2181}
1874 2182
1875our %MAP_PREFETCH; 2183our %MAP_PREFETCH;
1876our $MAP_PREFETCHER = undef; 2184our $MAP_PREFETCHER = undef;
1877 2185
1878sub find_async { 2186sub find_async {
1879 my ($path, $origin) = @_; 2187 my ($path, $origin, $load) = @_;
1880 2188
1881 $path = normalise $path, $origin && $origin->{path}; 2189 $path = normalise $path, $origin && $origin->{path};
1882 2190
1883 if (my $map = $cf::MAP{$path}) { 2191 if (my $map = $cf::MAP{$path}) {
1884 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2192 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1885 } 2193 }
1886 2194
1887 undef $MAP_PREFETCH{$path}; 2195 $MAP_PREFETCH{$path} |= $load;
2196
1888 $MAP_PREFETCHER ||= cf::async { 2197 $MAP_PREFETCHER ||= cf::async {
2198 $Coro::current->{desc} = "map prefetcher";
2199
1889 while (%MAP_PREFETCH) { 2200 while (%MAP_PREFETCH) {
1890 for my $path (keys %MAP_PREFETCH) { 2201 while (my ($k, $v) = each %MAP_PREFETCH) {
1891 my $map = find $path 2202 if (my $map = find $k) {
1892 or next;
1893 $map->load; 2203 $map->load if $v;
2204 }
1894 2205
1895 delete $MAP_PREFETCH{$path}; 2206 delete $MAP_PREFETCH{$k};
1896 } 2207 }
1897 } 2208 }
1898 undef $MAP_PREFETCHER; 2209 undef $MAP_PREFETCHER;
1899 }; 2210 };
1900 $MAP_PREFETCHER->prio (6); 2211 $MAP_PREFETCHER->prio (6);
1903} 2214}
1904 2215
1905sub save { 2216sub save {
1906 my ($self) = @_; 2217 my ($self) = @_;
1907 2218
1908 my $lock = cf::lock_acquire "map_data:" . $self->path; 2219 my $lock = cf::lock_acquire "map_data:$self->{path}";
1909 2220
1910 $self->{last_save} = $cf::RUNTIME; 2221 $self->{last_save} = $cf::RUNTIME;
1911 2222
1912 return unless $self->dirty; 2223 return unless $self->dirty;
1913 2224
1919 return if $self->{deny_save}; 2230 return if $self->{deny_save};
1920 2231
1921 local $self->{last_access} = $self->last_access;#d# 2232 local $self->{last_access} = $self->last_access;#d#
1922 2233
1923 cf::async { 2234 cf::async {
2235 $Coro::current->{desc} = "map player save";
1924 $_->contr->save for $self->players; 2236 $_->contr->save for $self->players;
1925 }; 2237 };
2238
2239 cf::get_slot 0.02;
1926 2240
1927 if ($uniq) { 2241 if ($uniq) {
1928 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2242 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1929 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2243 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1930 } else { 2244 } else {
1936 my ($self) = @_; 2250 my ($self) = @_;
1937 2251
1938 # save first because save cedes 2252 # save first because save cedes
1939 $self->save; 2253 $self->save;
1940 2254
1941 my $lock = cf::lock_acquire "map_data:" . $self->path; 2255 my $lock = cf::lock_acquire "map_data:$self->{path}";
1942 2256
1943 return if $self->players; 2257 return if $self->players;
1944 return if $self->in_memory != cf::MAP_IN_MEMORY; 2258 return if $self->in_memory != cf::MAP_ACTIVE;
1945 return if $self->{deny_save}; 2259 return if $self->{deny_save};
1946 2260
2261 $self->in_memory (cf::MAP_SWAPPED);
2262
2263 $self->deactivate;
2264 $_->clear_links_to ($self) for values %cf::MAP;
1947 $self->clear; 2265 $self->clear;
1948 $self->in_memory (cf::MAP_SWAPPED);
1949} 2266}
1950 2267
1951sub reset_at { 2268sub reset_at {
1952 my ($self) = @_; 2269 my ($self) = @_;
1953 2270
1985 if $uniq; 2302 if $uniq;
1986 } 2303 }
1987 2304
1988 delete $cf::MAP{$self->path}; 2305 delete $cf::MAP{$self->path};
1989 2306
2307 $self->deactivate;
2308 $_->clear_links_to ($self) for values %cf::MAP;
1990 $self->clear; 2309 $self->clear;
1991
1992 $_->clear_links_to ($self) for values %cf::MAP;
1993 2310
1994 $self->unlink_save; 2311 $self->unlink_save;
1995 $self->destroy; 2312 $self->destroy;
1996} 2313}
1997 2314
1998my $nuke_counter = "aaaa"; 2315my $nuke_counter = "aaaa";
1999 2316
2000sub nuke { 2317sub nuke {
2001 my ($self) = @_; 2318 my ($self) = @_;
2002 2319
2320 {
2321 my $lock = cf::lock_acquire "map_data:$self->{path}";
2322
2003 delete $cf::MAP{$self->path}; 2323 delete $cf::MAP{$self->path};
2004 2324
2005 $self->unlink_save; 2325 $self->unlink_save;
2006 2326
2007 bless $self, "cf::map"; 2327 bless $self, "cf::map";
2008 delete $self->{deny_reset}; 2328 delete $self->{deny_reset};
2009 $self->{deny_save} = 1; 2329 $self->{deny_save} = 1;
2010 $self->reset_timeout (1); 2330 $self->reset_timeout (1);
2011 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2331 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2012 2332
2013 $cf::MAP{$self->path} = $self; 2333 $cf::MAP{$self->path} = $self;
2334 }
2014 2335
2015 $self->reset; # polite request, might not happen 2336 $self->reset; # polite request, might not happen
2016} 2337}
2017 2338
2018=item $maps = cf::map::tmp_maps 2339=item $maps = cf::map::tmp_maps
2060 2381
2061sub unique_maps() { 2382sub unique_maps() {
2062 [ 2383 [
2063 map { 2384 map {
2064 utf8::decode $_; 2385 utf8::decode $_;
2065 /\.map$/ 2386 s/\.map$//; # TODO future compatibility hack
2387 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2388 ? ()
2066 ? normalise $_ 2389 : normalise $_
2067 : ()
2068 } @{ aio_readdir $UNIQUEDIR or [] } 2390 } @{ aio_readdir $UNIQUEDIR or [] }
2069 ] 2391 ]
2070} 2392}
2071 2393
2072package cf;
2073
2074=back 2394=back
2075 2395
2076=head3 cf::object 2396=head3 cf::object
2077 2397
2078=cut 2398=cut
2081 2401
2082=over 4 2402=over 4
2083 2403
2084=item $ob->inv_recursive 2404=item $ob->inv_recursive
2085 2405
2086Returns 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.
2087 2408
2088=cut 2409=cut
2089 2410
2090sub inv_recursive_; 2411sub inv_recursive_;
2091sub inv_recursive_ { 2412sub inv_recursive_ {
2094 2415
2095sub inv_recursive { 2416sub inv_recursive {
2096 inv_recursive_ inv $_[0] 2417 inv_recursive_ inv $_[0]
2097} 2418}
2098 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
2099package cf; 2448package cf;
2100 2449
2101=back 2450=back
2102 2451
2103=head3 cf::object::player 2452=head3 cf::object::player
2109Sends 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>
2110can 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
2111dialogue with the given NPC character. 2460dialogue with the given NPC character.
2112 2461
2113=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};
2114 2477
2115# rough implementation of a future "reply" method that works 2478# rough implementation of a future "reply" method that works
2116# with dialog boxes. 2479# with dialog boxes.
2117#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
2118sub cf::object::player::reply($$$;$) { 2481sub cf::object::player::reply($$$;$) {
2125 2488
2126 } else { 2489 } else {
2127 my $pl = $self->contr; 2490 my $pl = $self->contr;
2128 2491
2129 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2492 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2130 my $diag = $pl->{npc_dialog}; 2493 my $dialog = $pl->{npc_dialog};
2131 $diag->{pl}->ext_reply ( 2494 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2132 $diag->{id},
2133 msgtype => "reply",
2134 msg => $diag->{pl}->expand_cfpod ($msg),
2135 add_topics => []
2136 );
2137 2495
2138 } else { 2496 } else {
2139 $msg = $npc->name . " says: $msg" if $npc; 2497 $msg = $npc->name . " says: $msg" if $npc;
2140 $self->message ($msg, $flags); 2498 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2141 } 2499 }
2142 } 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 (@_);
2143} 2511}
2144 2512
2145=item $player_object->may ("access") 2513=item $player_object->may ("access")
2146 2514
2147Returns wether the given player is authorized to access resource "access" 2515Returns wether the given player is authorized to access resource "access"
2226 # use -1 or undef as default coordinates, not 0, 0 2594 # use -1 or undef as default coordinates, not 0, 0
2227 ($x, $y) = ($map->enter_x, $map->enter_y) 2595 ($x, $y) = ($map->enter_x, $map->enter_y)
2228 if $x <=0 && $y <= 0; 2596 if $x <=0 && $y <= 0;
2229 2597
2230 $map->load; 2598 $map->load;
2231 $map->load_diag; 2599 $map->load_neighbours;
2232 2600
2233 return unless $self->contr->active; 2601 return unless $self->contr->active;
2234 $self->activate_recursive; 2602 $self->activate_recursive;
2235 2603
2236 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2604 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2237 $self->enter_map ($map, $x, $y); 2605 $self->enter_map ($map, $x, $y);
2238} 2606}
2239 2607
2240=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2608=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2241 2609
2242Moves 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
2243her, loading and preparing them map, calling the provided $check callback 2611her, loading and preparing them map, calling the provided $check callback
2244that 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
2245the 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.
2246 2615
2247=cut 2616=cut
2248 2617
2249our $GOTOGEN; 2618our $GOTOGEN;
2250 2619
2251sub cf::object::player::goto { 2620sub cf::object::player::goto {
2252 my ($self, $path, $x, $y, $check) = @_; 2621 my ($self, $path, $x, $y, $check, $done) = @_;
2253 2622
2254 # 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
2255 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2624 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2256 2625
2257 $self->enter_link; 2626 $self->enter_link;
2258 2627
2259 (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
2260 my $map = eval { 2650 my $map = eval {
2261 my $map = cf::map::find $path; 2651 my $map = defined $path ? cf::map::find $path : undef;
2262 2652
2263 if ($map) { 2653 if ($map) {
2264 $map = $map->customise_for ($self); 2654 $map = $map->customise_for ($self);
2265 $map = $check->($map) if $check && $map; 2655 $map = $check->($map) if $check && $map;
2266 } else { 2656 } else {
2267 $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);
2268 } 2658 }
2269 2659
2270 $map 2660 $map
2271 }; 2661 };
2272 2662
2277 2667
2278 if ($gen == $self->{_goto_generation}) { 2668 if ($gen == $self->{_goto_generation}) {
2279 delete $self->{_goto_generation}; 2669 delete $self->{_goto_generation};
2280 $self->leave_link ($map, $x, $y); 2670 $self->leave_link ($map, $x, $y);
2281 } 2671 }
2672
2673 $done->() if $done;
2282 })->prio (1); 2674 })->prio (1);
2283} 2675}
2284 2676
2285=item $player_object->enter_exit ($exit_object) 2677=item $player_object->enter_exit ($exit_object)
2286 2678
2306} 2698}
2307 2699
2308sub prepare_random_map { 2700sub prepare_random_map {
2309 my ($exit) = @_; 2701 my ($exit) = @_;
2310 2702
2311 my $guard = cf::lock_acquire "exit_prepare:$exit";
2312
2313 # all this does is basically replace the /! path by 2703 # all this does is basically replace the /! path by
2314 # a new random map path (?random/...) with a seed 2704 # a new random map path (?random/...) with a seed
2315 # that depends on the exit object 2705 # that depends on the exit object
2316 2706
2317 my $rmp = parse_random_map_params $exit->msg; 2707 my $rmp = parse_random_map_params $exit->msg;
2319 if ($exit->map) { 2709 if ($exit->map) {
2320 $rmp->{region} = $exit->region->name; 2710 $rmp->{region} = $exit->region->name;
2321 $rmp->{origin_map} = $exit->map->path; 2711 $rmp->{origin_map} = $exit->map->path;
2322 $rmp->{origin_x} = $exit->x; 2712 $rmp->{origin_x} = $exit->x;
2323 $rmp->{origin_y} = $exit->y; 2713 $rmp->{origin_y} = $exit->y;
2714
2715 $exit->map->touch;
2324 } 2716 }
2325 2717
2326 $rmp->{random_seed} ||= $exit->random_seed; 2718 $rmp->{random_seed} ||= $exit->random_seed;
2327 2719
2328 my $data = cf::to_json $rmp; 2720 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2329 my $md5 = Digest::MD5::md5_hex $data; 2721 my $md5 = Digest::MD5::md5_hex $data;
2330 my $meta = "$RANDOMDIR/$md5.meta"; 2722 my $meta = "$RANDOMDIR/$md5.meta";
2331 2723
2332 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2724 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2333 aio_write $fh, 0, (length $data), $data, 0; 2725 aio_write $fh, 0, (length $data), $data, 0;
2334 undef $fh; 2726 undef $fh;
2335 aio_rename "$meta~", $meta; 2727 aio_rename "$meta~", $meta;
2336 2728
2729 my $slaying = "?random/$md5";
2730
2731 if ($exit->valid) {
2337 $exit->slaying ("?random/$md5"); 2732 $exit->slaying ("?random/$md5");
2338 $exit->msg (undef); 2733 $exit->msg (undef);
2734 }
2339 } 2735 }
2340} 2736}
2341 2737
2342sub cf::object::player::enter_exit { 2738sub cf::object::player::enter_exit {
2343 my ($self, $exit) = @_; 2739 my ($self, $exit) = @_;
2344 2740
2345 return unless $self->type == cf::PLAYER; 2741 return unless $self->type == cf::PLAYER;
2346 2742
2347 if ($exit->slaying eq "/!") {
2348 #TODO: this should de-fi-ni-te-ly not be a sync-job
2349 # the problem is that $exit might not survive long enough
2350 # so it needs to be done right now, right here
2351 cf::sync_job { prepare_random_map $exit };
2352 }
2353
2354 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2355 my $hp = $exit->stats->hp;
2356 my $sp = $exit->stats->sp;
2357
2358 $self->enter_link; 2743 $self->enter_link;
2359 2744
2360 (async { 2745 (async {
2361 $self->deactivate_recursive; # just to be sure 2746 $Coro::current->{desc} = "enter_exit";
2747
2362 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
2363 $self->goto ($slaying, $hp, $sp); 2763 $self->goto ($map, $x, $y);
2364 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
2365 1; 2769 1
2366 }) { 2770 }) {
2367 $self->message ("Something went wrong deep within the crossfire server. " 2771 $self->message ("Something went wrong deep within the crossfire server. "
2368 . "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. "
2369 . "Please report this to the dungeon master!", 2773 . "Please report this to the dungeon master!",
2370 cf::NDI_UNIQUE | cf::NDI_RED); 2774 cf::NDI_UNIQUE | cf::NDI_RED);
2391 2795
2392 utf8::encode $text; 2796 utf8::encode $text;
2393 $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);
2394} 2798}
2395 2799
2396=item $client->send_msg ($color, $type, $msg, [extra...]) 2800=item $client->send_msg ($channel, $msg, $color, [extra...])
2397 2801
2398Send 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
2399client 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
2400the 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
2401the message unless the client supports the msg packet. 2805the message unless the client supports the msg packet.
2402 2806
2403=cut 2807=cut
2404 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
2405sub cf::client::send_msg { 2867sub cf::client::send_msg {
2406 my ($self, $color, $type, $msg, @extra) = @_; 2868 my ($self, $channel, $msg, $color, @extra) = @_;
2407 2869
2408 $msg = $self->pl->expand_cfpod ($msg); 2870 $msg = $self->pl->expand_cfpod ($msg);
2409 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
2894 return unless @extra || length $msg;
2895
2410 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
2411 $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]));
2412 } else { 2903 } else {
2413 # replace some tags by gcfclient-compatible ones
2414 for ($msg) {
2415 1 while
2416 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2417 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2418 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2419 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2420 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2421 }
2422
2423 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
2424 if (0 && $msg =~ /\[/) { 2919 if (0 && $msg =~ /\[/) {
2920 # COMMAND/INFO
2425 $self->send_packet ("drawextinfo $color 4 0 $msg") 2921 $self->send_packet ("drawextinfo $color 10 8 $msg")
2426 } else { 2922 } else {
2427 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2923 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2428 $self->send_packet ("drawinfo $color $msg") 2924 $self->send_packet ("drawinfo $color $msg")
2429 } 2925 }
2430 } 2926 }
2431 } 2927 }
2432} 2928}
2433 2929
2434=item $client->ext_event ($type, %msg) 2930=item $client->ext_msg ($type, @msg)
2435 2931
2436Sends an ext event to the client. 2932Sends an ext event to the client.
2437 2933
2438=cut 2934=cut
2439 2935
2440sub cf::client::ext_event($$%) { 2936sub cf::client::ext_msg($$@) {
2441 my ($self, $type, %msg) = @_; 2937 my ($self, $type, @msg) = @_;
2442 2938
2939 if ($self->extcmd == 2) {
2940 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2941 } elsif ($self->extcmd == 1) { # TODO: remove
2443 $msg{msgtype} = "event_$type"; 2942 push @msg, msgtype => "event_$type";
2444 $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 }
2445} 2963}
2446 2964
2447=item $success = $client->query ($flags, "text", \&cb) 2965=item $success = $client->query ($flags, "text", \&cb)
2448 2966
2449Queues a query to the client, calling the given callback with 2967Queues a query to the client, calling the given callback with
2504 my ($ns, $buf) = @_; 3022 my ($ns, $buf) = @_;
2505 3023
2506 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3024 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2507 3025
2508 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
2509 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3034 if (my $cb = $EXTICMD{$type}) {
2510 if (my %reply = $cb->($ns, $msg)) { 3035 @reply = $cb->($ns, @payload);
2511 $reply{msgid} = $msg->{msgid};
2512 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2513 }
2514 } 3036 }
3037
3038 $ns->ext_reply ($reply, @reply)
3039 if $reply;
3040
2515 } else { 3041 } else {
2516 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";
2517 } 3043 }
2518 3044
2519 cf::override; 3045 cf::override;
2566our $safe = new Safe "safe"; 3092our $safe = new Safe "safe";
2567our $safe_hole = new Safe::Hole; 3093our $safe_hole = new Safe::Hole;
2568 3094
2569$SIG{FPE} = 'IGNORE'; 3095$SIG{FPE} = 'IGNORE';
2570 3096
2571$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));
2572 3102
2573# here we export the classes and methods available to script code 3103# here we export the classes and methods available to script code
2574 3104
2575=pod 3105=pod
2576 3106
2577The following functions and methods are available within a safe environment: 3107The following functions and methods are available within a safe environment:
2578 3108
2579 cf::object contr pay_amount pay_player map 3109 cf::object
3110 contr pay_amount pay_player map x y force_find force_add destroy
3111 insert remove name archname title slaying race decrease split
3112
2580 cf::object::player player 3113 cf::object::player
2581 cf::player peaceful 3114 player
2582 cf::map trigger 3115
3116 cf::player
3117 peaceful
3118
3119 cf::map
3120 trigger
2583 3121
2584=cut 3122=cut
2585 3123
2586for ( 3124for (
2587 ["cf::object" => qw(contr pay_amount pay_player map)], 3125 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3126 insert remove inv nrof name archname title slaying race
3127 decrease split destroy)],
2588 ["cf::object::player" => qw(player)], 3128 ["cf::object::player" => qw(player)],
2589 ["cf::player" => qw(peaceful)], 3129 ["cf::player" => qw(peaceful)],
2590 ["cf::map" => qw(trigger)], 3130 ["cf::map" => qw(trigger)],
2591) { 3131) {
2592 no strict 'refs'; 3132 no strict 'refs';
2668# the server's init and main functions 3208# the server's init and main functions
2669 3209
2670sub load_facedata($) { 3210sub load_facedata($) {
2671 my ($path) = @_; 3211 my ($path) = @_;
2672 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
2673 warn "loading facedata from $path\n"; 3219 warn "loading facedata from $path\n";
2674 3220
2675 my $facedata; 3221 my $facedata;
2676 0 < aio_load $path, $facedata 3222 0 < aio_load $path, $facedata
2677 or die "$path: $!"; 3223 or die "$path: $!";
2679 $facedata = Coro::Storable::thaw $facedata; 3225 $facedata = Coro::Storable::thaw $facedata;
2680 3226
2681 $facedata->{version} == 2 3227 $facedata->{version} == 2
2682 or cf::cleanup "$path: version mismatch, cannot proceed."; 3228 or cf::cleanup "$path: version mismatch, cannot proceed.";
2683 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
2684 { 3237 {
2685 my $faces = $facedata->{faceinfo}; 3238 my $faces = $facedata->{faceinfo};
2686 3239
2687 while (my ($face, $info) = each %$faces) { 3240 while (my ($face, $info) = each %$faces) {
2688 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3241 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3242
2689 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3243 cf::face::set_visibility $idx, $info->{visibility};
3244 cf::face::set_magicmap $idx, $info->{magicmap};
2690 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3245 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2691 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3246 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2692 Coro::cede; 3247
3248 cf::cede_to_tick;
2693 } 3249 }
2694 3250
2695 while (my ($face, $info) = each %$faces) { 3251 while (my ($face, $info) = each %$faces) {
2696 next unless $info->{smooth}; 3252 next unless $info->{smooth};
3253
2697 my $idx = cf::face::find $face 3254 my $idx = cf::face::find $face
2698 or next; 3255 or next;
3256
2699 if (my $smooth = cf::face::find $info->{smooth}) { 3257 if (my $smooth = cf::face::find $info->{smooth}) {
3258 cf::face::set_smooth $idx, $smooth;
2700 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3259 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2701 } else { 3260 } else {
2702 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3261 warn "smooth face '$info->{smooth}' not found for face '$face'";
2703 } 3262 }
2704 Coro::cede; 3263
3264 cf::cede_to_tick;
2705 } 3265 }
2706 } 3266 }
2707 3267
2708 { 3268 {
2709 my $anims = $facedata->{animinfo}; 3269 my $anims = $facedata->{animinfo};
2710 3270
2711 while (my ($anim, $info) = each %$anims) { 3271 while (my ($anim, $info) = each %$anims) {
2712 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3272 cf::anim::set $anim, $info->{frames}, $info->{facings};
2713 Coro::cede; 3273 cf::cede_to_tick;
2714 } 3274 }
2715 3275
2716 cf::anim::invalidate_all; # d'oh 3276 cf::anim::invalidate_all; # d'oh
2717 } 3277 }
2718 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
2719 1 3314 1
2720} 3315}
2721 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
2722sub 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
2723 load_resource_file "$MAPDIR/regions" 3360 load_resource_file "$MAPDIR/regions"
2724 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 }
2725} 3367}
2726 3368
2727sub reload_facedata { 3369sub reload_facedata {
2728 load_facedata "$DATADIR/facedata" 3370 load_facedata "$DATADIR/facedata"
2729 or die "unable to load facedata\n"; 3371 or die "unable to load facedata\n";
2730} 3372}
2731 3373
2732sub reload_archetypes { 3374sub reload_archetypes {
2733 load_resource_file "$DATADIR/archetypes" 3375 load_resource_file "$DATADIR/archetypes"
2734 or die "unable to load archetypes\n"; 3376 or die "unable to load archetypes\n";
2735 #d# NEED to laod twice to resolve forward references
2736 # this really needs to be done in an extra post-pass
2737 # (which needs to be synchronous, so solve it differently)
2738 load_resource_file "$DATADIR/archetypes"
2739 or die "unable to load archetypes\n";
2740} 3377}
2741 3378
2742sub reload_treasures { 3379sub reload_treasures {
2743 load_resource_file "$DATADIR/treasures" 3380 load_resource_file "$DATADIR/treasures"
2744 or die "unable to load treasurelists\n"; 3381 or die "unable to load treasurelists\n";
2745} 3382}
2746 3383
2747sub reload_resources { 3384sub reload_resources {
2748 warn "reloading resource files...\n"; 3385 warn "reloading resource files...\n";
2749 3386
3387 reload_facedata;
3388 reload_archetypes;
2750 reload_regions; 3389 reload_regions;
2751 reload_facedata;
2752 #reload_archetypes;#d#
2753 reload_archetypes;
2754 reload_treasures; 3390 reload_treasures;
2755 3391
2756 warn "finished reloading resource files\n"; 3392 warn "finished reloading resource files\n";
2757} 3393}
2758 3394
2759sub init { 3395sub init {
3396 my $guard = freeze_mainloop;
3397
2760 reload_resources; 3398 reload_resources;
2761} 3399}
2762 3400
2763sub cfg_load { 3401sub reload_config {
2764 open my $fh, "<:utf8", "$CONFDIR/config" 3402 open my $fh, "<:utf8", "$CONFDIR/config"
2765 or return; 3403 or return;
2766 3404
2767 local $/; 3405 local $/;
2768 *CFG = YAML::Syck::Load <$fh>; 3406 *CFG = YAML::Load <$fh>;
2769 3407
2770 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3408 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2771 3409
2772 $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};
2773 $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};
2784sub main { 3422sub main {
2785 # we must not ever block the main coroutine 3423 # we must not ever block the main coroutine
2786 local $Coro::idle = sub { 3424 local $Coro::idle = sub {
2787 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#
2788 (async { 3426 (async {
2789 Event::one_event; 3427 $Coro::current->{desc} = "IDLE BUG HANDLER";
3428 EV::loop EV::LOOP_ONESHOT;
2790 })->prio (Coro::PRIO_MAX); 3429 })->prio (Coro::PRIO_MAX);
2791 }; 3430 };
2792 3431
2793 cfg_load; 3432 {
3433 my $guard = freeze_mainloop;
3434 reload_config;
2794 db_init; 3435 db_init;
2795 load_extensions; 3436 load_extensions;
2796 3437
2797 $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
2798 Event::loop; 3442 EV::loop;
2799} 3443}
2800 3444
2801############################################################################# 3445#############################################################################
2802# initialisation and cleanup 3446# initialisation and cleanup
2803 3447
2804# install some emergency cleanup handlers 3448# install some emergency cleanup handlers
2805BEGIN { 3449BEGIN {
3450 our %SIGWATCHER = ();
2806 for my $signal (qw(INT HUP TERM)) { 3451 for my $signal (qw(INT HUP TERM)) {
2807 Event->signal ( 3452 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2808 reentrant => 0,
2809 data => WF_AUTOCANCEL,
2810 signal => $signal,
2811 prio => 0,
2812 cb => sub {
2813 cf::cleanup "SIG$signal"; 3453 cf::cleanup "SIG$signal";
2814 },
2815 ); 3454 };
2816 } 3455 }
2817} 3456}
2818 3457
2819sub write_runtime { 3458sub write_runtime_sync {
2820 my $runtime = "$LOCALDIR/runtime"; 3459 my $runtime = "$LOCALDIR/runtime";
2821 3460
2822 # first touch the runtime file to show we are still running: 3461 # first touch the runtime file to show we are still running:
2823 # the fsync below can take a very very long time. 3462 # the fsync below can take a very very long time.
2824 3463
2850 and return; 3489 and return;
2851 3490
2852 warn "runtime file written.\n"; 3491 warn "runtime file written.\n";
2853 3492
2854 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 };
2855} 3537}
2856 3538
2857sub emergency_save() { 3539sub emergency_save() {
2858 my $freeze_guard = cf::freeze_mainloop; 3540 my $freeze_guard = cf::freeze_mainloop;
2859 3541
2865 # and maps saved/destroyed asynchronously. 3547 # and maps saved/destroyed asynchronously.
2866 warn "begin emergency player save\n"; 3548 warn "begin emergency player save\n";
2867 for my $login (keys %cf::PLAYER) { 3549 for my $login (keys %cf::PLAYER) {
2868 my $pl = $cf::PLAYER{$login} or next; 3550 my $pl = $cf::PLAYER{$login} or next;
2869 $pl->valid or next; 3551 $pl->valid or next;
3552 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2870 $pl->save; 3553 $pl->save;
2871 } 3554 }
2872 warn "end emergency player save\n"; 3555 warn "end emergency player save\n";
2873 3556
2874 warn "begin emergency map save\n"; 3557 warn "begin emergency map save\n";
2880 warn "end emergency map save\n"; 3563 warn "end emergency map save\n";
2881 3564
2882 warn "begin emergency database checkpoint\n"; 3565 warn "begin emergency database checkpoint\n";
2883 BDB::db_env_txn_checkpoint $DB_ENV; 3566 BDB::db_env_txn_checkpoint $DB_ENV;
2884 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";
2885 }; 3572 };
2886 3573
2887 warn "leave emergency perl save\n"; 3574 warn "leave emergency perl save\n";
2888} 3575}
2889 3576
2904 warn "reloading..."; 3591 warn "reloading...";
2905 3592
2906 warn "entering sync_job"; 3593 warn "entering sync_job";
2907 3594
2908 cf::sync_job { 3595 cf::sync_job {
2909 cf::write_runtime; # external watchdog should not bark 3596 cf::write_runtime_sync; # external watchdog should not bark
2910 cf::emergency_save; 3597 cf::emergency_save;
2911 cf::write_runtime; # external watchdog should not bark 3598 cf::write_runtime_sync; # external watchdog should not bark
2912 3599
2913 warn "syncing database to disk"; 3600 warn "syncing database to disk";
2914 BDB::db_env_txn_checkpoint $DB_ENV; 3601 BDB::db_env_txn_checkpoint $DB_ENV;
2915 3602
2916 # 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
2917
2918 warn "cancelling all WF_AUTOCANCEL watchers";
2919 for (Event::all_watchers) {
2920 $_->cancel if $_->data & WF_AUTOCANCEL;
2921 }
2922 3604
2923 warn "flushing outstanding aio requests"; 3605 warn "flushing outstanding aio requests";
2924 for (;;) { 3606 for (;;) {
2925 BDB::flush; 3607 BDB::flush;
2926 IO::AIO::flush; 3608 IO::AIO::flush;
2927 Coro::cede; 3609 Coro::cede_notself;
2928 last unless IO::AIO::nreqs || BDB::nreqs; 3610 last unless IO::AIO::nreqs || BDB::nreqs;
2929 warn "iterate..."; 3611 warn "iterate...";
2930 } 3612 }
2931 3613
2932 ++$RELOAD; 3614 ++$RELOAD;
2991 warn "reloading cf.pm"; 3673 warn "reloading cf.pm";
2992 require cf; 3674 require cf;
2993 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3675 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2994 3676
2995 warn "loading config and database again"; 3677 warn "loading config and database again";
2996 cf::cfg_load; 3678 cf::reload_config;
2997 3679
2998 warn "loading extensions"; 3680 warn "loading extensions";
2999 cf::load_extensions; 3681 cf::load_extensions;
3000 3682
3001 warn "reattaching attachments to objects/players"; 3683 warn "reattaching attachments to objects/players";
3008 warn "leaving sync_job"; 3690 warn "leaving sync_job";
3009 3691
3010 1 3692 1
3011 } or do { 3693 } or do {
3012 warn $@; 3694 warn $@;
3013 warn "error while reloading, exiting."; 3695 cf::cleanup "error while reloading, exiting.";
3014 exit 1;
3015 }; 3696 };
3016 3697
3017 warn "reloaded"; 3698 warn "reloaded";
3018}; 3699};
3019 3700
3021 3702
3022sub reload_perl() { 3703sub reload_perl() {
3023 # doing reload synchronously and two reloads happen back-to-back, 3704 # doing reload synchronously and two reloads happen back-to-back,
3024 # coro crashes during coro_state_free->destroy here. 3705 # coro crashes during coro_state_free->destroy here.
3025 3706
3026 $RELOAD_WATCHER ||= Event->timer ( 3707 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3027 reentrant => 0,
3028 after => 0,
3029 data => WF_AUTOCANCEL,
3030 cb => sub {
3031 do_reload_perl; 3708 do_reload_perl;
3032 undef $RELOAD_WATCHER; 3709 undef $RELOAD_WATCHER;
3033 },
3034 ); 3710 };
3035} 3711}
3036 3712
3037register_command "reload" => sub { 3713register_command "reload" => sub {
3038 my ($who, $arg) = @_; 3714 my ($who, $arg) = @_;
3039 3715
3040 if ($who->flag (FLAG_WIZ)) { 3716 if ($who->flag (FLAG_WIZ)) {
3041 $who->message ("reloading server."); 3717 $who->message ("reloading server.");
3718 async {
3719 $Coro::current->{desc} = "perl_reload";
3042 async { reload_perl }; 3720 reload_perl;
3721 };
3043 } 3722 }
3044}; 3723};
3045 3724
3046unshift @INC, $LIBDIR; 3725unshift @INC, $LIBDIR;
3047 3726
3049 3728
3050our @WAIT_FOR_TICK; 3729our @WAIT_FOR_TICK;
3051our @WAIT_FOR_TICK_BEGIN; 3730our @WAIT_FOR_TICK_BEGIN;
3052 3731
3053sub wait_for_tick { 3732sub wait_for_tick {
3054 return unless $TICK_WATCHER->is_active;
3055 return if $Coro::current == $Coro::main; 3733 return if tick_inhibit || $Coro::current == $Coro::main;
3056 3734
3057 my $signal = new Coro::Signal; 3735 my $signal = new Coro::Signal;
3058 push @WAIT_FOR_TICK, $signal; 3736 push @WAIT_FOR_TICK, $signal;
3059 $signal->wait; 3737 $signal->wait;
3060} 3738}
3061 3739
3062sub wait_for_tick_begin { 3740sub wait_for_tick_begin {
3063 return unless $TICK_WATCHER->is_active;
3064 return if $Coro::current == $Coro::main; 3741 return if tick_inhibit || $Coro::current == $Coro::main;
3065 3742
3066 my $signal = new Coro::Signal; 3743 my $signal = new Coro::Signal;
3067 push @WAIT_FOR_TICK_BEGIN, $signal; 3744 push @WAIT_FOR_TICK_BEGIN, $signal;
3068 $signal->wait; 3745 $signal->wait;
3069} 3746}
3070 3747
3071 my $min = 1e6;#d# 3748sub tick {
3072 my $avg = 10;
3073$TICK_WATCHER = Event->timer (
3074 reentrant => 0,
3075 parked => 1,
3076 prio => 0,
3077 at => $NEXT_TICK || $TICK,
3078 data => WF_AUTOCANCEL,
3079 cb => sub {
3080 if ($Coro::current != $Coro::main) { 3749 if ($Coro::current != $Coro::main) {
3081 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"
3082 unless ++$bug_warning > 10; 3751 unless ++$bug_warning > 10;
3083 return; 3752 return;
3084 } 3753 }
3085 3754
3086 $NOW = $tick_start = Event::time;
3087
3088 cf::server_tick; # one server iteration 3755 cf::server_tick; # one server iteration
3089 3756
3090 0 && sync_job {#d# 3757 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3091 for(1..10) { 3758 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3092 my $t = Event::time; 3759 Coro::async_pool {
3093 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3760 $Coro::current->{desc} = "runtime saver";
3094 or die; 3761 write_runtime_sync
3095 3762 or warn "ERROR: unable to write runtime file: $!";
3096 $map->width (50);
3097 $map->height (50);
3098 $map->alloc;
3099 $map->_load_objects ("/tmp/x.map", 1);
3100 my $t = Event::time - $t;
3101
3102 #next unless $t < 0.0013;#d#
3103 if ($t < $min) {
3104 $min = $t;
3105 }
3106 $avg = $avg * 0.99 + $t * 0.01;
3107 }
3108 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3109 exit 0;
3110 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3111 }; 3763 };
3764 }
3112 3765
3113 $RUNTIME += $TICK;
3114 $NEXT_TICK += $TICK;
3115
3116 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3117 $NEXT_RUNTIME_WRITE = $NOW + 10;
3118 Coro::async_pool {
3119 write_runtime
3120 or warn "ERROR: unable to write runtime file: $!";
3121 };
3122 }
3123
3124# my $AFTER = Event::time;
3125# warn $AFTER - $NOW;#d#
3126
3127 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3766 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3128 $sig->send; 3767 $sig->send;
3129 } 3768 }
3130 while (my $sig = shift @WAIT_FOR_TICK) { 3769 while (my $sig = shift @WAIT_FOR_TICK) {
3131 $sig->send; 3770 $sig->send;
3132 } 3771 }
3133 3772
3134 $NOW = Event::time; 3773 $LOAD = ($NOW - $TICK_START) / $TICK;
3135
3136 # if we are delayed by four ticks or more, skip them all
3137 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3138
3139 $TICK_WATCHER->at ($NEXT_TICK);
3140 $TICK_WATCHER->start;
3141
3142 $LOAD = ($NOW - $tick_start) / $TICK;
3143 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3774 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3144 3775
3145 _post_tick; 3776 if (0) {
3146 3777 if ($NEXT_TICK) {
3147 3778 my $jitter = $TICK_START - $NEXT_TICK;
3779 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3780 warn "jitter $JITTER\n";#d#
3781 }
3148 }, 3782 }
3149); 3783}
3150 3784
3151{ 3785{
3152 BDB::max_poll_time $TICK * 0.1; 3786 # configure BDB
3153 $BDB_POLL_WATCHER = Event->io ( 3787
3154 reentrant => 0,
3155 fd => BDB::poll_fileno,
3156 poll => 'r',
3157 prio => 0,
3158 data => WF_AUTOCANCEL,
3159 cb => \&BDB::poll_cb,
3160 );
3161 BDB::min_parallel 8; 3788 BDB::min_parallel 8;
3162 3789 BDB::max_poll_reqs $TICK * 0.1;
3163 BDB::set_sync_prepare { 3790 $Coro::BDB::WATCHER->priority (1);
3164 my $status;
3165 my $current = $Coro::current;
3166 (
3167 sub {
3168 $status = $!;
3169 $current->ready; undef $current;
3170 },
3171 sub {
3172 Coro::schedule while defined $current;
3173 $! = $status;
3174 },
3175 )
3176 };
3177 3791
3178 unless ($DB_ENV) { 3792 unless ($DB_ENV) {
3179 $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);
3180 3798
3181 cf::sync_job { 3799 cf::sync_job {
3182 eval { 3800 eval {
3183 BDB::db_env_open 3801 BDB::db_env_open
3184 $DB_ENV, 3802 $DB_ENV,
3186 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
3187 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3805 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3188 0666; 3806 0666;
3189 3807
3190 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3808 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3191
3192 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3193 $DB_ENV->set_lk_detect;
3194 }; 3809 };
3195 3810
3196 cf::cleanup "db_env_open(db): $@" if $@; 3811 cf::cleanup "db_env_open(db): $@" if $@;
3197 }; 3812 };
3198 } 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 };
3199} 3824}
3200 3825
3201{ 3826{
3827 # configure IO::AIO
3828
3202 IO::AIO::min_parallel 8; 3829 IO::AIO::min_parallel 8;
3203
3204 undef $Coro::AIO::WATCHER;
3205 IO::AIO::max_poll_time $TICK * 0.1; 3830 IO::AIO::max_poll_time $TICK * 0.1;
3206 $AIO_POLL_WATCHER = Event->io ( 3831 $Coro::AIO::WATCHER->priority (1);
3207 reentrant => 0,
3208 data => WF_AUTOCANCEL,
3209 fd => IO::AIO::poll_fileno,
3210 poll => 'r',
3211 prio => 6,
3212 cb => \&IO::AIO::poll_cb,
3213 );
3214} 3832}
3215 3833
3216my $_log_backtrace; 3834my $_log_backtrace;
3217 3835
3218sub _log_backtrace { 3836sub _log_backtrace {
3222 3840
3223 # limit the # of concurrent backtraces 3841 # limit the # of concurrent backtraces
3224 if ($_log_backtrace < 2) { 3842 if ($_log_backtrace < 2) {
3225 ++$_log_backtrace; 3843 ++$_log_backtrace;
3226 async { 3844 async {
3845 $Coro::current->{desc} = "abt $msg";
3846
3227 my @bt = fork_call { 3847 my @bt = fork_call {
3228 @addr = map { sprintf "%x", $_ } @addr; 3848 @addr = map { sprintf "%x", $_ } @addr;
3229 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3849 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3230 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 |"
3231 or die "addr2line: $!"; 3851 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines