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.361 by root, Sun Sep 9 12:52:48 2007 UTC vs.
Revision 1.566 by root, Sun May 1 16:58:16 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines