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.278 by root, Mon Jun 11 21:38:14 2007 UTC vs.
Revision 1.434 by root, Thu May 29 03:27:37 2008 UTC

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

Diff Legend

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