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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines