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.358 by root, Fri Sep 7 18:10:52 2007 UTC vs.
Revision 1.564 by elmex, Thu Apr 28 14:58:08 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
1276use Coro::AIO; 1579use Coro::AIO;
1277 1580
1278=head3 cf::player 1581=head3 cf::player
1279 1582
1280=over 4 1583=over 4
1584
1585=item cf::player::num_playing
1586
1587Returns the official number of playing players, as per the Crossfire metaserver rules.
1588
1589=cut
1590
1591sub num_playing {
1592 scalar grep
1593 $_->ob->map
1594 && !$_->hidden
1595 && !$_->ob->flag (cf::FLAG_WIZ),
1596 cf::player::list
1597}
1281 1598
1282=item cf::player::find $login 1599=item cf::player::find $login
1283 1600
1284Returns the given player object, loading it if necessary (might block). 1601Returns the given player object, loading it if necessary (might block).
1285 1602
1304 1621
1305sub exists($) { 1622sub exists($) {
1306 my ($login) = @_; 1623 my ($login) = @_;
1307 1624
1308 $cf::PLAYER{$login} 1625 $cf::PLAYER{$login}
1309 or cf::sync_job { !aio_stat path $login } 1626 or !aio_stat path $login
1310} 1627}
1311 1628
1312sub find($) { 1629sub find($) {
1313 return $cf::PLAYER{$_[0]} || do { 1630 return $cf::PLAYER{$_[0]} || do {
1314 my $login = $_[0]; 1631 my $login = $_[0];
1324 aio_unlink +(playerdir $login) . "/$login.pl"; 1641 aio_unlink +(playerdir $login) . "/$login.pl";
1325 1642
1326 my $f = new_from_file cf::object::thawer path $login 1643 my $f = new_from_file cf::object::thawer path $login
1327 or return; 1644 or return;
1328 1645
1329 $f->next;
1330 my $pl = cf::player::load_pl $f 1646 my $pl = cf::player::load_pl $f
1331 or return; 1647 or return;
1648
1332 local $cf::PLAYER_LOADING{$login} = $pl; 1649 local $cf::PLAYER_LOADING{$login} = $pl;
1333 $f->resolve_delayed_derefs; 1650 $f->resolve_delayed_derefs;
1334 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1335 } 1652 }
1336 } 1653 }
1337} 1654}
1338 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
1339sub save($) { 1669sub save($) {
1340 my ($pl) = @_; 1670 my ($pl) = @_;
1341 1671
1342 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1343 1673
1346 1676
1347 return if $pl->{deny_save}; 1677 return if $pl->{deny_save};
1348 1678
1349 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1350 $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];
1351 1686
1352 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1353 cf::cede_to_tick; 1688 cf::cede_to_tick;
1354} 1689}
1355 1690
1387 my ($pl) = @_; 1722 my ($pl) = @_;
1388 1723
1389 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1390 1725
1391 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1392 $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
1393 1728
1394 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1395 $pl->deactivate; 1730 $pl->deactivate;
1731
1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1396 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1397 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1398 1737
1399 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1400 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1401 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
1439 1778
1440 for my $login (@$dirs) { 1779 for my $login (@$dirs) {
1441 my $path = path $login; 1780 my $path = path $login;
1442 1781
1443 # a .pst is a dead give-away for a valid player 1782 # a .pst is a dead give-away for a valid player
1444 unless (-e "$path.pst") { 1783 # if no pst file found, open and chekc for blocked users
1784 if (aio_stat "$path.pst") {
1445 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1785 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1446 aio_read $fh, 0, 512, my $buf, 0 or next; 1786 aio_read $fh, 0, 512, my $buf, 0 or next;
1447 $buf !~ /^password -------------$/m or next; # official not-valid tag 1787 $buf !~ /^password -------------$/m or next; # official not-valid tag
1448 } 1788 }
1449 1789
1453 1793
1454 \@logins 1794 \@logins
1455} 1795}
1456 1796
1457=item $player->maps 1797=item $player->maps
1798
1799=item cf::player::maps $login
1458 1800
1459Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1460player. May block. 1802player. May block.
1461 1803
1462=cut 1804=cut
1474 for (@$files) { 1816 for (@$files) {
1475 utf8::decode $_; 1817 utf8::decode $_;
1476 next if /\.(?:pl|pst)$/; 1818 next if /\.(?:pl|pst)$/;
1477 next unless /^$PATH_SEP/o; 1819 next unless /^$PATH_SEP/o;
1478 1820
1479 push @paths, cf::map::normalise "~$pl/$_"; 1821 push @paths, cf::map::normalise "~$pl/$_", $pl->map;
1480 } 1822 }
1481 1823
1482 \@paths 1824 \@paths
1483} 1825}
1484 1826
1485=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1827=item $protocol_xml = $player->expand_cfpod ($cfpod)
1486 1828
1487Expand crossfire pod fragments into protocol xml. 1829Expand deliantra pod fragments into protocol xml.
1488
1489=cut
1490
1491sub expand_cfpod {
1492 ((my $self), (local $_)) = @_;
1493
1494 # escape & and <
1495 s/&/&amp;/g;
1496 s/(?<![BIUGHT])</&lt;/g;
1497
1498 # this is buggy, it needs to properly take care of nested <'s
1499
1500 1 while
1501 # replace B<>, I<>, U<> etc.
1502 s/B<([^\>]*)>/<b>$1<\/b>/
1503 || s/I<([^\>]*)>/<i>$1<\/i>/
1504 || s/U<([^\>]*)>/<u>$1<\/u>/
1505 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1506 # replace G<male|female> tags
1507 || s{G<([^>|]*)\|([^>]*)>}{
1508 $self->gender ? $2 : $1
1509 }ge
1510 # replace H<hint text>
1511 || s{H<([^\>]*)>}
1512 {
1513 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1514 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1515 "")
1516 [$self->{hintmode}]
1517 }ge;
1518
1519 # create single paragraphs (very hackish)
1520 s/(?<=\S)\n(?=\w)/ /g;
1521
1522 # compress some whitespace
1523 s/\s+\n/\n/g; # ws line-ends
1524 s/\n\n+/\n/g; # double lines
1525 s/^\n+//; # beginning lines
1526 s/\n+$//; # ending lines
1527
1528 $_
1529}
1530
1531sub hintmode {
1532 $_[0]{hintmode} = $_[1] if @_ > 1;
1533 $_[0]{hintmode}
1534}
1535 1830
1536=item $player->ext_reply ($msgid, @msg) 1831=item $player->ext_reply ($msgid, @msg)
1537 1832
1538Sends an ext reply to the player. 1833Sends an ext reply to the player.
1539 1834
1571 1866
1572=cut 1867=cut
1573 1868
1574sub find_by_path($) { 1869sub find_by_path($) {
1575 my ($path) = @_; 1870 my ($path) = @_;
1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1576 1873
1577 my ($match, $specificity); 1874 my ($match, $specificity);
1578 1875
1579 for my $region (list) { 1876 for my $region (list) {
1580 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1606our $MAX_RESET = 3600; 1903our $MAX_RESET = 3600;
1607our $DEFAULT_RESET = 3000; 1904our $DEFAULT_RESET = 3000;
1608 1905
1609sub generate_random_map { 1906sub generate_random_map {
1610 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1611 # mit "rum" bekleckern, nicht 1908
1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1910
1612 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1613 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1614 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1615 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1616 $rmp->{exit_on_final_map},
1617 $rmp->{xsize}, $rmp->{ysize},
1618 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1619 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1620 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1621 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1622 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1623 (cf::region::find $rmp->{region}), $rmp->{custom}
1624 )
1625} 1912}
1626 1913
1627=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1628 1915
1629Register 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
1634 1921
1635sub register { 1922sub register {
1636 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1637 my $pkg = caller; 1924 my $pkg = caller;
1638 1925
1639 no strict;
1640 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1641 1927
1642 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1643} 1929}
1644 1930
1645# also paths starting with '/' 1931# also paths starting with '/'
1646$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1647 1933
1648sub thawer_merge { 1934sub thawer_merge {
1649 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1650 1936
1651 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
1656} 1942}
1657 1943
1658sub normalise { 1944sub normalise {
1659 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1660 1946
1661 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1662 1948
1663 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1664 1950
1665 # map plan: 1951 # map plan:
1666 # 1952 #
1668 # {... are special paths that are not being touched 1954 # {... are special paths that are not being touched
1669 # ?xxx/... are special absolute paths 1955 # ?xxx/... are special absolute paths
1670 # ?random/... random maps 1956 # ?random/... random maps
1671 # /... normal maps 1957 # /... normal maps
1672 # ~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
1673 1960
1674 $path =~ s/$PATH_SEP/\//go; 1961 $path =~ s/$PATH_SEP/\//go;
1675 1962
1676 # treat it as relative path if it starts with 1963 # treat it as relative path if it starts with
1677 # something that looks reasonable 1964 # something that looks reasonable
1678 if ($path =~ m{^(?:\./|\.\./|\w)}) { 1965 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1679 $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'";
1680 1967
1681 $base =~ s{[^/]+/?$}{}; 1968 $base =~ s{[^/]+/?$}{};
1682 $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;
1683 } 1984 }
1684 1985
1685 for ($path) { 1986 for ($path) {
1686 redo if s{//}{/};
1687 redo if s{/\.?/}{/}; 1987 redo if s{/\.?/}{/};
1688 redo if s{/[^/]+/\.\./}{/}; 1988 redo if s{/[^/]+/\.\./}{/};
1689 } 1989 }
1690 1990
1691 $path 1991 $path
1705 $self->init; # pass $1 etc. 2005 $self->init; # pass $1 etc.
1706 return $self; 2006 return $self;
1707 } 2007 }
1708 } 2008 }
1709 2009
1710 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2010 Carp::cluck "unable to resolve path '$path' (base '$base')";
1711 () 2011 ()
1712} 2012}
1713 2013
2014# may re-bless or do other evil things
1714sub init { 2015sub init {
1715 my ($self) = @_; 2016 my ($self) = @_;
1716 2017
1717 $self 2018 $self
1718} 2019}
1737 2038
1738# the temporary/swap location 2039# the temporary/swap location
1739sub save_path { 2040sub save_path {
1740 my ($self) = @_; 2041 my ($self) = @_;
1741 2042
1742 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2043 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1743 "$TMPDIR/$path.map" 2044 "$TMPDIR/$path.map"
1744} 2045}
1745 2046
1746# the unique path, undef == no special unique path 2047# the unique path, undef == no special unique path
1747sub uniq_path { 2048sub uniq_path {
1748 my ($self) = @_; 2049 my ($self) = @_;
1749 2050
1750 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2051 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1751 "$UNIQUEDIR/$path" 2052 "$UNIQUEDIR/$path"
1752}
1753
1754# and all this just because we cannot iterate over
1755# all maps in C++...
1756sub change_all_map_light {
1757 my ($change) = @_;
1758
1759 $_->change_map_light ($change)
1760 for grep $_->outdoor, values %cf::MAP;
1761} 2053}
1762 2054
1763sub decay_objects { 2055sub decay_objects {
1764 my ($self) = @_; 2056 my ($self) = @_;
1765 2057
1847 2139
1848sub find; 2140sub find;
1849sub find { 2141sub find {
1850 my ($path, $origin) = @_; 2142 my ($path, $origin) = @_;
1851 2143
2144 cf::cede_to_tick;
2145
1852 $path = normalise $path, $origin && $origin->path; 2146 $path = normalise $path, $origin;
1853 2147
1854 cf::lock_wait "map_data:$path";#d#remove 2148 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1855 cf::lock_wait "map_find:$path"; 2149 my $guard2 = cf::lock_acquire "map_find:$path";
1856 2150
1857 $cf::MAP{$path} || do { 2151 $cf::MAP{$path} || do {
1858 my $guard1 = cf::lock_acquire "map_find:$path";
1859 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1860
1861 my $map = new_from_path cf::map $path 2152 my $map = new_from_path cf::map $path
1862 or return; 2153 or return;
1863 2154
1864 $map->{last_save} = $cf::RUNTIME; 2155 $map->{last_save} = $cf::RUNTIME;
1865 2156
1867 or return; 2158 or return;
1868 2159
1869 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2160 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1870 # doing this can freeze the server in a sync job, obviously 2161 # doing this can freeze the server in a sync job, obviously
1871 #$cf::WAIT_FOR_TICK->wait; 2162 #$cf::WAIT_FOR_TICK->wait;
2163 undef $guard2;
1872 undef $guard1; 2164 undef $guard1;
1873 undef $guard2;
1874 $map->reset; 2165 $map->reset;
1875 return find $path; 2166 return find $path;
1876 } 2167 }
1877 2168
1878 $cf::MAP{$path} = $map 2169 $cf::MAP{$path} = $map
1879 } 2170 }
1880} 2171}
1881 2172
1882sub pre_load { } 2173sub pre_load { }
1883sub post_load { } 2174#sub post_load { } # XS
1884 2175
1885sub load { 2176sub load {
1886 my ($self) = @_; 2177 my ($self) = @_;
1887 2178
1888 local $self->{deny_reset} = 1; # loading can take a long time 2179 local $self->{deny_reset} = 1; # loading can take a long time
1891 2182
1892 { 2183 {
1893 my $guard = cf::lock_acquire "map_data:$path"; 2184 my $guard = cf::lock_acquire "map_data:$path";
1894 2185
1895 return unless $self->valid; 2186 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 2187 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 2188
1898 $self->in_memory (cf::MAP_LOADING); 2189 $self->in_memory (cf::MAP_LOADING);
1899 2190
1900 $self->alloc; 2191 $self->alloc;
1901 2192
1902 $self->pre_load; 2193 $self->pre_load;
1903 cf::cede_to_tick; 2194 cf::cede_to_tick;
1904 2195
2196 if (exists $self->{load_path}) {
1905 my $f = new_from_file cf::object::thawer $self->{load_path}; 2197 my $f = new_from_file cf::object::thawer $self->{load_path};
1906 $f->skip_block; 2198 $f->skip_block;
1907 $self->_load_objects ($f) 2199 $self->_load_objects ($f)
1908 or return; 2200 or return;
1909 2201
1910 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2202 $self->post_load_original
1911 if delete $self->{load_original}; 2203 if delete $self->{load_original};
1912 2204
1913 if (my $uniq = $self->uniq_path) { 2205 if (my $uniq = $self->uniq_path) {
1914 utf8::encode $uniq; 2206 utf8::encode $uniq;
1915 unless (aio_stat $uniq) { 2207 unless (aio_stat $uniq) {
1916 if (my $f = new_from_file cf::object::thawer $uniq) { 2208 if (my $f = new_from_file cf::object::thawer $uniq) {
1917 $self->clear_unique_items; 2209 $self->clear_unique_items;
1918 $self->_load_objects ($f); 2210 $self->_load_objects ($f);
1919 $f->resolve_delayed_derefs; 2211 $f->resolve_delayed_derefs;
2212 }
1920 } 2213 }
1921 } 2214 }
1922 }
1923 2215
1924 $f->resolve_delayed_derefs; 2216 $f->resolve_delayed_derefs;
2217 }
1925 2218
1926 cf::cede_to_tick; 2219 cf::cede_to_tick;
1927 # now do the right thing for maps 2220 # now do the right thing for maps
1928 $self->link_multipart_objects; 2221 $self->link_multipart_objects;
1929 $self->difficulty ($self->estimate_difficulty) 2222 $self->difficulty ($self->estimate_difficulty)
1933 unless ($self->{deny_activate}) { 2226 unless ($self->{deny_activate}) {
1934 $self->decay_objects; 2227 $self->decay_objects;
1935 $self->fix_auto_apply; 2228 $self->fix_auto_apply;
1936 $self->update_buttons; 2229 $self->update_buttons;
1937 cf::cede_to_tick; 2230 cf::cede_to_tick;
1938 $self->set_darkness_map;
1939 cf::cede_to_tick;
1940 $self->activate; 2231 $self->activate;
1941 } 2232 }
1942 2233
1943 $self->{last_save} = $cf::RUNTIME; 2234 $self->{last_save} = $cf::RUNTIME;
1944 $self->last_access ($cf::RUNTIME); 2235 $self->last_access ($cf::RUNTIME);
1945 2236
1946 $self->in_memory (cf::MAP_IN_MEMORY); 2237 $self->in_memory (cf::MAP_ACTIVE);
1947 } 2238 }
1948 2239
1949 $self->post_load; 2240 $self->post_load;
1950}
1951 2241
2242 1
2243}
2244
2245# customize the map for a given player, i.e.
2246# return the _real_ map. used by e.g. per-player
2247# maps to change the path to ~playername/mappath
1952sub customise_for { 2248sub customise_for {
1953 my ($self, $ob) = @_; 2249 my ($self, $ob) = @_;
1954 2250
1955 return find "~" . $ob->name . "/" . $self->{path} 2251 return find "~" . $ob->name . "/" . $self->{path}
1956 if $self->per_player; 2252 if $self->per_player;
1972 or next; 2268 or next;
1973 $neigh = find $neigh, $map 2269 $neigh = find $neigh, $map
1974 or next; 2270 or next;
1975 $neigh->load; 2271 $neigh->load;
1976 2272
2273 # now find the diagonal neighbours
1977 push @neigh, 2274 push @neigh,
1978 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2275 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1979 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2276 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1980 } 2277 }
1981 2278
1988} 2285}
1989 2286
1990sub find_sync { 2287sub find_sync {
1991 my ($path, $origin) = @_; 2288 my ($path, $origin) = @_;
1992 2289
1993 cf::sync_job { find $path, $origin } 2290 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2291 if $Coro::current == $Coro::main;
2292
2293 find $path, $origin
1994} 2294}
1995 2295
1996sub do_load_sync { 2296sub do_load_sync {
1997 my ($map) = @_; 2297 my ($map) = @_;
1998 2298
1999 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2299 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2000 if $Coro::current == $Coro::main; 2300 if $Coro::current == $Coro::main;
2001 2301
2002 cf::sync_job { $map->load }; 2302 $map->load;
2003} 2303}
2004 2304
2005our %MAP_PREFETCH; 2305our %MAP_PREFETCH;
2006our $MAP_PREFETCHER = undef; 2306our $MAP_PREFETCHER = undef;
2007 2307
2008sub find_async { 2308sub find_async {
2009 my ($path, $origin, $load) = @_; 2309 my ($path, $origin, $load) = @_;
2010 2310
2011 $path = normalise $path, $origin && $origin->{path}; 2311 $path = normalise $path, $origin;
2012 2312
2013 if (my $map = $cf::MAP{$path}) { 2313 if (my $map = $cf::MAP{$path}) {
2014 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2314 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2015 } 2315 }
2016 2316
2017 $MAP_PREFETCH{$path} |= $load; 2317 $MAP_PREFETCH{$path} |= $load;
2018 2318
2019 $MAP_PREFETCHER ||= cf::async { 2319 $MAP_PREFETCHER ||= cf::async {
2320 $Coro::current->{desc} = "map prefetcher";
2321
2020 while (%MAP_PREFETCH) { 2322 while (%MAP_PREFETCH) {
2021 while (my ($k, $v) = each %MAP_PREFETCH) { 2323 while (my ($k, $v) = each %MAP_PREFETCH) {
2022 if (my $map = find $k) { 2324 if (my $map = find $k) {
2023 $map->load if $v; 2325 $map->load if $v;
2024 } 2326 }
2031 $MAP_PREFETCHER->prio (6); 2333 $MAP_PREFETCHER->prio (6);
2032 2334
2033 () 2335 ()
2034} 2336}
2035 2337
2338# common code, used by both ->save and ->swapout
2036sub save { 2339sub _save {
2037 my ($self) = @_; 2340 my ($self) = @_;
2038
2039 my $lock = cf::lock_acquire "map_data:$self->{path}";
2040 2341
2041 $self->{last_save} = $cf::RUNTIME; 2342 $self->{last_save} = $cf::RUNTIME;
2042 2343
2043 return unless $self->dirty; 2344 return unless $self->dirty;
2044 2345
2050 return if $self->{deny_save}; 2351 return if $self->{deny_save};
2051 2352
2052 local $self->{last_access} = $self->last_access;#d# 2353 local $self->{last_access} = $self->last_access;#d#
2053 2354
2054 cf::async { 2355 cf::async {
2356 $Coro::current->{desc} = "map player save";
2055 $_->contr->save for $self->players; 2357 $_->contr->save for $self->players;
2056 }; 2358 };
2359
2360 cf::get_slot 0.02;
2057 2361
2058 if ($uniq) { 2362 if ($uniq) {
2059 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2363 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2060 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2364 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2061 } else { 2365 } else {
2062 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2366 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2063 } 2367 }
2064} 2368}
2065 2369
2370sub save {
2371 my ($self) = @_;
2372
2373 my $lock = cf::lock_acquire "map_data:$self->{path}";
2374
2375 $self->_save;
2376}
2377
2066sub swap_out { 2378sub swap_out {
2067 my ($self) = @_; 2379 my ($self) = @_;
2068 2380
2069 # save first because save cedes
2070 $self->save;
2071
2072 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2381 my $lock = cf::lock_acquire "map_data:$self->{path}";
2073 2382
2383 return if $self->in_memory != cf::MAP_ACTIVE;
2384 return if $self->{deny_save};
2074 return if $self->players; 2385 return if $self->players;
2075 return if $self->in_memory != cf::MAP_IN_MEMORY;
2076 return if $self->{deny_save};
2077 2386
2387 # first deactivate the map and "unlink" it from the core
2078 $self->deactivate; 2388 $self->deactivate;
2389 $_->clear_links_to ($self) for values %cf::MAP;
2390 $self->in_memory (cf::MAP_SWAPPED);
2391
2392 # then atomically save
2393 $self->_save;
2394
2395 # then free the map
2079 $self->clear; 2396 $self->clear;
2080 $self->in_memory (cf::MAP_SWAPPED);
2081} 2397}
2082 2398
2083sub reset_at { 2399sub reset_at {
2084 my ($self) = @_; 2400 my ($self) = @_;
2085 2401
2103 2419
2104 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2420 my $lock = cf::lock_acquire "map_data:$self->{path}";
2105 2421
2106 return if $self->players; 2422 return if $self->players;
2107 2423
2108 warn "resetting map ", $self->path; 2424 cf::trace "resetting map ", $self->path, "\n";
2109 2425
2110 $self->in_memory (cf::MAP_SWAPPED); 2426 $self->in_memory (cf::MAP_SWAPPED);
2111 2427
2112 # need to save uniques path 2428 # need to save uniques path
2113 unless ($self->{deny_save}) { 2429 unless ($self->{deny_save}) {
2118 } 2434 }
2119 2435
2120 delete $cf::MAP{$self->path}; 2436 delete $cf::MAP{$self->path};
2121 2437
2122 $self->deactivate; 2438 $self->deactivate;
2439 $_->clear_links_to ($self) for values %cf::MAP;
2123 $self->clear; 2440 $self->clear;
2124
2125 $_->clear_links_to ($self) for values %cf::MAP;
2126 2441
2127 $self->unlink_save; 2442 $self->unlink_save;
2128 $self->destroy; 2443 $self->destroy;
2129} 2444}
2130 2445
2138 2453
2139 delete $cf::MAP{$self->path}; 2454 delete $cf::MAP{$self->path};
2140 2455
2141 $self->unlink_save; 2456 $self->unlink_save;
2142 2457
2143 bless $self, "cf::map"; 2458 bless $self, "cf::map::wrap";
2144 delete $self->{deny_reset}; 2459 delete $self->{deny_reset};
2145 $self->{deny_save} = 1; 2460 $self->{deny_save} = 1;
2146 $self->reset_timeout (1); 2461 $self->reset_timeout (1);
2147 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2462 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2148 2463
2197 2512
2198sub unique_maps() { 2513sub unique_maps() {
2199 [ 2514 [
2200 map { 2515 map {
2201 utf8::decode $_; 2516 utf8::decode $_;
2202 /\.map$/ 2517 s/\.map$//; # TODO future compatibility hack
2518 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2519 ? ()
2203 ? normalise $_ 2520 : normalise $_
2204 : ()
2205 } @{ aio_readdir $UNIQUEDIR or [] } 2521 } @{ aio_readdir $UNIQUEDIR or [] }
2206 ] 2522 ]
2207} 2523}
2208 2524
2209package cf; 2525=item cf::map::static_maps
2526
2527Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2528file in the shared directory excluding F</styles> and F</editor>). May
2529block.
2530
2531=cut
2532
2533sub static_maps() {
2534 my @dirs = "";
2535 my @maps;
2536
2537 while (@dirs) {
2538 my $dir = shift @dirs;
2539
2540 next if $dir eq "/styles" || $dir eq "/editor";
2541
2542 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2543 or return;
2544
2545 for (@$files) {
2546 s/\.map$// or next;
2547 utf8::decode $_;
2548 push @maps, "$dir/$_";
2549 }
2550
2551 push @dirs, map "$dir/$_", @$dirs;
2552 }
2553
2554 \@maps
2555}
2210 2556
2211=back 2557=back
2212 2558
2213=head3 cf::object 2559=head3 cf::object
2214 2560
2218 2564
2219=over 4 2565=over 4
2220 2566
2221=item $ob->inv_recursive 2567=item $ob->inv_recursive
2222 2568
2223Returns the inventory of the object _and_ their inventories, recursively. 2569Returns the inventory of the object I<and> their inventories, recursively,
2570but I<not> the object itself.
2224 2571
2225=cut 2572=cut
2226 2573
2227sub inv_recursive_; 2574sub inv_recursive_;
2228sub inv_recursive_ { 2575sub inv_recursive_ {
2233 inv_recursive_ inv $_[0] 2580 inv_recursive_ inv $_[0]
2234} 2581}
2235 2582
2236=item $ref = $ob->ref 2583=item $ref = $ob->ref
2237 2584
2238creates and returns a persistent reference to an objetc that can be stored as a string. 2585Creates and returns a persistent reference to an object that can be stored as a string.
2239 2586
2240=item $ob = cf::object::deref ($refstring) 2587=item $ob = cf::object::deref ($refstring)
2241 2588
2242returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2589returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2243even if the object actually exists. May block. 2590even if the object actually exists. May block.
2245=cut 2592=cut
2246 2593
2247sub deref { 2594sub deref {
2248 my ($ref) = @_; 2595 my ($ref) = @_;
2249 2596
2250 # temporary compatibility#TODO#remove
2251 $ref =~ s{^<}{player/<};
2252
2253 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2597 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2254 my ($uuid, $name) = ($1, $2); 2598 my ($uuid, $name) = ($1, $2);
2255 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2599 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2256 or return; 2600 or return;
2257 $pl->ob->uuid eq $uuid 2601 $pl->ob->uuid eq $uuid
2258 or return; 2602 or return;
2278can be C<undef>. Does the right thing when the player is currently in a 2622can be C<undef>. Does the right thing when the player is currently in a
2279dialogue with the given NPC character. 2623dialogue with the given NPC character.
2280 2624
2281=cut 2625=cut
2282 2626
2627our $SAY_CHANNEL = {
2628 id => "say",
2629 title => "Map",
2630 reply => "say ",
2631 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2632};
2633
2634our $CHAT_CHANNEL = {
2635 id => "chat",
2636 title => "Chat",
2637 reply => "chat ",
2638 tooltip => "Player chat and shouts, global to the server.",
2639};
2640
2283# rough implementation of a future "reply" method that works 2641# rough implementation of a future "reply" method that works
2284# with dialog boxes. 2642# with dialog boxes.
2285#TODO: the first argument must go, split into a $npc->reply_to ( method 2643#TODO: the first argument must go, split into a $npc->reply_to ( method
2286sub cf::object::player::reply($$$;$) { 2644sub cf::object::player::reply($$$;$) {
2287 my ($self, $npc, $msg, $flags) = @_; 2645 my ($self, $npc, $msg, $flags) = @_;
2298 my $dialog = $pl->{npc_dialog}; 2656 my $dialog = $pl->{npc_dialog};
2299 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2657 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2300 2658
2301 } else { 2659 } else {
2302 $msg = $npc->name . " says: $msg" if $npc; 2660 $msg = $npc->name . " says: $msg" if $npc;
2303 $self->message ($msg, $flags); 2661 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2304 } 2662 }
2305 } 2663 }
2306} 2664}
2307 2665
2308=item $object->send_msg ($channel, $msg, $color, [extra...]) 2666=item $object->send_msg ($channel, $msg, $color, [extra...])
2333 2691
2334=item $player_object->enter_link 2692=item $player_object->enter_link
2335 2693
2336Freezes the player and moves him/her to a special map (C<{link}>). 2694Freezes the player and moves him/her to a special map (C<{link}>).
2337 2695
2338The player should be reasonably safe there for short amounts of time. You 2696The player should be reasonably safe there for short amounts of time (e.g.
2339I<MUST> call C<leave_link> as soon as possible, though. 2697for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2698though, as the player cannot control the character while it is on the link
2699map.
2340 2700
2341Will never block. 2701Will never block.
2342 2702
2343=item $player_object->leave_link ($map, $x, $y) 2703=item $player_object->leave_link ($map, $x, $y)
2344 2704
2364sub cf::object::player::enter_link { 2724sub cf::object::player::enter_link {
2365 my ($self) = @_; 2725 my ($self) = @_;
2366 2726
2367 $self->deactivate_recursive; 2727 $self->deactivate_recursive;
2368 2728
2729 ++$self->{_link_recursion};
2730
2369 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2731 return if UNIVERSAL::isa $self->map, "ext::map_link";
2370 2732
2371 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2733 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2372 if $self->map && $self->map->{path} ne "{link}"; 2734 if $self->map && $self->map->{path} ne "{link}";
2373 2735
2374 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2736 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2375} 2737}
2376 2738
2377sub cf::object::player::leave_link { 2739sub cf::object::player::leave_link {
2378 my ($self, $map, $x, $y) = @_; 2740 my ($self, $map, $x, $y) = @_;
2379 2741
2396 ($x, $y) = (-1, -1) 2758 ($x, $y) = (-1, -1)
2397 unless (defined $x) && (defined $y); 2759 unless (defined $x) && (defined $y);
2398 2760
2399 # use -1 or undef as default coordinates, not 0, 0 2761 # use -1 or undef as default coordinates, not 0, 0
2400 ($x, $y) = ($map->enter_x, $map->enter_y) 2762 ($x, $y) = ($map->enter_x, $map->enter_y)
2401 if $x <=0 && $y <= 0; 2763 if $x <= 0 && $y <= 0;
2402 2764
2403 $map->load; 2765 $map->load;
2404 $map->load_neighbours; 2766 $map->load_neighbours;
2405 2767
2406 return unless $self->contr->active; 2768 return unless $self->contr->active;
2407 $self->activate_recursive;
2408 2769
2409 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2770 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2410 $self->enter_map ($map, $x, $y); 2771 if ($self->enter_map ($map, $x, $y)) {
2411} 2772 # entering was successful
2773 delete $self->{_link_recursion};
2774 # only activate afterwards, to support waiting in hooks
2775 $self->activate_recursive;
2776 }
2412 2777
2778}
2779
2413=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2780=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2414 2781
2415Moves the player to the given map-path and coordinates by first freezing 2782Moves the player to the given map-path and coordinates by first freezing
2416her, loading and preparing them map, calling the provided $check callback 2783her, loading and preparing them map, calling the provided $check callback
2417that has to return the map if sucecssful, and then unfreezes the player on 2784that has to return the map if sucecssful, and then unfreezes the player on
2418the new (success) or old (failed) map position. In either case, $done will 2785the new (success) or old (failed) map position. In either case, $done will
2419be called at the end of this process. 2786be called at the end of this process.
2420 2787
2788Note that $check will be called with a potentially non-loaded map, so if
2789it needs a loaded map it has to call C<< ->load >>.
2790
2421=cut 2791=cut
2422 2792
2423our $GOTOGEN; 2793our $GOTOGEN;
2424 2794
2425sub cf::object::player::goto { 2795sub cf::object::player::goto {
2426 my ($self, $path, $x, $y, $check, $done) = @_; 2796 my ($self, $path, $x, $y, $check, $done) = @_;
2427 2797
2798 if ($self->{_link_recursion} >= $MAX_LINKS) {
2799 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2800 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2801 ($path, $x, $y) = @$EMERGENCY_POSITION;
2802 }
2803
2428 # do generation counting so two concurrent goto's will be executed in-order 2804 # do generation counting so two concurrent goto's will be executed in-order
2429 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2805 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2430 2806
2431 $self->enter_link; 2807 $self->enter_link;
2432 2808
2433 (async { 2809 (async {
2810 $Coro::current->{desc} = "player::goto $path $x $y";
2811
2812 # *tag paths override both path and x|y
2813 if ($path =~ /^\*(.*)$/) {
2814 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2815 my $ob = $obs[rand @obs];
2816
2817 # see if we actually can go there
2818 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2819 $ob = $obs[rand @obs];
2820 } else {
2821 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2822 }
2823 # else put us there anyways for now #d#
2824
2825 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2826 } else {
2827 ($path, $x, $y) = (undef, undef, undef);
2828 }
2829 }
2830
2434 my $map = eval { 2831 my $map = eval {
2435 my $map = cf::map::find $path; 2832 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2436 2833
2437 if ($map) { 2834 if ($map) {
2438 $map = $map->customise_for ($self); 2835 $map = $map->customise_for ($self);
2439 $map = $check->($map) if $check && $map; 2836 $map = $check->($map, $x, $y, $self) if $check && $map;
2440 } else { 2837 } else {
2441 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2838 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2442 } 2839 }
2443 2840
2444 $map 2841 $map
2445 }; 2842 };
2446 2843
2452 if ($gen == $self->{_goto_generation}) { 2849 if ($gen == $self->{_goto_generation}) {
2453 delete $self->{_goto_generation}; 2850 delete $self->{_goto_generation};
2454 $self->leave_link ($map, $x, $y); 2851 $self->leave_link ($map, $x, $y);
2455 } 2852 }
2456 2853
2457 $done->() if $done; 2854 $done->($self) if $done;
2458 })->prio (1); 2855 })->prio (1);
2459} 2856}
2460 2857
2461=item $player_object->enter_exit ($exit_object) 2858=item $player_object->enter_exit ($exit_object)
2462 2859
2482} 2879}
2483 2880
2484sub prepare_random_map { 2881sub prepare_random_map {
2485 my ($exit) = @_; 2882 my ($exit) = @_;
2486 2883
2487 my $guard = cf::lock_acquire "exit_prepare:$exit";
2488
2489 # all this does is basically replace the /! path by 2884 # all this does is basically replace the /! path by
2490 # a new random map path (?random/...) with a seed 2885 # a new random map path (?random/...) with a seed
2491 # that depends on the exit object 2886 # that depends on the exit object
2492 2887
2493 my $rmp = parse_random_map_params $exit->msg; 2888 my $rmp = parse_random_map_params $exit->msg;
2495 if ($exit->map) { 2890 if ($exit->map) {
2496 $rmp->{region} = $exit->region->name; 2891 $rmp->{region} = $exit->region->name;
2497 $rmp->{origin_map} = $exit->map->path; 2892 $rmp->{origin_map} = $exit->map->path;
2498 $rmp->{origin_x} = $exit->x; 2893 $rmp->{origin_x} = $exit->x;
2499 $rmp->{origin_y} = $exit->y; 2894 $rmp->{origin_y} = $exit->y;
2895
2896 $exit->map->touch;
2500 } 2897 }
2501 2898
2502 $rmp->{random_seed} ||= $exit->random_seed; 2899 $rmp->{random_seed} ||= $exit->random_seed;
2503 2900
2504 my $data = cf::to_json $rmp; 2901 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2505 my $md5 = Digest::MD5::md5_hex $data; 2902 my $md5 = Digest::MD5::md5_hex $data;
2506 my $meta = "$RANDOMDIR/$md5.meta"; 2903 my $meta = "$RANDOMDIR/$md5.meta";
2507 2904
2508 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2905 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2509 aio_write $fh, 0, (length $data), $data, 0; 2906 aio_write $fh, 0, (length $data), $data, 0;
2510 undef $fh; 2907 undef $fh;
2511 aio_rename "$meta~", $meta; 2908 aio_rename "$meta~", $meta;
2512 2909
2910 my $slaying = "?random/$md5";
2911
2912 if ($exit->valid) {
2513 $exit->slaying ("?random/$md5"); 2913 $exit->slaying ("?random/$md5");
2514 $exit->msg (undef); 2914 $exit->msg (undef);
2915 }
2515 } 2916 }
2516} 2917}
2517 2918
2518sub cf::object::player::enter_exit { 2919sub cf::object::player::enter_exit {
2519 my ($self, $exit) = @_; 2920 my ($self, $exit) = @_;
2520 2921
2521 return unless $self->type == cf::PLAYER; 2922 return unless $self->type == cf::PLAYER;
2522 2923
2523 if ($exit->slaying eq "/!") {
2524 #TODO: this should de-fi-ni-te-ly not be a sync-job
2525 # the problem is that $exit might not survive long enough
2526 # so it needs to be done right now, right here
2527 cf::sync_job { prepare_random_map $exit };
2528 }
2529
2530 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2531 my $hp = $exit->stats->hp;
2532 my $sp = $exit->stats->sp;
2533
2534 $self->enter_link; 2924 $self->enter_link;
2535 2925
2536 # if exit is damned, update players death & WoR home-position
2537 $self->contr->savebed ($slaying, $hp, $sp)
2538 if $exit->flag (FLAG_DAMNED);
2539
2540 (async { 2926 (async {
2541 $self->deactivate_recursive; # just to be sure 2927 $Coro::current->{desc} = "enter_exit";
2928
2542 unless (eval { 2929 unless (eval {
2930 $self->deactivate_recursive; # just to be sure
2931
2932 # random map handling
2933 {
2934 my $guard = cf::lock_acquire "exit_prepare:$exit";
2935
2936 prepare_random_map $exit
2937 if $exit->slaying eq "/!";
2938 }
2939
2940 my $map = cf::map::normalise $exit->slaying, $exit->map;
2941 my $x = $exit->stats->hp;
2942 my $y = $exit->stats->sp;
2943
2543 $self->goto ($slaying, $hp, $sp); 2944 $self->goto ($map, $x, $y);
2544 2945
2946 # if exit is damned, update players death & WoR home-position
2947 $self->contr->savebed ($map, $x, $y)
2948 if $exit->flag (cf::FLAG_DAMNED);
2949
2545 1; 2950 1
2546 }) { 2951 }) {
2547 $self->message ("Something went wrong deep within the crossfire server. " 2952 $self->message ("Something went wrong deep within the deliantra server. "
2548 . "I'll try to bring you back to the map you were before. " 2953 . "I'll try to bring you back to the map you were before. "
2549 . "Please report this to the dungeon master!", 2954 . "Please report this to the dungeon master!",
2550 cf::NDI_UNIQUE | cf::NDI_RED); 2955 cf::NDI_UNIQUE | cf::NDI_RED);
2551 2956
2552 warn "ERROR in enter_exit: $@"; 2957 error "ERROR in enter_exit: $@";
2553 $self->leave_link; 2958 $self->leave_link;
2554 } 2959 }
2555 })->prio (1); 2960 })->prio (1);
2556} 2961}
2557 2962
2569sub cf::client::send_drawinfo { 2974sub cf::client::send_drawinfo {
2570 my ($self, $text, $flags) = @_; 2975 my ($self, $text, $flags) = @_;
2571 2976
2572 utf8::encode $text; 2977 utf8::encode $text;
2573 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2978 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2979}
2980
2981=item $client->send_big_packet ($pkt)
2982
2983Like C<send_packet>, but tries to compress large packets, and fragments
2984them as required.
2985
2986=cut
2987
2988our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2989
2990sub cf::client::send_big_packet {
2991 my ($self, $pkt) = @_;
2992
2993 # try lzf for large packets
2994 $pkt = "lzf " . Compress::LZF::compress $pkt
2995 if 1024 <= length $pkt and $self->{can_lzf};
2996
2997 # split very large packets
2998 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2999 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3000 $pkt = "frag";
3001 }
3002
3003 $self->send_packet ($pkt);
2574} 3004}
2575 3005
2576=item $client->send_msg ($channel, $msg, $color, [extra...]) 3006=item $client->send_msg ($channel, $msg, $color, [extra...])
2577 3007
2578Send a drawinfo or msg packet to the client, formatting the msg for the 3008Send a drawinfo or msg packet to the client, formatting the msg for the
2580the message, with C<log> being the default. If C<$color> is negative, suppress 3010the message, with C<log> being the default. If C<$color> is negative, suppress
2581the message unless the client supports the msg packet. 3011the message unless the client supports the msg packet.
2582 3012
2583=cut 3013=cut
2584 3014
3015# non-persistent channels (usually the info channel)
2585our %CHANNEL = ( 3016our %CHANNEL = (
3017 "c/motd" => {
3018 id => "infobox",
3019 title => "MOTD",
3020 reply => undef,
3021 tooltip => "The message of the day",
3022 },
2586 "c/identify" => { 3023 "c/identify" => {
2587 id => "identify", 3024 id => "infobox",
2588 title => "Identify", 3025 title => "Identify",
2589 reply => undef, 3026 reply => undef,
2590 tooltip => "Items recently identified", 3027 tooltip => "Items recently identified",
2591 }, 3028 },
2592 "c/examine" => { 3029 "c/examine" => {
2593 id => "examine", 3030 id => "infobox",
2594 title => "Examine", 3031 title => "Examine",
2595 reply => undef, 3032 reply => undef,
2596 tooltip => "Signs and other items you examined", 3033 tooltip => "Signs and other items you examined",
2597 }, 3034 },
3035 "c/shopinfo" => {
3036 id => "infobox",
3037 title => "Shop Info",
3038 reply => undef,
3039 tooltip => "What your bargaining skill tells you about the shop",
3040 },
3041 "c/book" => {
3042 id => "infobox",
3043 title => "Book",
3044 reply => undef,
3045 tooltip => "The contents of a note or book",
3046 },
3047 "c/lookat" => {
3048 id => "infobox",
3049 title => "Look",
3050 reply => undef,
3051 tooltip => "What you saw there",
3052 },
3053 "c/who" => {
3054 id => "infobox",
3055 title => "Players",
3056 reply => undef,
3057 tooltip => "Shows players who are currently online",
3058 },
3059 "c/body" => {
3060 id => "infobox",
3061 title => "Body Parts",
3062 reply => undef,
3063 tooltip => "Shows which body parts you posess and are available",
3064 },
3065 "c/statistics" => {
3066 id => "infobox",
3067 title => "Statistics",
3068 reply => undef,
3069 tooltip => "Shows your primary statistics",
3070 },
3071 "c/skills" => {
3072 id => "infobox",
3073 title => "Skills",
3074 reply => undef,
3075 tooltip => "Shows your experience per skill and item power",
3076 },
3077 "c/shopitems" => {
3078 id => "infobox",
3079 title => "Shop Items",
3080 reply => undef,
3081 tooltip => "Shows the items currently for sale in this shop",
3082 },
3083 "c/resistances" => {
3084 id => "infobox",
3085 title => "Resistances",
3086 reply => undef,
3087 tooltip => "Shows your resistances",
3088 },
3089 "c/pets" => {
3090 id => "infobox",
3091 title => "Pets",
3092 reply => undef,
3093 tooltip => "Shows information abotu your pets/a specific pet",
3094 },
3095 "c/perceiveself" => {
3096 id => "infobox",
3097 title => "Perceive Self",
3098 reply => undef,
3099 tooltip => "You gained detailed knowledge about yourself",
3100 },
3101 "c/uptime" => {
3102 id => "infobox",
3103 title => "Uptime",
3104 reply => undef,
3105 tooltip => "How long the server has been running since last restart",
3106 },
3107 "c/mapinfo" => {
3108 id => "infobox",
3109 title => "Map Info",
3110 reply => undef,
3111 tooltip => "Information related to the maps",
3112 },
3113 "c/party" => {
3114 id => "party",
3115 title => "Party",
3116 reply => "gsay ",
3117 tooltip => "Messages and chat related to your party",
3118 },
3119 "c/death" => {
3120 id => "death",
3121 title => "Death",
3122 reply => undef,
3123 tooltip => "Reason for and more info about your most recent death",
3124 },
3125 "c/say" => $SAY_CHANNEL,
3126 "c/chat" => $CHAT_CHANNEL,
2598); 3127);
2599 3128
2600sub cf::client::send_msg { 3129sub cf::client::send_msg {
2601 my ($self, $channel, $msg, $color, @extra) = @_; 3130 my ($self, $channel, $msg, $color, @extra) = @_;
2602 3131
2603 $msg = $self->pl->expand_cfpod ($msg); 3132 $msg = $self->pl->expand_cfpod ($msg)
3133 unless $color & cf::NDI_VERBATIM;
2604 3134
2605 $color &= cf::NDI_CLIENT_MASK; # just in case... 3135 $color &= cf::NDI_CLIENT_MASK; # just in case...
2606 3136
2607 # check predefined channels, for the benefit of C 3137 # check predefined channels, for the benefit of C
2608 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 3138 if ($CHANNEL{$channel}) {
3139 $channel = $CHANNEL{$channel};
2609 3140
3141 $self->ext_msg (channel_info => $channel);
3142 $channel = $channel->{id};
3143
2610 if (ref $channel) { 3144 } elsif (ref $channel) {
2611 # send meta info to client, if not yet sent 3145 # send meta info to client, if not yet sent
2612 unless (exists $self->{channel}{$channel->{id}}) { 3146 unless (exists $self->{channel}{$channel->{id}}) {
2613 $self->{channel}{$channel->{id}} = $channel; 3147 $self->{channel}{$channel->{id}} = $channel;
2614 $self->ext_msg (channel_info => $channel) 3148 $self->ext_msg (channel_info => $channel);
2615 if $self->can_msg;
2616 } 3149 }
2617 3150
2618 $channel = $channel->{id}; 3151 $channel = $channel->{id};
2619 } 3152 }
2620 3153
2621 return unless @extra || length $msg; 3154 return unless @extra || length $msg;
2622 3155
2623 if ($self->can_msg) {
2624 # default colour, mask it out 3156 # default colour, mask it out
2625 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3157 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2626 if $color & cf::NDI_DEF; 3158 if $color & cf::NDI_DEF;
2627 3159
2628 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3160 my $pkt = "msg "
3161 . $self->{json_coder}->encode (
2629 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3162 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2630 } else { 3163 );
2631 if ($color >= 0) {
2632 # replace some tags by gcfclient-compatible ones
2633 for ($msg) {
2634 1 while
2635 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2636 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2637 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2638 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2639 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2640 }
2641 3164
2642 $color &= cf::NDI_COLOR_MASK; 3165 $self->send_big_packet ($pkt);
2643
2644 utf8::encode $msg;
2645
2646 if (0 && $msg =~ /\[/) {
2647 # COMMAND/INFO
2648 $self->send_packet ("drawextinfo $color 10 8 $msg")
2649 } else {
2650 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2651 $self->send_packet ("drawinfo $color $msg")
2652 }
2653 }
2654 }
2655} 3166}
2656 3167
2657=item $client->ext_msg ($type, @msg) 3168=item $client->ext_msg ($type, @msg)
2658 3169
2659Sends an ext event to the client. 3170Sends an ext event to the client.
2662 3173
2663sub cf::client::ext_msg($$@) { 3174sub cf::client::ext_msg($$@) {
2664 my ($self, $type, @msg) = @_; 3175 my ($self, $type, @msg) = @_;
2665 3176
2666 if ($self->extcmd == 2) { 3177 if ($self->extcmd == 2) {
2667 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3178 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2668 } elsif ($self->extcmd == 1) { # TODO: remove 3179 } elsif ($self->extcmd == 1) { # TODO: remove
2669 push @msg, msgtype => "event_$type"; 3180 push @msg, msgtype => "event_$type";
2670 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3181 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2671 } 3182 }
2672} 3183}
2673 3184
2674=item $client->ext_reply ($msgid, @msg) 3185=item $client->ext_reply ($msgid, @msg)
2675 3186
2679 3190
2680sub cf::client::ext_reply($$@) { 3191sub cf::client::ext_reply($$@) {
2681 my ($self, $id, @msg) = @_; 3192 my ($self, $id, @msg) = @_;
2682 3193
2683 if ($self->extcmd == 2) { 3194 if ($self->extcmd == 2) {
2684 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3195 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2685 } elsif ($self->extcmd == 1) { 3196 } elsif ($self->extcmd == 1) {
2686 #TODO: version 1, remove 3197 #TODO: version 1, remove
2687 unshift @msg, msgtype => "reply", msgid => $id; 3198 unshift @msg, msgtype => "reply", msgid => $id;
2688 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3199 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2689 } 3200 }
2690} 3201}
2691 3202
2692=item $success = $client->query ($flags, "text", \&cb) 3203=item $success = $client->query ($flags, "text", \&cb)
2693 3204
2764 3275
2765 $ns->ext_reply ($reply, @reply) 3276 $ns->ext_reply ($reply, @reply)
2766 if $reply; 3277 if $reply;
2767 3278
2768 } else { 3279 } else {
2769 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3280 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2770 } 3281 }
2771 3282
2772 cf::override; 3283 cf::override;
2773 }, 3284 },
2774); 3285);
2794 3305
2795 $coro 3306 $coro
2796} 3307}
2797 3308
2798cf::client->attach ( 3309cf::client->attach (
2799 on_destroy => sub { 3310 on_client_destroy => sub {
2800 my ($ns) = @_; 3311 my ($ns) = @_;
2801 3312
2802 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3313 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2803 }, 3314 },
2804); 3315);
2820our $safe_hole = new Safe::Hole; 3331our $safe_hole = new Safe::Hole;
2821 3332
2822$SIG{FPE} = 'IGNORE'; 3333$SIG{FPE} = 'IGNORE';
2823 3334
2824$safe->permit_only (Opcode::opset qw( 3335$safe->permit_only (Opcode::opset qw(
2825 :base_core :base_mem :base_orig :base_math 3336 :base_core :base_mem :base_orig :base_math :base_loop
2826 grepstart grepwhile mapstart mapwhile 3337 grepstart grepwhile mapstart mapwhile
2827 sort time 3338 sort time
2828)); 3339));
2829 3340
2830# here we export the classes and methods available to script code 3341# here we export the classes and methods available to script code
2832=pod 3343=pod
2833 3344
2834The following functions and methods are available within a safe environment: 3345The following functions and methods are available within a safe environment:
2835 3346
2836 cf::object 3347 cf::object
2837 contr pay_amount pay_player map x y force_find force_add 3348 contr pay_amount pay_player map x y force_find force_add destroy
2838 insert remove name archname title slaying race decrease_ob_nr 3349 insert remove name archname title slaying race decrease split
3350 value
2839 3351
2840 cf::object::player 3352 cf::object::player
2841 player 3353 player
2842 3354
2843 cf::player 3355 cf::player
2848 3360
2849=cut 3361=cut
2850 3362
2851for ( 3363for (
2852 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3364 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2853 insert remove inv name archname title slaying race 3365 insert remove inv nrof name archname title slaying race
2854 decrease_ob_nr)], 3366 decrease split destroy change_exp value msg lore send_msg)],
2855 ["cf::object::player" => qw(player)], 3367 ["cf::object::player" => qw(player)],
2856 ["cf::player" => qw(peaceful)], 3368 ["cf::player" => qw(peaceful send_msg)],
2857 ["cf::map" => qw(trigger)], 3369 ["cf::map" => qw(trigger)],
2858) { 3370) {
2859 no strict 'refs';
2860 my ($pkg, @funs) = @$_; 3371 my ($pkg, @funs) = @$_;
2861 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3372 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2862 for @funs; 3373 for @funs;
2863} 3374}
2864 3375
2879 3390
2880 my $qcode = $code; 3391 my $qcode = $code;
2881 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3392 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2882 $qcode =~ s/\n/\\n/g; 3393 $qcode =~ s/\n/\\n/g;
2883 3394
3395 %vars = (_dummy => 0) unless %vars;
3396
3397 my @res;
2884 local $_; 3398 local $_;
2885 local @safe::cf::_safe_eval_args = values %vars;
2886 3399
2887 my $eval = 3400 my $eval =
2888 "do {\n" 3401 "do {\n"
2889 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3402 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2890 . "#line 0 \"{$qcode}\"\n" 3403 . "#line 0 \"{$qcode}\"\n"
2891 . $code 3404 . $code
2892 . "\n}" 3405 . "\n}"
2893 ; 3406 ;
2894 3407
3408 if ($CFG{safe_eval}) {
2895 sub_generation_inc; 3409 sub_generation_inc;
3410 local @safe::cf::_safe_eval_args = values %vars;
2896 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3411 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2897 sub_generation_inc; 3412 sub_generation_inc;
3413 } else {
3414 local @cf::_safe_eval_args = values %vars;
3415 @res = wantarray ? eval eval : scalar eval $eval;
3416 }
2898 3417
2899 if ($@) { 3418 if ($@) {
2900 warn "$@"; 3419 warn "$@",
2901 warn "while executing safe code '$code'\n"; 3420 "while executing safe code '$code'\n",
2902 warn "with arguments " . (join " ", %vars) . "\n"; 3421 "with arguments " . (join " ", %vars) . "\n";
2903 } 3422 }
2904 3423
2905 wantarray ? @res : $res[0] 3424 wantarray ? @res : $res[0]
2906} 3425}
2907 3426
2921=cut 3440=cut
2922 3441
2923sub register_script_function { 3442sub register_script_function {
2924 my ($fun, $cb) = @_; 3443 my ($fun, $cb) = @_;
2925 3444
2926 no strict 'refs'; 3445 $fun = "safe::$fun" if $CFG{safe_eval};
2927 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3446 *$fun = $safe_hole->wrap ($cb);
2928} 3447}
2929 3448
2930=back 3449=back
2931 3450
2932=cut 3451=cut
2941 # for this (global event?) 3460 # for this (global event?)
2942 %ext::player_env::MUSIC_FACE_CACHE = (); 3461 %ext::player_env::MUSIC_FACE_CACHE = ();
2943 3462
2944 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3463 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2945 3464
2946 warn "loading facedata from $path\n"; 3465 trace "loading facedata from $path\n";
2947 3466
2948 my $facedata; 3467 my $facedata = decode_storable load_file $path;
2949 0 < aio_load $path, $facedata
2950 or die "$path: $!";
2951
2952 $facedata = Coro::Storable::thaw $facedata;
2953 3468
2954 $facedata->{version} == 2 3469 $facedata->{version} == 2
2955 or cf::cleanup "$path: version mismatch, cannot proceed."; 3470 or cf::cleanup "$path: version mismatch, cannot proceed.";
2956 3471
2957 # patch in the exptable 3472 # patch in the exptable
3473 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
2958 $facedata->{resource}{"res/exp_table"} = { 3474 $facedata->{resource}{"res/exp_table"} = {
2959 type => FT_RSRC, 3475 type => FT_RSRC,
2960 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3476 data => $exp_table,
3477 hash => (Digest::MD5::md5 $exp_table),
2961 }; 3478 };
2962 cf::cede_to_tick; 3479 cf::cede_to_tick;
2963 3480
2964 { 3481 {
2965 my $faces = $facedata->{faceinfo}; 3482 my $faces = $facedata->{faceinfo};
2966 3483
2967 while (my ($face, $info) = each %$faces) { 3484 while (my ($face, $info) = each %$faces) {
2968 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3485 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3486
2969 cf::face::set_visibility $idx, $info->{visibility}; 3487 cf::face::set_visibility $idx, $info->{visibility};
2970 cf::face::set_magicmap $idx, $info->{magicmap}; 3488 cf::face::set_magicmap $idx, $info->{magicmap};
2971 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3489 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2972 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3490 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3491 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
2973 3492
2974 cf::cede_to_tick; 3493 cf::cede_to_tick;
2975 } 3494 }
2976 3495
2977 while (my ($face, $info) = each %$faces) { 3496 while (my ($face, $info) = each %$faces) {
2978 next unless $info->{smooth}; 3497 next unless $info->{smooth};
3498
2979 my $idx = cf::face::find $face 3499 my $idx = cf::face::find $face
2980 or next; 3500 or next;
3501
2981 if (my $smooth = cf::face::find $info->{smooth}) { 3502 if (my $smooth = cf::face::find $info->{smooth}) {
2982 cf::face::set_smooth $idx, $smooth; 3503 cf::face::set_smooth $idx, $smooth;
2983 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3504 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2984 } else { 3505 } else {
2985 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3506 error "smooth face '$info->{smooth}' not found for face '$face'";
2986 } 3507 }
2987 3508
2988 cf::cede_to_tick; 3509 cf::cede_to_tick;
2989 } 3510 }
2990 } 3511 }
2999 3520
3000 cf::anim::invalidate_all; # d'oh 3521 cf::anim::invalidate_all; # d'oh
3001 } 3522 }
3002 3523
3003 { 3524 {
3004 # TODO: for gcfclient pleasure, we should give resources
3005 # that gcfclient doesn't grok a >10000 face index.
3006 my $res = $facedata->{resource}; 3525 my $res = $facedata->{resource};
3007 3526
3008 my $soundconf = delete $res->{"res/sound.conf"};
3009
3010 while (my ($name, $info) = each %$res) { 3527 while (my ($name, $info) = each %$res) {
3528 if (defined $info->{type}) {
3011 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3529 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3012 my $data;
3013 3530
3014 if ($info->{type} & 1) { 3531 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3015 # prepend meta info 3532 cf::face::set_type $idx, $info->{type};
3016
3017 my $meta = $enc->encode ({
3018 name => $name,
3019 %{ $info->{meta} || {} },
3020 });
3021
3022 $data = pack "(w/a*)*", $meta, $info->{data};
3023 } else { 3533 } else {
3024 $data = $info->{data}; 3534 $RESOURCE{$name} = $info; # unused
3025 } 3535 }
3026 3536
3027 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3028 cf::face::set_type $idx, $info->{type};
3029
3030 cf::cede_to_tick; 3537 cf::cede_to_tick;
3031 } 3538 }
3032
3033 if ($soundconf) {
3034 $soundconf = $enc->decode (delete $soundconf->{data});
3035
3036 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3037 my $sound = $soundconf->{compat}[$_]
3038 or next;
3039
3040 my $face = cf::face::find "sound/$sound->[1]";
3041 cf::sound::set $sound->[0] => $face;
3042 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3043 }
3044
3045 while (my ($k, $v) = each %{$soundconf->{event}}) {
3046 my $face = cf::face::find "sound/$v";
3047 cf::sound::set $k => $face;
3048 }
3049 }
3050 } 3539 }
3540
3541 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3051 3542
3052 1 3543 1
3053} 3544}
3054 3545
3055register_exticmd fx_want => sub { 3546register_exticmd fx_want => sub {
3057 3548
3058 while (my ($k, $v) = each %$want) { 3549 while (my ($k, $v) = each %$want) {
3059 $ns->fx_want ($k, $v); 3550 $ns->fx_want ($k, $v);
3060 } 3551 }
3061}; 3552};
3553
3554sub load_resource_file($) {
3555 my $guard = lock_acquire "load_resource_file";
3556
3557 my $status = load_resource_file_ $_[0];
3558 get_slot 0.1, 100;
3559 cf::arch::commit_load;
3560
3561 $status
3562}
3062 3563
3063sub reload_regions { 3564sub reload_regions {
3064 # HACK to clear player env face cache, we need some signal framework 3565 # HACK to clear player env face cache, we need some signal framework
3065 # for this (global event?) 3566 # for this (global event?)
3066 %ext::player_env::MUSIC_FACE_CACHE = (); 3567 %ext::player_env::MUSIC_FACE_CACHE = ();
3080} 3581}
3081 3582
3082sub reload_archetypes { 3583sub reload_archetypes {
3083 load_resource_file "$DATADIR/archetypes" 3584 load_resource_file "$DATADIR/archetypes"
3084 or die "unable to load archetypes\n"; 3585 or die "unable to load archetypes\n";
3085 #d# NEED to laod twice to resolve forward references
3086 # this really needs to be done in an extra post-pass
3087 # (which needs to be synchronous, so solve it differently)
3088 load_resource_file "$DATADIR/archetypes"
3089 or die "unable to load archetypes\n";
3090} 3586}
3091 3587
3092sub reload_treasures { 3588sub reload_treasures {
3093 load_resource_file "$DATADIR/treasures" 3589 load_resource_file "$DATADIR/treasures"
3094 or die "unable to load treasurelists\n"; 3590 or die "unable to load treasurelists\n";
3095} 3591}
3096 3592
3593sub reload_sound {
3594 trace "loading sound config from $DATADIR/sound\n";
3595
3596 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3597
3598 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3599 my $sound = $soundconf->{compat}[$_]
3600 or next;
3601
3602 my $face = cf::face::find "sound/$sound->[1]";
3603 cf::sound::set $sound->[0] => $face;
3604 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3605 }
3606
3607 while (my ($k, $v) = each %{$soundconf->{event}}) {
3608 my $face = cf::face::find "sound/$v";
3609 cf::sound::set $k => $face;
3610 }
3611}
3612
3097sub reload_resources { 3613sub reload_resources {
3098 warn "reloading resource files...\n"; 3614 trace "reloading resource files...\n";
3099 3615
3616 reload_exp_table;
3617 reload_materials;
3618 reload_facedata;
3619 reload_sound;
3620 reload_archetypes;
3100 reload_regions; 3621 reload_regions;
3101 reload_facedata;
3102 #reload_archetypes;#d#
3103 reload_archetypes;
3104 reload_treasures; 3622 reload_treasures;
3105 3623
3106 warn "finished reloading resource files\n"; 3624 trace "finished reloading resource files\n";
3107}
3108
3109sub init {
3110 reload_resources;
3111} 3625}
3112 3626
3113sub reload_config { 3627sub reload_config {
3114 open my $fh, "<:utf8", "$CONFDIR/config" 3628 trace "reloading config file...\n";
3115 or return;
3116 3629
3117 local $/; 3630 my $config = load_file "$CONFDIR/config";
3118 *CFG = YAML::Syck::Load <$fh>; 3631 utf8::decode $config;
3632 *CFG = decode_yaml $config;
3119 3633
3120 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3634 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3121 3635
3122 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3636 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3123 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3637 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3124 3638
3125 if (exists $CFG{mlockall}) { 3639 if (exists $CFG{mlockall}) {
3129 }; 3643 };
3130 warn $@ if $@; 3644 warn $@ if $@;
3131 } 3645 }
3132} 3646}
3133 3647
3648sub pidfile() {
3649 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3650 or die "$PIDFILE: $!";
3651 flock $fh, &Fcntl::LOCK_EX
3652 or die "$PIDFILE: flock: $!";
3653 $fh
3654}
3655
3656# make sure only one server instance is running at any one time
3657sub atomic {
3658 my $fh = pidfile;
3659
3660 my $pid = <$fh>;
3661 kill 9, $pid if $pid > 0;
3662
3663 seek $fh, 0, 0;
3664 print $fh $$;
3665}
3666
3667sub main_loop {
3668 trace "EV::loop starting\n";
3669 if (1) {
3670 EV::loop;
3671 }
3672 trace "EV::loop returned\n";
3673 goto &main_loop unless $REALLY_UNLOOP;
3674}
3675
3134sub main { 3676sub main {
3677 cf::init_globals; # initialise logging
3678
3679 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3680 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3681 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3682 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3683
3684 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3685
3135 # we must not ever block the main coroutine 3686 # we must not ever block the main coroutine
3136 local $Coro::idle = sub { 3687 local $Coro::idle = sub {
3137 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3688 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3138 (async { 3689 (async {
3139 Event::one_event; 3690 $Coro::current->{desc} = "IDLE BUG HANDLER";
3691 EV::loop EV::LOOP_ONESHOT;
3140 })->prio (Coro::PRIO_MAX); 3692 })->prio (Coro::PRIO_MAX);
3141 }; 3693 };
3142 3694
3695 evthread_start IO::AIO::poll_fileno;
3696
3697 cf::sync_job {
3698 cf::incloader::init ();
3699
3700 cf::init_anim;
3701 cf::init_attackmess;
3702 cf::init_dynamic;
3703
3704 cf::load_settings;
3705
3706 reload_resources;
3143 reload_config; 3707 reload_config;
3144 db_init; 3708 db_init;
3709
3710 cf::init_uuid;
3711 cf::init_signals;
3712 cf::init_skills;
3713
3714 cf::init_beforeplay;
3715
3716 atomic;
3717
3145 load_extensions; 3718 load_extensions;
3146 3719
3147 $TICK_WATCHER->start; 3720 utime time, time, $RUNTIMEFILE;
3148 Event::loop; 3721
3722 # no (long-running) fork's whatsoever before this point(!)
3723 use POSIX ();
3724 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3725
3726 cf::_post_init 0;
3727 };
3728
3729 cf::object::thawer::errors_are_fatal 0;
3730 info "parse errors in files are no longer fatal from this point on.\n";
3731
3732 my $free_main; $free_main = EV::idle sub {
3733 undef $free_main;
3734 undef &main; # free gobs of memory :)
3735 };
3736
3737 goto &main_loop;
3149} 3738}
3150 3739
3151############################################################################# 3740#############################################################################
3152# initialisation and cleanup 3741# initialisation and cleanup
3153 3742
3154# install some emergency cleanup handlers 3743# install some emergency cleanup handlers
3155BEGIN { 3744BEGIN {
3745 our %SIGWATCHER = ();
3156 for my $signal (qw(INT HUP TERM)) { 3746 for my $signal (qw(INT HUP TERM)) {
3157 Event->signal ( 3747 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3158 reentrant => 0,
3159 data => WF_AUTOCANCEL,
3160 signal => $signal,
3161 prio => 0,
3162 cb => sub {
3163 cf::cleanup "SIG$signal"; 3748 cf::cleanup "SIG$signal";
3164 },
3165 ); 3749 };
3166 } 3750 }
3167} 3751}
3168 3752
3169sub write_runtime { 3753sub write_runtime_sync {
3170 my $runtime = "$LOCALDIR/runtime"; 3754 my $t0 = AE::time;
3171 3755
3172 # first touch the runtime file to show we are still running: 3756 # first touch the runtime file to show we are still running:
3173 # the fsync below can take a very very long time. 3757 # the fsync below can take a very very long time.
3174 3758
3175 IO::AIO::aio_utime $runtime, undef, undef; 3759 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3176 3760
3177 my $guard = cf::lock_acquire "write_runtime"; 3761 my $guard = cf::lock_acquire "write_runtime";
3178 3762
3179 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3763 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3180 or return; 3764 or return;
3181 3765
3182 my $value = $cf::RUNTIME + 90 + 10; 3766 my $value = $cf::RUNTIME + 90 + 10;
3183 # 10 is the runtime save interval, for a monotonic clock 3767 # 10 is the runtime save interval, for a monotonic clock
3184 # 60 allows for the watchdog to kill the server. 3768 # 60 allows for the watchdog to kill the server.
3194 aio_utime $fh, undef, undef; 3778 aio_utime $fh, undef, undef;
3195 3779
3196 close $fh 3780 close $fh
3197 or return; 3781 or return;
3198 3782
3199 aio_rename "$runtime~", $runtime 3783 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3200 and return; 3784 and return;
3201 3785
3202 warn "runtime file written.\n"; 3786 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3203 3787
3204 1 3788 1
3789}
3790
3791our $uuid_lock;
3792our $uuid_skip;
3793
3794sub write_uuid_sync($) {
3795 $uuid_skip ||= $_[0];
3796
3797 return if $uuid_lock;
3798 local $uuid_lock = 1;
3799
3800 my $uuid = "$LOCALDIR/uuid";
3801
3802 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3803 or return;
3804
3805 my $value = uuid_seq uuid_cur;
3806
3807 unless ($value) {
3808 info "cowardly refusing to write zero uuid value!\n";
3809 return;
3810 }
3811
3812 my $value = uuid_str $value + $uuid_skip;
3813 $uuid_skip = 0;
3814
3815 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3816 and return;
3817
3818 # always fsync - this file is important
3819 aio_fsync $fh
3820 and return;
3821
3822 close $fh
3823 or return;
3824
3825 aio_rename "$uuid~", $uuid
3826 and return;
3827
3828 trace "uuid file written ($value).\n";
3829
3830 1
3831
3832}
3833
3834sub write_uuid($$) {
3835 my ($skip, $sync) = @_;
3836
3837 $sync ? write_uuid_sync $skip
3838 : async { write_uuid_sync $skip };
3205} 3839}
3206 3840
3207sub emergency_save() { 3841sub emergency_save() {
3208 my $freeze_guard = cf::freeze_mainloop; 3842 my $freeze_guard = cf::freeze_mainloop;
3209 3843
3210 warn "enter emergency perl save\n"; 3844 info "emergency_perl_save: enter\n";
3845
3846 # this is a trade-off: we want to be very quick here, so
3847 # save all maps without fsync, and later call a global sync
3848 # (which in turn might be very very slow)
3849 local $USE_FSYNC = 0;
3211 3850
3212 cf::sync_job { 3851 cf::sync_job {
3852 cf::write_runtime_sync; # external watchdog should not bark
3853
3213 # use a peculiar iteration method to avoid tripping on perl 3854 # use a peculiar iteration method to avoid tripping on perl
3214 # refcount bugs in for. also avoids problems with players 3855 # refcount bugs in for. also avoids problems with players
3215 # and maps saved/destroyed asynchronously. 3856 # and maps saved/destroyed asynchronously.
3216 warn "begin emergency player save\n"; 3857 info "emergency_perl_save: begin player save\n";
3217 for my $login (keys %cf::PLAYER) { 3858 for my $login (keys %cf::PLAYER) {
3218 my $pl = $cf::PLAYER{$login} or next; 3859 my $pl = $cf::PLAYER{$login} or next;
3219 $pl->valid or next; 3860 $pl->valid or next;
3861 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3220 $pl->save; 3862 $pl->save;
3221 } 3863 }
3222 warn "end emergency player save\n"; 3864 info "emergency_perl_save: end player save\n";
3223 3865
3224 warn "begin emergency map save\n"; 3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3868 info "emergency_perl_save: begin map save\n";
3225 for my $path (keys %cf::MAP) { 3869 for my $path (keys %cf::MAP) {
3226 my $map = $cf::MAP{$path} or next; 3870 my $map = $cf::MAP{$path} or next;
3227 $map->valid or next; 3871 $map->valid or next;
3228 $map->save; 3872 $map->save;
3229 } 3873 }
3230 warn "end emergency map save\n"; 3874 info "emergency_perl_save: end map save\n";
3231 3875
3232 warn "begin emergency database checkpoint\n"; 3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 info "emergency_perl_save: begin database checkpoint\n";
3233 BDB::db_env_txn_checkpoint $DB_ENV; 3879 BDB::db_env_txn_checkpoint $DB_ENV;
3234 warn "end emergency database checkpoint\n"; 3880 info "emergency_perl_save: end database checkpoint\n";
3881
3882 info "emergency_perl_save: begin write uuid\n";
3883 write_uuid_sync 1;
3884 info "emergency_perl_save: end write uuid\n";
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3887
3888 trace "emergency_perl_save: syncing database to disk";
3889 BDB::db_env_txn_checkpoint $DB_ENV;
3890
3891 info "emergency_perl_save: starting sync\n";
3892 IO::AIO::aio_sync sub {
3893 info "emergency_perl_save: finished sync\n";
3894 };
3895
3896 cf::write_runtime_sync; # external watchdog should not bark
3897
3898 trace "emergency_perl_save: flushing outstanding aio requests";
3899 while (IO::AIO::nreqs || BDB::nreqs) {
3900 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3901 }
3902
3903 cf::write_runtime_sync; # external watchdog should not bark
3235 }; 3904 };
3236 3905
3237 warn "leave emergency perl save\n"; 3906 info "emergency_perl_save: leave\n";
3238} 3907}
3239 3908
3240sub post_cleanup { 3909sub post_cleanup {
3241 my ($make_core) = @_; 3910 my ($make_core) = @_;
3242 3911
3912 IO::AIO::flush;
3913
3243 warn Carp::longmess "post_cleanup backtrace" 3914 error Carp::longmess "post_cleanup backtrace"
3244 if $make_core; 3915 if $make_core;
3916
3917 my $fh = pidfile;
3918 unlink $PIDFILE if <$fh> == $$;
3919}
3920
3921# a safer delete_package, copied from Symbol
3922sub clear_package($) {
3923 my $pkg = shift;
3924
3925 # expand to full symbol table name if needed
3926 unless ($pkg =~ /^main::.*::$/) {
3927 $pkg = "main$pkg" if $pkg =~ /^::/;
3928 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3929 $pkg .= '::' unless $pkg =~ /::$/;
3930 }
3931
3932 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3933 my $stem_symtab = *{$stem}{HASH};
3934
3935 defined $stem_symtab and exists $stem_symtab->{$leaf}
3936 or return;
3937
3938 # clear all symbols
3939 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3940 for my $name (keys %$leaf_symtab) {
3941 _gv_clear *{"$pkg$name"};
3942# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3943 }
3245} 3944}
3246 3945
3247sub do_reload_perl() { 3946sub do_reload_perl() {
3248 # can/must only be called in main 3947 # can/must only be called in main
3249 if ($Coro::current != $Coro::main) { 3948 unless (in_main) {
3250 warn "can only reload from main coroutine"; 3949 error "can only reload from main coroutine";
3251 return; 3950 return;
3252 } 3951 }
3253 3952
3254 warn "reloading..."; 3953 return if $RELOAD++;
3255 3954
3256 warn "entering sync_job"; 3955 my $t1 = AE::time;
3257 3956
3957 while ($RELOAD) {
3958 cf::get_slot 0.1, -1, "reload_perl";
3959 info "perl_reload: reloading...";
3960
3961 trace "perl_reload: entering sync_job";
3962
3258 cf::sync_job { 3963 cf::sync_job {
3259 cf::write_runtime; # external watchdog should not bark
3260 cf::emergency_save; 3964 #cf::emergency_save;
3261 cf::write_runtime; # external watchdog should not bark
3262 3965
3263 warn "syncing database to disk";
3264 BDB::db_env_txn_checkpoint $DB_ENV;
3265
3266 # if anything goes wrong in here, we should simply crash as we already saved
3267
3268 warn "cancelling all WF_AUTOCANCEL watchers";
3269 for (Event::all_watchers) {
3270 $_->cancel if $_->data & WF_AUTOCANCEL;
3271 }
3272
3273 warn "flushing outstanding aio requests";
3274 for (;;) {
3275 BDB::flush;
3276 IO::AIO::flush;
3277 Coro::cede;
3278 last unless IO::AIO::nreqs || BDB::nreqs;
3279 warn "iterate...";
3280 }
3281
3282 ++$RELOAD;
3283
3284 warn "cancelling all extension coros"; 3966 trace "perl_reload: cancelling all extension coros";
3285 $_->cancel for values %EXT_CORO; 3967 $_->cancel for values %EXT_CORO;
3286 %EXT_CORO = (); 3968 %EXT_CORO = ();
3287 3969
3288 warn "removing commands"; 3970 trace "perl_reload: removing commands";
3289 %COMMAND = (); 3971 %COMMAND = ();
3290 3972
3291 warn "removing ext/exti commands"; 3973 trace "perl_reload: removing ext/exti commands";
3292 %EXTCMD = (); 3974 %EXTCMD = ();
3293 %EXTICMD = (); 3975 %EXTICMD = ();
3294 3976
3295 warn "unloading/nuking all extensions"; 3977 trace "perl_reload: unloading/nuking all extensions";
3296 for my $pkg (@EXTS) { 3978 for my $pkg (@EXTS) {
3297 warn "... unloading $pkg"; 3979 trace "... unloading $pkg";
3298 3980
3299 if (my $cb = $pkg->can ("unload")) { 3981 if (my $cb = $pkg->can ("unload")) {
3300 eval { 3982 eval {
3301 $cb->($pkg); 3983 $cb->($pkg);
3302 1 3984 1
3303 } or warn "$pkg unloaded, but with errors: $@"; 3985 } or error "$pkg unloaded, but with errors: $@";
3986 }
3987
3988 trace "... clearing $pkg";
3989 clear_package $pkg;
3304 } 3990 }
3305 3991
3306 warn "... nuking $pkg";
3307 Symbol::delete_package $pkg;
3308 }
3309
3310 warn "unloading all perl modules loaded from $LIBDIR"; 3992 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3311 while (my ($k, $v) = each %INC) { 3993 while (my ($k, $v) = each %INC) {
3312 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3994 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3313 3995
3314 warn "... unloading $k"; 3996 trace "... unloading $k";
3315 delete $INC{$k}; 3997 delete $INC{$k};
3316 3998
3317 $k =~ s/\.pm$//; 3999 $k =~ s/\.pm$//;
3318 $k =~ s/\//::/g; 4000 $k =~ s/\//::/g;
3319 4001
3320 if (my $cb = $k->can ("unload_module")) { 4002 if (my $cb = $k->can ("unload_module")) {
3321 $cb->(); 4003 $cb->();
4004 }
4005
4006 clear_package $k;
3322 } 4007 }
3323 4008
3324 Symbol::delete_package $k;
3325 }
3326
3327 warn "getting rid of safe::, as good as possible"; 4009 trace "perl_reload: getting rid of safe::, as good as possible";
3328 Symbol::delete_package "safe::$_" 4010 clear_package "safe::$_"
3329 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4011 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3330 4012
3331 warn "unloading cf.pm \"a bit\""; 4013 trace "perl_reload: unloading cf.pm \"a bit\"";
3332 delete $INC{"cf.pm"}; 4014 delete $INC{"cf.pm"};
3333 delete $INC{"cf/pod.pm"}; 4015 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3334 4016
3335 # don't, removes xs symbols, too, 4017 # don't, removes xs symbols, too,
3336 # and global variables created in xs 4018 # and global variables created in xs
3337 #Symbol::delete_package __PACKAGE__; 4019 #clear_package __PACKAGE__;
3338 4020
3339 warn "unload completed, starting to reload now"; 4021 info "perl_reload: unload completed, starting to reload now";
3340 4022
3341 warn "reloading cf.pm"; 4023 trace "perl_reload: reloading cf.pm";
3342 require cf; 4024 require cf;
3343 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4025 cf::_connect_to_perl_1;
3344 4026
3345 warn "loading config and database again"; 4027 trace "perl_reload: loading config and database again";
3346 cf::reload_config; 4028 cf::reload_config;
3347 4029
3348 warn "loading extensions"; 4030 trace "perl_reload: loading extensions";
3349 cf::load_extensions; 4031 cf::load_extensions;
3350 4032
4033 if ($REATTACH_ON_RELOAD) {
3351 warn "reattaching attachments to objects/players"; 4034 trace "perl_reload: reattaching attachments to objects/players";
3352 _global_reattach; # objects, sockets 4035 _global_reattach; # objects, sockets
3353 warn "reattaching attachments to maps"; 4036 trace "perl_reload: reattaching attachments to maps";
3354 reattach $_ for values %MAP; 4037 reattach $_ for values %MAP;
3355 warn "reattaching attachments to players"; 4038 trace "perl_reload: reattaching attachments to players";
3356 reattach $_ for values %PLAYER; 4039 reattach $_ for values %PLAYER;
4040 }
3357 4041
3358 warn "leaving sync_job"; 4042 cf::_post_init 1;
3359 4043
4044 trace "perl_reload: leaving sync_job";
4045
3360 1 4046 1
3361 } or do { 4047 } or do {
3362 warn $@; 4048 error $@;
3363 warn "error while reloading, exiting."; 4049 cf::cleanup "perl_reload: error, exiting.";
3364 exit 1; 4050 };
4051
4052 --$RELOAD;
3365 }; 4053 }
3366 4054
3367 warn "reloaded"; 4055 $t1 = AE::time - $t1;
4056 info "perl_reload: completed in ${t1}s\n";
3368}; 4057};
3369 4058
3370our $RELOAD_WATCHER; # used only during reload 4059our $RELOAD_WATCHER; # used only during reload
3371 4060
3372sub reload_perl() { 4061sub reload_perl() {
3373 # doing reload synchronously and two reloads happen back-to-back, 4062 # doing reload synchronously and two reloads happen back-to-back,
3374 # coro crashes during coro_state_free->destroy here. 4063 # coro crashes during coro_state_free->destroy here.
3375 4064
3376 $RELOAD_WATCHER ||= Event->timer ( 4065 $RELOAD_WATCHER ||= cf::async {
3377 reentrant => 0, 4066 Coro::AIO::aio_wait cache_extensions;
3378 after => 0, 4067
3379 data => WF_AUTOCANCEL, 4068 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3380 cb => sub {
3381 do_reload_perl; 4069 do_reload_perl;
3382 undef $RELOAD_WATCHER; 4070 undef $RELOAD_WATCHER;
3383 }, 4071 };
3384 ); 4072 };
3385} 4073}
3386 4074
3387register_command "reload" => sub { 4075register_command "reload" => sub {
3388 my ($who, $arg) = @_; 4076 my ($who, $arg) = @_;
3389 4077
3390 if ($who->flag (FLAG_WIZ)) { 4078 if ($who->flag (FLAG_WIZ)) {
3391 $who->message ("reloading server."); 4079 $who->message ("reloading server.");
4080 async {
4081 $Coro::current->{desc} = "perl_reload";
3392 async { reload_perl }; 4082 reload_perl;
4083 };
3393 } 4084 }
3394}; 4085};
3395 4086
3396unshift @INC, $LIBDIR; 4087#############################################################################
3397 4088
3398my $bug_warning = 0; 4089my $bug_warning = 0;
3399 4090
3400our @WAIT_FOR_TICK; 4091our @WAIT_FOR_TICK;
3401our @WAIT_FOR_TICK_BEGIN; 4092our @WAIT_FOR_TICK_BEGIN;
3402 4093
3403sub wait_for_tick { 4094sub wait_for_tick() {
3404 return unless $TICK_WATCHER->is_active;
3405 return if $Coro::current == $Coro::main; 4095 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3406 4096
3407 my $signal = new Coro::Signal; 4097 my $signal = new Coro::Signal;
3408 push @WAIT_FOR_TICK, $signal; 4098 push @WAIT_FOR_TICK, $signal;
3409 $signal->wait; 4099 $signal->wait;
3410} 4100}
3411 4101
3412sub wait_for_tick_begin { 4102sub wait_for_tick_begin() {
3413 return unless $TICK_WATCHER->is_active;
3414 return if $Coro::current == $Coro::main; 4103 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3415 4104
3416 my $signal = new Coro::Signal; 4105 my $signal = new Coro::Signal;
3417 push @WAIT_FOR_TICK_BEGIN, $signal; 4106 push @WAIT_FOR_TICK_BEGIN, $signal;
3418 $signal->wait; 4107 $signal->wait;
3419} 4108}
3420 4109
3421 my $min = 1e6;#d# 4110sub tick {
3422 my $avg = 10;
3423$TICK_WATCHER = Event->timer (
3424 reentrant => 0,
3425 parked => 1,
3426 prio => 0,
3427 at => $NEXT_TICK || $TICK,
3428 data => WF_AUTOCANCEL,
3429 cb => sub {
3430 if ($Coro::current != $Coro::main) { 4111 if ($Coro::current != $Coro::main) {
3431 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4112 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3432 unless ++$bug_warning > 10; 4113 unless ++$bug_warning > 10;
3433 return; 4114 return;
3434 } 4115 }
3435 4116
3436 $NOW = $tick_start = Event::time;
3437
3438 cf::server_tick; # one server iteration 4117 cf::server_tick; # one server iteration
3439 4118
3440 0 && sync_job {#d# 4119 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3441 for(1..10) {
3442 my $t = Event::time;
3443 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3444 or die;
3445 4120
3446 $map->width (50); 4121 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3447 $map->height (50); 4122 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3448 $map->alloc; 4123 Coro::async_pool {
3449 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work 4124 $Coro::current->{desc} = "runtime saver";
3450 my $t = Event::time - $t; 4125 write_runtime_sync
3451 4126 or error "ERROR: unable to write runtime file: $!";
3452 #next unless $t < 0.0013;#d#
3453 if ($t < $min) {
3454 $min = $t;
3455 }
3456 $avg = $avg * 0.99 + $t * 0.01;
3457 }
3458 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3459 exit 0;
3460 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3461 }; 4127 };
4128 }
3462 4129
3463 $RUNTIME += $TICK;
3464 $NEXT_TICK += $TICK;
3465
3466 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3467 $NEXT_RUNTIME_WRITE = $NOW + 10;
3468 Coro::async_pool {
3469 write_runtime
3470 or warn "ERROR: unable to write runtime file: $!";
3471 };
3472 }
3473
3474# my $AFTER = Event::time;
3475# warn $AFTER - $NOW;#d#
3476
3477 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4130 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3478 $sig->send; 4131 $sig->send;
3479 } 4132 }
3480 while (my $sig = shift @WAIT_FOR_TICK) { 4133 while (my $sig = shift @WAIT_FOR_TICK) {
3481 $sig->send; 4134 $sig->send;
3482 } 4135 }
3483 4136
3484 $NOW = Event::time; 4137 $LOAD = ($NOW - $TICK_START) / $TICK;
3485
3486 # if we are delayed by four ticks or more, skip them all
3487 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3488
3489 $TICK_WATCHER->at ($NEXT_TICK);
3490 $TICK_WATCHER->start;
3491
3492 $LOAD = ($NOW - $tick_start) / $TICK;
3493 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4138 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3494 4139
3495 _post_tick; 4140 if (0) {
3496 4141 if ($NEXT_TICK) {
3497 4142 my $jitter = $TICK_START - $NEXT_TICK;
4143 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4144 debug "jitter $JITTER\n";#d#
4145 }
3498 }, 4146 }
3499); 4147}
3500 4148
3501{ 4149{
3502 BDB::max_poll_time $TICK * 0.1; 4150 # configure BDB
3503 $BDB_POLL_WATCHER = Event->io ( 4151
3504 reentrant => 0,
3505 fd => BDB::poll_fileno,
3506 poll => 'r',
3507 prio => 0,
3508 data => WF_AUTOCANCEL,
3509 cb => \&BDB::poll_cb,
3510 );
3511 BDB::min_parallel 8; 4152 BDB::min_parallel 16;
3512 4153 BDB::max_poll_reqs $TICK * 0.1;
3513 BDB::set_sync_prepare { 4154 $AnyEvent::BDB::WATCHER->priority (1);
3514 my $status;
3515 my $current = $Coro::current;
3516 (
3517 sub {
3518 $status = $!;
3519 $current->ready; undef $current;
3520 },
3521 sub {
3522 Coro::schedule while defined $current;
3523 $! = $status;
3524 },
3525 )
3526 };
3527 4155
3528 unless ($DB_ENV) { 4156 unless ($DB_ENV) {
3529 $DB_ENV = BDB::db_env_create; 4157 $DB_ENV = BDB::db_env_create;
4158 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4159 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4160 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4161 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4162 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3530 4163
3531 cf::sync_job { 4164 cf::sync_job {
3532 eval { 4165 eval {
3533 BDB::db_env_open 4166 BDB::db_env_open
3534 $DB_ENV, 4167 $DB_ENV,
3536 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4169 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3537 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4170 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3538 0666; 4171 0666;
3539 4172
3540 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4173 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3541
3542 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3543 $DB_ENV->set_lk_detect;
3544 }; 4174 };
3545 4175
3546 cf::cleanup "db_env_open(db): $@" if $@; 4176 cf::cleanup "db_env_open(db): $@" if $@;
3547 }; 4177 };
3548 } 4178 }
4179
4180 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4181 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4182 };
4183 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4184 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4185 };
4186 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4187 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4188 };
3549} 4189}
3550 4190
3551{ 4191{
4192 # configure IO::AIO
4193
3552 IO::AIO::min_parallel 8; 4194 IO::AIO::min_parallel 8;
3553
3554 undef $Coro::AIO::WATCHER;
3555 IO::AIO::max_poll_time $TICK * 0.1; 4195 IO::AIO::max_poll_time $TICK * 0.1;
3556 $AIO_POLL_WATCHER = Event->io ( 4196 undef $AnyEvent::AIO::WATCHER;
3557 reentrant => 0,
3558 data => WF_AUTOCANCEL,
3559 fd => IO::AIO::poll_fileno,
3560 poll => 'r',
3561 prio => 6,
3562 cb => \&IO::AIO::poll_cb,
3563 );
3564} 4197}
3565 4198
3566my $_log_backtrace; 4199our $_log_backtrace;
4200our $_log_backtrace_last;
3567 4201
3568sub _log_backtrace { 4202sub _log_backtrace {
3569 my ($msg, @addr) = @_; 4203 my ($msg, @addr) = @_;
3570 4204
3571 $msg =~ s/\n//; 4205 $msg =~ s/\n$//;
3572 4206
4207 if ($_log_backtrace_last eq $msg) {
4208 LOG llevInfo, "[ABT] $msg\n";
4209 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3573 # limit the # of concurrent backtraces 4210 # limit the # of concurrent backtraces
3574 if ($_log_backtrace < 2) { 4211 } elsif ($_log_backtrace < 2) {
4212 $_log_backtrace_last = $msg;
3575 ++$_log_backtrace; 4213 ++$_log_backtrace;
4214 my $perl_bt = Carp::longmess $msg;
3576 async { 4215 async {
4216 $Coro::current->{desc} = "abt $msg";
4217
3577 my @bt = fork_call { 4218 my @bt = fork_call {
3578 @addr = map { sprintf "%x", $_ } @addr; 4219 @addr = map { sprintf "%x", $_ } @addr;
3579 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4220 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3580 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4221 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3581 or die "addr2line: $!"; 4222 or die "addr2line: $!";
3589 } 4230 }
3590 4231
3591 @funcs 4232 @funcs
3592 }; 4233 };
3593 4234
3594 LOG llevInfo, "[ABT] $msg\n"; 4235 LOG llevInfo, "[ABT] $perl_bt\n";
4236 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3595 LOG llevInfo, "[ABT] $_\n" for @bt; 4237 LOG llevInfo, "[ABT] $_\n" for @bt;
3596 --$_log_backtrace; 4238 --$_log_backtrace;
3597 }; 4239 };
3598 } else { 4240 } else {
3599 LOG llevInfo, "[ABT] $msg\n"; 4241 LOG llevInfo, "[ABT] $msg\n";
3600 LOG llevInfo, "[ABT] [suppressed]\n"; 4242 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3601 } 4243 }
3602} 4244}
3603 4245
3604# load additional modules 4246# load additional modules
3605use cf::pod; 4247require "cf/$_.pm" for @EXTRA_MODULES;
4248cf::_connect_to_perl_2;
3606 4249
3607END { cf::emergency_save } 4250END { cf::emergency_save }
3608 4251
36091 42521
3610 4253

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines