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.284 by root, Sun Jun 24 04:15:42 2007 UTC vs.
Revision 1.551 by root, Sun May 16 13:48:07 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# 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 Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use 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 ();
35use Carp ();
14 36
37use Guard ();
15use Coro 3.61 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
51use Coro::Util ();
24 52
53use JSON::XS 2.01 ();
25use BDB (); 54use BDB ();
26use Data::Dumper; 55use Data::Dumper;
27use Digest::MD5;
28use Fcntl; 56use Fcntl;
29use YAML::Syck (); 57use YAML::XS ();
30use IO::AIO 2.32 (); 58use IO::AIO ();
31use Time::HiRes; 59use Time::HiRes;
32use Compress::LZF; 60use Compress::LZF;
61use Digest::MD5 ();
62
63AnyEvent::detect;
33 64
34# configure various modules to our taste 65# configure various modules to our taste
35# 66#
36$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39 75
40$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
41 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
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
46 78
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
48 82
49our %COMMAND = (); 83our %COMMAND = ();
50our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
51 85
52our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 87our %EXTCMD = ();
88our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
56 91
57our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
58our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
59 96
60our $CONFDIR = confdir; 97our $CONFDIR = confdir;
61our $DATADIR = datadir; 98our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
71 118
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $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 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 121our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
79 123
124our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER;
80our $BDB_POLL_WATCHER; 126our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 127our $DB_ENV;
128
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
82 130
83our %CFG; 131our %CFG;
84 132
85our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 134our $RUNTIME;
135our $NOW;
87 136
88our %PLAYER; # all users 137our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 138our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 139our $LINK_MAP; # the special {link} map, which is always available
91 140
92# used to convert map paths into valid unix filenames by replacing / by ∕ 141# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 142our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 143
95our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
146our $JITTER; # average jitter
97our $tick_start; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
98 153
99binmode STDOUT; 154binmode STDOUT;
100binmode STDERR; 155binmode STDERR;
101 156
102# read virtual server time, if available 157# read virtual server time, if available
103unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
104 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
105 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
106 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
107} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
108 165
109mkdir $_ 166mkdir $_
110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
111 168
112our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
113 170
114sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
115 187
116############################################################################# 188#############################################################################
117 189
118=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
119 191
155 227
156The raw value load value from the last tick. 228The raw value load value from the last tick.
157 229
158=item %cf::CFG 230=item %cf::CFG
159 231
160Configuration for the server, loaded from C</etc/crossfire/config>, or 232Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 233from wherever your confdir points to.
162 234
163=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
164 236
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These 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 238returns directly I<after> the tick processing (and consequently, can only wake one thread
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
246=item @cf::INVOKE_RESULTS
247
248This array contains the results of the last C<invoke ()> call. When
249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
250that call.
251
252=item %cf::REFLECT
253
254Contains, for each (C++) class name, a hash reference with information
255about object members (methods, scalars, arrays and flags) and other
256metadata, which is useful for introspection.
257
169=back 258=back
170 259
171=cut 260=cut
172 261
173BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
174 *CORE::GLOBAL::warn = sub { 263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
268$Coro::State::WARNHOOK = sub {
175 my $msg = join "", @_; 269 my $msg = join "", @_;
176 270
177 $msg .= "\n" 271 $msg .= "\n"
178 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
179 273
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 275
182 utf8::encode $msg;
183 LOG llevError, $msg; 276 LOG llevWarn, $msg;
184 }; 277};
185} 278
279$Coro::State::DIEHOOK = sub {
280 return unless $^S eq 0; # "eq", not "=="
281
282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
285 error "DIEHOOK called in main context, Coro bug?\n";#d#
286 return;#d#
287 }#d#
288
289 # kill coroutine otherwise
290 Coro::terminate
291};
186 292
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
197for my $pkg (qw( 303for my $pkg (qw(
198 cf::global cf::attachable 304 cf::global cf::attachable
199 cf::object cf::object::player 305 cf::object cf::object::player
200 cf::client cf::player 306 cf::client cf::player
201 cf::arch cf::living 307 cf::arch cf::living
308 cf::map cf::mapspace
202 cf::map cf::party cf::region 309 cf::party cf::region
203)) { 310)) {
204 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 312}
207 313
208$Event::DIED = sub { 314$EV::DIED = sub {
209 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
210}; 316};
211 317
212############################################################################# 318#############################################################################
213 319
214=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
236 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 342 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237 $d 343 $d
238 } || "[unable to dump $_[0]: '$@']"; 344 } || "[unable to dump $_[0]: '$@']";
239} 345}
240 346
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243=item $ref = cf::from_json $json 347=item $ref = cf::decode_json $json
244 348
245Converts a JSON string into the corresponding perl data structure. 349Converts a JSON string into the corresponding perl data structure.
246 350
247=item $json = cf::to_json $ref 351=item $json = cf::encode_json $ref
248 352
249Converts a perl data structure into its JSON representation. 353Converts a perl data structure into its JSON representation.
250 354
355=cut
356
357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
358
359sub encode_json($) { $json_coder->encode ($_[0]) }
360sub decode_json($) { $json_coder->decode ($_[0]) }
361
362=item $ref = cf::yaml_load $scalar
363
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365
366=cut
367
368sub fork_call(&@);
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_
372}
373
374=item cf::post_init { BLOCK }
375
376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
377but I<before> the server starts ticking again.
378
379The codeblock will have a single boolean argument to indicate whether this
380is a reload or not.
381
382=cut
383
384sub post_init(&) {
385 push @POST_INIT, shift;
386}
387
388sub _post_init {
389 trace "running post_init jobs";
390
391 # run them in parallel...
392
393 my @join;
394
395 while () {
396 push @join, map &Coro::async ($_, 0), @POST_INIT;
397 @POST_INIT = ();
398
399 @join or last;
400
401 (pop @join)->join;
402 }
403}
404
251=item cf::lock_wait $string 405=item cf::lock_wait $string
252 406
253Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
254 408
255=item my $lock = cf::lock_acquire $string 409=item my $lock = cf::lock_acquire $string
256 410
257Wait until the given lock is available and then acquires it and returns 411Wait until the given lock is available and then acquires it and returns
258a Coro::guard object. If the guard object gets destroyed (goes out of scope, 412a L<Guard> object. If the guard object gets destroyed (goes out of scope,
259for example when the coroutine gets canceled), the lock is automatically 413for example when the coroutine gets canceled), the lock is automatically
260returned. 414returned.
261 415
416Locks are *not* recursive, locking from the same coro twice results in a
417deadlocked coro.
418
262Lock names should begin with a unique identifier (for example, cf::map::find 419Lock names should begin with a unique identifier (for example, cf::map::find
263uses map_find and cf::map::load uses map_load). 420uses map_find and cf::map::load uses map_load).
264 421
265=item $locked = cf::lock_active $string 422=item $locked = cf::lock_active $string
266 423
267Return true if the lock is currently active, i.e. somebody has locked it. 424Return true if the lock is currently active, i.e. somebody has locked it.
268 425
269=cut 426=cut
270 427
271our %LOCK; 428our $LOCKS = new Coro::SemaphoreSet;
272 429
273sub lock_wait($) { 430sub lock_wait($) {
274 my ($key) = @_; 431 $LOCKS->wait ($_[0]);
275
276 # wait for lock, if any
277 while ($LOCK{$key}) {
278 push @{ $LOCK{$key} }, $Coro::current;
279 Coro::schedule;
280 }
281} 432}
282 433
283sub lock_acquire($) { 434sub lock_acquire($) {
284 my ($key) = @_; 435 $LOCKS->guard ($_[0])
285
286 # wait, to be sure we are not locked
287 lock_wait $key;
288
289 $LOCK{$key} = [];
290
291 Coro::guard {
292 # wake up all waiters, to be on the safe side
293 $_->ready for @{ delete $LOCK{$key} };
294 }
295} 436}
296 437
297sub lock_active($) { 438sub lock_active($) {
298 my ($key) = @_; 439 $LOCKS->count ($_[0]) < 1
299
300 ! ! $LOCK{$key}
301} 440}
302 441
303sub freeze_mainloop { 442sub freeze_mainloop {
304 return unless $TICK_WATCHER->is_active; 443 tick_inhibit_inc;
305 444
306 my $guard = Coro::guard { 445 &Guard::guard (\&tick_inhibit_dec);
307 $TICK_WATCHER->start; 446}
447
448=item cf::periodic $interval, $cb
449
450Like EV::periodic, but randomly selects a starting point so that the actions
451get spread over time.
452
453=cut
454
455sub periodic($$) {
456 my ($interval, $cb) = @_;
457
458 my $start = rand List::Util::min 180, $interval;
459
460 EV::periodic $start, $interval, 0, $cb
461}
462
463=item cf::get_slot $time[, $priority[, $name]]
464
465Allocate $time seconds of blocking CPU time at priority C<$priority>:
466This call blocks and returns only when you have at least C<$time> seconds
467of cpu time till the next tick. The slot is only valid till the next cede.
468
469The optional C<$name> can be used to identify the job to run. It might be
470used for statistical purposes and should identify the same time-class.
471
472Useful for short background jobs.
473
474=cut
475
476our @SLOT_QUEUE;
477our $SLOT_QUEUE;
478our $SLOT_DECAY = 0.9;
479
480$SLOT_QUEUE->cancel if $SLOT_QUEUE;
481$SLOT_QUEUE = Coro::async {
482 $Coro::current->desc ("timeslot manager");
483
484 my $signal = new Coro::Signal;
485 my $busy;
486
487 while () {
488 next_job:
489
490 my $avail = cf::till_tick;
491
492 for (0 .. $#SLOT_QUEUE) {
493 if ($SLOT_QUEUE[$_][0] <= $avail) {
494 $busy = 0;
495 my $job = splice @SLOT_QUEUE, $_, 1, ();
496 $job->[2]->send;
497 Coro::cede;
498 goto next_job;
499 } else {
500 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
501 }
502 }
503
504 if (@SLOT_QUEUE) {
505 # we do not use wait_for_tick() as it returns immediately when tick is inactive
506 push @cf::WAIT_FOR_TICK, $signal;
507 $signal->wait;
508 } else {
509 $busy = 0;
510 Coro::schedule;
511 }
308 }; 512 }
309 $TICK_WATCHER->stop; 513};
310 $guard 514
515sub get_slot($;$$) {
516 return if tick_inhibit || $Coro::current == $Coro::main;
517
518 my ($time, $pri, $name) = @_;
519
520 $time = clamp $time, 0.01, $TICK * .6;
521
522 my $sig = new Coro::Signal;
523
524 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
525 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
526 $SLOT_QUEUE->ready;
527 $sig->wait;
311} 528}
312 529
313=item cf::async { BLOCK } 530=item cf::async { BLOCK }
314 531
315Currently the same as Coro::async_pool, meaning you cannot use 532Currently the same as Coro::async_pool, meaning you cannot use
320 537
321BEGIN { *async = \&Coro::async_pool } 538BEGIN { *async = \&Coro::async_pool }
322 539
323=item cf::sync_job { BLOCK } 540=item cf::sync_job { BLOCK }
324 541
325The design of Crossfire TRT requires that the main coroutine ($Coro::main) 542The design of Deliantra requires that the main coroutine ($Coro::main)
326is always able to handle events or runnable, as Crossfire TRT is only 543is always able to handle events or runnable, as Deliantra is only
327partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 544partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
328acceptable. 545acceptable.
329 546
330If it must be done, put the blocking parts into C<sync_job>. This will run 547If it must be done, put the blocking parts into C<sync_job>. This will run
331the given BLOCK in another coroutine while waiting for the result. The 548the given BLOCK in another coroutine while waiting for the result. The
335=cut 552=cut
336 553
337sub sync_job(&) { 554sub sync_job(&) {
338 my ($job) = @_; 555 my ($job) = @_;
339 556
340 if ($Coro::current == $Coro::main) { 557 if (in_main) {
341 my $time = Event::time; 558 my $time = AE::time;
342 559
343 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
344 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
345 562
346 # TODO: use suspend/resume instead 563 #LOG llevError, Carp::longmess "sync job";#d#
347 # (but this is cancel-safe) 564
348 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
349 566
350 my $busy = 1; 567 my $busy = 1;
351 my @res; 568 my @res;
352 569
353 (async { 570 (async {
571 $Coro::current->desc ("sync job coro");
354 @res = eval { $job->() }; 572 @res = eval { $job->() };
355 warn $@ if $@; 573 error $@ if $@;
356 undef $busy; 574 undef $busy;
357 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
358 576
359 while ($busy) { 577 while ($busy) {
360 Coro::cede or Event::one_event; 578 if (Coro::nready) {
579 Coro::cede_notself;
580 } else {
581 EV::loop EV::LOOP_ONESHOT;
361 } 582 }
583 }
362 584
363 $time = Event::time - $time; 585 my $time = AE::time - $time;
364 586
365 LOG llevError | logBacktrace, Carp::longmess "long sync job"
366 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
367
368 $tick_start += $time; # do not account sync jobs to server load 587 $TICK_START += $time; # do not account sync jobs to server load
369 588
370 wantarray ? @res : $res[0] 589 wantarray ? @res : $res[0]
371 } else { 590 } else {
372 # we are in another coroutine, how wonderful, everything just works 591 # we are in another coroutine, how wonderful, everything just works
373 592
393 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
394 613
395 $coro 614 $coro
396} 615}
397 616
398=item fork_call { }, $args 617=item fork_call { }, @args
399 618
400Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
401process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
402Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
403never block itself or use any form of Event handling. 622never block itself or use any form of event handling.
404 623
405=cut 624=cut
625
626sub post_fork {
627 reset_signals;
628}
406 629
407sub fork_call(&@) { 630sub fork_call(&@) {
408 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
409 632
410# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 633 # we seemingly have to make a local copy of the whole thing,
411# or die "socketpair: $!"; 634 # otherwise perl prematurely frees the stuff :/
412 pipe my $fh1, my $fh2 635 # TODO: investigate and fix (likely this will be rather laborious)
413 or die "pipe: $!";
414 636
415 if (my $pid = fork) { 637 my @res = Coro::Util::fork_eval {
416 close $fh2; 638 cf::post_fork;
639 &$cb
640 } @args;
417 641
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 642 wantarray ? @res : $res[-1]
419 $res = Coro::Storable::thaw $res; 643}
420 644
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave 645sub objinfo {
422
423 die $$res unless "ARRAY" eq ref $res;
424
425 return wantarray ? @$res : $res->[-1];
426 } else {
427 reset_signals;
428 local $SIG{__WARN__};
429 local $SIG{__DIE__};
430 eval {
431 close $fh1;
432
433 my @res = eval { $cb->(@args) };
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
435 };
436
437 warn $@ if $@;
438 _exit 0;
439 } 646 (
647 "counter value" => cf::object::object_count,
648 "objects created" => cf::object::create_count,
649 "objects destroyed" => cf::object::destroy_count,
650 "freelist size" => cf::object::free_count,
651 "allocated objects" => cf::object::objects_size,
652 "active objects" => cf::object::actives_size,
653 )
654}
655
656=item $coin = coin_from_name $name
657
658=cut
659
660our %coin_alias = (
661 "silver" => "silvercoin",
662 "silvercoin" => "silvercoin",
663 "silvercoins" => "silvercoin",
664 "gold" => "goldcoin",
665 "goldcoin" => "goldcoin",
666 "goldcoins" => "goldcoin",
667 "platinum" => "platinacoin",
668 "platinumcoin" => "platinacoin",
669 "platinumcoins" => "platinacoin",
670 "platina" => "platinacoin",
671 "platinacoin" => "platinacoin",
672 "platinacoins" => "platinacoin",
673 "royalty" => "royalty",
674 "royalties" => "royalty",
675);
676
677sub coin_from_name($) {
678 $coin_alias{$_[0]}
679 ? cf::arch::find $coin_alias{$_[0]}
680 : undef
440} 681}
441 682
442=item $value = cf::db_get $family => $key 683=item $value = cf::db_get $family => $key
443 684
444Returns a single value from the environment database. 685Returns a single value from the environment database.
446=item cf::db_put $family => $key => $value 687=item cf::db_put $family => $key => $value
447 688
448Stores the given C<$value> in the family. It can currently store binary 689Stores the given C<$value> in the family. It can currently store binary
449data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 690data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
450 691
692=item $db = cf::db_table "name"
693
694Create and/or open a new database table. The string must not be "db" and must be unique
695within each server.
696
451=cut 697=cut
698
699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
703 my ($name) = @_;
704 my $db = BDB::db_create $DB_ENV;
705
706 eval {
707 $db->set_flags (BDB::CHKSUM);
708
709 utf8::encode $name;
710 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
711 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
712 cf::cleanup "db_open(db): $!" if $!;
713 };
714 cf::cleanup "db_open(db): $@" if $@;
715
716 $db
717}
452 718
453our $DB; 719our $DB;
454 720
455sub db_init { 721sub db_init {
456 unless ($DB) { 722 $DB ||= db_table "db";
457 $DB = BDB::db_create $DB_ENV;
458
459 cf::sync_job {
460 eval {
461 $DB->set_flags (BDB::CHKSUM);
462
463 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
464 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
465 cf::cleanup "db_open(db): $!" if $!;
466 };
467 cf::cleanup "db_open(db): $@" if $@;
468 };
469 }
470} 723}
471 724
472sub db_get($$) { 725sub db_get($$) {
473 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
474 727
475 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
476 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
477 732
478 $! ? () 733 $! ? ()
479 : $data 734 : $data
480 }
481} 735}
482 736
483sub db_put($$$) { 737sub db_put($$$) {
484 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
485 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
524 if (1) { 778 if (1) {
525 $md5 = 779 $md5 =
526 join "\x00", 780 join "\x00",
527 $processversion, 781 $processversion,
528 map { 782 map {
529 Coro::cede; 783 cf::cede_to_tick;
530 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 784 ($src->[$_], Digest::MD5::md5_hex $data[$_])
531 } 0.. $#$src; 785 } 0.. $#$src;
532 786
533 787
534 my $dbmd5 = db_get cache => "$id/md5"; 788 my $dbmd5 = db_get cache => "$id/md5";
541 795
542 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
543 my $data = $process->(\@data); 797 my $data = $process->(\@data);
544 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
545 799
546 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
547 801
548 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
549 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
550 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
551 805
561 815
562=cut 816=cut
563 817
564sub datalog($@) { 818sub datalog($@) {
565 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
566 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
567} 821}
568 822
569=back 823=back
570 824
571=cut 825=cut
572 826
573############################################################################# 827#############################################################################
574 828
575=head2 ATTACHABLE OBJECTS 829=head2 ATTACHABLE OBJECTS
576 830
577Many objects in crossfire are so-called attachable objects. That means you can 831Many objects in deliantra are so-called attachable objects. That means you can
578attach callbacks/event handlers (a collection of which is called an "attachment") 832attach callbacks/event handlers (a collection of which is called an "attachment")
579to it. All such attachable objects support the following methods. 833to it. All such attachable objects support the following methods.
580 834
581In the following description, CLASS can be any of C<global>, C<object> 835In the following description, CLASS can be any of C<global>, C<object>
582C<player>, C<client> or C<map> (i.e. the attachable objects in 836C<player>, C<client> or C<map> (i.e. the attachable objects in
583Crossfire TRT). 837Deliantra).
584 838
585=over 4 839=over 4
586 840
587=item $attachable->attach ($attachment, key => $value...) 841=item $attachable->attach ($attachment, key => $value...)
588 842
632=item cf::CLASS::attachment $name, ... 886=item cf::CLASS::attachment $name, ...
633 887
634Register an attachment by C<$name> through which attachable objects of the 888Register an attachment by C<$name> through which attachable objects of the
635given CLASS can refer to this attachment. 889given CLASS can refer to this attachment.
636 890
637Some classes such as crossfire maps and objects can specify attachments 891Some classes such as deliantra maps and objects can specify attachments
638that are attached at load/instantiate time, thus the need for a name. 892that are attached at load/instantiate time, thus the need for a name.
639 893
640These calls expect any number of the following handler/hook descriptions: 894These calls expect any number of the following handler/hook descriptions:
641 895
642=over 4 896=over 4
766 1020
767 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
768 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
769 1023
770 } elsif (ref $type) { 1024 } elsif (ref $type) {
771 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
772 1026
773 } else { 1027 } else {
774 shift @arg; 1028 shift @arg;
775 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
776 } 1030 }
777 } 1031 }
778} 1032}
779 1033
780sub _object_attach { 1034sub _object_attach {
790 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
791 } 1045 }
792 1046
793 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
794 } else { 1048 } else {
795 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
796 } 1050 }
797 1051
798 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
799} 1053}
800 1054
840 "; 1094 ";
841 die if $@; 1095 die if $@;
842} 1096}
843 1097
844our $override; 1098our $override;
845our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1099our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846 1100
847sub override { 1101sub override {
848 $override = 1; 1102 $override = 1;
849 @invoke_results = (); 1103 @INVOKE_RESULTS = (@_);
850} 1104}
851 1105
852sub do_invoke { 1106sub do_invoke {
853 my $event = shift; 1107 my $event = shift;
854 my $callbacks = shift; 1108 my $callbacks = shift;
855 1109
856 @invoke_results = (); 1110 @INVOKE_RESULTS = ();
857 1111
858 local $override; 1112 local $override;
859 1113
860 for (@$callbacks) { 1114 for (@$callbacks) {
861 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
862 1116
863 if ($@) { 1117 if ($@) {
864 warn "$@";
865 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
866 override; 1119 override;
867 } 1120 }
868 1121
869 return 1 if $override; 1122 return 1 if $override;
870 } 1123 }
871 1124
872 0 1125 0
873} 1126}
874 1127
875=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1128=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
876 1129
877=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1130=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
878 1131
879Generate an object-specific event with the given arguments. 1132Generate an object-specific event with the given arguments.
880 1133
881This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1134This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
882removed in future versions), and there is no public API to access override 1135removed in future versions), and there is no public API to access override
883results (if you must, access C<@cf::invoke_results> directly). 1136results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884 1137
885=back 1138=back
886 1139
887=cut 1140=cut
888 1141
889############################################################################# 1142#############################################################################
890# object support 1143# object support
1144
1145sub _object_equal($$);
1146sub _object_equal($$) {
1147 my ($a, $b) = @_;
1148
1149 return 0 unless (ref $a) eq (ref $b);
1150
1151 if ("HASH" eq ref $a) {
1152 my @ka = keys %$a;
1153 my @kb = keys %$b;
1154
1155 return 0 if @ka != @kb;
1156
1157 for (0 .. $#ka) {
1158 return 0 unless $ka[$_] eq $kb[$_];
1159 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1160 }
1161
1162 } elsif ("ARRAY" eq ref $a) {
1163
1164 return 0 if @$a != @$b;
1165
1166 for (0 .. $#$a) {
1167 return 0 unless _object_equal $a->[$_], $b->[$_];
1168 }
1169
1170 } elsif ($a ne $b) {
1171 return 0;
1172 }
1173
1174 1
1175}
1176
1177our $SLOW_MERGES;#d#
1178sub _can_merge {
1179 my ($ob1, $ob2) = @_;
1180
1181 ++$SLOW_MERGES;#d#
1182
1183 # we do the slow way here
1184 return _object_equal $ob1, $ob2
1185}
891 1186
892sub reattach { 1187sub reattach {
893 # basically do the same as instantiate, without calling instantiate 1188 # basically do the same as instantiate, without calling instantiate
894 my ($obj) = @_; 1189 my ($obj) = @_;
895 1190
1191 # no longer needed after getting rid of delete_package?
896 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1192 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
897 1193
898 my $registry = $obj->registry; 1194 my $registry = $obj->registry;
899 1195
900 @$registry = (); 1196 @$registry = ();
901 1197
906 for (@$attach) { 1202 for (@$attach) {
907 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
908 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
909 } 1205 }
910 } else { 1206 } else {
911 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
912 } 1208 }
913 } 1209 }
914} 1210}
915 1211
916cf::attachable->attach ( 1212cf::attachable->attach (
917 prio => -1000000, 1213 prio => -1000000,
918 on_instantiate => sub { 1214 on_instantiate => sub {
919 my ($obj, $data) = @_; 1215 my ($obj, $data) = @_;
920 1216
921 $data = from_json $data; 1217 $data = decode_json $data;
922 1218
923 for (@$data) { 1219 for (@$data) {
924 my ($name, $args) = @$_; 1220 my ($name, $args) = @$_;
925 1221
926 $obj->attach ($name, %{$args || {} }); 1222 $obj->attach ($name, %{$args || {} });
942sub object_freezer_save { 1238sub object_freezer_save {
943 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
944 1240
945 sync_job { 1241 sync_job {
946 if (length $$rdata) { 1242 if (length $$rdata) {
1243 utf8::decode (my $decname = $filename);
947 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
948 $filename, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
949 1247
950 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951 chmod SAVE_MODE, $fh; 1249 aio_chmod $fh, SAVE_MODE;
952 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953 aio_fsync $fh if $cf::USE_FSYNC; 1251 if ($cf::USE_FSYNC) {
1252 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1253 aio_fsync $fh;
1254 }
954 close $fh; 1255 aio_close $fh;
955 1256
956 if (@$objs) { 1257 if (@$objs) {
957 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1258 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1259 aio_chmod $fh, SAVE_MODE;
959 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1260 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
960 aio_write $fh, 0, (length $data), $data, 0; 1261 aio_write $fh, 0, (length $data), $data, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1262 if ($cf::USE_FSYNC) {
1263 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1264 aio_fsync $fh;
1265 }
962 close $fh; 1266 aio_close $fh;
963 aio_rename "$filename.pst~", "$filename.pst"; 1267 aio_rename "$filename.pst~", "$filename.pst";
964 } 1268 }
965 } else { 1269 } else {
966 aio_unlink "$filename.pst"; 1270 aio_unlink "$filename.pst";
967 } 1271 }
968 1272
969 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1274
1275 $filename =~ s%/[^/]+$%%;
1276 aio_pathsync $filename if $cf::USE_FSYNC;
970 } else { 1277 } else {
971 warn "FATAL: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
972 } 1279 }
973 } else { 1280 } else {
974 aio_unlink $filename; 1281 aio_unlink $filename;
975 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
976 } 1283 }
977 } 1284 };
978} 1285}
979 1286
980sub object_freezer_as_string { 1287sub object_freezer_as_string {
981 my ($rdata, $objs) = @_; 1288 my ($rdata, $objs) = @_;
982 1289
994 or return; 1301 or return;
995 1302
996 unless (aio_stat "$filename.pst") { 1303 unless (aio_stat "$filename.pst") {
997 (aio_load "$filename.pst", $av) >= 0 1304 (aio_load "$filename.pst", $av) >= 0
998 or return; 1305 or return;
1306
999 $av = eval { (Storable::thaw $av)->{objs} }; 1307 my $st = eval { Coro::Storable::thaw $av };
1308 $av = $st->{objs};
1000 } 1309 }
1001 1310
1311 utf8::decode (my $decname = $filename);
1002 warn sprintf "loading %s (%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1003 $filename, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1315
1004 return ($data, $av); 1316 ($data, $av)
1005} 1317}
1006 1318
1007=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
1008 1320
1009=over 4 1321=over 4
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1341 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1342}
1031 1343
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1344=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1345
1034Register a callback fro execution when the client sends an extcmd packet. 1346Register a callback for execution when the client sends an (synchronous)
1347extcmd packet. Ext commands will be processed in the order they are
1348received by the server, like other user commands. The first argument is
1349the logged-in player. Ext commands can only be processed after a player
1350has logged in successfully.
1035 1351
1036If the callback returns something, it is sent back as if reply was being 1352If the callback returns something, it is sent back as if reply was being
1037called. 1353called.
1038 1354
1355=item cf::register_exticmd $name => \&callback($ns,$packet);
1356
1357Register a callback for execution when the client sends an (asynchronous)
1358exticmd packet. Exti commands are processed by the server as soon as they
1359are received, i.e. out of order w.r.t. other commands. The first argument
1360is a client socket. Exti commands can be received anytime, even before
1361log-in.
1362
1363If the callback returns something, it is sent back as if reply was being
1364called.
1365
1039=cut 1366=cut
1040 1367
1041sub register_extcmd { 1368sub register_extcmd {
1042 my ($name, $cb) = @_; 1369 my ($name, $cb) = @_;
1043 1370
1044 $EXTCMD{$name} = $cb; 1371 $EXTCMD{$name} = $cb;
1045} 1372}
1046 1373
1374sub register_exticmd {
1375 my ($name, $cb) = @_;
1376
1377 $EXTICMD{$name} = $cb;
1378}
1379
1380use File::Glob ();
1381
1047cf::player->attach ( 1382cf::player->attach (
1048 on_command => sub { 1383 on_unknown_command => sub {
1049 my ($pl, $name, $params) = @_; 1384 my ($pl, $name, $params) = @_;
1050 1385
1051 my $cb = $COMMAND{$name} 1386 my $cb = $COMMAND{$name}
1052 or return; 1387 or return;
1053 1388
1058 cf::override; 1393 cf::override;
1059 }, 1394 },
1060 on_extcmd => sub { 1395 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1396 my ($pl, $buf) = @_;
1062 1397
1063 my $msg = eval { from_json $buf }; 1398 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1399
1065 if (ref $msg) { 1400 if (ref $msg) {
1401 my ($type, $reply, @payload) =
1402 "ARRAY" eq ref $msg
1403 ? @$msg
1404 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1405
1406 my @reply;
1407
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1408 if (my $cb = $EXTCMD{$type}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1409 @reply = $cb->($pl, @payload);
1068 $pl->ext_reply ($msg->{msgid}, %reply);
1069 }
1070 } 1410 }
1411
1412 $pl->ext_reply ($reply, @reply)
1413 if $reply;
1414
1071 } else { 1415 } else {
1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073 } 1417 }
1074 1418
1075 cf::override; 1419 cf::override;
1076 }, 1420 },
1077); 1421);
1078 1422
1423# "readahead" all extensions
1424sub cache_extensions {
1425 my $grp = IO::AIO::aio_group;
1426
1427 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1428 for (grep /\.ext$/, @{$_[0]}) {
1429 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1430 }
1431 };
1432
1433 $grp
1434}
1435
1079sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1080 cf::sync_job { 1439 cf::sync_job {
1081 my %todo; 1440 my %todo;
1082 1441
1083 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1084 next unless -r $path; 1443 next unless -r $path;
1102 1461
1103 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1104 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1105 1464
1106 $ext{source} = 1465 $ext{source} =
1107 "package $pkg; use strict; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1108 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1109 . $source 1468 . $source
1110 . "\n};\n1"; 1469 . "\n};\n1";
1111 1470
1112 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
1113 } 1472 }
1114 1473
1474 my $pass = 0;
1115 my %done; 1475 my %done;
1116 while (%todo) { 1476 while (%todo) {
1117 my $progress; 1477 my $progress;
1118 1478
1479 ++$pass;
1480
1481 ext:
1119 while (my ($k, $v) = each %todo) { 1482 while (my ($k, $v) = each %todo) {
1120 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1121 goto skip 1484 next ext
1122 unless exists $done{$_}; 1485 unless exists $done{$_};
1123 } 1486 }
1124 1487
1125 warn "... loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1126 1489
1127 unless (eval $v->{source}) { 1490 my $active = eval $v->{source};
1491
1492 if (length $@) {
1128 my $msg = $@ ? "$v->{path}: $@\n" 1493 error "$v->{path}: $@\n";
1129 : "$v->{base}: extension inactive.\n";
1130 1494
1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1131 if (exists $v->{meta}{mandatory}) { 1496 if exists $v->{meta}{mandatory};
1132 warn $msg; 1497
1133 warn "mandatory extension failed to load, exiting.\n"; 1498 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1134 exit 1; 1499 delete $todo{$k};
1135 } 1500 } else {
1136 1501 $done{$k} = delete $todo{$k};
1137 warn $msg; 1502 push @EXTS, $v->{pkg};
1503 $progress = 1;
1504
1505 info "$v->{base}: extension inactive.\n"
1506 unless $active;
1138 } 1507 }
1139
1140 $done{$k} = delete $todo{$k};
1141 push @EXTS, $v->{pkg};
1142 $progress = 1;
1143 } 1508 }
1144 1509
1145 skip: 1510 unless ($progress) {
1146 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1511 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1147 unless $progress; 1512
1513 while (my ($k, $v) = each %todo) {
1514 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1515 if exists $v->{meta}{mandatory};
1516 }
1517 }
1148 } 1518 }
1149 }; 1519 };
1150} 1520}
1151 1521
1152############################################################################# 1522#############################################################################
1153 1523
1154=back 1524=back
1155 1525
1156=head2 CORE EXTENSIONS 1526=head2 CORE EXTENSIONS
1157 1527
1158Functions and methods that extend core crossfire objects. 1528Functions and methods that extend core deliantra objects.
1159 1529
1160=cut 1530=cut
1161 1531
1162package cf::player; 1532package cf::player;
1163 1533
1164use Coro::AIO; 1534use Coro::AIO;
1165 1535
1166=head3 cf::player 1536=head3 cf::player
1167 1537
1168=over 4 1538=over 4
1539
1540=item cf::player::num_playing
1541
1542Returns the official number of playing players, as per the Crossfire metaserver rules.
1543
1544=cut
1545
1546sub num_playing {
1547 scalar grep
1548 $_->ob->map
1549 && !$_->hidden
1550 && !$_->ob->flag (cf::FLAG_WIZ),
1551 cf::player::list
1552}
1169 1553
1170=item cf::player::find $login 1554=item cf::player::find $login
1171 1555
1172Returns the given player object, loading it if necessary (might block). 1556Returns the given player object, loading it if necessary (might block).
1173 1557
1192 1576
1193sub exists($) { 1577sub exists($) {
1194 my ($login) = @_; 1578 my ($login) = @_;
1195 1579
1196 $cf::PLAYER{$login} 1580 $cf::PLAYER{$login}
1197 or cf::sync_job { !aio_stat path $login } 1581 or !aio_stat path $login
1198} 1582}
1199 1583
1200sub find($) { 1584sub find($) {
1201 return $cf::PLAYER{$_[0]} || do { 1585 return $cf::PLAYER{$_[0]} || do {
1202 my $login = $_[0]; 1586 my $login = $_[0];
1209 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1593 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1594 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1595 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212 aio_unlink +(playerdir $login) . "/$login.pl"; 1596 aio_unlink +(playerdir $login) . "/$login.pl";
1213 1597
1214 my $pl = load_pl path $login 1598 my $f = new_from_file cf::object::thawer path $login
1215 or return; 1599 or return;
1600
1601 my $pl = cf::player::load_pl $f
1602 or return;
1603
1604 local $cf::PLAYER_LOADING{$login} = $pl;
1605 $f->resolve_delayed_derefs;
1216 $cf::PLAYER{$login} = $pl 1606 $cf::PLAYER{$login} = $pl
1217 } 1607 }
1218 } 1608 }
1219} 1609}
1610
1611cf::player->attach (
1612 on_load => sub {
1613 my ($pl, $path) = @_;
1614
1615 # restore slots saved in save, below
1616 my $slots = delete $pl->{_slots};
1617
1618 $pl->ob->current_weapon ($slots->[0]);
1619 $pl->combat_ob ($slots->[1]);
1620 $pl->ranged_ob ($slots->[2]);
1621 },
1622);
1220 1623
1221sub save($) { 1624sub save($) {
1222 my ($pl) = @_; 1625 my ($pl) = @_;
1223 1626
1224 return if $pl->{deny_save}; 1627 return if $pl->{deny_save};
1229 return if $pl->{deny_save}; 1632 return if $pl->{deny_save};
1230 1633
1231 aio_mkdir playerdir $pl, 0770; 1634 aio_mkdir playerdir $pl, 0770;
1232 $pl->{last_save} = $cf::RUNTIME; 1635 $pl->{last_save} = $cf::RUNTIME;
1233 1636
1637 cf::get_slot 0.01;
1638
1639 # save slots, to be restored later
1640 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1641
1234 $pl->save_pl ($path); 1642 $pl->save_pl ($path);
1235 Coro::cede; 1643 cf::cede_to_tick;
1236} 1644}
1237 1645
1238sub new($) { 1646sub new($) {
1239 my ($login) = @_; 1647 my ($login) = @_;
1240 1648
1246 $cf::PLAYER{$login} = $self; 1654 $cf::PLAYER{$login} = $self;
1247 1655
1248 $self 1656 $self
1249} 1657}
1250 1658
1659=item $player->send_msg ($channel, $msg, $color, [extra...])
1660
1661=cut
1662
1663sub send_msg {
1664 my $ns = shift->ns
1665 or return;
1666 $ns->send_msg (@_);
1667}
1668
1251=item $pl->quit_character 1669=item $pl->quit_character
1252 1670
1253Nukes the player without looking back. If logged in, the connection will 1671Nukes the player without looking back. If logged in, the connection will
1254be destroyed. May block for a long time. 1672be destroyed. May block for a long time.
1255 1673
1259 my ($pl) = @_; 1677 my ($pl) = @_;
1260 1678
1261 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1262 1680
1263 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1264 $pl->password ("*"); # this should lock out the player until we nuked the dir 1682 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1265 1683
1266 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1267 $pl->deactivate; 1685 $pl->deactivate;
1686
1687 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1268 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1269 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1270 1692
1271 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1272 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1273 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
1308 or return []; 1730 or return [];
1309 1731
1310 my @logins; 1732 my @logins;
1311 1733
1312 for my $login (@$dirs) { 1734 for my $login (@$dirs) {
1735 my $path = path $login;
1736
1737 # a .pst is a dead give-away for a valid player
1738 # if no pst file found, open and chekc for blocked users
1739 if (aio_stat "$path.pst") {
1313 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1740 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314 aio_read $fh, 0, 512, my $buf, 0 or next; 1741 aio_read $fh, 0, 512, my $buf, 0 or next;
1315 $buf !~ /^password -------------$/m or next; # official not-valid tag 1742 $buf !~ /^password -------------$/m or next; # official not-valid tag
1743 }
1316 1744
1317 utf8::decode $login; 1745 utf8::decode $login;
1318 push @logins, $login; 1746 push @logins, $login;
1319 } 1747 }
1320 1748
1321 \@logins 1749 \@logins
1322} 1750}
1323 1751
1324=item $player->maps 1752=item $player->maps
1753
1754=item cf::player::maps $login
1325 1755
1326Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1327player. May block. 1757player. May block.
1328 1758
1329=cut 1759=cut
1347 } 1777 }
1348 1778
1349 \@paths 1779 \@paths
1350} 1780}
1351 1781
1352=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1782=item $protocol_xml = $player->expand_cfpod ($cfpod)
1353 1783
1354Expand crossfire pod fragments into protocol xml. 1784Expand deliantra pod fragments into protocol xml.
1355 1785
1356=cut
1357
1358sub expand_cfpod {
1359 ((my $self), (local $_)) = @_;
1360
1361 # escape & and <
1362 s/&/&amp;/g;
1363 s/(?<![BIUGH])</&lt;/g;
1364
1365 # this is buggy, it needs to properly take care of nested <'s
1366
1367 1 while
1368 # replace B<>, I<>, U<> etc.
1369 s/B<([^\>]*)>/<b>$1<\/b>/
1370 || s/I<([^\>]*)>/<i>$1<\/i>/
1371 || s/U<([^\>]*)>/<u>$1<\/u>/
1372 # replace G<male|female> tags
1373 || s{G<([^>|]*)\|([^>]*)>}{
1374 $self->gender ? $2 : $1
1375 }ge
1376 # replace H<hint text>
1377 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1378
1379 # create single paragraphs (very hackish)
1380 s/(?<=\S)\n(?=\w)/ /g;
1381
1382 $_
1383}
1384
1385=item $player->ext_reply ($msgid, %msg) 1786=item $player->ext_reply ($msgid, @msg)
1386 1787
1387Sends an ext reply to the player. 1788Sends an ext reply to the player.
1388 1789
1389=cut 1790=cut
1390 1791
1391sub ext_reply($$%) { 1792sub ext_reply($$@) {
1392 my ($self, $id, %msg) = @_; 1793 my ($self, $id, @msg) = @_;
1393 1794
1394 $msg{msgid} = $id; 1795 $self->ns->ext_reply ($id, @msg)
1395
1396 $self->send ("ext " . cf::to_json \%msg);
1397} 1796}
1398 1797
1399=item $player->ext_event ($type, %msg) 1798=item $player->ext_msg ($type, @msg)
1400 1799
1401Sends an ext event to the client. 1800Sends an ext event to the client.
1402 1801
1403=cut 1802=cut
1404 1803
1405sub ext_event($$%) { 1804sub ext_msg($$@) {
1406 my ($self, $type, %msg) = @_; 1805 my ($self, $type, @msg) = @_;
1407 1806
1408 $self->ns->ext_event ($type, %msg); 1807 $self->ns->ext_msg ($type, @msg);
1409} 1808}
1410 1809
1411=head3 cf::region 1810=head3 cf::region
1412 1811
1413=over 4 1812=over 4
1423=cut 1822=cut
1424 1823
1425sub find_by_path($) { 1824sub find_by_path($) {
1426 my ($path) = @_; 1825 my ($path) = @_;
1427 1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1828
1428 my ($match, $specificity); 1829 my ($match, $specificity);
1429 1830
1430 for my $region (list) { 1831 for my $region (list) {
1431 if ($region->match && $path =~ $region->match) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1432 ($match, $specificity) = ($region, $region->specificity) 1833 ($match, $specificity) = ($region, $region->specificity)
1433 if $region->specificity > $specificity; 1834 if $region->specificity > $specificity;
1434 } 1835 }
1435 } 1836 }
1436 1837
1457our $MAX_RESET = 3600; 1858our $MAX_RESET = 3600;
1458our $DEFAULT_RESET = 3000; 1859our $DEFAULT_RESET = 3000;
1459 1860
1460sub generate_random_map { 1861sub generate_random_map {
1461 my ($self, $rmp) = @_; 1862 my ($self, $rmp) = @_;
1863
1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1865
1462 # mit "rum" bekleckern, nicht 1866 # mit "rum" bekleckern, nicht
1463 $self->_create_random_map ( 1867 $self->_create_random_map (
1464 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1868 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1465 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1869 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1466 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1870 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1467 $rmp->{exit_on_final_map}, 1871 $rmp->{exit_on_final_map},
1468 $rmp->{xsize}, $rmp->{ysize}, 1872 $rmp->{xsize}, $rmp->{ysize},
1469 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1873 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1470 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1874 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1485 1889
1486sub register { 1890sub register {
1487 my (undef, $regex, $prio) = @_; 1891 my (undef, $regex, $prio) = @_;
1488 my $pkg = caller; 1892 my $pkg = caller;
1489 1893
1490 no strict;
1491 push @{"$pkg\::ISA"}, __PACKAGE__; 1894 push @{"$pkg\::ISA"}, __PACKAGE__;
1492 1895
1493 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1896 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1494} 1897}
1495 1898
1496# also paths starting with '/' 1899# also paths starting with '/'
1497$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1900$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1498 1901
1499sub thawer_merge { 1902sub thawer_merge {
1500 my ($self, $merge) = @_; 1903 my ($self, $merge) = @_;
1501 1904
1502 # we have to keep some variables in memory intact 1905 # we have to keep some variables in memory intact
1507} 1910}
1508 1911
1509sub normalise { 1912sub normalise {
1510 my ($path, $base) = @_; 1913 my ($path, $base) = @_;
1511 1914
1512 $path = "$path"; # make sure its a string 1915 $path = "$path"; # make sure it's a string
1513 1916
1514 $path =~ s/\.map$//; 1917 $path =~ s/\.map$//;
1515 1918
1516 # map plan: 1919 # map plan:
1517 # 1920 #
1532 $base =~ s{[^/]+/?$}{}; 1935 $base =~ s{[^/]+/?$}{};
1533 $path = "$base/$path"; 1936 $path = "$base/$path";
1534 } 1937 }
1535 1938
1536 for ($path) { 1939 for ($path) {
1537 redo if s{//}{/};
1538 redo if s{/\.?/}{/}; 1940 redo if s{/\.?/}{/};
1539 redo if s{/[^/]+/\.\./}{/}; 1941 redo if s{/[^/]+/\.\./}{/};
1540 } 1942 }
1541 1943
1542 $path 1944 $path
1556 $self->init; # pass $1 etc. 1958 $self->init; # pass $1 etc.
1557 return $self; 1959 return $self;
1558 } 1960 }
1559 } 1961 }
1560 1962
1561 Carp::carp "unable to resolve path '$path' (base '$base')."; 1963 Carp::cluck "unable to resolve path '$path' (base '$base')";
1562 () 1964 ()
1563} 1965}
1564 1966
1565sub init { 1967sub init {
1566 my ($self) = @_; 1968 my ($self) = @_;
1588 1990
1589# the temporary/swap location 1991# the temporary/swap location
1590sub save_path { 1992sub save_path {
1591 my ($self) = @_; 1993 my ($self) = @_;
1592 1994
1593 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1995 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1594 "$TMPDIR/$path.map" 1996 "$TMPDIR/$path.map"
1595} 1997}
1596 1998
1597# the unique path, undef == no special unique path 1999# the unique path, undef == no special unique path
1598sub uniq_path { 2000sub uniq_path {
1599 my ($self) = @_; 2001 my ($self) = @_;
1600 2002
1601 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2003 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1602 "$UNIQUEDIR/$path" 2004 "$UNIQUEDIR/$path"
1603}
1604
1605# and all this just because we cannot iterate over
1606# all maps in C++...
1607sub change_all_map_light {
1608 my ($change) = @_;
1609
1610 $_->change_map_light ($change)
1611 for grep $_->outdoor, values %cf::MAP;
1612} 2005}
1613 2006
1614sub decay_objects { 2007sub decay_objects {
1615 my ($self) = @_; 2008 my ($self) = @_;
1616 2009
1629 2022
1630sub load_header_from($) { 2023sub load_header_from($) {
1631 my ($self, $path) = @_; 2024 my ($self, $path) = @_;
1632 2025
1633 utf8::encode $path; 2026 utf8::encode $path;
1634 #aio_open $path, O_RDONLY, 0 2027 my $f = new_from_file cf::object::thawer $path
1635 # or return;
1636
1637 $self->_load_header ($path)
1638 or return; 2028 or return;
2029
2030 $self->_load_header ($f)
2031 or return;
2032
2033 local $MAP_LOADING{$self->{path}} = $self;
2034 $f->resolve_delayed_derefs;
1639 2035
1640 $self->{load_path} = $path; 2036 $self->{load_path} = $path;
1641 2037
1642 1 2038 1
1643} 2039}
1695 2091
1696sub find; 2092sub find;
1697sub find { 2093sub find {
1698 my ($path, $origin) = @_; 2094 my ($path, $origin) = @_;
1699 2095
2096 cf::cede_to_tick;
2097
1700 $path = normalise $path, $origin && $origin->path; 2098 $path = normalise $path, $origin && $origin->path;
1701 2099
2100 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1702 cf::lock_wait "map_find:$path"; 2101 my $guard2 = cf::lock_acquire "map_find:$path";
1703 2102
1704 $cf::MAP{$path} || do { 2103 $cf::MAP{$path} || do {
1705 my $guard = cf::lock_acquire "map_find:$path";
1706 my $map = new_from_path cf::map $path 2104 my $map = new_from_path cf::map $path
1707 or return; 2105 or return;
1708 2106
1709 $map->{last_save} = $cf::RUNTIME; 2107 $map->{last_save} = $cf::RUNTIME;
1710 2108
1712 or return; 2110 or return;
1713 2111
1714 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2112 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1715 # doing this can freeze the server in a sync job, obviously 2113 # doing this can freeze the server in a sync job, obviously
1716 #$cf::WAIT_FOR_TICK->wait; 2114 #$cf::WAIT_FOR_TICK->wait;
2115 undef $guard2;
2116 undef $guard1;
1717 $map->reset; 2117 $map->reset;
1718 undef $guard;
1719 return find $path; 2118 return find $path;
1720 } 2119 }
1721 2120
1722 $cf::MAP{$path} = $map 2121 $cf::MAP{$path} = $map
1723 } 2122 }
1724} 2123}
1725 2124
1726sub pre_load { } 2125sub pre_load { }
1727sub post_load { } 2126#sub post_load { } # XS
1728 2127
1729sub load { 2128sub load {
1730 my ($self) = @_; 2129 my ($self) = @_;
1731 2130
1732 local $self->{deny_reset} = 1; # loading can take a long time 2131 local $self->{deny_reset} = 1; # loading can take a long time
1733 2132
1734 my $path = $self->{path}; 2133 my $path = $self->{path};
1735 2134
1736 { 2135 {
1737 my $guard = cf::lock_acquire "map_load:$path"; 2136 my $guard = cf::lock_acquire "map_data:$path";
1738 2137
2138 return unless $self->valid;
1739 return if $self->in_memory != cf::MAP_SWAPPED; 2139 return unless $self->in_memory == cf::MAP_SWAPPED;
1740 2140
1741 $self->in_memory (cf::MAP_LOADING); 2141 $self->in_memory (cf::MAP_LOADING);
1742 2142
1743 $self->alloc; 2143 $self->alloc;
1744 2144
1745 $self->pre_load; 2145 $self->pre_load;
1746 Coro::cede; 2146 cf::cede_to_tick;
1747 2147
2148 my $f = new_from_file cf::object::thawer $self->{load_path};
2149 $f->skip_block;
1748 $self->_load_objects ($self->{load_path}, 1) 2150 $self->_load_objects ($f)
1749 or return; 2151 or return;
1750 2152
1751 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2153 $self->post_load_original
1752 if delete $self->{load_original}; 2154 if delete $self->{load_original};
1753 2155
1754 if (my $uniq = $self->uniq_path) { 2156 if (my $uniq = $self->uniq_path) {
1755 utf8::encode $uniq; 2157 utf8::encode $uniq;
1756 if (aio_open $uniq, O_RDONLY, 0) { 2158 unless (aio_stat $uniq) {
2159 if (my $f = new_from_file cf::object::thawer $uniq) {
1757 $self->clear_unique_items; 2160 $self->clear_unique_items;
1758 $self->_load_objects ($uniq, 0); 2161 $self->_load_objects ($f);
2162 $f->resolve_delayed_derefs;
2163 }
1759 } 2164 }
1760 } 2165 }
1761 2166
1762 Coro::cede; 2167 $f->resolve_delayed_derefs;
2168
2169 cf::cede_to_tick;
1763 # now do the right thing for maps 2170 # now do the right thing for maps
1764 $self->link_multipart_objects; 2171 $self->link_multipart_objects;
1765 $self->difficulty ($self->estimate_difficulty) 2172 $self->difficulty ($self->estimate_difficulty)
1766 unless $self->difficulty; 2173 unless $self->difficulty;
1767 Coro::cede; 2174 cf::cede_to_tick;
1768 2175
1769 unless ($self->{deny_activate}) { 2176 unless ($self->{deny_activate}) {
1770 $self->decay_objects; 2177 $self->decay_objects;
1771 $self->fix_auto_apply; 2178 $self->fix_auto_apply;
1772 $self->update_buttons; 2179 $self->update_buttons;
1773 Coro::cede; 2180 cf::cede_to_tick;
1774 $self->set_darkness_map;
1775 Coro::cede;
1776 $self->activate; 2181 $self->activate;
1777 } 2182 }
1778 2183
2184 $self->{last_save} = $cf::RUNTIME;
2185 $self->last_access ($cf::RUNTIME);
2186
1779 $self->in_memory (cf::MAP_IN_MEMORY); 2187 $self->in_memory (cf::MAP_ACTIVE);
1780 } 2188 }
1781 2189
1782 $self->post_load; 2190 $self->post_load;
1783} 2191}
1784 2192
2193# customize the map for a given player, i.e.
2194# return the _real_ map. used by e.g. per-player
2195# maps to change the path to ~playername/mappath
1785sub customise_for { 2196sub customise_for {
1786 my ($self, $ob) = @_; 2197 my ($self, $ob) = @_;
1787 2198
1788 return find "~" . $ob->name . "/" . $self->{path} 2199 return find "~" . $ob->name . "/" . $self->{path}
1789 if $self->per_player; 2200 if $self->per_player;
1793 2204
1794 $self 2205 $self
1795} 2206}
1796 2207
1797# find and load all maps in the 3x3 area around a map 2208# find and load all maps in the 3x3 area around a map
1798sub load_diag { 2209sub load_neighbours {
1799 my ($map) = @_; 2210 my ($map) = @_;
1800 2211
1801 my @diag; # diagonal neighbours 2212 my @neigh; # diagonal neighbours
1802 2213
1803 for (0 .. 3) { 2214 for (0 .. 3) {
1804 my $neigh = $map->tile_path ($_) 2215 my $neigh = $map->tile_path ($_)
1805 or next; 2216 or next;
1806 $neigh = find $neigh, $map 2217 $neigh = find $neigh, $map
1807 or next; 2218 or next;
1808 $neigh->load; 2219 $neigh->load;
1809 2220
2221 # now find the diagonal neighbours
2222 push @neigh,
1810 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2223 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1811 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2224 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1812 } 2225 }
1813 2226
1814 for (@diag) { 2227 for (grep defined $_->[0], @neigh) {
2228 my ($path, $origin) = @$_;
1815 my $neigh = find @$_ 2229 my $neigh = find $path, $origin
1816 or next; 2230 or next;
1817 $neigh->load; 2231 $neigh->load;
1818 } 2232 }
1819} 2233}
1820 2234
1821sub find_sync { 2235sub find_sync {
1822 my ($path, $origin) = @_; 2236 my ($path, $origin) = @_;
1823 2237
1824 cf::sync_job { find $path, $origin } 2238 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2239 if $Coro::current == $Coro::main;
2240
2241 find $path, $origin
1825} 2242}
1826 2243
1827sub do_load_sync { 2244sub do_load_sync {
1828 my ($map) = @_; 2245 my ($map) = @_;
1829 2246
1830 cf::sync_job { $map->load }; 2247 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2248 if $Coro::current == $Coro::main;
2249
2250 $map->load;
1831} 2251}
1832 2252
1833our %MAP_PREFETCH; 2253our %MAP_PREFETCH;
1834our $MAP_PREFETCHER = undef; 2254our $MAP_PREFETCHER = undef;
1835 2255
1836sub find_async { 2256sub find_async {
1837 my ($path, $origin) = @_; 2257 my ($path, $origin, $load) = @_;
1838 2258
1839 $path = normalise $path, $origin && $origin->{path}; 2259 $path = normalise $path, $origin && $origin->{path};
1840 2260
1841 if (my $map = $cf::MAP{$path}) { 2261 if (my $map = $cf::MAP{$path}) {
1842 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2262 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1843 } 2263 }
1844 2264
1845 undef $MAP_PREFETCH{$path}; 2265 $MAP_PREFETCH{$path} |= $load;
2266
1846 $MAP_PREFETCHER ||= cf::async { 2267 $MAP_PREFETCHER ||= cf::async {
2268 $Coro::current->{desc} = "map prefetcher";
2269
1847 while (%MAP_PREFETCH) { 2270 while (%MAP_PREFETCH) {
1848 for my $path (keys %MAP_PREFETCH) { 2271 while (my ($k, $v) = each %MAP_PREFETCH) {
1849 my $map = find $path 2272 if (my $map = find $k) {
1850 or next;
1851 $map->load; 2273 $map->load if $v;
2274 }
1852 2275
1853 delete $MAP_PREFETCH{$path}; 2276 delete $MAP_PREFETCH{$k};
1854 } 2277 }
1855 } 2278 }
1856 undef $MAP_PREFETCHER; 2279 undef $MAP_PREFETCHER;
1857 }; 2280 };
1858 $MAP_PREFETCHER->prio (6); 2281 $MAP_PREFETCHER->prio (6);
1859 2282
1860 () 2283 ()
1861} 2284}
1862 2285
2286# common code, used by both ->save and ->swapout
1863sub save { 2287sub _save {
1864 my ($self) = @_; 2288 my ($self) = @_;
1865
1866 my $lock = cf::lock_acquire "map_data:" . $self->path;
1867 2289
1868 $self->{last_save} = $cf::RUNTIME; 2290 $self->{last_save} = $cf::RUNTIME;
1869 2291
1870 return unless $self->dirty; 2292 return unless $self->dirty;
1871 2293
1877 return if $self->{deny_save}; 2299 return if $self->{deny_save};
1878 2300
1879 local $self->{last_access} = $self->last_access;#d# 2301 local $self->{last_access} = $self->last_access;#d#
1880 2302
1881 cf::async { 2303 cf::async {
2304 $Coro::current->{desc} = "map player save";
1882 $_->contr->save for $self->players; 2305 $_->contr->save for $self->players;
1883 }; 2306 };
2307
2308 cf::get_slot 0.02;
1884 2309
1885 if ($uniq) { 2310 if ($uniq) {
1886 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2311 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1887 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2312 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1888 } else { 2313 } else {
1889 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2314 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1890 } 2315 }
1891} 2316}
1892 2317
2318sub save {
2319 my ($self) = @_;
2320
2321 my $lock = cf::lock_acquire "map_data:$self->{path}";
2322
2323 $self->_save;
2324}
2325
1893sub swap_out { 2326sub swap_out {
1894 my ($self) = @_; 2327 my ($self) = @_;
1895 2328
1896 # save first because save cedes
1897 $self->save;
1898
1899 my $lock = cf::lock_acquire "map_data:" . $self->path; 2329 my $lock = cf::lock_acquire "map_data:$self->{path}";
1900 2330
2331 return if $self->in_memory != cf::MAP_ACTIVE;
2332 return if $self->{deny_save};
1901 return if $self->players; 2333 return if $self->players;
1902 return if $self->in_memory != cf::MAP_IN_MEMORY;
1903 return if $self->{deny_save};
1904 2334
2335 # first deactivate the map and "unlink" it from the core
2336 $self->deactivate;
2337 $_->clear_links_to ($self) for values %cf::MAP;
2338 $self->in_memory (cf::MAP_SWAPPED);
2339
2340 # then atomically save
2341 $self->_save;
2342
2343 # then free the map
1905 $self->clear; 2344 $self->clear;
1906 $self->in_memory (cf::MAP_SWAPPED);
1907} 2345}
1908 2346
1909sub reset_at { 2347sub reset_at {
1910 my ($self) = @_; 2348 my ($self) = @_;
1911 2349
1929 2367
1930 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2368 my $lock = cf::lock_acquire "map_data:$self->{path}";
1931 2369
1932 return if $self->players; 2370 return if $self->players;
1933 2371
1934 warn "resetting map ", $self->path; 2372 cf::trace "resetting map ", $self->path, "\n";
1935 2373
1936 $self->in_memory (cf::MAP_SWAPPED); 2374 $self->in_memory (cf::MAP_SWAPPED);
1937 2375
1938 # need to save uniques path 2376 # need to save uniques path
1939 unless ($self->{deny_save}) { 2377 unless ($self->{deny_save}) {
1943 if $uniq; 2381 if $uniq;
1944 } 2382 }
1945 2383
1946 delete $cf::MAP{$self->path}; 2384 delete $cf::MAP{$self->path};
1947 2385
2386 $self->deactivate;
2387 $_->clear_links_to ($self) for values %cf::MAP;
1948 $self->clear; 2388 $self->clear;
1949
1950 $_->clear_links_to ($self) for values %cf::MAP;
1951 2389
1952 $self->unlink_save; 2390 $self->unlink_save;
1953 $self->destroy; 2391 $self->destroy;
1954} 2392}
1955 2393
1956my $nuke_counter = "aaaa"; 2394my $nuke_counter = "aaaa";
1957 2395
1958sub nuke { 2396sub nuke {
1959 my ($self) = @_; 2397 my ($self) = @_;
1960 2398
2399 {
2400 my $lock = cf::lock_acquire "map_data:$self->{path}";
2401
1961 delete $cf::MAP{$self->path}; 2402 delete $cf::MAP{$self->path};
1962 2403
1963 $self->unlink_save; 2404 $self->unlink_save;
1964 2405
1965 bless $self, "cf::map"; 2406 bless $self, "cf::map::wrap";
1966 delete $self->{deny_reset}; 2407 delete $self->{deny_reset};
1967 $self->{deny_save} = 1; 2408 $self->{deny_save} = 1;
1968 $self->reset_timeout (1); 2409 $self->reset_timeout (1);
1969 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2410 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1970 2411
1971 $cf::MAP{$self->path} = $self; 2412 $cf::MAP{$self->path} = $self;
2413 }
1972 2414
1973 $self->reset; # polite request, might not happen 2415 $self->reset; # polite request, might not happen
1974} 2416}
1975 2417
1976=item $maps = cf::map::tmp_maps 2418=item $maps = cf::map::tmp_maps
2018 2460
2019sub unique_maps() { 2461sub unique_maps() {
2020 [ 2462 [
2021 map { 2463 map {
2022 utf8::decode $_; 2464 utf8::decode $_;
2023 /\.map$/ 2465 s/\.map$//; # TODO future compatibility hack
2466 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2467 ? ()
2024 ? normalise $_ 2468 : normalise $_
2025 : ()
2026 } @{ aio_readdir $UNIQUEDIR or [] } 2469 } @{ aio_readdir $UNIQUEDIR or [] }
2027 ] 2470 ]
2028} 2471}
2029 2472
2030package cf; 2473=item cf::map::static_maps
2474
2475Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2476file in the shared directory excluding F</styles> and F</editor>). May
2477block.
2478
2479=cut
2480
2481sub static_maps() {
2482 my @dirs = "";
2483 my @maps;
2484
2485 while (@dirs) {
2486 my $dir = shift @dirs;
2487
2488 next if $dir eq "/styles" || $dir eq "/editor";
2489
2490 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2491 or return;
2492
2493 for (@$files) {
2494 s/\.map$// or next;
2495 utf8::decode $_;
2496 push @maps, "$dir/$_";
2497 }
2498
2499 push @dirs, map "$dir/$_", @$dirs;
2500 }
2501
2502 \@maps
2503}
2031 2504
2032=back 2505=back
2033 2506
2034=head3 cf::object 2507=head3 cf::object
2035 2508
2039 2512
2040=over 4 2513=over 4
2041 2514
2042=item $ob->inv_recursive 2515=item $ob->inv_recursive
2043 2516
2044Returns the inventory of the object _and_ their inventories, recursively. 2517Returns the inventory of the object I<and> their inventories, recursively,
2518but I<not> the object itself.
2045 2519
2046=cut 2520=cut
2047 2521
2048sub inv_recursive_; 2522sub inv_recursive_;
2049sub inv_recursive_ { 2523sub inv_recursive_ {
2052 2526
2053sub inv_recursive { 2527sub inv_recursive {
2054 inv_recursive_ inv $_[0] 2528 inv_recursive_ inv $_[0]
2055} 2529}
2056 2530
2531=item $ref = $ob->ref
2532
2533Creates and returns a persistent reference to an object that can be stored as a string.
2534
2535=item $ob = cf::object::deref ($refstring)
2536
2537returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2538even if the object actually exists. May block.
2539
2540=cut
2541
2542sub deref {
2543 my ($ref) = @_;
2544
2545 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2546 my ($uuid, $name) = ($1, $2);
2547 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2548 or return;
2549 $pl->ob->uuid eq $uuid
2550 or return;
2551
2552 $pl->ob
2553 } else {
2554 warn "$ref: cannot resolve object reference\n";
2555 undef
2556 }
2557}
2558
2057package cf; 2559package cf;
2058 2560
2059=back 2561=back
2060 2562
2061=head3 cf::object::player 2563=head3 cf::object::player
2067Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2569Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2068can be C<undef>. Does the right thing when the player is currently in a 2570can be C<undef>. Does the right thing when the player is currently in a
2069dialogue with the given NPC character. 2571dialogue with the given NPC character.
2070 2572
2071=cut 2573=cut
2574
2575our $SAY_CHANNEL = {
2576 id => "say",
2577 title => "Map",
2578 reply => "say ",
2579 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2580};
2581
2582our $CHAT_CHANNEL = {
2583 id => "chat",
2584 title => "Chat",
2585 reply => "chat ",
2586 tooltip => "Player chat and shouts, global to the server.",
2587};
2072 2588
2073# rough implementation of a future "reply" method that works 2589# rough implementation of a future "reply" method that works
2074# with dialog boxes. 2590# with dialog boxes.
2075#TODO: the first argument must go, split into a $npc->reply_to ( method 2591#TODO: the first argument must go, split into a $npc->reply_to ( method
2076sub cf::object::player::reply($$$;$) { 2592sub cf::object::player::reply($$$;$) {
2083 2599
2084 } else { 2600 } else {
2085 my $pl = $self->contr; 2601 my $pl = $self->contr;
2086 2602
2087 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2603 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2088 my $diag = $pl->{npc_dialog}; 2604 my $dialog = $pl->{npc_dialog};
2089 $diag->{pl}->ext_reply ( 2605 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2090 $diag->{id},
2091 msgtype => "reply",
2092 msg => $diag->{pl}->expand_cfpod ($msg),
2093 add_topics => []
2094 );
2095 2606
2096 } else { 2607 } else {
2097 $msg = $npc->name . " says: $msg" if $npc; 2608 $msg = $npc->name . " says: $msg" if $npc;
2098 $self->message ($msg, $flags); 2609 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2099 } 2610 }
2100 } 2611 }
2612}
2613
2614=item $object->send_msg ($channel, $msg, $color, [extra...])
2615
2616=cut
2617
2618sub cf::object::send_msg {
2619 my $pl = shift->contr
2620 or return;
2621 $pl->send_msg (@_);
2101} 2622}
2102 2623
2103=item $player_object->may ("access") 2624=item $player_object->may ("access")
2104 2625
2105Returns wether the given player is authorized to access resource "access" 2626Returns wether the given player is authorized to access resource "access"
2118 2639
2119=item $player_object->enter_link 2640=item $player_object->enter_link
2120 2641
2121Freezes the player and moves him/her to a special map (C<{link}>). 2642Freezes the player and moves him/her to a special map (C<{link}>).
2122 2643
2123The player should be reasonably safe there for short amounts of time. You 2644The player should be reasonably safe there for short amounts of time (e.g.
2124I<MUST> call C<leave_link> as soon as possible, though. 2645for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2646though, as the player cannot control the character while it is on the link
2647map.
2125 2648
2126Will never block. 2649Will never block.
2127 2650
2128=item $player_object->leave_link ($map, $x, $y) 2651=item $player_object->leave_link ($map, $x, $y)
2129 2652
2149sub cf::object::player::enter_link { 2672sub cf::object::player::enter_link {
2150 my ($self) = @_; 2673 my ($self) = @_;
2151 2674
2152 $self->deactivate_recursive; 2675 $self->deactivate_recursive;
2153 2676
2677 ++$self->{_link_recursion};
2678
2154 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2679 return if UNIVERSAL::isa $self->map, "ext::map_link";
2155 2680
2156 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2681 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2157 if $self->map && $self->map->{path} ne "{link}"; 2682 if $self->map && $self->map->{path} ne "{link}";
2158 2683
2159 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2684 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2160} 2685}
2161 2686
2162sub cf::object::player::leave_link { 2687sub cf::object::player::leave_link {
2163 my ($self, $map, $x, $y) = @_; 2688 my ($self, $map, $x, $y) = @_;
2164 2689
2181 ($x, $y) = (-1, -1) 2706 ($x, $y) = (-1, -1)
2182 unless (defined $x) && (defined $y); 2707 unless (defined $x) && (defined $y);
2183 2708
2184 # use -1 or undef as default coordinates, not 0, 0 2709 # use -1 or undef as default coordinates, not 0, 0
2185 ($x, $y) = ($map->enter_x, $map->enter_y) 2710 ($x, $y) = ($map->enter_x, $map->enter_y)
2186 if $x <=0 && $y <= 0; 2711 if $x <= 0 && $y <= 0;
2187 2712
2188 $map->load; 2713 $map->load;
2189 $map->load_diag; 2714 $map->load_neighbours;
2190 2715
2191 return unless $self->contr->active; 2716 return unless $self->contr->active;
2192 $self->activate_recursive;
2193 2717
2194 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2718 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2195 $self->enter_map ($map, $x, $y); 2719 if ($self->enter_map ($map, $x, $y)) {
2196} 2720 # entering was successful
2721 delete $self->{_link_recursion};
2722 # only activate afterwards, to support waiting in hooks
2723 $self->activate_recursive;
2724 }
2197 2725
2726}
2727
2198=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2728=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2199 2729
2200Moves the player to the given map-path and coordinates by first freezing 2730Moves the player to the given map-path and coordinates by first freezing
2201her, loading and preparing them map, calling the provided $check callback 2731her, loading and preparing them map, calling the provided $check callback
2202that has to return the map if sucecssful, and then unfreezes the player on 2732that has to return the map if sucecssful, and then unfreezes the player on
2203the new (success) or old (failed) map position. 2733the new (success) or old (failed) map position. In either case, $done will
2734be called at the end of this process.
2735
2736Note that $check will be called with a potentially non-loaded map, so if
2737it needs a loaded map it has to call C<< ->load >>.
2204 2738
2205=cut 2739=cut
2206 2740
2207our $GOTOGEN; 2741our $GOTOGEN;
2208 2742
2209sub cf::object::player::goto { 2743sub cf::object::player::goto {
2210 my ($self, $path, $x, $y, $check) = @_; 2744 my ($self, $path, $x, $y, $check, $done) = @_;
2745
2746 if ($self->{_link_recursion} >= $MAX_LINKS) {
2747 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2748 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2749 ($path, $x, $y) = @$EMERGENCY_POSITION;
2750 }
2211 2751
2212 # do generation counting so two concurrent goto's will be executed in-order 2752 # do generation counting so two concurrent goto's will be executed in-order
2213 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2753 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2214 2754
2215 $self->enter_link; 2755 $self->enter_link;
2216 2756
2217 (async { 2757 (async {
2758 $Coro::current->{desc} = "player::goto $path $x $y";
2759
2760 # *tag paths override both path and x|y
2761 if ($path =~ /^\*(.*)$/) {
2762 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2763 my $ob = $obs[rand @obs];
2764
2765 # see if we actually can go there
2766 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2767 $ob = $obs[rand @obs];
2768 } else {
2769 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2770 }
2771 # else put us there anyways for now #d#
2772
2773 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2774 } else {
2775 ($path, $x, $y) = (undef, undef, undef);
2776 }
2777 }
2778
2218 my $map = eval { 2779 my $map = eval {
2219 my $map = cf::map::find $path; 2780 my $map = defined $path ? cf::map::find $path : undef;
2220 2781
2221 if ($map) { 2782 if ($map) {
2222 $map = $map->customise_for ($self); 2783 $map = $map->customise_for ($self);
2223 $map = $check->($map) if $check && $map; 2784 $map = $check->($map, $x, $y, $self) if $check && $map;
2224 } else { 2785 } else {
2225 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2786 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2226 } 2787 }
2227 2788
2228 $map 2789 $map
2229 }; 2790 };
2230 2791
2235 2796
2236 if ($gen == $self->{_goto_generation}) { 2797 if ($gen == $self->{_goto_generation}) {
2237 delete $self->{_goto_generation}; 2798 delete $self->{_goto_generation};
2238 $self->leave_link ($map, $x, $y); 2799 $self->leave_link ($map, $x, $y);
2239 } 2800 }
2801
2802 $done->($self) if $done;
2240 })->prio (1); 2803 })->prio (1);
2241} 2804}
2242 2805
2243=item $player_object->enter_exit ($exit_object) 2806=item $player_object->enter_exit ($exit_object)
2244 2807
2264} 2827}
2265 2828
2266sub prepare_random_map { 2829sub prepare_random_map {
2267 my ($exit) = @_; 2830 my ($exit) = @_;
2268 2831
2269 my $guard = cf::lock_acquire "exit_prepare:$exit";
2270
2271 # all this does is basically replace the /! path by 2832 # all this does is basically replace the /! path by
2272 # a new random map path (?random/...) with a seed 2833 # a new random map path (?random/...) with a seed
2273 # that depends on the exit object 2834 # that depends on the exit object
2274 2835
2275 my $rmp = parse_random_map_params $exit->msg; 2836 my $rmp = parse_random_map_params $exit->msg;
2277 if ($exit->map) { 2838 if ($exit->map) {
2278 $rmp->{region} = $exit->region->name; 2839 $rmp->{region} = $exit->region->name;
2279 $rmp->{origin_map} = $exit->map->path; 2840 $rmp->{origin_map} = $exit->map->path;
2280 $rmp->{origin_x} = $exit->x; 2841 $rmp->{origin_x} = $exit->x;
2281 $rmp->{origin_y} = $exit->y; 2842 $rmp->{origin_y} = $exit->y;
2843
2844 $exit->map->touch;
2282 } 2845 }
2283 2846
2284 $rmp->{random_seed} ||= $exit->random_seed; 2847 $rmp->{random_seed} ||= $exit->random_seed;
2285 2848
2286 my $data = cf::to_json $rmp; 2849 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2287 my $md5 = Digest::MD5::md5_hex $data; 2850 my $md5 = Digest::MD5::md5_hex $data;
2288 my $meta = "$RANDOMDIR/$md5.meta"; 2851 my $meta = "$RANDOMDIR/$md5.meta";
2289 2852
2290 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2853 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2291 aio_write $fh, 0, (length $data), $data, 0; 2854 aio_write $fh, 0, (length $data), $data, 0;
2292 undef $fh; 2855 undef $fh;
2293 aio_rename "$meta~", $meta; 2856 aio_rename "$meta~", $meta;
2294 2857
2858 my $slaying = "?random/$md5";
2859
2860 if ($exit->valid) {
2295 $exit->slaying ("?random/$md5"); 2861 $exit->slaying ("?random/$md5");
2296 $exit->msg (undef); 2862 $exit->msg (undef);
2863 }
2297 } 2864 }
2298} 2865}
2299 2866
2300sub cf::object::player::enter_exit { 2867sub cf::object::player::enter_exit {
2301 my ($self, $exit) = @_; 2868 my ($self, $exit) = @_;
2302 2869
2303 return unless $self->type == cf::PLAYER; 2870 return unless $self->type == cf::PLAYER;
2304 2871
2305 if ($exit->slaying eq "/!") {
2306 #TODO: this should de-fi-ni-te-ly not be a sync-job
2307 # the problem is that $exit might not survive long enough
2308 # so it needs to be done right now, right here
2309 cf::sync_job { prepare_random_map $exit };
2310 }
2311
2312 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2313 my $hp = $exit->stats->hp;
2314 my $sp = $exit->stats->sp;
2315
2316 $self->enter_link; 2872 $self->enter_link;
2317 2873
2318 (async { 2874 (async {
2319 $self->deactivate_recursive; # just to be sure 2875 $Coro::current->{desc} = "enter_exit";
2876
2320 unless (eval { 2877 unless (eval {
2878 $self->deactivate_recursive; # just to be sure
2879
2880 # random map handling
2881 {
2882 my $guard = cf::lock_acquire "exit_prepare:$exit";
2883
2884 prepare_random_map $exit
2885 if $exit->slaying eq "/!";
2886 }
2887
2888 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2889 my $x = $exit->stats->hp;
2890 my $y = $exit->stats->sp;
2891
2321 $self->goto ($slaying, $hp, $sp); 2892 $self->goto ($map, $x, $y);
2322 2893
2894 # if exit is damned, update players death & WoR home-position
2895 $self->contr->savebed ($map, $x, $y)
2896 if $exit->flag (cf::FLAG_DAMNED);
2897
2323 1; 2898 1
2324 }) { 2899 }) {
2325 $self->message ("Something went wrong deep within the crossfire server. " 2900 $self->message ("Something went wrong deep within the deliantra server. "
2326 . "I'll try to bring you back to the map you were before. " 2901 . "I'll try to bring you back to the map you were before. "
2327 . "Please report this to the dungeon master!", 2902 . "Please report this to the dungeon master!",
2328 cf::NDI_UNIQUE | cf::NDI_RED); 2903 cf::NDI_UNIQUE | cf::NDI_RED);
2329 2904
2330 warn "ERROR in enter_exit: $@"; 2905 error "ERROR in enter_exit: $@";
2331 $self->leave_link; 2906 $self->leave_link;
2332 } 2907 }
2333 })->prio (1); 2908 })->prio (1);
2334} 2909}
2335 2910
2349 2924
2350 utf8::encode $text; 2925 utf8::encode $text;
2351 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2926 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2352} 2927}
2353 2928
2929=item $client->send_big_packet ($pkt)
2930
2931Like C<send_packet>, but tries to compress large packets, and fragments
2932them as required.
2933
2934=cut
2935
2936our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2937
2938sub cf::client::send_big_packet {
2939 my ($self, $pkt) = @_;
2940
2941 # try lzf for large packets
2942 $pkt = "lzf " . Compress::LZF::compress $pkt
2943 if 1024 <= length $pkt and $self->{can_lzf};
2944
2945 # split very large packets
2946 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2947 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2948 $pkt = "frag";
2949 }
2950
2951 $self->send_packet ($pkt);
2952}
2953
2354=item $client->send_msg ($color, $type, $msg, [extra...]) 2954=item $client->send_msg ($channel, $msg, $color, [extra...])
2355 2955
2356Send a drawinfo or msg packet to the client, formatting the msg for the 2956Send a drawinfo or msg packet to the client, formatting the msg for the
2357client if neccessary. C<$type> should be a string identifying the type of 2957client if neccessary. C<$type> should be a string identifying the type of
2358the message, with C<log> being the default. If C<$color> is negative, suppress 2958the message, with C<log> being the default. If C<$color> is negative, suppress
2359the message unless the client supports the msg packet. 2959the message unless the client supports the msg packet.
2360 2960
2361=cut 2961=cut
2362 2962
2963# non-persistent channels (usually the info channel)
2964our %CHANNEL = (
2965 "c/motd" => {
2966 id => "infobox",
2967 title => "MOTD",
2968 reply => undef,
2969 tooltip => "The message of the day",
2970 },
2971 "c/identify" => {
2972 id => "infobox",
2973 title => "Identify",
2974 reply => undef,
2975 tooltip => "Items recently identified",
2976 },
2977 "c/examine" => {
2978 id => "infobox",
2979 title => "Examine",
2980 reply => undef,
2981 tooltip => "Signs and other items you examined",
2982 },
2983 "c/shopinfo" => {
2984 id => "infobox",
2985 title => "Shop Info",
2986 reply => undef,
2987 tooltip => "What your bargaining skill tells you about the shop",
2988 },
2989 "c/book" => {
2990 id => "infobox",
2991 title => "Book",
2992 reply => undef,
2993 tooltip => "The contents of a note or book",
2994 },
2995 "c/lookat" => {
2996 id => "infobox",
2997 title => "Look",
2998 reply => undef,
2999 tooltip => "What you saw there",
3000 },
3001 "c/who" => {
3002 id => "infobox",
3003 title => "Players",
3004 reply => undef,
3005 tooltip => "Shows players who are currently online",
3006 },
3007 "c/body" => {
3008 id => "infobox",
3009 title => "Body Parts",
3010 reply => undef,
3011 tooltip => "Shows which body parts you posess and are available",
3012 },
3013 "c/statistics" => {
3014 id => "infobox",
3015 title => "Statistics",
3016 reply => undef,
3017 tooltip => "Shows your primary statistics",
3018 },
3019 "c/skills" => {
3020 id => "infobox",
3021 title => "Skills",
3022 reply => undef,
3023 tooltip => "Shows your experience per skill and item power",
3024 },
3025 "c/shopitems" => {
3026 id => "infobox",
3027 title => "Shop Items",
3028 reply => undef,
3029 tooltip => "Shows the items currently for sale in this shop",
3030 },
3031 "c/resistances" => {
3032 id => "infobox",
3033 title => "Resistances",
3034 reply => undef,
3035 tooltip => "Shows your resistances",
3036 },
3037 "c/pets" => {
3038 id => "infobox",
3039 title => "Pets",
3040 reply => undef,
3041 tooltip => "Shows information abotu your pets/a specific pet",
3042 },
3043 "c/perceiveself" => {
3044 id => "infobox",
3045 title => "Perceive Self",
3046 reply => undef,
3047 tooltip => "You gained detailed knowledge about yourself",
3048 },
3049 "c/uptime" => {
3050 id => "infobox",
3051 title => "Uptime",
3052 reply => undef,
3053 tooltip => "How long the server has been running since last restart",
3054 },
3055 "c/mapinfo" => {
3056 id => "infobox",
3057 title => "Map Info",
3058 reply => undef,
3059 tooltip => "Information related to the maps",
3060 },
3061 "c/party" => {
3062 id => "party",
3063 title => "Party",
3064 reply => "gsay ",
3065 tooltip => "Messages and chat related to your party",
3066 },
3067 "c/death" => {
3068 id => "death",
3069 title => "Death",
3070 reply => undef,
3071 tooltip => "Reason for and more info about your most recent death",
3072 },
3073 "c/say" => $SAY_CHANNEL,
3074 "c/chat" => $CHAT_CHANNEL,
3075);
3076
2363sub cf::client::send_msg { 3077sub cf::client::send_msg {
2364 my ($self, $color, $type, $msg, @extra) = @_; 3078 my ($self, $channel, $msg, $color, @extra) = @_;
2365 3079
2366 $msg = $self->pl->expand_cfpod ($msg); 3080 $msg = $self->pl->expand_cfpod ($msg)
3081 unless $color & cf::NDI_VERBATIM;
2367 3082
2368 if ($self->can_msg) { 3083 $color &= cf::NDI_CLIENT_MASK; # just in case...
2369 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);
2370 } else {
2371 # replace some tags by gcfclient-compatible ones
2372 for ($msg) {
2373 1 while
2374 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2375 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2376 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2377 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2378 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${1}[\/color]/;
2379 }
2380 3084
2381 if ($color >= 0) { 3085 # check predefined channels, for the benefit of C
2382 if (0 && $msg =~ /\[/) { 3086 if ($CHANNEL{$channel}) {
2383 $self->send_packet ("drawextinfo $color 4 0 $msg") 3087 $channel = $CHANNEL{$channel};
2384 } else { 3088
2385 s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 3089 $self->ext_msg (channel_info => $channel);
2386 $self->send_packet ("drawinfo $color $msg") 3090 $channel = $channel->{id};
3091
3092 } elsif (ref $channel) {
3093 # send meta info to client, if not yet sent
3094 unless (exists $self->{channel}{$channel->{id}}) {
3095 $self->{channel}{$channel->{id}} = $channel;
3096 $self->ext_msg (channel_info => $channel);
2387 } 3097 }
2388 }
2389 }
2390}
2391 3098
3099 $channel = $channel->{id};
3100 }
3101
3102 return unless @extra || length $msg;
3103
3104 # default colour, mask it out
3105 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
3106 if $color & cf::NDI_DEF;
3107
3108 my $pkt = "msg "
3109 . $self->{json_coder}->encode (
3110 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
3111 );
3112
3113 $self->send_big_packet ($pkt);
3114}
3115
2392=item $client->ext_event ($type, %msg) 3116=item $client->ext_msg ($type, @msg)
2393 3117
2394Sends an exti event to the client. 3118Sends an ext event to the client.
2395 3119
2396=cut 3120=cut
2397 3121
2398sub cf::client::ext_event($$%) { 3122sub cf::client::ext_msg($$@) {
2399 my ($self, $type, %msg) = @_; 3123 my ($self, $type, @msg) = @_;
2400 3124
3125 if ($self->extcmd == 2) {
3126 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3127 } elsif ($self->extcmd == 1) { # TODO: remove
2401 $msg{msgtype} = "event_$type"; 3128 push @msg, msgtype => "event_$type";
2402 $self->send_packet ("ext " . cf::to_json \%msg); 3129 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3130 }
3131}
3132
3133=item $client->ext_reply ($msgid, @msg)
3134
3135Sends an ext reply to the client.
3136
3137=cut
3138
3139sub cf::client::ext_reply($$@) {
3140 my ($self, $id, @msg) = @_;
3141
3142 if ($self->extcmd == 2) {
3143 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3144 } elsif ($self->extcmd == 1) {
3145 #TODO: version 1, remove
3146 unshift @msg, msgtype => "reply", msgid => $id;
3147 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3148 }
2403} 3149}
2404 3150
2405=item $success = $client->query ($flags, "text", \&cb) 3151=item $success = $client->query ($flags, "text", \&cb)
2406 3152
2407Queues a query to the client, calling the given callback with 3153Queues a query to the client, calling the given callback with
2408the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 3154the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2409C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 3155C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2410 3156
2411Queries can fail, so check the return code. Or don't, as queries will become 3157Queries can fail, so check the return code. Or don't, as queries will
2412reliable at some point in the future. 3158become reliable at some point in the future.
2413 3159
2414=cut 3160=cut
2415 3161
2416sub cf::client::query { 3162sub cf::client::query {
2417 my ($self, $flags, $text, $cb) = @_; 3163 my ($self, $flags, $text, $cb) = @_;
2425 utf8::encode $text; 3171 utf8::encode $text;
2426 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 3172 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2427 3173
2428 $self->send_packet ($self->{query_queue}[0][0]) 3174 $self->send_packet ($self->{query_queue}[0][0])
2429 if @{ $self->{query_queue} } == 1; 3175 if @{ $self->{query_queue} } == 1;
3176
3177 1
2430} 3178}
2431 3179
2432cf::client->attach ( 3180cf::client->attach (
3181 on_connect => sub {
3182 my ($ns) = @_;
3183
3184 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
3185 },
2433 on_reply => sub { 3186 on_reply => sub {
2434 my ($ns, $msg) = @_; 3187 my ($ns, $msg) = @_;
2435 3188
2436 # this weird shuffling is so that direct followup queries 3189 # this weird shuffling is so that direct followup queries
2437 # get handled first 3190 # get handled first
2449 } else { 3202 } else {
2450 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 3203 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2451 } 3204 }
2452 } 3205 }
2453 }, 3206 },
3207 on_exticmd => sub {
3208 my ($ns, $buf) = @_;
3209
3210 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3211
3212 if (ref $msg) {
3213 my ($type, $reply, @payload) =
3214 "ARRAY" eq ref $msg
3215 ? @$msg
3216 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3217
3218 my @reply;
3219
3220 if (my $cb = $EXTICMD{$type}) {
3221 @reply = $cb->($ns, @payload);
3222 }
3223
3224 $ns->ext_reply ($reply, @reply)
3225 if $reply;
3226
3227 } else {
3228 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3229 }
3230
3231 cf::override;
3232 },
2454); 3233);
2455 3234
2456=item $client->async (\&cb) 3235=item $client->async (\&cb)
2457 3236
2458Create a new coroutine, running the specified callback. The coroutine will 3237Create a new coroutine, running the specified callback. The coroutine will
2474 3253
2475 $coro 3254 $coro
2476} 3255}
2477 3256
2478cf::client->attach ( 3257cf::client->attach (
2479 on_destroy => sub { 3258 on_client_destroy => sub {
2480 my ($ns) = @_; 3259 my ($ns) = @_;
2481 3260
2482 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3261 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2483 }, 3262 },
2484); 3263);
2499our $safe = new Safe "safe"; 3278our $safe = new Safe "safe";
2500our $safe_hole = new Safe::Hole; 3279our $safe_hole = new Safe::Hole;
2501 3280
2502$SIG{FPE} = 'IGNORE'; 3281$SIG{FPE} = 'IGNORE';
2503 3282
2504$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3283$safe->permit_only (Opcode::opset qw(
3284 :base_core :base_mem :base_orig :base_math :base_loop
3285 grepstart grepwhile mapstart mapwhile
3286 sort time
3287));
2505 3288
2506# here we export the classes and methods available to script code 3289# here we export the classes and methods available to script code
2507 3290
2508=pod 3291=pod
2509 3292
2510The following functions and methods are available within a safe environment: 3293The following functions and methods are available within a safe environment:
2511 3294
2512 cf::object contr pay_amount pay_player map 3295 cf::object
3296 contr pay_amount pay_player map x y force_find force_add destroy
3297 insert remove name archname title slaying race decrease split
3298 value
3299
2513 cf::object::player player 3300 cf::object::player
2514 cf::player peaceful 3301 player
2515 cf::map trigger 3302
3303 cf::player
3304 peaceful
3305
3306 cf::map
3307 trigger
2516 3308
2517=cut 3309=cut
2518 3310
2519for ( 3311for (
2520 ["cf::object" => qw(contr pay_amount pay_player map)], 3312 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3313 insert remove inv nrof name archname title slaying race
3314 decrease split destroy change_exp value msg lore send_msg)],
2521 ["cf::object::player" => qw(player)], 3315 ["cf::object::player" => qw(player)],
2522 ["cf::player" => qw(peaceful)], 3316 ["cf::player" => qw(peaceful send_msg)],
2523 ["cf::map" => qw(trigger)], 3317 ["cf::map" => qw(trigger)],
2524) { 3318) {
2525 no strict 'refs';
2526 my ($pkg, @funs) = @$_; 3319 my ($pkg, @funs) = @$_;
2527 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3320 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2528 for @funs; 3321 for @funs;
2529} 3322}
2530 3323
2545 3338
2546 my $qcode = $code; 3339 my $qcode = $code;
2547 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3340 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2548 $qcode =~ s/\n/\\n/g; 3341 $qcode =~ s/\n/\\n/g;
2549 3342
3343 %vars = (_dummy => 0) unless %vars;
3344
3345 my @res;
2550 local $_; 3346 local $_;
2551 local @safe::cf::_safe_eval_args = values %vars;
2552 3347
2553 my $eval = 3348 my $eval =
2554 "do {\n" 3349 "do {\n"
2555 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3350 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2556 . "#line 0 \"{$qcode}\"\n" 3351 . "#line 0 \"{$qcode}\"\n"
2557 . $code 3352 . $code
2558 . "\n}" 3353 . "\n}"
2559 ; 3354 ;
2560 3355
3356 if ($CFG{safe_eval}) {
2561 sub_generation_inc; 3357 sub_generation_inc;
3358 local @safe::cf::_safe_eval_args = values %vars;
2562 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3359 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2563 sub_generation_inc; 3360 sub_generation_inc;
3361 } else {
3362 local @cf::_safe_eval_args = values %vars;
3363 @res = wantarray ? eval eval : scalar eval $eval;
3364 }
2564 3365
2565 if ($@) { 3366 if ($@) {
2566 warn "$@"; 3367 warn "$@",
2567 warn "while executing safe code '$code'\n"; 3368 "while executing safe code '$code'\n",
2568 warn "with arguments " . (join " ", %vars) . "\n"; 3369 "with arguments " . (join " ", %vars) . "\n";
2569 } 3370 }
2570 3371
2571 wantarray ? @res : $res[0] 3372 wantarray ? @res : $res[0]
2572} 3373}
2573 3374
2587=cut 3388=cut
2588 3389
2589sub register_script_function { 3390sub register_script_function {
2590 my ($fun, $cb) = @_; 3391 my ($fun, $cb) = @_;
2591 3392
2592 no strict 'refs'; 3393 $fun = "safe::$fun" if $CFG{safe_eval};
2593 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3394 *$fun = $safe_hole->wrap ($cb);
2594} 3395}
2595 3396
2596=back 3397=back
2597 3398
2598=cut 3399=cut
2601# the server's init and main functions 3402# the server's init and main functions
2602 3403
2603sub load_facedata($) { 3404sub load_facedata($) {
2604 my ($path) = @_; 3405 my ($path) = @_;
2605 3406
3407 # HACK to clear player env face cache, we need some signal framework
3408 # for this (global event?)
3409 %ext::player_env::MUSIC_FACE_CACHE = ();
3410
3411 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3412
2606 warn "loading facedata from $path\n"; 3413 trace "loading facedata from $path\n";
2607 3414
2608 my $facedata;
2609 0 < aio_load $path, $facedata 3415 0 < aio_load $path, my $facedata
2610 or die "$path: $!"; 3416 or die "$path: $!";
2611 3417
2612 $facedata = Coro::Storable::thaw $facedata; 3418 $facedata = Coro::Storable::thaw $facedata;
2613 3419
2614 $facedata->{version} == 2 3420 $facedata->{version} == 2
2615 or cf::cleanup "$path: version mismatch, cannot proceed."; 3421 or cf::cleanup "$path: version mismatch, cannot proceed.";
2616 3422
3423 # patch in the exptable
3424 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3425 $facedata->{resource}{"res/exp_table"} = {
3426 type => FT_RSRC,
3427 data => $exp_table,
3428 hash => (Digest::MD5::md5 $exp_table),
3429 };
3430 cf::cede_to_tick;
3431
2617 { 3432 {
2618 my $faces = $facedata->{faceinfo}; 3433 my $faces = $facedata->{faceinfo};
2619 3434
2620 while (my ($face, $info) = each %$faces) { 3435 while (my ($face, $info) = each %$faces) {
2621 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3436 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3437
2622 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3438 cf::face::set_visibility $idx, $info->{visibility};
3439 cf::face::set_magicmap $idx, $info->{magicmap};
2623 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3440 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2624 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3441 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2625 Coro::cede; 3442
3443 cf::cede_to_tick;
2626 } 3444 }
2627 3445
2628 while (my ($face, $info) = each %$faces) { 3446 while (my ($face, $info) = each %$faces) {
2629 next unless $info->{smooth}; 3447 next unless $info->{smooth};
3448
2630 my $idx = cf::face::find $face 3449 my $idx = cf::face::find $face
2631 or next; 3450 or next;
3451
2632 if (my $smooth = cf::face::find $info->{smooth}) { 3452 if (my $smooth = cf::face::find $info->{smooth}) {
3453 cf::face::set_smooth $idx, $smooth;
2633 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3454 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2634 } else { 3455 } else {
2635 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3456 error "smooth face '$info->{smooth}' not found for face '$face'";
2636 } 3457 }
2637 Coro::cede; 3458
3459 cf::cede_to_tick;
2638 } 3460 }
2639 } 3461 }
2640 3462
2641 { 3463 {
2642 my $anims = $facedata->{animinfo}; 3464 my $anims = $facedata->{animinfo};
2643 3465
2644 while (my ($anim, $info) = each %$anims) { 3466 while (my ($anim, $info) = each %$anims) {
2645 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3467 cf::anim::set $anim, $info->{frames}, $info->{facings};
2646 Coro::cede; 3468 cf::cede_to_tick;
2647 } 3469 }
2648 3470
2649 cf::anim::invalidate_all; # d'oh 3471 cf::anim::invalidate_all; # d'oh
2650 } 3472 }
2651 3473
3474 {
3475 my $res = $facedata->{resource};
3476
3477 while (my ($name, $info) = each %$res) {
3478 if (defined $info->{type}) {
3479 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3480
3481 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3482 cf::face::set_type $idx, $info->{type};
3483 } else {
3484 $RESOURCE{$name} = $info; # unused
3485 }
3486
3487 cf::cede_to_tick;
3488 }
3489 }
3490
3491 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3492
2652 1 3493 1
2653} 3494}
2654 3495
3496register_exticmd fx_want => sub {
3497 my ($ns, $want) = @_;
3498
3499 while (my ($k, $v) = each %$want) {
3500 $ns->fx_want ($k, $v);
3501 }
3502};
3503
3504sub load_resource_file($) {
3505 my $guard = lock_acquire "load_resource_file";
3506
3507 my $status = load_resource_file_ $_[0];
3508 get_slot 0.1, 100;
3509 cf::arch::commit_load;
3510
3511 $status
3512}
3513
2655sub reload_regions { 3514sub reload_regions {
3515 # HACK to clear player env face cache, we need some signal framework
3516 # for this (global event?)
3517 %ext::player_env::MUSIC_FACE_CACHE = ();
3518
2656 load_resource_file "$MAPDIR/regions" 3519 load_resource_file "$MAPDIR/regions"
2657 or die "unable to load regions file\n"; 3520 or die "unable to load regions file\n";
3521
3522 for (cf::region::list) {
3523 $_->{match} = qr/$_->{match}/
3524 if exists $_->{match};
3525 }
2658} 3526}
2659 3527
2660sub reload_facedata { 3528sub reload_facedata {
2661 load_facedata "$DATADIR/facedata" 3529 load_facedata "$DATADIR/facedata"
2662 or die "unable to load facedata\n"; 3530 or die "unable to load facedata\n";
2670sub reload_treasures { 3538sub reload_treasures {
2671 load_resource_file "$DATADIR/treasures" 3539 load_resource_file "$DATADIR/treasures"
2672 or die "unable to load treasurelists\n"; 3540 or die "unable to load treasurelists\n";
2673} 3541}
2674 3542
3543sub reload_sound {
3544 trace "loading sound config from $DATADIR/sound\n";
3545
3546 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3547 or die "$DATADIR/sound $!";
3548
3549 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3550
3551 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3552 my $sound = $soundconf->{compat}[$_]
3553 or next;
3554
3555 my $face = cf::face::find "sound/$sound->[1]";
3556 cf::sound::set $sound->[0] => $face;
3557 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3558 }
3559
3560 while (my ($k, $v) = each %{$soundconf->{event}}) {
3561 my $face = cf::face::find "sound/$v";
3562 cf::sound::set $k => $face;
3563 }
3564}
3565
2675sub reload_resources { 3566sub reload_resources {
2676 warn "reloading resource files...\n"; 3567 trace "reloading resource files...\n";
2677 3568
3569 reload_exp_table;
3570 reload_materials;
3571 reload_facedata;
3572 reload_sound;
3573 reload_archetypes;
2678 reload_regions; 3574 reload_regions;
2679 reload_facedata;
2680 #reload_archetypes;#d#
2681 reload_archetypes;
2682 reload_treasures; 3575 reload_treasures;
2683 3576
2684 warn "finished reloading resource files\n"; 3577 trace "finished reloading resource files\n";
2685} 3578}
2686 3579
2687sub init { 3580sub reload_config {
2688 reload_resources; 3581 trace "reloading config file...\n";
2689}
2690 3582
2691sub cfg_load { 3583 0 < aio_load "$CONFDIR/config", my $config
2692 open my $fh, "<:utf8", "$CONFDIR/config" 3584 or die "$CONFDIR/config: $!";
2693 or return;
2694 3585
2695 local $/; 3586 utf8::decode $config;
2696 *CFG = YAML::Syck::Load <$fh>; 3587 *CFG = yaml_load $config;
2697 3588
2698 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3589 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2699 3590
2700 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3591 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2701 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3592 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2702 3593
2703 if (exists $CFG{mlockall}) { 3594 if (exists $CFG{mlockall}) {
2707 }; 3598 };
2708 warn $@ if $@; 3599 warn $@ if $@;
2709 } 3600 }
2710} 3601}
2711 3602
3603sub pidfile() {
3604 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3605 or die "$PIDFILE: $!";
3606 flock $fh, &Fcntl::LOCK_EX
3607 or die "$PIDFILE: flock: $!";
3608 $fh
3609}
3610
3611# make sure only one server instance is running at any one time
3612sub atomic {
3613 my $fh = pidfile;
3614
3615 my $pid = <$fh>;
3616 kill 9, $pid if $pid > 0;
3617
3618 seek $fh, 0, 0;
3619 print $fh $$;
3620}
3621
3622sub main_loop {
3623 trace "EV::loop starting\n";
3624 if (1) {
3625 EV::loop;
3626 }
3627 trace "EV::loop returned\n";
3628 goto &main_loop unless $REALLY_UNLOOP;
3629}
3630
2712sub main { 3631sub main {
3632 cf::init_globals; # initialise logging
3633
3634 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3635 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3636 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3637 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3638
3639 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3640
2713 # we must not ever block the main coroutine 3641 # we must not ever block the main coroutine
2714 local $Coro::idle = sub { 3642 local $Coro::idle = sub {
2715 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3643 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2716 (async { 3644 (async {
2717 Event::one_event; 3645 $Coro::current->{desc} = "IDLE BUG HANDLER";
3646 EV::loop EV::LOOP_ONESHOT;
2718 })->prio (Coro::PRIO_MAX); 3647 })->prio (Coro::PRIO_MAX);
2719 }; 3648 };
2720 3649
2721 cfg_load; 3650 evthread_start IO::AIO::poll_fileno;
3651
3652 cf::sync_job {
3653 cf::incloader::init ();
3654
3655 cf::init_anim;
3656 cf::init_attackmess;
3657 cf::init_dynamic;
3658
3659 cf::load_settings;
3660
3661 reload_resources;
3662 reload_config;
2722 db_init; 3663 db_init;
3664
3665 cf::init_uuid;
3666 cf::init_signals;
3667 cf::init_skills;
3668
3669 cf::init_beforeplay;
3670
3671 atomic;
3672
2723 load_extensions; 3673 load_extensions;
2724 3674
2725 $TICK_WATCHER->start; 3675 utime time, time, $RUNTIMEFILE;
2726 Event::loop; 3676
3677 # no (long-running) fork's whatsoever before this point(!)
3678 use POSIX ();
3679 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3680
3681 cf::_post_init 0;
3682 };
3683
3684 cf::object::thawer::errors_are_fatal 0;
3685 info "parse errors in files are no longer fatal from this point on.\n";
3686
3687 my $free_main; $free_main = EV::idle sub {
3688 undef $free_main;
3689 undef &main; # free gobs of memory :)
3690 };
3691
3692 goto &main_loop;
2727} 3693}
2728 3694
2729############################################################################# 3695#############################################################################
2730# initialisation and cleanup 3696# initialisation and cleanup
2731 3697
2732# install some emergency cleanup handlers 3698# install some emergency cleanup handlers
2733BEGIN { 3699BEGIN {
3700 our %SIGWATCHER = ();
2734 for my $signal (qw(INT HUP TERM)) { 3701 for my $signal (qw(INT HUP TERM)) {
2735 Event->signal ( 3702 $SIGWATCHER{$signal} = AE::signal $signal, sub {
2736 reentrant => 0,
2737 data => WF_AUTOCANCEL,
2738 signal => $signal,
2739 prio => 0,
2740 cb => sub {
2741 cf::cleanup "SIG$signal"; 3703 cf::cleanup "SIG$signal";
2742 },
2743 ); 3704 };
2744 } 3705 }
2745} 3706}
2746 3707
2747sub write_runtime { 3708sub write_runtime_sync {
2748 my $runtime = "$LOCALDIR/runtime"; 3709 my $t0 = AE::time;
2749 3710
2750 # first touch the runtime file to show we are still running: 3711 # first touch the runtime file to show we are still running:
2751 # the fsync below can take a very very long time. 3712 # the fsync below can take a very very long time.
2752 3713
2753 IO::AIO::aio_utime $runtime, undef, undef; 3714 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2754 3715
2755 my $guard = cf::lock_acquire "write_runtime"; 3716 my $guard = cf::lock_acquire "write_runtime";
2756 3717
2757 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3718 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
2758 or return; 3719 or return;
2759 3720
2760 my $value = $cf::RUNTIME + 90 + 10; 3721 my $value = $cf::RUNTIME + 90 + 10;
2761 # 10 is the runtime save interval, for a monotonic clock 3722 # 10 is the runtime save interval, for a monotonic clock
2762 # 60 allows for the watchdog to kill the server. 3723 # 60 allows for the watchdog to kill the server.
2772 aio_utime $fh, undef, undef; 3733 aio_utime $fh, undef, undef;
2773 3734
2774 close $fh 3735 close $fh
2775 or return; 3736 or return;
2776 3737
2777 aio_rename "$runtime~", $runtime 3738 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2778 and return; 3739 and return;
2779 3740
2780 warn "runtime file written.\n"; 3741 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
2781 3742
2782 1 3743 1
3744}
3745
3746our $uuid_lock;
3747our $uuid_skip;
3748
3749sub write_uuid_sync($) {
3750 $uuid_skip ||= $_[0];
3751
3752 return if $uuid_lock;
3753 local $uuid_lock = 1;
3754
3755 my $uuid = "$LOCALDIR/uuid";
3756
3757 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3758 or return;
3759
3760 my $value = uuid_seq uuid_cur;
3761
3762 unless ($value) {
3763 info "cowardly refusing to write zero uuid value!\n";
3764 return;
3765 }
3766
3767 my $value = uuid_str $value + $uuid_skip;
3768 $uuid_skip = 0;
3769
3770 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3771 and return;
3772
3773 # always fsync - this file is important
3774 aio_fsync $fh
3775 and return;
3776
3777 close $fh
3778 or return;
3779
3780 aio_rename "$uuid~", $uuid
3781 and return;
3782
3783 trace "uuid file written ($value).\n";
3784
3785 1
3786
3787}
3788
3789sub write_uuid($$) {
3790 my ($skip, $sync) = @_;
3791
3792 $sync ? write_uuid_sync $skip
3793 : async { write_uuid_sync $skip };
2783} 3794}
2784 3795
2785sub emergency_save() { 3796sub emergency_save() {
2786 my $freeze_guard = cf::freeze_mainloop; 3797 my $freeze_guard = cf::freeze_mainloop;
2787 3798
2788 warn "enter emergency perl save\n"; 3799 info "emergency_perl_save: enter\n";
3800
3801 # this is a trade-off: we want to be very quick here, so
3802 # save all maps without fsync, and later call a global sync
3803 # (which in turn might be very very slow)
3804 local $USE_FSYNC = 0;
2789 3805
2790 cf::sync_job { 3806 cf::sync_job {
3807 cf::write_runtime_sync; # external watchdog should not bark
3808
2791 # use a peculiar iteration method to avoid tripping on perl 3809 # use a peculiar iteration method to avoid tripping on perl
2792 # refcount bugs in for. also avoids problems with players 3810 # refcount bugs in for. also avoids problems with players
2793 # and maps saved/destroyed asynchronously. 3811 # and maps saved/destroyed asynchronously.
2794 warn "begin emergency player save\n"; 3812 info "emergency_perl_save: begin player save\n";
2795 for my $login (keys %cf::PLAYER) { 3813 for my $login (keys %cf::PLAYER) {
2796 my $pl = $cf::PLAYER{$login} or next; 3814 my $pl = $cf::PLAYER{$login} or next;
2797 $pl->valid or next; 3815 $pl->valid or next;
3816 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2798 $pl->save; 3817 $pl->save;
2799 } 3818 }
2800 warn "end emergency player save\n"; 3819 info "emergency_perl_save: end player save\n";
2801 3820
2802 warn "begin emergency map save\n"; 3821 cf::write_runtime_sync; # external watchdog should not bark
3822
3823 info "emergency_perl_save: begin map save\n";
2803 for my $path (keys %cf::MAP) { 3824 for my $path (keys %cf::MAP) {
2804 my $map = $cf::MAP{$path} or next; 3825 my $map = $cf::MAP{$path} or next;
2805 $map->valid or next; 3826 $map->valid or next;
2806 $map->save; 3827 $map->save;
2807 } 3828 }
2808 warn "end emergency map save\n"; 3829 info "emergency_perl_save: end map save\n";
2809 3830
2810 warn "begin emergency database checkpoint\n"; 3831 cf::write_runtime_sync; # external watchdog should not bark
3832
3833 info "emergency_perl_save: begin database checkpoint\n";
2811 BDB::db_env_txn_checkpoint $DB_ENV; 3834 BDB::db_env_txn_checkpoint $DB_ENV;
2812 warn "end emergency database checkpoint\n"; 3835 info "emergency_perl_save: end database checkpoint\n";
3836
3837 info "emergency_perl_save: begin write uuid\n";
3838 write_uuid_sync 1;
3839 info "emergency_perl_save: end write uuid\n";
3840
3841 cf::write_runtime_sync; # external watchdog should not bark
3842
3843 trace "emergency_perl_save: syncing database to disk";
3844 BDB::db_env_txn_checkpoint $DB_ENV;
3845
3846 info "emergency_perl_save: starting sync\n";
3847 IO::AIO::aio_sync sub {
3848 info "emergency_perl_save: finished sync\n";
3849 };
3850
3851 cf::write_runtime_sync; # external watchdog should not bark
3852
3853 trace "emergency_perl_save: flushing outstanding aio requests";
3854 while (IO::AIO::nreqs || BDB::nreqs) {
3855 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3856 }
3857
3858 cf::write_runtime_sync; # external watchdog should not bark
2813 }; 3859 };
2814 3860
2815 warn "leave emergency perl save\n"; 3861 info "emergency_perl_save: leave\n";
2816} 3862}
2817 3863
2818sub post_cleanup { 3864sub post_cleanup {
2819 my ($make_core) = @_; 3865 my ($make_core) = @_;
2820 3866
3867 IO::AIO::flush;
3868
2821 warn Carp::longmess "post_cleanup backtrace" 3869 error Carp::longmess "post_cleanup backtrace"
2822 if $make_core; 3870 if $make_core;
3871
3872 my $fh = pidfile;
3873 unlink $PIDFILE if <$fh> == $$;
3874}
3875
3876# a safer delete_package, copied from Symbol
3877sub clear_package($) {
3878 my $pkg = shift;
3879
3880 # expand to full symbol table name if needed
3881 unless ($pkg =~ /^main::.*::$/) {
3882 $pkg = "main$pkg" if $pkg =~ /^::/;
3883 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3884 $pkg .= '::' unless $pkg =~ /::$/;
3885 }
3886
3887 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3888 my $stem_symtab = *{$stem}{HASH};
3889
3890 defined $stem_symtab and exists $stem_symtab->{$leaf}
3891 or return;
3892
3893 # clear all symbols
3894 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3895 for my $name (keys %$leaf_symtab) {
3896 _gv_clear *{"$pkg$name"};
3897# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3898 }
2823} 3899}
2824 3900
2825sub do_reload_perl() { 3901sub do_reload_perl() {
2826 # can/must only be called in main 3902 # can/must only be called in main
2827 if ($Coro::current != $Coro::main) { 3903 unless (in_main) {
2828 warn "can only reload from main coroutine"; 3904 error "can only reload from main coroutine";
2829 return; 3905 return;
2830 } 3906 }
2831 3907
2832 warn "reloading..."; 3908 return if $RELOAD++;
2833 3909
2834 warn "entering sync_job"; 3910 my $t1 = AE::time;
2835 3911
3912 while ($RELOAD) {
3913 cf::get_slot 0.1, -1, "reload_perl";
3914 info "perl_reload: reloading...";
3915
3916 trace "perl_reload: entering sync_job";
3917
2836 cf::sync_job { 3918 cf::sync_job {
2837 cf::write_runtime; # external watchdog should not bark
2838 cf::emergency_save; 3919 #cf::emergency_save;
2839 cf::write_runtime; # external watchdog should not bark
2840 3920
2841 warn "syncing database to disk";
2842 BDB::db_env_txn_checkpoint $DB_ENV;
2843
2844 # if anything goes wrong in here, we should simply crash as we already saved
2845
2846 warn "cancelling all WF_AUTOCANCEL watchers";
2847 for (Event::all_watchers) {
2848 $_->cancel if $_->data & WF_AUTOCANCEL;
2849 }
2850
2851 warn "flushing outstanding aio requests";
2852 for (;;) {
2853 BDB::flush;
2854 IO::AIO::flush;
2855 Coro::cede;
2856 last unless IO::AIO::nreqs || BDB::nreqs;
2857 warn "iterate...";
2858 }
2859
2860 ++$RELOAD;
2861
2862 warn "cancelling all extension coros"; 3921 trace "perl_reload: cancelling all extension coros";
2863 $_->cancel for values %EXT_CORO; 3922 $_->cancel for values %EXT_CORO;
2864 %EXT_CORO = (); 3923 %EXT_CORO = ();
2865 3924
2866 warn "removing commands"; 3925 trace "perl_reload: removing commands";
2867 %COMMAND = (); 3926 %COMMAND = ();
2868 3927
2869 warn "removing ext commands"; 3928 trace "perl_reload: removing ext/exti commands";
2870 %EXTCMD = (); 3929 %EXTCMD = ();
3930 %EXTICMD = ();
2871 3931
2872 warn "unloading/nuking all extensions"; 3932 trace "perl_reload: unloading/nuking all extensions";
2873 for my $pkg (@EXTS) { 3933 for my $pkg (@EXTS) {
2874 warn "... unloading $pkg"; 3934 trace "... unloading $pkg";
2875 3935
2876 if (my $cb = $pkg->can ("unload")) { 3936 if (my $cb = $pkg->can ("unload")) {
2877 eval { 3937 eval {
2878 $cb->($pkg); 3938 $cb->($pkg);
2879 1 3939 1
2880 } or warn "$pkg unloaded, but with errors: $@"; 3940 } or error "$pkg unloaded, but with errors: $@";
3941 }
3942
3943 trace "... clearing $pkg";
3944 clear_package $pkg;
2881 } 3945 }
2882 3946
2883 warn "... nuking $pkg";
2884 Symbol::delete_package $pkg;
2885 }
2886
2887 warn "unloading all perl modules loaded from $LIBDIR"; 3947 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
2888 while (my ($k, $v) = each %INC) { 3948 while (my ($k, $v) = each %INC) {
2889 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3949 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2890 3950
2891 warn "... unloading $k"; 3951 trace "... unloading $k";
2892 delete $INC{$k}; 3952 delete $INC{$k};
2893 3953
2894 $k =~ s/\.pm$//; 3954 $k =~ s/\.pm$//;
2895 $k =~ s/\//::/g; 3955 $k =~ s/\//::/g;
2896 3956
2897 if (my $cb = $k->can ("unload_module")) { 3957 if (my $cb = $k->can ("unload_module")) {
2898 $cb->(); 3958 $cb->();
3959 }
3960
3961 clear_package $k;
2899 } 3962 }
2900 3963
2901 Symbol::delete_package $k;
2902 }
2903
2904 warn "getting rid of safe::, as good as possible"; 3964 trace "perl_reload: getting rid of safe::, as good as possible";
2905 Symbol::delete_package "safe::$_" 3965 clear_package "safe::$_"
2906 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3966 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2907 3967
2908 warn "unloading cf.pm \"a bit\""; 3968 trace "perl_reload: unloading cf.pm \"a bit\"";
2909 delete $INC{"cf.pm"}; 3969 delete $INC{"cf.pm"};
2910 delete $INC{"cf/pod.pm"}; 3970 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
2911 3971
2912 # don't, removes xs symbols, too, 3972 # don't, removes xs symbols, too,
2913 # and global variables created in xs 3973 # and global variables created in xs
2914 #Symbol::delete_package __PACKAGE__; 3974 #clear_package __PACKAGE__;
2915 3975
2916 warn "unload completed, starting to reload now"; 3976 info "perl_reload: unload completed, starting to reload now";
2917 3977
2918 warn "reloading cf.pm"; 3978 trace "perl_reload: reloading cf.pm";
2919 require cf; 3979 require cf;
2920 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3980 cf::_connect_to_perl_1;
2921 3981
2922 warn "loading config and database again"; 3982 trace "perl_reload: loading config and database again";
2923 cf::cfg_load; 3983 cf::reload_config;
2924 3984
2925 warn "loading extensions"; 3985 trace "perl_reload: loading extensions";
2926 cf::load_extensions; 3986 cf::load_extensions;
2927 3987
3988 if ($REATTACH_ON_RELOAD) {
2928 warn "reattaching attachments to objects/players"; 3989 trace "perl_reload: reattaching attachments to objects/players";
2929 _global_reattach; # objects, sockets 3990 _global_reattach; # objects, sockets
2930 warn "reattaching attachments to maps"; 3991 trace "perl_reload: reattaching attachments to maps";
2931 reattach $_ for values %MAP; 3992 reattach $_ for values %MAP;
2932 warn "reattaching attachments to players"; 3993 trace "perl_reload: reattaching attachments to players";
2933 reattach $_ for values %PLAYER; 3994 reattach $_ for values %PLAYER;
3995 }
2934 3996
2935 warn "leaving sync_job"; 3997 cf::_post_init 1;
2936 3998
3999 trace "perl_reload: leaving sync_job";
4000
2937 1 4001 1
2938 } or do { 4002 } or do {
2939 warn $@; 4003 error $@;
2940 warn "error while reloading, exiting."; 4004 cf::cleanup "perl_reload: error, exiting.";
2941 exit 1; 4005 };
4006
4007 --$RELOAD;
2942 }; 4008 }
2943 4009
2944 warn "reloaded"; 4010 $t1 = AE::time - $t1;
4011 info "perl_reload: completed in ${t1}s\n";
2945}; 4012};
2946 4013
2947our $RELOAD_WATCHER; # used only during reload 4014our $RELOAD_WATCHER; # used only during reload
2948 4015
2949sub reload_perl() { 4016sub reload_perl() {
2950 # doing reload synchronously and two reloads happen back-to-back, 4017 # doing reload synchronously and two reloads happen back-to-back,
2951 # coro crashes during coro_state_free->destroy here. 4018 # coro crashes during coro_state_free->destroy here.
2952 4019
2953 $RELOAD_WATCHER ||= Event->timer ( 4020 $RELOAD_WATCHER ||= cf::async {
2954 reentrant => 0, 4021 Coro::AIO::aio_wait cache_extensions;
2955 after => 0, 4022
2956 data => WF_AUTOCANCEL, 4023 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
2957 cb => sub {
2958 do_reload_perl; 4024 do_reload_perl;
2959 undef $RELOAD_WATCHER; 4025 undef $RELOAD_WATCHER;
2960 }, 4026 };
2961 ); 4027 };
2962} 4028}
2963 4029
2964register_command "reload" => sub { 4030register_command "reload" => sub {
2965 my ($who, $arg) = @_; 4031 my ($who, $arg) = @_;
2966 4032
2967 if ($who->flag (FLAG_WIZ)) { 4033 if ($who->flag (FLAG_WIZ)) {
2968 $who->message ("reloading server."); 4034 $who->message ("reloading server.");
4035 async {
4036 $Coro::current->{desc} = "perl_reload";
2969 async { reload_perl }; 4037 reload_perl;
4038 };
2970 } 4039 }
2971}; 4040};
2972 4041
2973unshift @INC, $LIBDIR; 4042#############################################################################
2974 4043
2975my $bug_warning = 0; 4044my $bug_warning = 0;
2976 4045
2977our @WAIT_FOR_TICK; 4046our @WAIT_FOR_TICK;
2978our @WAIT_FOR_TICK_BEGIN; 4047our @WAIT_FOR_TICK_BEGIN;
2979 4048
2980sub wait_for_tick { 4049sub wait_for_tick() {
2981 return unless $TICK_WATCHER->is_active;
2982 return if $Coro::current == $Coro::main; 4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
2983 4051
2984 my $signal = new Coro::Signal; 4052 my $signal = new Coro::Signal;
2985 push @WAIT_FOR_TICK, $signal; 4053 push @WAIT_FOR_TICK, $signal;
2986 $signal->wait; 4054 $signal->wait;
2987} 4055}
2988 4056
2989sub wait_for_tick_begin { 4057sub wait_for_tick_begin() {
2990 return unless $TICK_WATCHER->is_active;
2991 return if $Coro::current == $Coro::main; 4058 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
2992 4059
2993 my $signal = new Coro::Signal; 4060 my $signal = new Coro::Signal;
2994 push @WAIT_FOR_TICK_BEGIN, $signal; 4061 push @WAIT_FOR_TICK_BEGIN, $signal;
2995 $signal->wait; 4062 $signal->wait;
2996} 4063}
2997 4064
2998 my $min = 1e6;#d# 4065sub tick {
2999 my $avg = 10;
3000$TICK_WATCHER = Event->timer (
3001 reentrant => 0,
3002 parked => 1,
3003 prio => 0,
3004 at => $NEXT_TICK || $TICK,
3005 data => WF_AUTOCANCEL,
3006 cb => sub {
3007 if ($Coro::current != $Coro::main) { 4066 if ($Coro::current != $Coro::main) {
3008 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4067 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3009 unless ++$bug_warning > 10; 4068 unless ++$bug_warning > 10;
3010 return; 4069 return;
3011 } 4070 }
3012 4071
3013 $NOW = $tick_start = Event::time;
3014
3015 cf::server_tick; # one server iteration 4072 cf::server_tick; # one server iteration
3016 4073
3017 0 && sync_job {#d# 4074 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3018 for(1..10) {
3019 my $t = Event::time;
3020 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3021 or die;
3022 4075
3023 $map->width (50); 4076 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3024 $map->height (50); 4077 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3025 $map->alloc; 4078 Coro::async_pool {
3026 $map->_load_objects ("/tmp/x.map", 1); 4079 $Coro::current->{desc} = "runtime saver";
3027 my $t = Event::time - $t; 4080 write_runtime_sync
3028 4081 or error "ERROR: unable to write runtime file: $!";
3029 #next unless $t < 0.0013;#d#
3030 if ($t < $min) {
3031 $min = $t;
3032 }
3033 $avg = $avg * 0.99 + $t * 0.01;
3034 }
3035 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3036 exit 0;
3037 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3038 }; 4082 };
4083 }
3039 4084
3040 $RUNTIME += $TICK;
3041 $NEXT_TICK += $TICK;
3042
3043 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3044 $NEXT_RUNTIME_WRITE = $NOW + 10;
3045 Coro::async_pool {
3046 write_runtime
3047 or warn "ERROR: unable to write runtime file: $!";
3048 };
3049 }
3050
3051# my $AFTER = Event::time;
3052# warn $AFTER - $NOW;#d#
3053
3054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4085 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3055 $sig->send; 4086 $sig->send;
3056 } 4087 }
3057 while (my $sig = shift @WAIT_FOR_TICK) { 4088 while (my $sig = shift @WAIT_FOR_TICK) {
3058 $sig->send; 4089 $sig->send;
3059 } 4090 }
3060 4091
3061 $NOW = Event::time; 4092 $LOAD = ($NOW - $TICK_START) / $TICK;
3062
3063 # if we are delayed by four ticks or more, skip them all
3064 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3065
3066 $TICK_WATCHER->at ($NEXT_TICK);
3067 $TICK_WATCHER->start;
3068
3069 $LOAD = ($NOW - $tick_start) / $TICK;
3070 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4093 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3071 4094
3072 _post_tick; 4095 if (0) {
3073 4096 if ($NEXT_TICK) {
3074 4097 my $jitter = $TICK_START - $NEXT_TICK;
4098 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4099 debug "jitter $JITTER\n";#d#
4100 }
3075 }, 4101 }
3076); 4102}
3077 4103
3078{ 4104{
3079 BDB::max_poll_time $TICK * 0.1; 4105 # configure BDB
3080 $BDB_POLL_WATCHER = Event->io ( 4106
3081 reentrant => 0,
3082 fd => BDB::poll_fileno,
3083 poll => 'r',
3084 prio => 0,
3085 data => WF_AUTOCANCEL,
3086 cb => \&BDB::poll_cb,
3087 );
3088 BDB::min_parallel 8; 4107 BDB::min_parallel 16;
3089 4108 BDB::max_poll_reqs $TICK * 0.1;
3090 BDB::set_sync_prepare { 4109 $AnyEvent::BDB::WATCHER->priority (1);
3091 my $status;
3092 my $current = $Coro::current;
3093 (
3094 sub {
3095 $status = $!;
3096 $current->ready; undef $current;
3097 },
3098 sub {
3099 Coro::schedule while defined $current;
3100 $! = $status;
3101 },
3102 )
3103 };
3104 4110
3105 unless ($DB_ENV) { 4111 unless ($DB_ENV) {
3106 $DB_ENV = BDB::db_env_create; 4112 $DB_ENV = BDB::db_env_create;
4113 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4114 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4115 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4116 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4117 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3107 4118
3108 cf::sync_job { 4119 cf::sync_job {
3109 eval { 4120 eval {
3110 BDB::db_env_open 4121 BDB::db_env_open
3111 $DB_ENV, 4122 $DB_ENV,
3113 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4124 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3114 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4125 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3115 0666; 4126 0666;
3116 4127
3117 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4128 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3118
3119 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3120 $DB_ENV->set_lk_detect;
3121 }; 4129 };
3122 4130
3123 cf::cleanup "db_env_open(db): $@" if $@; 4131 cf::cleanup "db_env_open(db): $@" if $@;
3124 }; 4132 };
3125 } 4133 }
4134
4135 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4136 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4137 };
4138 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4139 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4140 };
4141 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4142 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4143 };
3126} 4144}
3127 4145
3128{ 4146{
4147 # configure IO::AIO
4148
3129 IO::AIO::min_parallel 8; 4149 IO::AIO::min_parallel 8;
3130
3131 undef $Coro::AIO::WATCHER;
3132 IO::AIO::max_poll_time $TICK * 0.1; 4150 IO::AIO::max_poll_time $TICK * 0.1;
3133 $AIO_POLL_WATCHER = Event->io ( 4151 undef $AnyEvent::AIO::WATCHER;
3134 reentrant => 0,
3135 data => WF_AUTOCANCEL,
3136 fd => IO::AIO::poll_fileno,
3137 poll => 'r',
3138 prio => 6,
3139 cb => \&IO::AIO::poll_cb,
3140 );
3141} 4152}
3142 4153
3143my $_log_backtrace; 4154my $_log_backtrace;
3144 4155
3145sub _log_backtrace { 4156sub _log_backtrace {
3148 $msg =~ s/\n//; 4159 $msg =~ s/\n//;
3149 4160
3150 # limit the # of concurrent backtraces 4161 # limit the # of concurrent backtraces
3151 if ($_log_backtrace < 2) { 4162 if ($_log_backtrace < 2) {
3152 ++$_log_backtrace; 4163 ++$_log_backtrace;
4164 my $perl_bt = Carp::longmess $msg;
3153 async { 4165 async {
4166 $Coro::current->{desc} = "abt $msg";
4167
3154 my @bt = fork_call { 4168 my @bt = fork_call {
3155 @addr = map { sprintf "%x", $_ } @addr; 4169 @addr = map { sprintf "%x", $_ } @addr;
3156 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4170 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3157 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4171 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3158 or die "addr2line: $!"; 4172 or die "addr2line: $!";
3166 } 4180 }
3167 4181
3168 @funcs 4182 @funcs
3169 }; 4183 };
3170 4184
3171 LOG llevInfo, "[ABT] $msg\n"; 4185 LOG llevInfo, "[ABT] $perl_bt\n";
4186 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3172 LOG llevInfo, "[ABT] $_\n" for @bt; 4187 LOG llevInfo, "[ABT] $_\n" for @bt;
3173 --$_log_backtrace; 4188 --$_log_backtrace;
3174 }; 4189 };
3175 } else { 4190 } else {
3176 LOG llevInfo, "[ABT] $msg\n"; 4191 LOG llevInfo, "[ABT] $msg\n";
3177 LOG llevInfo, "[ABT] [suppressed]\n"; 4192 LOG llevInfo, "[ABT] [suppressed]\n";
3178 } 4193 }
3179} 4194}
3180 4195
3181# load additional modules 4196# load additional modules
3182use cf::pod; 4197require "cf/$_.pm" for @EXTRA_MODULES;
4198cf::_connect_to_perl_2;
3183 4199
3184END { cf::emergency_save } 4200END { cf::emergency_save }
3185 4201
31861 42021
3187 4203

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines