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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines