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.271 by root, Fri Jun 1 06:04:08 2007 UTC vs.
Revision 1.427 by root, Sat Apr 26 12:25:45 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV 3.2;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.61 (); 36use Coro 4.50 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
22use Coro::AIO; 43use Coro::AIO;
44use Coro::BDB;
23use Coro::Storable; 45use Coro::Storable;
46use Coro::Util ();
24 47
48use JSON::XS 2.01 ();
25use BDB (); 49use BDB ();
26use Data::Dumper; 50use Data::Dumper;
27use Digest::MD5; 51use Digest::MD5;
28use Fcntl; 52use Fcntl;
29use YAML::Syck (); 53use YAML ();
30use IO::AIO 2.32 (); 54use IO::AIO 2.51 ();
31use Time::HiRes; 55use Time::HiRes;
32use Compress::LZF; 56use Compress::LZF;
57use Digest::MD5 ();
33 58
34# configure various modules to our taste 59# configure various modules to our taste
35# 60#
36$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39 64
40$Event::Eval = 1; # no idea why this is required, but it is
41
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1;
44
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 66
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48 68
49our %COMMAND = (); 69our %COMMAND = ();
50our %COMMAND_TIME = (); 70our %COMMAND_TIME = ();
51 71
52our @EXTS = (); # list of extension package names 72our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 73our %EXTCMD = ();
74our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 75our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 76our %EXT_MAP = (); # pluggable maps
56 77
57our $RELOAD; # number of reloads so far 78our $RELOAD; # number of reloads so far
58our @EVENT; 79our @EVENT;
… …
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
71 93
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER;
74our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 97our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
79 99
80our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 104our $DB_ENV;
82 105
83our %CFG; 106our %CFG;
84 107
85our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 109our $RUNTIME;
110our $NOW;
87 111
88our %PLAYER; # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 113our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
91 115
92# used to convert map paths into valid unix filenames by replacing / by ∕ 116# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 118
95our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
97our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
98 123
99binmode STDOUT; 124binmode STDOUT;
100binmode STDERR; 125binmode STDERR;
101 126
102# read virtual server time, if available 127# read virtual server time, if available
… …
155 180
156The raw value load value from the last tick. 181The raw value load value from the last tick.
157 182
158=item %cf::CFG 183=item %cf::CFG
159 184
160Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 186from wherever your confdir points to.
162 187
163=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
164 189
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 190These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 191returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 192per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 193
194=item @cf::INVOKE_RESULTS
195
196This array contains the results of the last C<invoke ()> call. When
197C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call.
199
169=back 200=back
170 201
171=cut 202=cut
172 203
173BEGIN { 204BEGIN {
… …
177 $msg .= "\n" 208 $msg .= "\n"
178 unless $msg =~ /\n$/; 209 unless $msg =~ /\n$/;
179 210
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 212
182 utf8::encode $msg;
183 LOG llevError, $msg; 213 LOG llevError, $msg;
184 }; 214 };
185} 215}
216
217$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "=="
219
220 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d#
223 }#d#
224
225 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate
228};
229
230$SIG{__DIE__} = sub { }; #d#?
186 231
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 236@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
237@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
192@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 238@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
193 239
194# we bless all objects into (empty) derived classes to force a method lookup 240# we bless all objects into (empty) derived classes to force a method lookup
195# within the Safe compartment. 241# within the Safe compartment.
196for my $pkg (qw( 242for my $pkg (qw(
197 cf::global cf::attachable 243 cf::global cf::attachable
… …
202)) { 248)) {
203 no strict 'refs'; 249 no strict 'refs';
204 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
205} 251}
206 252
207$Event::DIED = sub { 253$EV::DIED = sub {
208 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
209}; 255};
256
257#############################################################################
210 258
211=head2 UTILITY FUNCTIONS 259=head2 UTILITY FUNCTIONS
212 260
213=over 4 261=over 4
214 262
… …
233 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 281 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
234 $d 282 $d
235 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
236} 284}
237 285
238use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
239
240=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
241 287
242Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
243 289
244=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
245 291
246Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
293
294=cut
295
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297
298sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) }
247 300
248=item cf::lock_wait $string 301=item cf::lock_wait $string
249 302
250Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
251 304
… …
254Wait until the given lock is available and then acquires it and returns 307Wait until the given lock is available and then acquires it and returns
255a Coro::guard object. If the guard object gets destroyed (goes out of scope, 308a Coro::guard object. If the guard object gets destroyed (goes out of scope,
256for example when the coroutine gets canceled), the lock is automatically 309for example when the coroutine gets canceled), the lock is automatically
257returned. 310returned.
258 311
312Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro.
314
259Lock names should begin with a unique identifier (for example, cf::map::find 315Lock names should begin with a unique identifier (for example, cf::map::find
260uses map_find and cf::map::load uses map_load). 316uses map_find and cf::map::load uses map_load).
261 317
262=item $locked = cf::lock_active $string 318=item $locked = cf::lock_active $string
263 319
264Return true if the lock is currently active, i.e. somebody has locked it. 320Return true if the lock is currently active, i.e. somebody has locked it.
265 321
266=cut 322=cut
267 323
268our %LOCK; 324our %LOCK;
325our %LOCKER;#d#
269 326
270sub lock_wait($) { 327sub lock_wait($) {
271 my ($key) = @_; 328 my ($key) = @_;
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
272 334
273 # wait for lock, if any 335 # wait for lock, if any
274 while ($LOCK{$key}) { 336 while ($LOCK{$key}) {
275 push @{ $LOCK{$key} }, $Coro::current; 337 push @{ $LOCK{$key} }, $Coro::current;
276 Coro::schedule; 338 Coro::schedule;
… …
282 344
283 # wait, to be sure we are not locked 345 # wait, to be sure we are not locked
284 lock_wait $key; 346 lock_wait $key;
285 347
286 $LOCK{$key} = []; 348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
287 350
288 Coro::guard { 351 Coro::guard {
352 delete $LOCKER{$key};#d#
289 # wake up all waiters, to be on the safe side 353 # wake up all waiters, to be on the safe side
290 $_->ready for @{ delete $LOCK{$key} }; 354 $_->ready for @{ delete $LOCK{$key} };
291 } 355 }
292} 356}
293 357
… …
296 360
297 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
298} 362}
299 363
300sub freeze_mainloop { 364sub freeze_mainloop {
301 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
302 366
303 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
304 $TICK_WATCHER->start; 368}
369
370=item cf::periodic $interval, $cb
371
372Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer.
374
375=cut
376
377sub periodic($$) {
378 my ($interval, $cb) = @_;
379
380 my $start = rand List::Util::min 180, $interval;
381
382 EV::periodic $start, $interval, 0, $cb
383}
384
385=item cf::get_slot $time[, $priority[, $name]]
386
387Allocate $time seconds of blocking CPU time at priority C<$priority>:
388This call blocks and returns only when you have at least C<$time> seconds
389of cpu time till the next tick. The slot is only valid till the next cede.
390
391The optional C<$name> can be used to identify the job to run. It might be
392used for statistical purposes and should identify the same time-class.
393
394Useful for short background jobs.
395
396=cut
397
398our @SLOT_QUEUE;
399our $SLOT_QUEUE;
400
401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
405 my $signal = new Coro::Signal;
406
407 while () {
408 next_job:
409 my $avail = cf::till_tick;
410 if ($avail > 0.01) {
411 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) {
413 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send;
415 Coro::cede;
416 goto next_job;
417 }
418 }
419 }
420
421 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait;
425 } else {
426 Coro::schedule;
427 }
305 }; 428 }
306 $TICK_WATCHER->stop; 429};
307 $guard 430
431sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main;
433
434 my ($time, $pri, $name) = @_;
435
436 $time = $TICK * .6 if $time > $TICK * .6;
437 my $sig = new Coro::Signal;
438
439 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
440 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
441 $SLOT_QUEUE->ready;
442 $sig->wait;
308} 443}
309 444
310=item cf::async { BLOCK } 445=item cf::async { BLOCK }
311 446
312Currently the same as Coro::async_pool, meaning you cannot use 447Currently the same as Coro::async_pool, meaning you cannot use
… …
317 452
318BEGIN { *async = \&Coro::async_pool } 453BEGIN { *async = \&Coro::async_pool }
319 454
320=item cf::sync_job { BLOCK } 455=item cf::sync_job { BLOCK }
321 456
322The design of crossfire+ requires that the main coro ($Coro::main) is 457The design of Deliantra requires that the main coroutine ($Coro::main)
323always able to handle events or runnable, as crossfire+ is only partly 458is always able to handle events or runnable, as Deliantra is only
324reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 459partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
460acceptable.
325 461
326If it must be done, put the blocking parts into C<sync_job>. This will run 462If it must be done, put the blocking parts into C<sync_job>. This will run
327the given BLOCK in another coroutine while waiting for the result. The 463the given BLOCK in another coroutine while waiting for the result. The
328server will be frozen during this time, so the block should either finish 464server will be frozen during this time, so the block should either finish
329fast or be very important. 465fast or be very important.
… …
332 468
333sub sync_job(&) { 469sub sync_job(&) {
334 my ($job) = @_; 470 my ($job) = @_;
335 471
336 if ($Coro::current == $Coro::main) { 472 if ($Coro::current == $Coro::main) {
337 my $time = Event::time; 473 my $time = EV::time;
338 474
339 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
340 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
341 477
342 # TODO: use suspend/resume instead 478 LOG llevError, Carp::longmess "sync job";#d#
343 # (but this is cancel-safe) 479
344 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
345 481
346 my $busy = 1; 482 my $busy = 1;
347 my @res; 483 my @res;
348 484
349 (async { 485 (async {
486 $Coro::current->desc ("sync job coro");
350 @res = eval { $job->() }; 487 @res = eval { $job->() };
351 warn $@ if $@; 488 warn $@ if $@;
352 undef $busy; 489 undef $busy;
353 })->prio (Coro::PRIO_MAX); 490 })->prio (Coro::PRIO_MAX);
354 491
355 while ($busy) { 492 while ($busy) {
356 Coro::cede or Event::one_event; 493 if (Coro::nready) {
494 Coro::cede_notself;
495 } else {
496 EV::loop EV::LOOP_ONESHOT;
357 } 497 }
498 }
358 499
359 $time = Event::time - $time; 500 my $time = EV::time - $time;
360 501
361 LOG llevError | logBacktrace, Carp::longmess "long sync job"
362 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
363
364 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
365 503
366 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
367 } else { 505 } else {
368 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
369 507
… …
389 $EXT_CORO{$coro+0} = $coro; 527 $EXT_CORO{$coro+0} = $coro;
390 528
391 $coro 529 $coro
392} 530}
393 531
394sub write_runtime { 532=item fork_call { }, $args
395 my $runtime = "$LOCALDIR/runtime";
396 533
397 # first touch the runtime file to show we are still running: 534Executes the given code block with the given arguments in a seperate
398 # the fsync below can take a very very long time. 535process, returning the results. Everything must be serialisable with
536Coro::Storable. May, of course, block. Note that the executed sub may
537never block itself or use any form of event handling.
399 538
400 IO::AIO::aio_utime $runtime, undef, undef; 539=cut
401 540
402 my $guard = cf::lock_acquire "write_runtime"; 541sub fork_call(&@) {
542 my ($cb, @args) = @_;
403 543
404 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 544 # we seemingly have to make a local copy of the whole thing,
405 or return; 545 # otherwise perl prematurely frees the stuff :/
546 # TODO: investigate and fix (likely this will be rather laborious)
406 547
407 my $value = $cf::RUNTIME + 90 + 10; 548 my @res = Coro::Util::fork_eval {
408 # 10 is the runtime save interval, for a monotonic clock 549 reset_signals;
409 # 60 allows for the watchdog to kill the server. 550 &$cb
551 }, @args;
410 552
411 (aio_write $fh, 0, (length $value), $value, 0) <= 0 553 wantarray ? @res : $res[-1]
412 and return; 554}
413 555
414 # always fsync - this file is important 556=item $coin = coin_from_name $name
415 aio_fsync $fh
416 and return;
417 557
418 # touch it again to show we are up-to-date 558=cut
419 aio_utime $fh, undef, undef;
420 559
421 close $fh 560our %coin_alias = (
422 or return; 561 "silver" => "silvercoin",
562 "silvercoin" => "silvercoin",
563 "silvercoins" => "silvercoin",
564 "gold" => "goldcoin",
565 "goldcoin" => "goldcoin",
566 "goldcoins" => "goldcoin",
567 "platinum" => "platinacoin",
568 "platinumcoin" => "platinacoin",
569 "platinumcoins" => "platinacoin",
570 "platina" => "platinacoin",
571 "platinacoin" => "platinacoin",
572 "platinacoins" => "platinacoin",
573 "royalty" => "royalty",
574 "royalties" => "royalty",
575);
423 576
424 aio_rename "$runtime~", $runtime 577sub coin_from_name($) {
425 and return; 578 $coin_alias{$_[0]}
579 ? cf::arch::find $coin_alias{$_[0]}
580 : undef
581}
426 582
427 warn "runtime file written.\n";#d# 583=item $value = cf::db_get $family => $key
428 584
585Returns a single value from the environment database.
586
587=item cf::db_put $family => $key => $value
588
589Stores the given C<$value> in the family. It can currently store binary
590data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
591
592=item $db = cf::db_table "name"
593
594Create and/or open a new database table. The string must not be "db" and must be unique
595within each server.
596
597=cut
598
599sub db_table($) {
600 my ($name) = @_;
601 my $db = BDB::db_create $DB_ENV;
602
603 eval {
604 $db->set_flags (BDB::CHKSUM);
605
606 utf8::encode $name;
607 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
608 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
609 cf::cleanup "db_open(db): $!" if $!;
610 };
611 cf::cleanup "db_open(db): $@" if $@;
612
613 $db
614}
615
616our $DB;
617
618sub db_init {
619 cf::sync_job {
620 $DB ||= db_table "db";
621 };
622}
623
624sub db_get($$) {
625 my $key = "$_[0]/$_[1]";
626
627 cf::sync_job {
628 BDB::db_get $DB, undef, $key, my $data;
629
630 $! ? ()
631 : $data
429 1 632 }
633}
634
635sub db_put($$$) {
636 BDB::dbreq_pri 4;
637 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
638}
639
640=item cf::cache $id => [$paths...], $processversion => $process
641
642Generic caching function that returns the value of the resource $id,
643caching and regenerating as required.
644
645This function can block.
646
647=cut
648
649sub cache {
650 my ($id, $src, $processversion, $process) = @_;
651
652 my $meta =
653 join "\x00",
654 $processversion,
655 map {
656 aio_stat $_
657 and Carp::croak "$_: $!";
658
659 ($_, (stat _)[7,9])
660 } @$src;
661
662 my $dbmeta = db_get cache => "$id/meta";
663 if ($dbmeta ne $meta) {
664 # changed, we may need to process
665
666 my @data;
667 my $md5;
668
669 for (0 .. $#$src) {
670 0 <= aio_load $src->[$_], $data[$_]
671 or Carp::croak "$src->[$_]: $!";
672 }
673
674 # if processing is expensive, check
675 # checksum first
676 if (1) {
677 $md5 =
678 join "\x00",
679 $processversion,
680 map {
681 cf::cede_to_tick;
682 ($src->[$_], Digest::MD5::md5_hex $data[$_])
683 } 0.. $#$src;
684
685
686 my $dbmd5 = db_get cache => "$id/md5";
687 if ($dbmd5 eq $md5) {
688 db_put cache => "$id/meta", $meta;
689
690 return db_get cache => "$id/data";
691 }
692 }
693
694 my $t1 = Time::HiRes::time;
695 my $data = $process->(\@data);
696 my $t2 = Time::HiRes::time;
697
698 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
699
700 db_put cache => "$id/data", $data;
701 db_put cache => "$id/md5" , $md5;
702 db_put cache => "$id/meta", $meta;
703
704 return $data;
705 }
706
707 db_get cache => "$id/data"
430} 708}
431 709
432=item cf::datalog type => key => value, ... 710=item cf::datalog type => key => value, ...
433 711
434Log a datalog packet of the given type with the given key-value pairs. 712Log a datalog packet of the given type with the given key-value pairs.
… …
452attach callbacks/event handlers (a collection of which is called an "attachment") 730attach callbacks/event handlers (a collection of which is called an "attachment")
453to it. All such attachable objects support the following methods. 731to it. All such attachable objects support the following methods.
454 732
455In the following description, CLASS can be any of C<global>, C<object> 733In the following description, CLASS can be any of C<global>, C<object>
456C<player>, C<client> or C<map> (i.e. the attachable objects in 734C<player>, C<client> or C<map> (i.e. the attachable objects in
457crossfire+). 735Deliantra).
458 736
459=over 4 737=over 4
460 738
461=item $attachable->attach ($attachment, key => $value...) 739=item $attachable->attach ($attachment, key => $value...)
462 740
… …
664 _attach $registry, $klass, @attach; 942 _attach $registry, $klass, @attach;
665 } 943 }
666 944
667 $obj->{$name} = \%arg; 945 $obj->{$name} = \%arg;
668 } else { 946 } else {
669 warn "object uses attachment '$name' that is not available, postponing.\n"; 947 warn "object uses attachment '$name' which is not available, postponing.\n";
670 } 948 }
671 949
672 $obj->{_attachment}{$name} = undef; 950 $obj->{_attachment}{$name} = undef;
673} 951}
674 952
… …
714 "; 992 ";
715 die if $@; 993 die if $@;
716} 994}
717 995
718our $override; 996our $override;
719our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 997our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
720 998
721sub override { 999sub override {
722 $override = 1; 1000 $override = 1;
723 @invoke_results = (); 1001 @INVOKE_RESULTS = (@_);
724} 1002}
725 1003
726sub do_invoke { 1004sub do_invoke {
727 my $event = shift; 1005 my $event = shift;
728 my $callbacks = shift; 1006 my $callbacks = shift;
729 1007
730 @invoke_results = (); 1008 @INVOKE_RESULTS = ();
731 1009
732 local $override; 1010 local $override;
733 1011
734 for (@$callbacks) { 1012 for (@$callbacks) {
735 eval { &{$_->[1]} }; 1013 eval { &{$_->[1]} };
… …
744 } 1022 }
745 1023
746 0 1024 0
747} 1025}
748 1026
749=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
750 1028
751=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
752 1030
753Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
754 1032
755This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1033This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
756removed in future versions), and there is no public API to access override 1034removed in future versions), and there is no public API to access override
757results (if you must, access C<@cf::invoke_results> directly). 1035results (if you must, access C<@cf::INVOKE_RESULTS> directly).
758 1036
759=back 1037=back
760 1038
761=cut 1039=cut
762 1040
763############################################################################# 1041#############################################################################
764# object support 1042# object support
1043
1044sub _object_equal($$);
1045sub _object_equal($$) {
1046 my ($a, $b) = @_;
1047
1048 return 0 unless (ref $a) eq (ref $b);
1049
1050 if ("HASH" eq ref $a) {
1051 my @ka = keys %$a;
1052 my @kb = keys %$b;
1053
1054 return 0 if @ka != @kb;
1055
1056 for (0 .. $#ka) {
1057 return 0 unless $ka[$_] eq $kb[$_];
1058 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1059 }
1060
1061 } elsif ("ARRAY" eq ref $a) {
1062
1063 return 0 if @$a != @$b;
1064
1065 for (0 .. $#$a) {
1066 return 0 unless _object_equal $a->[$_], $b->[$_];
1067 }
1068
1069 } elsif ($a ne $b) {
1070 return 0;
1071 }
1072
1073 1
1074}
1075
1076our $SLOW_MERGES;#d#
1077sub _can_merge {
1078 my ($ob1, $ob2) = @_;
1079
1080 ++$SLOW_MERGES;#d#
1081
1082 # we do the slow way here
1083 return _object_equal $ob1, $ob2
1084}
765 1085
766sub reattach { 1086sub reattach {
767 # basically do the same as instantiate, without calling instantiate 1087 # basically do the same as instantiate, without calling instantiate
768 my ($obj) = @_; 1088 my ($obj) = @_;
769 1089
… …
790cf::attachable->attach ( 1110cf::attachable->attach (
791 prio => -1000000, 1111 prio => -1000000,
792 on_instantiate => sub { 1112 on_instantiate => sub {
793 my ($obj, $data) = @_; 1113 my ($obj, $data) = @_;
794 1114
795 $data = from_json $data; 1115 $data = decode_json $data;
796 1116
797 for (@$data) { 1117 for (@$data) {
798 my ($name, $args) = @$_; 1118 my ($name, $args) = @$_;
799 1119
800 $obj->attach ($name, %{$args || {} }); 1120 $obj->attach ($name, %{$args || {} });
… …
816sub object_freezer_save { 1136sub object_freezer_save {
817 my ($filename, $rdata, $objs) = @_; 1137 my ($filename, $rdata, $objs) = @_;
818 1138
819 sync_job { 1139 sync_job {
820 if (length $$rdata) { 1140 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename);
821 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
822 $filename, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
823 1144
824 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
825 chmod SAVE_MODE, $fh; 1146 aio_chmod $fh, SAVE_MODE;
826 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
827 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
828 close $fh; 1149 aio_close $fh;
829 1150
830 if (@$objs) { 1151 if (@$objs) {
831 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
832 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
833 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
834 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
835 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
836 close $fh; 1157 aio_close $fh;
837 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
838 } 1159 }
839 } else { 1160 } else {
840 aio_unlink "$filename.pst"; 1161 aio_unlink "$filename.pst";
841 } 1162 }
… …
846 } 1167 }
847 } else { 1168 } else {
848 aio_unlink $filename; 1169 aio_unlink $filename;
849 aio_unlink "$filename.pst"; 1170 aio_unlink "$filename.pst";
850 } 1171 }
851 } 1172 };
852} 1173}
853 1174
854sub object_freezer_as_string { 1175sub object_freezer_as_string {
855 my ($rdata, $objs) = @_; 1176 my ($rdata, $objs) = @_;
856 1177
… …
868 or return; 1189 or return;
869 1190
870 unless (aio_stat "$filename.pst") { 1191 unless (aio_stat "$filename.pst") {
871 (aio_load "$filename.pst", $av) >= 0 1192 (aio_load "$filename.pst", $av) >= 0
872 or return; 1193 or return;
1194
873 $av = eval { (Storable::thaw $av)->{objs} }; 1195 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs};
874 } 1197 }
875 1198
1199 utf8::decode (my $decname = $filename);
876 warn sprintf "loading %s (%d)\n", 1200 warn sprintf "loading %s (%d,%d)\n",
877 $filename, length $data, scalar @{$av || []};#d# 1201 $decname, length $data, scalar @{$av || []};
1202
878 return ($data, $av); 1203 ($data, $av)
879} 1204}
1205
1206=head2 COMMAND CALLBACKS
1207
1208=over 4
1209
1210=cut
880 1211
881############################################################################# 1212#############################################################################
882# command handling &c 1213# command handling &c
883 1214
884=item cf::register_command $name => \&callback($ob,$args); 1215=item cf::register_command $name => \&callback($ob,$args);
… …
897 push @{ $COMMAND{$name} }, [$caller, $cb]; 1228 push @{ $COMMAND{$name} }, [$caller, $cb];
898} 1229}
899 1230
900=item cf::register_extcmd $name => \&callback($pl,$packet); 1231=item cf::register_extcmd $name => \&callback($pl,$packet);
901 1232
902Register a callbackf ro execution when the client sends an extcmd packet. 1233Register a callback for execution when the client sends an (synchronous)
1234extcmd packet. Ext commands will be processed in the order they are
1235received by the server, like other user commands. The first argument is
1236the logged-in player. Ext commands can only be processed after a player
1237has logged in successfully.
903 1238
904If the callback returns something, it is sent back as if reply was being 1239If the callback returns something, it is sent back as if reply was being
905called. 1240called.
906 1241
1242=item cf::register_exticmd $name => \&callback($ns,$packet);
1243
1244Register a callback for execution when the client sends an (asynchronous)
1245exticmd packet. Exti commands are processed by the server as soon as they
1246are received, i.e. out of order w.r.t. other commands. The first argument
1247is a client socket. Exti commands can be received anytime, even before
1248log-in.
1249
1250If the callback returns something, it is sent back as if reply was being
1251called.
1252
907=cut 1253=cut
908 1254
909sub register_extcmd { 1255sub register_extcmd {
910 my ($name, $cb) = @_; 1256 my ($name, $cb) = @_;
911 1257
912 $EXTCMD{$name} = $cb; 1258 $EXTCMD{$name} = $cb;
1259}
1260
1261sub register_exticmd {
1262 my ($name, $cb) = @_;
1263
1264 $EXTICMD{$name} = $cb;
913} 1265}
914 1266
915cf::player->attach ( 1267cf::player->attach (
916 on_command => sub { 1268 on_command => sub {
917 my ($pl, $name, $params) = @_; 1269 my ($pl, $name, $params) = @_;
… …
926 cf::override; 1278 cf::override;
927 }, 1279 },
928 on_extcmd => sub { 1280 on_extcmd => sub {
929 my ($pl, $buf) = @_; 1281 my ($pl, $buf) = @_;
930 1282
931 my $msg = eval { from_json $buf }; 1283 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
932 1284
933 if (ref $msg) { 1285 if (ref $msg) {
1286 my ($type, $reply, @payload) =
1287 "ARRAY" eq ref $msg
1288 ? @$msg
1289 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1290
1291 my @reply;
1292
934 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1293 if (my $cb = $EXTCMD{$type}) {
935 if (my %reply = $cb->($pl, $msg)) { 1294 @reply = $cb->($pl, @payload);
936 $pl->ext_reply ($msg->{msgid}, %reply);
937 }
938 } 1295 }
1296
1297 $pl->ext_reply ($reply, @reply)
1298 if $reply;
1299
939 } else { 1300 } else {
940 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
941 } 1302 }
942 1303
943 cf::override; 1304 cf::override;
944 }, 1305 },
945); 1306);
946 1307
947sub load_extension {
948 my ($path) = @_;
949
950 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
951 my $base = $1;
952 my $pkg = $1;
953 $pkg =~ s/[^[:word:]]/_/g;
954 $pkg = "ext::$pkg";
955
956 warn "... loading '$path' into '$pkg'\n";
957
958 open my $fh, "<:utf8", $path
959 or die "$path: $!";
960
961 my $source =
962 "package $pkg; use strict; use utf8;\n"
963 . "#line 1 \"$path\"\n{\n"
964 . (do { local $/; <$fh> })
965 . "\n};\n1";
966
967 unless (eval $source) {
968 my $msg = $@ ? "$path: $@\n"
969 : "extension disabled.\n";
970 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
971 warn $@;
972 warn "mandatory extension failed to load, exiting.\n";
973 exit 1;
974 }
975 die $@;
976 }
977
978 push @EXTS, $pkg;
979}
980
981sub load_extensions { 1308sub load_extensions {
1309 cf::sync_job {
1310 my %todo;
1311
982 for my $ext (<$LIBDIR/*.ext>) { 1312 for my $path (<$LIBDIR/*.ext>) {
983 next unless -r $ext; 1313 next unless -r $path;
984 eval { 1314
985 load_extension $ext; 1315 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1316 my $base = $1;
1317 my $pkg = $1;
1318 $pkg =~ s/[^[:word:]]/_/g;
1319 $pkg = "ext::$pkg";
1320
1321 open my $fh, "<:utf8", $path
1322 or die "$path: $!";
1323
1324 my $source = do { local $/; <$fh> };
1325
1326 my %ext = (
1327 path => $path,
1328 base => $base,
1329 pkg => $pkg,
1330 );
1331
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334
1335 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n"
1337 . "#line 1 \"$path\"\n{\n"
1338 . $source
1339 . "\n};\n1";
1340
1341 $todo{$base} = \%ext;
1342 }
1343
1344 my %done;
1345 while (%todo) {
1346 my $progress;
1347
1348 while (my ($k, $v) = each %todo) {
1349 for (split /,\s*/, $v->{meta}{depends}) {
1350 goto skip
1351 unless exists $done{$_};
1352 }
1353
1354 warn "... loading '$k' into '$v->{pkg}'\n";
1355
1356 unless (eval $v->{source}) {
1357 my $msg = $@ ? "$v->{path}: $@\n"
1358 : "$v->{base}: extension inactive.\n";
1359
1360 if (exists $v->{meta}{mandatory}) {
1361 warn $msg;
1362 cf::cleanup "mandatory extension failed to load, exiting.";
1363 }
1364
1365 warn $msg;
1366 }
1367
1368 $done{$k} = delete $todo{$k};
1369 push @EXTS, $v->{pkg};
1370 $progress = 1;
986 1 1371 }
987 } or warn "$ext not loaded: $@"; 1372
1373 skip:
1374 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1375 unless $progress;
1376 }
988 } 1377 };
989} 1378}
990 1379
991############################################################################# 1380#############################################################################
992 1381
1382=back
1383
993=head2 CORE EXTENSIONS 1384=head2 CORE EXTENSIONS
994 1385
995Functions and methods that extend core crossfire objects. 1386Functions and methods that extend core crossfire objects.
996 1387
997=cut 1388=cut
… …
1001use Coro::AIO; 1392use Coro::AIO;
1002 1393
1003=head3 cf::player 1394=head3 cf::player
1004 1395
1005=over 4 1396=over 4
1397
1398=item cf::player::num_playing
1399
1400Returns the official number of playing players, as per the Crossfire metaserver rules.
1401
1402=cut
1403
1404sub num_playing {
1405 scalar grep
1406 $_->ob->map
1407 && !$_->hidden
1408 && !$_->ob->flag (cf::FLAG_WIZ),
1409 cf::player::list
1410}
1006 1411
1007=item cf::player::find $login 1412=item cf::player::find $login
1008 1413
1009Returns the given player object, loading it if necessary (might block). 1414Returns the given player object, loading it if necessary (might block).
1010 1415
… …
1046 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1451 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1047 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1452 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1048 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1453 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1049 aio_unlink +(playerdir $login) . "/$login.pl"; 1454 aio_unlink +(playerdir $login) . "/$login.pl";
1050 1455
1051 my $pl = load_pl path $login 1456 my $f = new_from_file cf::object::thawer path $login
1052 or return; 1457 or return;
1458
1459 my $pl = cf::player::load_pl $f
1460 or return;
1461
1462 local $cf::PLAYER_LOADING{$login} = $pl;
1463 $f->resolve_delayed_derefs;
1053 $cf::PLAYER{$login} = $pl 1464 $cf::PLAYER{$login} = $pl
1054 } 1465 }
1055 } 1466 }
1056} 1467}
1057 1468
… …
1066 return if $pl->{deny_save}; 1477 return if $pl->{deny_save};
1067 1478
1068 aio_mkdir playerdir $pl, 0770; 1479 aio_mkdir playerdir $pl, 0770;
1069 $pl->{last_save} = $cf::RUNTIME; 1480 $pl->{last_save} = $cf::RUNTIME;
1070 1481
1482 cf::get_slot 0.01;
1483
1071 $pl->save_pl ($path); 1484 $pl->save_pl ($path);
1072 Coro::cede; 1485 cf::cede_to_tick;
1073} 1486}
1074 1487
1075sub new($) { 1488sub new($) {
1076 my ($login) = @_; 1489 my ($login) = @_;
1077 1490
… …
1081 $self->{deny_save} = 1; 1494 $self->{deny_save} = 1;
1082 1495
1083 $cf::PLAYER{$login} = $self; 1496 $cf::PLAYER{$login} = $self;
1084 1497
1085 $self 1498 $self
1499}
1500
1501=item $player->send_msg ($channel, $msg, $color, [extra...])
1502
1503=cut
1504
1505sub send_msg {
1506 my $ns = shift->ns
1507 or return;
1508 $ns->send_msg (@_);
1086} 1509}
1087 1510
1088=item $pl->quit_character 1511=item $pl->quit_character
1089 1512
1090Nukes the player without looking back. If logged in, the connection will 1513Nukes the player without looking back. If logged in, the connection will
… …
1145 or return []; 1568 or return [];
1146 1569
1147 my @logins; 1570 my @logins;
1148 1571
1149 for my $login (@$dirs) { 1572 for my $login (@$dirs) {
1573 my $path = path $login;
1574
1575 # a .pst is a dead give-away for a valid player
1576 # if no pst file found, open and chekc for blocked users
1577 if (aio_stat "$path.pst") {
1150 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1578 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1151 aio_read $fh, 0, 512, my $buf, 0 or next; 1579 aio_read $fh, 0, 512, my $buf, 0 or next;
1152 $buf !~ /^password -------------$/m or next; # official not-valid tag 1580 $buf !~ /^password -------------$/m or next; # official not-valid tag
1581 }
1153 1582
1154 utf8::decode $login; 1583 utf8::decode $login;
1155 push @logins, $login; 1584 push @logins, $login;
1156 } 1585 }
1157 1586
… …
1184 } 1613 }
1185 1614
1186 \@paths 1615 \@paths
1187} 1616}
1188 1617
1618=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1619
1620Expand crossfire pod fragments into protocol xml.
1621
1622=cut
1623
1624use re 'eval';
1625
1626my $group;
1627my $interior; $interior = qr{
1628 # match a pod interior sequence sans C<< >>
1629 (?:
1630 \ (.*?)\ (?{ $group = $^N })
1631 | < (??{$interior}) >
1632 )
1633}x;
1634
1635sub expand_cfpod {
1636 my ($self, $pod) = @_;
1637
1638 my $xml;
1639
1640 while () {
1641 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1642 $group = $1;
1643
1644 $group =~ s/&/&amp;/g;
1645 $group =~ s/</&lt;/g;
1646
1647 $xml .= $group;
1648 } elsif ($pod =~ m%\G
1649 ([BCGHITU])
1650 <
1651 (?:
1652 ([^<>]*) (?{ $group = $^N })
1653 | < $interior >
1654 )
1655 >
1656 %gcsx
1657 ) {
1658 my ($code, $data) = ($1, $group);
1659
1660 if ($code eq "B") {
1661 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1662 } elsif ($code eq "I") {
1663 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1664 } elsif ($code eq "U") {
1665 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1666 } elsif ($code eq "C") {
1667 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1668 } elsif ($code eq "T") {
1669 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1670 } elsif ($code eq "G") {
1671 my ($male, $female) = split /\|/, $data;
1672 $data = $self->gender ? $female : $male;
1673 $xml .= expand_cfpod ($self, $data);
1674 } elsif ($code eq "H") {
1675 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1676 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1677 "")
1678 [$self->{hintmode}];
1679 } else {
1680 $xml .= "error processing '$code($data)' directive";
1681 }
1682 } else {
1683 if ($pod =~ /\G(.+)/) {
1684 warn "parse error while expanding $pod (at $1)";
1685 }
1686 last;
1687 }
1688 }
1689
1690 for ($xml) {
1691 # create single paragraphs (very hackish)
1692 s/(?<=\S)\n(?=\w)/ /g;
1693
1694 # compress some whitespace
1695 s/\s+\n/\n/g; # ws line-ends
1696 s/\n\n+/\n/g; # double lines
1697 s/^\n+//; # beginning lines
1698 s/\n+$//; # ending lines
1699 }
1700
1701 $xml
1702}
1703
1704no re 'eval';
1705
1706sub hintmode {
1707 $_[0]{hintmode} = $_[1] if @_ > 1;
1708 $_[0]{hintmode}
1709}
1710
1189=item $player->ext_reply ($msgid, %msg) 1711=item $player->ext_reply ($msgid, @msg)
1190 1712
1191Sends an ext reply to the player. 1713Sends an ext reply to the player.
1192 1714
1193=cut 1715=cut
1194 1716
1195sub ext_reply($$%) { 1717sub ext_reply($$@) {
1196 my ($self, $id, %msg) = @_; 1718 my ($self, $id, @msg) = @_;
1197 1719
1198 $msg{msgid} = $id; 1720 $self->ns->ext_reply ($id, @msg)
1199
1200 $self->send ("ext " . cf::to_json \%msg);
1201} 1721}
1202 1722
1203=item $player->ext_event ($type, %msg) 1723=item $player->ext_msg ($type, @msg)
1204 1724
1205Sends an ext event to the client. 1725Sends an ext event to the client.
1206 1726
1207=cut 1727=cut
1208 1728
1209sub ext_event($$%) { 1729sub ext_msg($$@) {
1210 my ($self, $type, %msg) = @_; 1730 my ($self, $type, @msg) = @_;
1211 1731
1212 $self->ns->ext_event ($type, %msg); 1732 $self->ns->ext_msg ($type, @msg);
1213} 1733}
1214 1734
1215=head3 cf::region 1735=head3 cf::region
1216 1736
1217=over 4 1737=over 4
… …
1220 1740
1221package cf::region; 1741package cf::region;
1222 1742
1223=item cf::region::find_by_path $path 1743=item cf::region::find_by_path $path
1224 1744
1225Tries to decuce the probable region for a map knowing only its path. 1745Tries to decuce the likely region for a map knowing only its path.
1226 1746
1227=cut 1747=cut
1228 1748
1229sub find_by_path($) { 1749sub find_by_path($) {
1230 my ($path) = @_; 1750 my ($path) = @_;
1231 1751
1232 my ($match, $specificity); 1752 my ($match, $specificity);
1233 1753
1234 for my $region (list) { 1754 for my $region (list) {
1235 if ($region->match && $path =~ $region->match) { 1755 if ($region->{match} && $path =~ $region->{match}) {
1236 ($match, $specificity) = ($region, $region->specificity) 1756 ($match, $specificity) = ($region, $region->specificity)
1237 if $region->specificity > $specificity; 1757 if $region->specificity > $specificity;
1238 } 1758 }
1239 } 1759 }
1240 1760
… …
1261our $MAX_RESET = 3600; 1781our $MAX_RESET = 3600;
1262our $DEFAULT_RESET = 3000; 1782our $DEFAULT_RESET = 3000;
1263 1783
1264sub generate_random_map { 1784sub generate_random_map {
1265 my ($self, $rmp) = @_; 1785 my ($self, $rmp) = @_;
1786
1787 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1788
1266 # mit "rum" bekleckern, nicht 1789 # mit "rum" bekleckern, nicht
1267 $self->_create_random_map ( 1790 $self->_create_random_map (
1268 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1791 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1269 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1792 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1270 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1793 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1304 my ($self, $merge) = @_; 1827 my ($self, $merge) = @_;
1305 1828
1306 # we have to keep some variables in memory intact 1829 # we have to keep some variables in memory intact
1307 local $self->{path}; 1830 local $self->{path};
1308 local $self->{load_path}; 1831 local $self->{load_path};
1309 local $self->{deny_save};
1310 local $self->{deny_reset};
1311 1832
1312 $self->SUPER::thawer_merge ($merge); 1833 $self->SUPER::thawer_merge ($merge);
1313} 1834}
1314 1835
1315sub normalise { 1836sub normalise {
… …
1362 $self->init; # pass $1 etc. 1883 $self->init; # pass $1 etc.
1363 return $self; 1884 return $self;
1364 } 1885 }
1365 } 1886 }
1366 1887
1367 Carp::carp "unable to resolve path '$path' (base '$base')."; 1888 Carp::cluck "unable to resolve path '$path' (base '$base').";
1368 () 1889 ()
1369} 1890}
1370 1891
1371sub init { 1892sub init {
1372 my ($self) = @_; 1893 my ($self) = @_;
… …
1394 1915
1395# the temporary/swap location 1916# the temporary/swap location
1396sub save_path { 1917sub save_path {
1397 my ($self) = @_; 1918 my ($self) = @_;
1398 1919
1399 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1920 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1400 "$TMPDIR/$path.map" 1921 "$TMPDIR/$path.map"
1401} 1922}
1402 1923
1403# the unique path, undef == no special unique path 1924# the unique path, undef == no special unique path
1404sub uniq_path { 1925sub uniq_path {
1405 my ($self) = @_; 1926 my ($self) = @_;
1406 1927
1407 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1408 "$UNIQUEDIR/$path" 1929 "$UNIQUEDIR/$path"
1409} 1930}
1410 1931
1411# and all this just because we cannot iterate over 1932# and all this just because we cannot iterate over
1412# all maps in C++... 1933# all maps in C++...
… …
1415 1936
1416 $_->change_map_light ($change) 1937 $_->change_map_light ($change)
1417 for grep $_->outdoor, values %cf::MAP; 1938 for grep $_->outdoor, values %cf::MAP;
1418} 1939}
1419 1940
1941sub decay_objects {
1942 my ($self) = @_;
1943
1944 return if $self->{deny_reset};
1945
1946 $self->do_decay_objects;
1947}
1948
1420sub unlink_save { 1949sub unlink_save {
1421 my ($self) = @_; 1950 my ($self) = @_;
1422 1951
1423 utf8::encode (my $save = $self->save_path); 1952 utf8::encode (my $save = $self->save_path);
1424 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1953 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
… …
1427 1956
1428sub load_header_from($) { 1957sub load_header_from($) {
1429 my ($self, $path) = @_; 1958 my ($self, $path) = @_;
1430 1959
1431 utf8::encode $path; 1960 utf8::encode $path;
1432 #aio_open $path, O_RDONLY, 0 1961 my $f = new_from_file cf::object::thawer $path
1433 # or return;
1434
1435 $self->_load_header ($path)
1436 or return; 1962 or return;
1963
1964 $self->_load_header ($f)
1965 or return;
1966
1967 local $MAP_LOADING{$self->{path}} = $self;
1968 $f->resolve_delayed_derefs;
1437 1969
1438 $self->{load_path} = $path; 1970 $self->{load_path} = $path;
1439 1971
1440 1 1972 1
1441} 1973}
… …
1480 $self->load_header_orig 2012 $self->load_header_orig
1481 or return; 2013 or return;
1482 $self->prepare_orig; 2014 $self->prepare_orig;
1483 } 2015 }
1484 2016
2017 $self->{deny_reset} = 1
2018 if $self->no_reset;
2019
1485 $self->default_region (cf::region::find_by_path $self->{path}) 2020 $self->default_region (cf::region::find_by_path $self->{path})
1486 unless $self->default_region; 2021 unless $self->default_region;
1487 2022
1488 1 2023 1
1489} 2024}
… …
1492sub find { 2027sub find {
1493 my ($path, $origin) = @_; 2028 my ($path, $origin) = @_;
1494 2029
1495 $path = normalise $path, $origin && $origin->path; 2030 $path = normalise $path, $origin && $origin->path;
1496 2031
2032 cf::lock_wait "map_data:$path";#d#remove
1497 cf::lock_wait "map_find:$path"; 2033 cf::lock_wait "map_find:$path";
1498 2034
1499 $cf::MAP{$path} || do { 2035 $cf::MAP{$path} || do {
1500 my $guard = cf::lock_acquire "map_find:$path"; 2036 my $guard1 = cf::lock_acquire "map_find:$path";
2037 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2038
1501 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
1502 or return; 2040 or return;
1503 2041
1504 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
1505 2043
1506 $map->load_header 2044 $map->load_header
1507 or return; 2045 or return;
1508 2046
1509 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1510 # doing this can freeze the server in a sync job, obviously 2048 # doing this can freeze the server in a sync job, obviously
1511 #$cf::WAIT_FOR_TICK->wait; 2049 #$cf::WAIT_FOR_TICK->wait;
2050 undef $guard1;
2051 undef $guard2;
1512 $map->reset; 2052 $map->reset;
1513 undef $guard;
1514 return find $path; 2053 return find $path;
1515 } 2054 }
1516 2055
1517 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
1518 } 2057 }
… …
1527 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
1528 2067
1529 my $path = $self->{path}; 2068 my $path = $self->{path};
1530 2069
1531 { 2070 {
1532 my $guard = cf::lock_acquire "map_load:$path"; 2071 my $guard = cf::lock_acquire "map_data:$path";
1533 2072
2073 return unless $self->valid;
1534 return if $self->in_memory != cf::MAP_SWAPPED; 2074 return unless $self->in_memory == cf::MAP_SWAPPED;
1535 2075
1536 $self->in_memory (cf::MAP_LOADING); 2076 $self->in_memory (cf::MAP_LOADING);
1537 2077
1538 $self->alloc; 2078 $self->alloc;
1539 2079
1540 $self->pre_load; 2080 $self->pre_load;
1541 Coro::cede; 2081 cf::cede_to_tick;
1542 2082
2083 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block;
1543 $self->_load_objects ($self->{load_path}, 1) 2085 $self->_load_objects ($f)
1544 or return; 2086 or return;
1545 2087
1546 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2088 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1547 if delete $self->{load_original}; 2089 if delete $self->{load_original};
1548 2090
1549 if (my $uniq = $self->uniq_path) { 2091 if (my $uniq = $self->uniq_path) {
1550 utf8::encode $uniq; 2092 utf8::encode $uniq;
1551 if (aio_open $uniq, O_RDONLY, 0) { 2093 unless (aio_stat $uniq) {
2094 if (my $f = new_from_file cf::object::thawer $uniq) {
1552 $self->clear_unique_items; 2095 $self->clear_unique_items;
1553 $self->_load_objects ($uniq, 0); 2096 $self->_load_objects ($f);
2097 $f->resolve_delayed_derefs;
2098 }
1554 } 2099 }
1555 } 2100 }
1556 2101
1557 Coro::cede; 2102 $f->resolve_delayed_derefs;
2103
2104 cf::cede_to_tick;
1558 # now do the right thing for maps 2105 # now do the right thing for maps
1559 $self->link_multipart_objects; 2106 $self->link_multipart_objects;
1560 $self->difficulty ($self->estimate_difficulty) 2107 $self->difficulty ($self->estimate_difficulty)
1561 unless $self->difficulty; 2108 unless $self->difficulty;
1562 Coro::cede; 2109 cf::cede_to_tick;
1563 2110
1564 unless ($self->{deny_activate}) { 2111 unless ($self->{deny_activate}) {
1565 $self->decay_objects; 2112 $self->decay_objects;
1566 $self->fix_auto_apply; 2113 $self->fix_auto_apply;
1567 $self->update_buttons; 2114 $self->update_buttons;
1568 Coro::cede; 2115 cf::cede_to_tick;
1569 $self->set_darkness_map; 2116 $self->set_darkness_map;
1570 Coro::cede; 2117 cf::cede_to_tick;
1571 $self->activate; 2118 $self->activate;
1572 } 2119 }
1573 2120
2121 $self->{last_save} = $cf::RUNTIME;
2122 $self->last_access ($cf::RUNTIME);
2123
1574 $self->in_memory (cf::MAP_IN_MEMORY); 2124 $self->in_memory (cf::MAP_ACTIVE);
1575 } 2125 }
1576 2126
1577 $self->post_load; 2127 $self->post_load;
1578} 2128}
1579 2129
… …
1581 my ($self, $ob) = @_; 2131 my ($self, $ob) = @_;
1582 2132
1583 return find "~" . $ob->name . "/" . $self->{path} 2133 return find "~" . $ob->name . "/" . $self->{path}
1584 if $self->per_player; 2134 if $self->per_player;
1585 2135
2136# return find "?party/" . $ob->name . "/" . $self->{path}
2137# if $self->per_party;
2138
1586 $self 2139 $self
1587} 2140}
1588 2141
1589# find and load all maps in the 3x3 area around a map 2142# find and load all maps in the 3x3 area around a map
1590sub load_diag { 2143sub load_neighbours {
1591 my ($map) = @_; 2144 my ($map) = @_;
1592 2145
1593 my @diag; # diagonal neighbours 2146 my @neigh; # diagonal neighbours
1594 2147
1595 for (0 .. 3) { 2148 for (0 .. 3) {
1596 my $neigh = $map->tile_path ($_) 2149 my $neigh = $map->tile_path ($_)
1597 or next; 2150 or next;
1598 $neigh = find $neigh, $map 2151 $neigh = find $neigh, $map
1599 or next; 2152 or next;
1600 $neigh->load; 2153 $neigh->load;
1601 2154
2155 push @neigh,
1602 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2156 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1603 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2157 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1604 } 2158 }
1605 2159
1606 for (@diag) { 2160 for (grep defined $_->[0], @neigh) {
2161 my ($path, $origin) = @$_;
1607 my $neigh = find @$_ 2162 my $neigh = find $path, $origin
1608 or next; 2163 or next;
1609 $neigh->load; 2164 $neigh->load;
1610 } 2165 }
1611} 2166}
1612 2167
… …
1617} 2172}
1618 2173
1619sub do_load_sync { 2174sub do_load_sync {
1620 my ($map) = @_; 2175 my ($map) = @_;
1621 2176
2177 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2178 if $Coro::current == $Coro::main;
2179
1622 cf::sync_job { $map->load }; 2180 cf::sync_job { $map->load };
1623} 2181}
1624 2182
1625our %MAP_PREFETCH; 2183our %MAP_PREFETCH;
1626our $MAP_PREFETCHER = undef; 2184our $MAP_PREFETCHER = undef;
1627 2185
1628sub find_async { 2186sub find_async {
1629 my ($path, $origin) = @_; 2187 my ($path, $origin, $load) = @_;
1630 2188
1631 $path = normalise $path, $origin && $origin->{path}; 2189 $path = normalise $path, $origin && $origin->{path};
1632 2190
1633 if (my $map = $cf::MAP{$path}) { 2191 if (my $map = $cf::MAP{$path}) {
1634 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2192 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1635 } 2193 }
1636 2194
1637 undef $MAP_PREFETCH{$path}; 2195 $MAP_PREFETCH{$path} |= $load;
2196
1638 $MAP_PREFETCHER ||= cf::async { 2197 $MAP_PREFETCHER ||= cf::async {
2198 $Coro::current->{desc} = "map prefetcher";
2199
1639 while (%MAP_PREFETCH) { 2200 while (%MAP_PREFETCH) {
1640 for my $path (keys %MAP_PREFETCH) { 2201 while (my ($k, $v) = each %MAP_PREFETCH) {
1641 my $map = find $path 2202 if (my $map = find $k) {
1642 or next;
1643 $map->load; 2203 $map->load if $v;
2204 }
1644 2205
1645 delete $MAP_PREFETCH{$path}; 2206 delete $MAP_PREFETCH{$k};
1646 } 2207 }
1647 } 2208 }
1648 undef $MAP_PREFETCHER; 2209 undef $MAP_PREFETCHER;
1649 }; 2210 };
1650 $MAP_PREFETCHER->prio (6); 2211 $MAP_PREFETCHER->prio (6);
… …
1653} 2214}
1654 2215
1655sub save { 2216sub save {
1656 my ($self) = @_; 2217 my ($self) = @_;
1657 2218
1658 my $lock = cf::lock_acquire "map_data:" . $self->path; 2219 my $lock = cf::lock_acquire "map_data:$self->{path}";
1659 2220
1660 $self->{last_save} = $cf::RUNTIME; 2221 $self->{last_save} = $cf::RUNTIME;
1661 2222
1662 return unless $self->dirty; 2223 return unless $self->dirty;
1663 2224
… …
1669 return if $self->{deny_save}; 2230 return if $self->{deny_save};
1670 2231
1671 local $self->{last_access} = $self->last_access;#d# 2232 local $self->{last_access} = $self->last_access;#d#
1672 2233
1673 cf::async { 2234 cf::async {
2235 $Coro::current->{desc} = "map player save";
1674 $_->contr->save for $self->players; 2236 $_->contr->save for $self->players;
1675 }; 2237 };
2238
2239 cf::get_slot 0.02;
1676 2240
1677 if ($uniq) { 2241 if ($uniq) {
1678 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2242 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1679 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2243 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1680 } else { 2244 } else {
… …
1686 my ($self) = @_; 2250 my ($self) = @_;
1687 2251
1688 # save first because save cedes 2252 # save first because save cedes
1689 $self->save; 2253 $self->save;
1690 2254
1691 my $lock = cf::lock_acquire "map_data:" . $self->path; 2255 my $lock = cf::lock_acquire "map_data:$self->{path}";
1692 2256
1693 return if $self->players; 2257 return if $self->players;
1694 return if $self->in_memory != cf::MAP_IN_MEMORY; 2258 return if $self->in_memory != cf::MAP_ACTIVE;
1695 return if $self->{deny_save}; 2259 return if $self->{deny_save};
1696 2260
2261 $self->in_memory (cf::MAP_SWAPPED);
2262
2263 $self->deactivate;
2264 $_->clear_links_to ($self) for values %cf::MAP;
1697 $self->clear; 2265 $self->clear;
1698 $self->in_memory (cf::MAP_SWAPPED);
1699} 2266}
1700 2267
1701sub reset_at { 2268sub reset_at {
1702 my ($self) = @_; 2269 my ($self) = @_;
1703 2270
1704 # TODO: safety, remove and allow resettable per-player maps 2271 # TODO: safety, remove and allow resettable per-player maps
1705 return 1e99 if $self->isa ("ext::map_per_player");#d#
1706 return 1e99 if $self->{deny_reset}; 2272 return 1e99 if $self->{deny_reset};
1707 2273
1708 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2274 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1709 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2275 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1710 2276
… …
1721 my ($self) = @_; 2287 my ($self) = @_;
1722 2288
1723 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2289 my $lock = cf::lock_acquire "map_data:$self->{path}";
1724 2290
1725 return if $self->players; 2291 return if $self->players;
1726 return if $self->isa ("ext::map_per_player");#d#
1727 2292
1728 warn "resetting map ", $self->path;#d# 2293 warn "resetting map ", $self->path;
1729 2294
1730 $self->in_memory (cf::MAP_SWAPPED); 2295 $self->in_memory (cf::MAP_SWAPPED);
1731 2296
1732 # need to save uniques path 2297 # need to save uniques path
1733 unless ($self->{deny_save}) { 2298 unless ($self->{deny_save}) {
… …
1737 if $uniq; 2302 if $uniq;
1738 } 2303 }
1739 2304
1740 delete $cf::MAP{$self->path}; 2305 delete $cf::MAP{$self->path};
1741 2306
2307 $self->deactivate;
2308 $_->clear_links_to ($self) for values %cf::MAP;
1742 $self->clear; 2309 $self->clear;
1743
1744 $_->clear_links_to ($self) for values %cf::MAP;
1745 2310
1746 $self->unlink_save; 2311 $self->unlink_save;
1747 $self->destroy; 2312 $self->destroy;
1748} 2313}
1749 2314
1750my $nuke_counter = "aaaa"; 2315my $nuke_counter = "aaaa";
1751 2316
1752sub nuke { 2317sub nuke {
1753 my ($self) = @_; 2318 my ($self) = @_;
1754 2319
2320 {
2321 my $lock = cf::lock_acquire "map_data:$self->{path}";
2322
1755 delete $cf::MAP{$self->path}; 2323 delete $cf::MAP{$self->path};
1756 2324
1757 $self->unlink_save; 2325 $self->unlink_save;
1758 2326
1759 bless $self, "cf::map"; 2327 bless $self, "cf::map";
1760 delete $self->{deny_reset}; 2328 delete $self->{deny_reset};
1761 $self->{deny_save} = 1; 2329 $self->{deny_save} = 1;
1762 $self->reset_timeout (1); 2330 $self->reset_timeout (1);
1763 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2331 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1764 2332
1765 $cf::MAP{$self->path} = $self; 2333 $cf::MAP{$self->path} = $self;
2334 }
1766 2335
1767 $self->reset; # polite request, might not happen 2336 $self->reset; # polite request, might not happen
2337}
2338
2339=item $maps = cf::map::tmp_maps
2340
2341Returns an arrayref with all map paths of currently instantiated and saved
2342maps. May block.
2343
2344=cut
2345
2346sub tmp_maps() {
2347 [
2348 map {
2349 utf8::decode $_;
2350 /\.map$/
2351 ? normalise $_
2352 : ()
2353 } @{ aio_readdir $TMPDIR or [] }
2354 ]
2355}
2356
2357=item $maps = cf::map::random_maps
2358
2359Returns an arrayref with all map paths of currently instantiated and saved
2360random maps. May block.
2361
2362=cut
2363
2364sub random_maps() {
2365 [
2366 map {
2367 utf8::decode $_;
2368 /\.map$/
2369 ? normalise "?random/$_"
2370 : ()
2371 } @{ aio_readdir $RANDOMDIR or [] }
2372 ]
1768} 2373}
1769 2374
1770=item cf::map::unique_maps 2375=item cf::map::unique_maps
1771 2376
1772Returns an arrayref of paths of all shared maps that have 2377Returns an arrayref of paths of all shared maps that have
1773instantiated unique items. May block. 2378instantiated unique items. May block.
1774 2379
1775=cut 2380=cut
1776 2381
1777sub unique_maps() { 2382sub unique_maps() {
1778 my $files = aio_readdir $UNIQUEDIR 2383 [
1779 or return; 2384 map {
1780
1781 my @paths;
1782
1783 for (@$files) {
1784 utf8::decode $_; 2385 utf8::decode $_;
1785 next if /\.pst$/; 2386 s/\.map$//; # TODO future compatibility hack
1786 next unless /^$PATH_SEP/o; 2387 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
1787 2388 ? ()
1788 push @paths, cf::map::normalise $_; 2389 : normalise $_
2390 } @{ aio_readdir $UNIQUEDIR or [] }
1789 } 2391 ]
1790
1791 \@paths
1792} 2392}
1793
1794package cf;
1795 2393
1796=back 2394=back
1797 2395
1798=head3 cf::object 2396=head3 cf::object
1799 2397
… …
1803 2401
1804=over 4 2402=over 4
1805 2403
1806=item $ob->inv_recursive 2404=item $ob->inv_recursive
1807 2405
1808Returns the inventory of the object _and_ their inventories, recursively. 2406Returns the inventory of the object I<and> their inventories, recursively,
2407but I<not> the object itself.
1809 2408
1810=cut 2409=cut
1811 2410
1812sub inv_recursive_; 2411sub inv_recursive_;
1813sub inv_recursive_ { 2412sub inv_recursive_ {
1814 map { $_, inv_recursive_ $_->inv } @_ 2413 map { $_, inv_recursive_ $_->inv } @_
1815} 2414}
1816 2415
1817sub inv_recursive { 2416sub inv_recursive {
1818 inv_recursive_ inv $_[0] 2417 inv_recursive_ inv $_[0]
2418}
2419
2420=item $ref = $ob->ref
2421
2422Creates and returns a persistent reference to an object that can be stored as a string.
2423
2424=item $ob = cf::object::deref ($refstring)
2425
2426returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2427even if the object actually exists. May block.
2428
2429=cut
2430
2431sub deref {
2432 my ($ref) = @_;
2433
2434 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2435 my ($uuid, $name) = ($1, $2);
2436 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2437 or return;
2438 $pl->ob->uuid eq $uuid
2439 or return;
2440
2441 $pl->ob
2442 } else {
2443 warn "$ref: cannot resolve object reference\n";
2444 undef
2445 }
1819} 2446}
1820 2447
1821package cf; 2448package cf;
1822 2449
1823=back 2450=back
… …
1842 2469
1843 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2470 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1844 2471
1845 if ($self->{record_replies}) { 2472 if ($self->{record_replies}) {
1846 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2473 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2474
1847 } else { 2475 } else {
2476 my $pl = $self->contr;
2477
2478 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2479 my $dialog = $pl->{npc_dialog};
2480 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2481
2482 } else {
1848 $msg = $npc->name . " says: $msg" if $npc; 2483 $msg = $npc->name . " says: $msg" if $npc;
1849 $self->message ($msg, $flags); 2484 $self->message ($msg, $flags);
2485 }
1850 } 2486 }
2487}
2488
2489=item $object->send_msg ($channel, $msg, $color, [extra...])
2490
2491=cut
2492
2493sub cf::object::send_msg {
2494 my $pl = shift->contr
2495 or return;
2496 $pl->send_msg (@_);
1851} 2497}
1852 2498
1853=item $player_object->may ("access") 2499=item $player_object->may ("access")
1854 2500
1855Returns wether the given player is authorized to access resource "access" 2501Returns wether the given player is authorized to access resource "access"
… …
1934 # use -1 or undef as default coordinates, not 0, 0 2580 # use -1 or undef as default coordinates, not 0, 0
1935 ($x, $y) = ($map->enter_x, $map->enter_y) 2581 ($x, $y) = ($map->enter_x, $map->enter_y)
1936 if $x <=0 && $y <= 0; 2582 if $x <=0 && $y <= 0;
1937 2583
1938 $map->load; 2584 $map->load;
1939 $map->load_diag; 2585 $map->load_neighbours;
1940 2586
1941 return unless $self->contr->active; 2587 return unless $self->contr->active;
1942 $self->activate_recursive; 2588 $self->activate_recursive;
1943 2589
1944 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1945 $self->enter_map ($map, $x, $y); 2591 $self->enter_map ($map, $x, $y);
1946} 2592}
1947 2593
1948=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2594=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1949 2595
1950Moves the player to the given map-path and coordinates by first freezing 2596Moves the player to the given map-path and coordinates by first freezing
1951her, loading and preparing them map, calling the provided $check callback 2597her, loading and preparing them map, calling the provided $check callback
1952that has to return the map if sucecssful, and then unfreezes the player on 2598that has to return the map if sucecssful, and then unfreezes the player on
1953the new (success) or old (failed) map position. 2599the new (success) or old (failed) map position. In either case, $done will
2600be called at the end of this process.
1954 2601
1955=cut 2602=cut
1956 2603
1957our $GOTOGEN; 2604our $GOTOGEN;
1958 2605
1959sub cf::object::player::goto { 2606sub cf::object::player::goto {
1960 my ($self, $path, $x, $y, $check) = @_; 2607 my ($self, $path, $x, $y, $check, $done) = @_;
1961 2608
1962 # do generation counting so two concurrent goto's will be executed in-order 2609 # do generation counting so two concurrent goto's will be executed in-order
1963 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2610 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1964 2611
1965 $self->enter_link; 2612 $self->enter_link;
1966 2613
1967 (async { 2614 (async {
2615 $Coro::current->{desc} = "player::goto $path $x $y";
2616
2617 # *tag paths override both path and x|y
2618 if ($path =~ /^\*(.*)$/) {
2619 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2620 my $ob = $obs[rand @obs];
2621
2622 # see if we actually can go there
2623 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2624 $ob = $obs[rand @obs];
2625 } else {
2626 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2627 }
2628 # else put us there anyways for now #d#
2629
2630 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2631 } else {
2632 ($path, $x, $y) = (undef, undef, undef);
2633 }
2634 }
2635
1968 my $map = eval { 2636 my $map = eval {
1969 my $map = cf::map::find $path; 2637 my $map = defined $path ? cf::map::find $path : undef;
1970 2638
1971 if ($map) { 2639 if ($map) {
1972 $map = $map->customise_for ($self); 2640 $map = $map->customise_for ($self);
1973 $map = $check->($map) if $check && $map; 2641 $map = $check->($map) if $check && $map;
1974 } else { 2642 } else {
1975 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2643 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
1976 } 2644 }
1977 2645
1978 $map 2646 $map
1979 }; 2647 };
1980 2648
… …
1985 2653
1986 if ($gen == $self->{_goto_generation}) { 2654 if ($gen == $self->{_goto_generation}) {
1987 delete $self->{_goto_generation}; 2655 delete $self->{_goto_generation};
1988 $self->leave_link ($map, $x, $y); 2656 $self->leave_link ($map, $x, $y);
1989 } 2657 }
2658
2659 $done->() if $done;
1990 })->prio (1); 2660 })->prio (1);
1991} 2661}
1992 2662
1993=item $player_object->enter_exit ($exit_object) 2663=item $player_object->enter_exit ($exit_object)
1994 2664
… …
2031 $rmp->{origin_y} = $exit->y; 2701 $rmp->{origin_y} = $exit->y;
2032 } 2702 }
2033 2703
2034 $rmp->{random_seed} ||= $exit->random_seed; 2704 $rmp->{random_seed} ||= $exit->random_seed;
2035 2705
2036 my $data = cf::to_json $rmp; 2706 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2037 my $md5 = Digest::MD5::md5_hex $data; 2707 my $md5 = Digest::MD5::md5_hex $data;
2038 my $meta = "$RANDOMDIR/$md5.meta"; 2708 my $meta = "$RANDOMDIR/$md5.meta";
2039 2709
2040 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2710 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2041 aio_write $fh, 0, (length $data), $data, 0; 2711 aio_write $fh, 0, (length $data), $data, 0;
… …
2063 my $hp = $exit->stats->hp; 2733 my $hp = $exit->stats->hp;
2064 my $sp = $exit->stats->sp; 2734 my $sp = $exit->stats->sp;
2065 2735
2066 $self->enter_link; 2736 $self->enter_link;
2067 2737
2738 # if exit is damned, update players death & WoR home-position
2739 $self->contr->savebed ($slaying, $hp, $sp)
2740 if $exit->flag (FLAG_DAMNED);
2741
2068 (async { 2742 (async {
2743 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2744
2069 $self->deactivate_recursive; # just to be sure 2745 $self->deactivate_recursive; # just to be sure
2070 unless (eval { 2746 unless (eval {
2071 $self->goto ($slaying, $hp, $sp); 2747 $self->goto ($slaying, $hp, $sp);
2072 2748
2073 1; 2749 1;
… …
2099 2775
2100 utf8::encode $text; 2776 utf8::encode $text;
2101 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2777 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2102} 2778}
2103 2779
2780=item $client->send_msg ($channel, $msg, $color, [extra...])
2781
2782Send a drawinfo or msg packet to the client, formatting the msg for the
2783client if neccessary. C<$type> should be a string identifying the type of
2784the message, with C<log> being the default. If C<$color> is negative, suppress
2785the message unless the client supports the msg packet.
2786
2787=cut
2788
2789# non-persistent channels (usually the info channel)
2790our %CHANNEL = (
2791 "c/identify" => {
2792 id => "infobox",
2793 title => "Identify",
2794 reply => undef,
2795 tooltip => "Items recently identified",
2796 },
2797 "c/examine" => {
2798 id => "infobox",
2799 title => "Examine",
2800 reply => undef,
2801 tooltip => "Signs and other items you examined",
2802 },
2803 "c/book" => {
2804 id => "infobox",
2805 title => "Book",
2806 reply => undef,
2807 tooltip => "The contents of a note or book",
2808 },
2809 "c/lookat" => {
2810 id => "infobox",
2811 title => "Look",
2812 reply => undef,
2813 tooltip => "What you saw there",
2814 },
2815 "c/who" => {
2816 id => "infobox",
2817 title => "Players",
2818 reply => undef,
2819 tooltip => "Shows players who are currently online",
2820 },
2821 "c/body" => {
2822 id => "infobox",
2823 title => "Body Parts",
2824 reply => undef,
2825 tooltip => "Shows which body parts you posess and are available",
2826 },
2827 "c/uptime" => {
2828 id => "infobox",
2829 title => "Uptime",
2830 reply => undef,
2831 tooltip => "How long the server has been running since last restart",
2832 },
2833 "c/mapinfo" => {
2834 id => "infobox",
2835 title => "Map Info",
2836 reply => undef,
2837 tooltip => "Information related to the maps",
2838 },
2839 "c/party" => {
2840 id => "party",
2841 title => "Party",
2842 reply => "gsay ",
2843 tooltip => "Messages and chat related to your party",
2844 },
2845);
2846
2847sub cf::client::send_msg {
2848 my ($self, $channel, $msg, $color, @extra) = @_;
2849
2850 $msg = $self->pl->expand_cfpod ($msg);
2851
2852 $color &= cf::NDI_CLIENT_MASK; # just in case...
2853
2854 # check predefined channels, for the benefit of C
2855 if ($CHANNEL{$channel}) {
2856 $channel = $CHANNEL{$channel};
2857
2858 $self->ext_msg (channel_info => $channel)
2859 if $self->can_msg;
2860
2861 $channel = $channel->{id};
2862
2863 } elsif (ref $channel) {
2864 # send meta info to client, if not yet sent
2865 unless (exists $self->{channel}{$channel->{id}}) {
2866 $self->{channel}{$channel->{id}} = $channel;
2867 $self->ext_msg (channel_info => $channel)
2868 if $self->can_msg;
2869 }
2870
2871 $channel = $channel->{id};
2872 }
2873
2874 return unless @extra || length $msg;
2875
2876 if ($self->can_msg) {
2877 # default colour, mask it out
2878 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2879 if $color & cf::NDI_DEF;
2880
2881 $self->send_packet ("msg " . $self->{json_coder}->encode (
2882 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2883 } else {
2884 if ($color >= 0) {
2885 # replace some tags by gcfclient-compatible ones
2886 for ($msg) {
2887 1 while
2888 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2889 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2890 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2891 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2892 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2893 }
2894
2895 $color &= cf::NDI_COLOR_MASK;
2896
2897 utf8::encode $msg;
2898
2899 if (0 && $msg =~ /\[/) {
2900 # COMMAND/INFO
2901 $self->send_packet ("drawextinfo $color 10 8 $msg")
2902 } else {
2903 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2904 $self->send_packet ("drawinfo $color $msg")
2905 }
2906 }
2907 }
2908}
2909
2104=item $client->ext_event ($type, %msg) 2910=item $client->ext_msg ($type, @msg)
2105 2911
2106Sends an exti event to the client. 2912Sends an ext event to the client.
2107 2913
2108=cut 2914=cut
2109 2915
2110sub cf::client::ext_event($$%) { 2916sub cf::client::ext_msg($$@) {
2111 my ($self, $type, %msg) = @_; 2917 my ($self, $type, @msg) = @_;
2112 2918
2919 if ($self->extcmd == 2) {
2920 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2921 } elsif ($self->extcmd == 1) { # TODO: remove
2113 $msg{msgtype} = "event_$type"; 2922 push @msg, msgtype => "event_$type";
2114 $self->send_packet ("ext " . cf::to_json \%msg); 2923 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2924 }
2925}
2926
2927=item $client->ext_reply ($msgid, @msg)
2928
2929Sends an ext reply to the client.
2930
2931=cut
2932
2933sub cf::client::ext_reply($$@) {
2934 my ($self, $id, @msg) = @_;
2935
2936 if ($self->extcmd == 2) {
2937 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2938 } elsif ($self->extcmd == 1) {
2939 #TODO: version 1, remove
2940 unshift @msg, msgtype => "reply", msgid => $id;
2941 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2942 }
2115} 2943}
2116 2944
2117=item $success = $client->query ($flags, "text", \&cb) 2945=item $success = $client->query ($flags, "text", \&cb)
2118 2946
2119Queues a query to the client, calling the given callback with 2947Queues a query to the client, calling the given callback with
2120the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2948the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2121C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2949C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2122 2950
2123Queries can fail, so check the return code. Or don't, as queries will become 2951Queries can fail, so check the return code. Or don't, as queries will
2124reliable at some point in the future. 2952become reliable at some point in the future.
2125 2953
2126=cut 2954=cut
2127 2955
2128sub cf::client::query { 2956sub cf::client::query {
2129 my ($self, $flags, $text, $cb) = @_; 2957 my ($self, $flags, $text, $cb) = @_;
… …
2137 utf8::encode $text; 2965 utf8::encode $text;
2138 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2966 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2139 2967
2140 $self->send_packet ($self->{query_queue}[0][0]) 2968 $self->send_packet ($self->{query_queue}[0][0])
2141 if @{ $self->{query_queue} } == 1; 2969 if @{ $self->{query_queue} } == 1;
2970
2971 1
2142} 2972}
2143 2973
2144cf::client->attach ( 2974cf::client->attach (
2975 on_connect => sub {
2976 my ($ns) = @_;
2977
2978 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2979 },
2145 on_reply => sub { 2980 on_reply => sub {
2146 my ($ns, $msg) = @_; 2981 my ($ns, $msg) = @_;
2147 2982
2148 # this weird shuffling is so that direct followup queries 2983 # this weird shuffling is so that direct followup queries
2149 # get handled first 2984 # get handled first
… …
2161 } else { 2996 } else {
2162 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2997 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2163 } 2998 }
2164 } 2999 }
2165 }, 3000 },
3001 on_exticmd => sub {
3002 my ($ns, $buf) = @_;
3003
3004 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3005
3006 if (ref $msg) {
3007 my ($type, $reply, @payload) =
3008 "ARRAY" eq ref $msg
3009 ? @$msg
3010 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3011
3012 my @reply;
3013
3014 if (my $cb = $EXTICMD{$type}) {
3015 @reply = $cb->($ns, @payload);
3016 }
3017
3018 $ns->ext_reply ($reply, @reply)
3019 if $reply;
3020
3021 } else {
3022 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3023 }
3024
3025 cf::override;
3026 },
2166); 3027);
2167 3028
2168=item $client->async (\&cb) 3029=item $client->async (\&cb)
2169 3030
2170Create a new coroutine, running the specified callback. The coroutine will 3031Create a new coroutine, running the specified callback. The coroutine will
… …
2211our $safe = new Safe "safe"; 3072our $safe = new Safe "safe";
2212our $safe_hole = new Safe::Hole; 3073our $safe_hole = new Safe::Hole;
2213 3074
2214$SIG{FPE} = 'IGNORE'; 3075$SIG{FPE} = 'IGNORE';
2215 3076
2216$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3077$safe->permit_only (Opcode::opset qw(
3078 :base_core :base_mem :base_orig :base_math
3079 grepstart grepwhile mapstart mapwhile
3080 sort time
3081));
2217 3082
2218# here we export the classes and methods available to script code 3083# here we export the classes and methods available to script code
2219 3084
2220=pod 3085=pod
2221 3086
2222The following functions and methods are available within a safe environment: 3087The following functions and methods are available within a safe environment:
2223 3088
2224 cf::object contr pay_amount pay_player map 3089 cf::object
3090 contr pay_amount pay_player map x y force_find force_add destroy
3091 insert remove name archname title slaying race decrease split
3092
2225 cf::object::player player 3093 cf::object::player
2226 cf::player peaceful 3094 player
2227 cf::map trigger 3095
3096 cf::player
3097 peaceful
3098
3099 cf::map
3100 trigger
2228 3101
2229=cut 3102=cut
2230 3103
2231for ( 3104for (
2232 ["cf::object" => qw(contr pay_amount pay_player map)], 3105 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3106 insert remove inv name archname title slaying race
3107 decrease split destroy)],
2233 ["cf::object::player" => qw(player)], 3108 ["cf::object::player" => qw(player)],
2234 ["cf::player" => qw(peaceful)], 3109 ["cf::player" => qw(peaceful)],
2235 ["cf::map" => qw(trigger)], 3110 ["cf::map" => qw(trigger)],
2236) { 3111) {
2237 no strict 'refs'; 3112 no strict 'refs';
… …
2308=back 3183=back
2309 3184
2310=cut 3185=cut
2311 3186
2312############################################################################# 3187#############################################################################
2313
2314=head2 EXTENSION DATABASE SUPPORT
2315
2316Crossfire maintains a very simple database for extension use. It can
2317currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2318convert to/from binary).
2319
2320The parameter C<$family> should best start with the name of the extension
2321using it, it should be unique.
2322
2323=over 4
2324
2325=item $value = cf::db_get $family => $key
2326
2327Returns a single value from the database.
2328
2329=item cf::db_put $family => $key => $value
2330
2331Stores the given C<$value> in the family.
2332
2333=cut
2334
2335our $DB;
2336
2337sub db_init {
2338 unless ($DB) {
2339 $DB = BDB::db_create $DB_ENV;
2340
2341 cf::sync_job {
2342 eval {
2343 $DB->set_flags (BDB::CHKSUM);
2344
2345 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2346 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2347 cf::cleanup "db_open(db): $!" if $!;
2348 };
2349 cf::cleanup "db_open(db): $@" if $@;
2350 };
2351 }
2352}
2353
2354sub db_get($$) {
2355 my $key = "$_[0]/$_[1]";
2356
2357 cf::sync_job {
2358 BDB::db_get $DB, undef, $key, my $data;
2359
2360 $! ? ()
2361 : $data
2362 }
2363}
2364
2365sub db_put($$$) {
2366 BDB::dbreq_pri 4;
2367 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2368}
2369
2370=item cf::cache $id => [$paths...], $processversion => $process
2371
2372Generic caching function that returns the value of the resource $id,
2373caching and regenerating as required.
2374
2375This function can block.
2376
2377=cut
2378
2379sub cache {
2380 my ($id, $src, $processversion, $process) = @_;
2381
2382 my $meta =
2383 join "\x00",
2384 $processversion,
2385 map {
2386 aio_stat $_
2387 and Carp::croak "$_: $!";
2388
2389 ($_, (stat _)[7,9])
2390 } @$src;
2391
2392 my $dbmeta = db_get cache => "$id/meta";
2393 if ($dbmeta ne $meta) {
2394 # changed, we may need to process
2395
2396 my @data;
2397 my $md5;
2398
2399 for (0 .. $#$src) {
2400 0 <= aio_load $src->[$_], $data[$_]
2401 or Carp::croak "$src->[$_]: $!";
2402 }
2403
2404 # if processing is expensive, check
2405 # checksum first
2406 if (1) {
2407 $md5 =
2408 join "\x00",
2409 $processversion,
2410 map {
2411 Coro::cede;
2412 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2413 } 0.. $#$src;
2414
2415
2416 my $dbmd5 = db_get cache => "$id/md5";
2417 if ($dbmd5 eq $md5) {
2418 db_put cache => "$id/meta", $meta;
2419
2420 return db_get cache => "$id/data";
2421 }
2422 }
2423
2424 my $t1 = Time::HiRes::time;
2425 my $data = $process->(\@data);
2426 my $t2 = Time::HiRes::time;
2427
2428 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2429
2430 db_put cache => "$id/data", $data;
2431 db_put cache => "$id/md5" , $md5;
2432 db_put cache => "$id/meta", $meta;
2433
2434 return $data;
2435 }
2436
2437 db_get cache => "$id/data"
2438}
2439
2440=item fork_call { }, $args
2441
2442Executes the given code block with the given arguments in a seperate
2443process, returning the results. Everything must be serialisable with
2444Coro::Storable. May, of course, block. Note that the executed sub may
2445never block itself or use any form of Event handling.
2446
2447=cut
2448
2449sub fork_call(&@) {
2450 my ($cb, @args) = @_;
2451
2452# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2453# or die "socketpair: $!";
2454 pipe my $fh1, my $fh2
2455 or die "pipe: $!";
2456
2457 if (my $pid = fork) {
2458 close $fh2;
2459
2460 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2461 $res = Coro::Storable::thaw $res;
2462
2463 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2464
2465 die $$res unless "ARRAY" eq ref $res;
2466
2467 return wantarray ? @$res : $res->[-1];
2468 } else {
2469 reset_signals;
2470 local $SIG{__WARN__};
2471 local $SIG{__DIE__};
2472 eval {
2473 close $fh1;
2474
2475 my @res = eval { $cb->(@args) };
2476 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2477 };
2478
2479 warn $@ if $@;
2480 _exit 0;
2481 }
2482}
2483
2484#############################################################################
2485# the server's init and main functions 3188# the server's init and main functions
2486 3189
2487sub load_facedata($) { 3190sub load_facedata($) {
2488 my ($path) = @_; 3191 my ($path) = @_;
3192
3193 # HACK to clear player env face cache, we need some signal framework
3194 # for this (global event?)
3195 %ext::player_env::MUSIC_FACE_CACHE = ();
3196
3197 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2489 3198
2490 warn "loading facedata from $path\n"; 3199 warn "loading facedata from $path\n";
2491 3200
2492 my $facedata; 3201 my $facedata;
2493 0 < aio_load $path, $facedata 3202 0 < aio_load $path, $facedata
… …
2496 $facedata = Coro::Storable::thaw $facedata; 3205 $facedata = Coro::Storable::thaw $facedata;
2497 3206
2498 $facedata->{version} == 2 3207 $facedata->{version} == 2
2499 or cf::cleanup "$path: version mismatch, cannot proceed."; 3208 or cf::cleanup "$path: version mismatch, cannot proceed.";
2500 3209
3210 # patch in the exptable
3211 $facedata->{resource}{"res/exp_table"} = {
3212 type => FT_RSRC,
3213 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3214 };
3215 cf::cede_to_tick;
3216
2501 { 3217 {
2502 my $faces = $facedata->{faceinfo}; 3218 my $faces = $facedata->{faceinfo};
2503 3219
2504 while (my ($face, $info) = each %$faces) { 3220 while (my ($face, $info) = each %$faces) {
2505 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3221 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3222
2506 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3223 cf::face::set_visibility $idx, $info->{visibility};
3224 cf::face::set_magicmap $idx, $info->{magicmap};
2507 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3225 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2508 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3226 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2509 Coro::cede; 3227
3228 cf::cede_to_tick;
2510 } 3229 }
2511 3230
2512 while (my ($face, $info) = each %$faces) { 3231 while (my ($face, $info) = each %$faces) {
2513 next unless $info->{smooth}; 3232 next unless $info->{smooth};
3233
2514 my $idx = cf::face::find $face 3234 my $idx = cf::face::find $face
2515 or next; 3235 or next;
3236
2516 if (my $smooth = cf::face::find $info->{smooth}) { 3237 if (my $smooth = cf::face::find $info->{smooth}) {
3238 cf::face::set_smooth $idx, $smooth;
2517 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3239 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2518 } else { 3240 } else {
2519 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3241 warn "smooth face '$info->{smooth}' not found for face '$face'";
2520 } 3242 }
2521 Coro::cede; 3243
3244 cf::cede_to_tick;
2522 } 3245 }
2523 } 3246 }
2524 3247
2525 { 3248 {
2526 my $anims = $facedata->{animinfo}; 3249 my $anims = $facedata->{animinfo};
2527 3250
2528 while (my ($anim, $info) = each %$anims) { 3251 while (my ($anim, $info) = each %$anims) {
2529 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3252 cf::anim::set $anim, $info->{frames}, $info->{facings};
2530 Coro::cede; 3253 cf::cede_to_tick;
2531 } 3254 }
2532 3255
2533 cf::anim::invalidate_all; # d'oh 3256 cf::anim::invalidate_all; # d'oh
2534 } 3257 }
2535 3258
3259 {
3260 # TODO: for gcfclient pleasure, we should give resources
3261 # that gcfclient doesn't grok a >10000 face index.
3262 my $res = $facedata->{resource};
3263
3264 while (my ($name, $info) = each %$res) {
3265 if (defined $info->{type}) {
3266 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3267 my $data;
3268
3269 if ($info->{type} & 1) {
3270 # prepend meta info
3271
3272 my $meta = $enc->encode ({
3273 name => $name,
3274 %{ $info->{meta} || {} },
3275 });
3276
3277 $data = pack "(w/a*)*", $meta, $info->{data};
3278 } else {
3279 $data = $info->{data};
3280 }
3281
3282 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3283 cf::face::set_type $idx, $info->{type};
3284 } else {
3285 $RESOURCE{$name} = $info;
3286 }
3287
3288 cf::cede_to_tick;
3289 }
3290 }
3291
3292 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3293
2536 1 3294 1
2537} 3295}
2538 3296
3297cf::global->attach (on_resource_update => sub {
3298 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3299 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3300
3301 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3302 my $sound = $soundconf->{compat}[$_]
3303 or next;
3304
3305 my $face = cf::face::find "sound/$sound->[1]";
3306 cf::sound::set $sound->[0] => $face;
3307 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3308 }
3309
3310 while (my ($k, $v) = each %{$soundconf->{event}}) {
3311 my $face = cf::face::find "sound/$v";
3312 cf::sound::set $k => $face;
3313 }
3314 }
3315});
3316
3317register_exticmd fx_want => sub {
3318 my ($ns, $want) = @_;
3319
3320 while (my ($k, $v) = each %$want) {
3321 $ns->fx_want ($k, $v);
3322 }
3323};
3324
3325sub load_resource_file($) {
3326 my $guard = lock_acquire "load_resource_file";
3327
3328 my $status = load_resource_file_ $_[0];
3329 get_slot 0.1, 100;
3330 cf::arch::commit_load;
3331
3332 $status
3333}
3334
2539sub reload_regions { 3335sub reload_regions {
3336 # HACK to clear player env face cache, we need some signal framework
3337 # for this (global event?)
3338 %ext::player_env::MUSIC_FACE_CACHE = ();
3339
2540 load_resource_file "$MAPDIR/regions" 3340 load_resource_file "$MAPDIR/regions"
2541 or die "unable to load regions file\n"; 3341 or die "unable to load regions file\n";
3342
3343 for (cf::region::list) {
3344 $_->{match} = qr/$_->{match}/
3345 if exists $_->{match};
3346 }
2542} 3347}
2543 3348
2544sub reload_facedata { 3349sub reload_facedata {
2545 load_facedata "$DATADIR/facedata" 3350 load_facedata "$DATADIR/facedata"
2546 or die "unable to load facedata\n"; 3351 or die "unable to load facedata\n";
… …
2557} 3362}
2558 3363
2559sub reload_resources { 3364sub reload_resources {
2560 warn "reloading resource files...\n"; 3365 warn "reloading resource files...\n";
2561 3366
2562 reload_regions;
2563 reload_facedata; 3367 reload_facedata;
2564 reload_archetypes; 3368 reload_archetypes;
3369 reload_regions;
2565 reload_treasures; 3370 reload_treasures;
2566 3371
2567 warn "finished reloading resource files\n"; 3372 warn "finished reloading resource files\n";
2568} 3373}
2569 3374
2570sub init { 3375sub init {
3376 my $guard = freeze_mainloop;
3377
2571 reload_resources; 3378 reload_resources;
2572} 3379}
2573 3380
2574sub cfg_load { 3381sub reload_config {
2575 open my $fh, "<:utf8", "$CONFDIR/config" 3382 open my $fh, "<:utf8", "$CONFDIR/config"
2576 or return; 3383 or return;
2577 3384
2578 local $/; 3385 local $/;
2579 *CFG = YAML::Syck::Load <$fh>; 3386 *CFG = YAML::Load <$fh>;
2580 3387
2581 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3388 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2582 3389
2583 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3390 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2584 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3391 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2595sub main { 3402sub main {
2596 # we must not ever block the main coroutine 3403 # we must not ever block the main coroutine
2597 local $Coro::idle = sub { 3404 local $Coro::idle = sub {
2598 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3405 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2599 (async { 3406 (async {
2600 Event::one_event; 3407 $Coro::current->{desc} = "IDLE BUG HANDLER";
3408 EV::loop EV::LOOP_ONESHOT;
2601 })->prio (Coro::PRIO_MAX); 3409 })->prio (Coro::PRIO_MAX);
2602 }; 3410 };
2603 3411
2604 cfg_load; 3412 {
3413 my $guard = freeze_mainloop;
3414 reload_config;
2605 db_init; 3415 db_init;
2606 load_extensions; 3416 load_extensions;
2607 3417
2608 $TICK_WATCHER->start; 3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 evthread_start IO::AIO::poll_fileno;
3420 }
3421
2609 Event::loop; 3422 EV::loop;
2610} 3423}
2611 3424
2612############################################################################# 3425#############################################################################
2613# initialisation and cleanup 3426# initialisation and cleanup
2614 3427
2615# install some emergency cleanup handlers 3428# install some emergency cleanup handlers
2616BEGIN { 3429BEGIN {
3430 our %SIGWATCHER = ();
2617 for my $signal (qw(INT HUP TERM)) { 3431 for my $signal (qw(INT HUP TERM)) {
2618 Event->signal ( 3432 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2619 reentrant => 0,
2620 data => WF_AUTOCANCEL,
2621 signal => $signal,
2622 prio => 0,
2623 cb => sub {
2624 cf::cleanup "SIG$signal"; 3433 cf::cleanup "SIG$signal";
2625 },
2626 ); 3434 };
3435 }
3436}
3437
3438sub write_runtime_sync {
3439 my $runtime = "$LOCALDIR/runtime";
3440
3441 # first touch the runtime file to show we are still running:
3442 # the fsync below can take a very very long time.
3443
3444 IO::AIO::aio_utime $runtime, undef, undef;
3445
3446 my $guard = cf::lock_acquire "write_runtime";
3447
3448 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3449 or return;
3450
3451 my $value = $cf::RUNTIME + 90 + 10;
3452 # 10 is the runtime save interval, for a monotonic clock
3453 # 60 allows for the watchdog to kill the server.
3454
3455 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3456 and return;
3457
3458 # always fsync - this file is important
3459 aio_fsync $fh
3460 and return;
3461
3462 # touch it again to show we are up-to-date
3463 aio_utime $fh, undef, undef;
3464
3465 close $fh
3466 or return;
3467
3468 aio_rename "$runtime~", $runtime
3469 and return;
3470
3471 warn "runtime file written.\n";
3472
2627 } 3473 1
3474}
3475
3476our $uuid_lock;
3477our $uuid_skip;
3478
3479sub write_uuid_sync($) {
3480 $uuid_skip ||= $_[0];
3481
3482 return if $uuid_lock;
3483 local $uuid_lock = 1;
3484
3485 my $uuid = "$LOCALDIR/uuid";
3486
3487 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3488 or return;
3489
3490 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3491 $uuid_skip = 0;
3492
3493 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3494 and return;
3495
3496 # always fsync - this file is important
3497 aio_fsync $fh
3498 and return;
3499
3500 close $fh
3501 or return;
3502
3503 aio_rename "$uuid~", $uuid
3504 and return;
3505
3506 warn "uuid file written ($value).\n";
3507
3508 1
3509
3510}
3511
3512sub write_uuid($$) {
3513 my ($skip, $sync) = @_;
3514
3515 $sync ? write_uuid_sync $skip
3516 : async { write_uuid_sync $skip };
2628} 3517}
2629 3518
2630sub emergency_save() { 3519sub emergency_save() {
2631 my $freeze_guard = cf::freeze_mainloop; 3520 my $freeze_guard = cf::freeze_mainloop;
2632 3521
… …
2638 # and maps saved/destroyed asynchronously. 3527 # and maps saved/destroyed asynchronously.
2639 warn "begin emergency player save\n"; 3528 warn "begin emergency player save\n";
2640 for my $login (keys %cf::PLAYER) { 3529 for my $login (keys %cf::PLAYER) {
2641 my $pl = $cf::PLAYER{$login} or next; 3530 my $pl = $cf::PLAYER{$login} or next;
2642 $pl->valid or next; 3531 $pl->valid or next;
3532 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2643 $pl->save; 3533 $pl->save;
2644 } 3534 }
2645 warn "end emergency player save\n"; 3535 warn "end emergency player save\n";
2646 3536
2647 warn "begin emergency map save\n"; 3537 warn "begin emergency map save\n";
… …
2653 warn "end emergency map save\n"; 3543 warn "end emergency map save\n";
2654 3544
2655 warn "begin emergency database checkpoint\n"; 3545 warn "begin emergency database checkpoint\n";
2656 BDB::db_env_txn_checkpoint $DB_ENV; 3546 BDB::db_env_txn_checkpoint $DB_ENV;
2657 warn "end emergency database checkpoint\n"; 3547 warn "end emergency database checkpoint\n";
3548
3549 warn "begin write uuid\n";
3550 write_uuid_sync 1;
3551 warn "end write uuid\n";
2658 }; 3552 };
2659 3553
2660 warn "leave emergency perl save\n"; 3554 warn "leave emergency perl save\n";
2661} 3555}
2662 3556
… …
2677 warn "reloading..."; 3571 warn "reloading...";
2678 3572
2679 warn "entering sync_job"; 3573 warn "entering sync_job";
2680 3574
2681 cf::sync_job { 3575 cf::sync_job {
2682 cf::write_runtime; # external watchdog should not bark 3576 cf::write_runtime_sync; # external watchdog should not bark
2683 cf::emergency_save; 3577 cf::emergency_save;
2684 cf::write_runtime; # external watchdog should not bark 3578 cf::write_runtime_sync; # external watchdog should not bark
2685 3579
2686 warn "syncing database to disk"; 3580 warn "syncing database to disk";
2687 BDB::db_env_txn_checkpoint $DB_ENV; 3581 BDB::db_env_txn_checkpoint $DB_ENV;
2688 3582
2689 # if anything goes wrong in here, we should simply crash as we already saved 3583 # if anything goes wrong in here, we should simply crash as we already saved
2690
2691 warn "cancelling all WF_AUTOCANCEL watchers";
2692 for (Event::all_watchers) {
2693 $_->cancel if $_->data & WF_AUTOCANCEL;
2694 }
2695 3584
2696 warn "flushing outstanding aio requests"; 3585 warn "flushing outstanding aio requests";
2697 for (;;) { 3586 for (;;) {
2698 BDB::flush; 3587 BDB::flush;
2699 IO::AIO::flush; 3588 IO::AIO::flush;
2700 Coro::cede; 3589 Coro::cede_notself;
2701 last unless IO::AIO::nreqs || BDB::nreqs; 3590 last unless IO::AIO::nreqs || BDB::nreqs;
2702 warn "iterate..."; 3591 warn "iterate...";
2703 } 3592 }
2704 3593
2705 ++$RELOAD; 3594 ++$RELOAD;
… …
2709 %EXT_CORO = (); 3598 %EXT_CORO = ();
2710 3599
2711 warn "removing commands"; 3600 warn "removing commands";
2712 %COMMAND = (); 3601 %COMMAND = ();
2713 3602
2714 warn "removing ext commands"; 3603 warn "removing ext/exti commands";
2715 %EXTCMD = (); 3604 %EXTCMD = ();
3605 %EXTICMD = ();
2716 3606
2717 warn "unloading/nuking all extensions"; 3607 warn "unloading/nuking all extensions";
2718 for my $pkg (@EXTS) { 3608 for my $pkg (@EXTS) {
2719 warn "... unloading $pkg"; 3609 warn "... unloading $pkg";
2720 3610
… …
2763 warn "reloading cf.pm"; 3653 warn "reloading cf.pm";
2764 require cf; 3654 require cf;
2765 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3655 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2766 3656
2767 warn "loading config and database again"; 3657 warn "loading config and database again";
2768 cf::cfg_load; 3658 cf::reload_config;
2769 3659
2770 warn "loading extensions"; 3660 warn "loading extensions";
2771 cf::load_extensions; 3661 cf::load_extensions;
2772 3662
2773 warn "reattaching attachments to objects/players"; 3663 warn "reattaching attachments to objects/players";
… …
2780 warn "leaving sync_job"; 3670 warn "leaving sync_job";
2781 3671
2782 1 3672 1
2783 } or do { 3673 } or do {
2784 warn $@; 3674 warn $@;
2785 warn "error while reloading, exiting."; 3675 cf::cleanup "error while reloading, exiting.";
2786 exit 1;
2787 }; 3676 };
2788 3677
2789 warn "reloaded"; 3678 warn "reloaded";
2790}; 3679};
2791 3680
… …
2793 3682
2794sub reload_perl() { 3683sub reload_perl() {
2795 # doing reload synchronously and two reloads happen back-to-back, 3684 # doing reload synchronously and two reloads happen back-to-back,
2796 # coro crashes during coro_state_free->destroy here. 3685 # coro crashes during coro_state_free->destroy here.
2797 3686
2798 $RELOAD_WATCHER ||= Event->timer ( 3687 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
2799 reentrant => 0,
2800 after => 0,
2801 data => WF_AUTOCANCEL,
2802 cb => sub {
2803 do_reload_perl; 3688 do_reload_perl;
2804 undef $RELOAD_WATCHER; 3689 undef $RELOAD_WATCHER;
2805 },
2806 ); 3690 };
2807} 3691}
2808 3692
2809register_command "reload" => sub { 3693register_command "reload" => sub {
2810 my ($who, $arg) = @_; 3694 my ($who, $arg) = @_;
2811 3695
2812 if ($who->flag (FLAG_WIZ)) { 3696 if ($who->flag (FLAG_WIZ)) {
2813 $who->message ("reloading server."); 3697 $who->message ("reloading server.");
3698 async {
3699 $Coro::current->{desc} = "perl_reload";
2814 async { reload_perl }; 3700 reload_perl;
3701 };
2815 } 3702 }
2816}; 3703};
2817 3704
2818unshift @INC, $LIBDIR; 3705unshift @INC, $LIBDIR;
2819 3706
… …
2821 3708
2822our @WAIT_FOR_TICK; 3709our @WAIT_FOR_TICK;
2823our @WAIT_FOR_TICK_BEGIN; 3710our @WAIT_FOR_TICK_BEGIN;
2824 3711
2825sub wait_for_tick { 3712sub wait_for_tick {
2826 return unless $TICK_WATCHER->is_active;
2827 return if $Coro::current == $Coro::main; 3713 return if tick_inhibit || $Coro::current == $Coro::main;
2828 3714
2829 my $signal = new Coro::Signal; 3715 my $signal = new Coro::Signal;
2830 push @WAIT_FOR_TICK, $signal; 3716 push @WAIT_FOR_TICK, $signal;
2831 $signal->wait; 3717 $signal->wait;
2832} 3718}
2833 3719
2834sub wait_for_tick_begin { 3720sub wait_for_tick_begin {
2835 return unless $TICK_WATCHER->is_active;
2836 return if $Coro::current == $Coro::main; 3721 return if tick_inhibit || $Coro::current == $Coro::main;
2837 3722
2838 my $signal = new Coro::Signal; 3723 my $signal = new Coro::Signal;
2839 push @WAIT_FOR_TICK_BEGIN, $signal; 3724 push @WAIT_FOR_TICK_BEGIN, $signal;
2840 $signal->wait; 3725 $signal->wait;
2841} 3726}
2842 3727
2843 my $min = 1e6;#d# 3728sub tick {
2844 my $avg = 10;
2845$TICK_WATCHER = Event->timer (
2846 reentrant => 0,
2847 parked => 1,
2848 prio => 0,
2849 at => $NEXT_TICK || $TICK,
2850 data => WF_AUTOCANCEL,
2851 cb => sub {
2852 if ($Coro::current != $Coro::main) { 3729 if ($Coro::current != $Coro::main) {
2853 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3730 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2854 unless ++$bug_warning > 10; 3731 unless ++$bug_warning > 10;
2855 return; 3732 return;
2856 } 3733 }
2857 3734
2858 $NOW = $tick_start = Event::time;
2859
2860 cf::server_tick; # one server iteration 3735 cf::server_tick; # one server iteration
2861 3736
2862 0 && sync_job {#d# 3737 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2863 for(1..10) { 3738 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2864 my $t = Event::time; 3739 Coro::async_pool {
2865 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3740 $Coro::current->{desc} = "runtime saver";
2866 or die; 3741 write_runtime_sync
2867 3742 or warn "ERROR: unable to write runtime file: $!";
2868 $map->width (50);
2869 $map->height (50);
2870 $map->alloc;
2871 $map->_load_objects ("/tmp/x.map", 1);
2872 my $t = Event::time - $t;
2873
2874 #next unless $t < 0.0013;#d#
2875 if ($t < $min) {
2876 $min = $t;
2877 }
2878 $avg = $avg * 0.99 + $t * 0.01;
2879 }
2880 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2881 exit 0;
2882 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2883 }; 3743 };
3744 }
2884 3745
2885 $RUNTIME += $TICK;
2886 $NEXT_TICK += $TICK;
2887
2888 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2889 $NEXT_RUNTIME_WRITE = $NOW + 10;
2890 Coro::async_pool {
2891 write_runtime
2892 or warn "ERROR: unable to write runtime file: $!";
2893 };
2894 }
2895
2896# my $AFTER = Event::time;
2897# warn $AFTER - $NOW;#d#
2898
2899 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3746 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2900 $sig->send; 3747 $sig->send;
2901 } 3748 }
2902 while (my $sig = shift @WAIT_FOR_TICK) { 3749 while (my $sig = shift @WAIT_FOR_TICK) {
2903 $sig->send; 3750 $sig->send;
2904 } 3751 }
2905 3752
2906 $NOW = Event::time; 3753 $LOAD = ($NOW - $TICK_START) / $TICK;
2907
2908 # if we are delayed by four ticks or more, skip them all
2909 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2910
2911 $TICK_WATCHER->at ($NEXT_TICK);
2912 $TICK_WATCHER->start;
2913
2914 $LOAD = ($NOW - $tick_start) / $TICK;
2915 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3754 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2916 3755
2917 _post_tick; 3756 if (0) {
2918 3757 if ($NEXT_TICK) {
2919 3758 my $jitter = $TICK_START - $NEXT_TICK;
3759 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3760 warn "jitter $JITTER\n";#d#
3761 }
2920 }, 3762 }
2921); 3763}
2922 3764
2923{ 3765{
2924 BDB::max_poll_time $TICK * 0.1; 3766 # configure BDB
2925 $BDB_POLL_WATCHER = Event->io ( 3767
2926 reentrant => 0,
2927 fd => BDB::poll_fileno,
2928 poll => 'r',
2929 prio => 0,
2930 data => WF_AUTOCANCEL,
2931 cb => \&BDB::poll_cb,
2932 );
2933 BDB::min_parallel 8; 3768 BDB::min_parallel 8;
2934 3769 BDB::max_poll_reqs $TICK * 0.1;
2935 BDB::set_sync_prepare { 3770 $Coro::BDB::WATCHER->priority (1);
2936 my $status;
2937 my $current = $Coro::current;
2938 (
2939 sub {
2940 $status = $!;
2941 $current->ready; undef $current;
2942 },
2943 sub {
2944 Coro::schedule while defined $current;
2945 $! = $status;
2946 },
2947 )
2948 };
2949 3771
2950 unless ($DB_ENV) { 3772 unless ($DB_ENV) {
2951 $DB_ENV = BDB::db_env_create; 3773 $DB_ENV = BDB::db_env_create;
3774 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3775 | BDB::LOG_AUTOREMOVE, 1);
3776 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3777 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2952 3778
2953 cf::sync_job { 3779 cf::sync_job {
2954 eval { 3780 eval {
2955 BDB::db_env_open 3781 BDB::db_env_open
2956 $DB_ENV, 3782 $DB_ENV,
… …
2958 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3784 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2959 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3785 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2960 0666; 3786 0666;
2961 3787
2962 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3788 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2963
2964 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2965 $DB_ENV->set_lk_detect;
2966 }; 3789 };
2967 3790
2968 cf::cleanup "db_env_open(db): $@" if $@; 3791 cf::cleanup "db_env_open(db): $@" if $@;
2969 }; 3792 };
2970 } 3793 }
3794
3795 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3796 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3797 };
3798 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3799 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3800 };
3801 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3802 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3803 };
2971} 3804}
2972 3805
2973{ 3806{
3807 # configure IO::AIO
3808
2974 IO::AIO::min_parallel 8; 3809 IO::AIO::min_parallel 8;
2975
2976 undef $Coro::AIO::WATCHER;
2977 IO::AIO::max_poll_time $TICK * 0.1; 3810 IO::AIO::max_poll_time $TICK * 0.1;
2978 $AIO_POLL_WATCHER = Event->io ( 3811 $Coro::AIO::WATCHER->priority (1);
2979 reentrant => 0,
2980 data => WF_AUTOCANCEL,
2981 fd => IO::AIO::poll_fileno,
2982 poll => 'r',
2983 prio => 6,
2984 cb => \&IO::AIO::poll_cb,
2985 );
2986} 3812}
2987 3813
2988my $_log_backtrace; 3814my $_log_backtrace;
2989 3815
2990sub _log_backtrace { 3816sub _log_backtrace {
… …
2994 3820
2995 # limit the # of concurrent backtraces 3821 # limit the # of concurrent backtraces
2996 if ($_log_backtrace < 2) { 3822 if ($_log_backtrace < 2) {
2997 ++$_log_backtrace; 3823 ++$_log_backtrace;
2998 async { 3824 async {
3825 $Coro::current->{desc} = "abt $msg";
3826
2999 my @bt = fork_call { 3827 my @bt = fork_call {
3000 @addr = map { sprintf "%x", $_ } @addr; 3828 @addr = map { sprintf "%x", $_ } @addr;
3001 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3829 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3002 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3830 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3003 or die "addr2line: $!"; 3831 or die "addr2line: $!";

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines