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.308 by root, Mon Jul 16 14:09:40 2007 UTC vs.
Revision 1.434 by root, Thu May 29 03:27:37 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines