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.336 by root, Tue Aug 21 00:31:18 2007 UTC vs.
Revision 1.565 by root, Sat Apr 30 05:41:17 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 1.4 (); 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; # all users 139our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # 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
456Locks are *not* recursive, locking from the same coro twice results in a
457deadlocked coro.
458
277Lock names should begin with a unique identifier (for example, cf::map::find 459Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 460uses map_find and cf::map::load uses map_load).
279 461
280=item $locked = cf::lock_active $string 462=item $locked = cf::lock_active $string
281 463
282Return 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.
283 465
284=cut 466=cut
285 467
286our %LOCK; 468our $LOCKS = new Coro::SemaphoreSet;
287 469
288sub lock_wait($) { 470sub lock_wait($) {
289 my ($key) = @_; 471 $LOCKS->wait ($_[0]);
290
291 # wait for lock, if any
292 while ($LOCK{$key}) {
293 push @{ $LOCK{$key} }, $Coro::current;
294 Coro::schedule;
295 }
296} 472}
297 473
298sub lock_acquire($) { 474sub lock_acquire($) {
299 my ($key) = @_; 475 $LOCKS->guard ($_[0])
300
301 # wait, to be sure we are not locked
302 lock_wait $key;
303
304 $LOCK{$key} = [];
305
306 Coro::guard {
307 # wake up all waiters, to be on the safe side
308 $_->ready for @{ delete $LOCK{$key} };
309 }
310} 476}
311 477
312sub lock_active($) { 478sub lock_active($) {
313 my ($key) = @_; 479 $LOCKS->count ($_[0]) < 1
314
315 ! ! $LOCK{$key}
316} 480}
317 481
318sub freeze_mainloop { 482sub freeze_mainloop {
319 return unless $TICK_WATCHER->is_active; 483 tick_inhibit_inc;
320 484
321 my $guard = Coro::guard { 485 &Guard::guard (\&tick_inhibit_dec);
322 $TICK_WATCHER->start; 486}
323 }; 487
324 $TICK_WATCHER->stop; 488=item cf::periodic $interval, $cb
325 $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
326} 501}
327 502
328=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
329 504
330Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
331This 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
332of 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.
333 512
334The 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
335used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
336 515
337Useful for short background jobs. 516Useful for short background jobs.
338 517
339=cut 518=cut
340 519
341our @SLOT_QUEUE; 520our @SLOT_QUEUE;
342our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
343 523
344$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
526 $Coro::current->desc ("timeslot manager");
527
346 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
347 530
348 while () { 531 while () {
349 next_job: 532 next_job:
533
350 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
351 if ($avail > 0.01) { 535
352 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
353 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
354 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
355 $job->[2]->send; 540 $job->[2]->send;
356 Coro::cede; 541 Coro::cede;
357 goto next_job; 542 goto next_job;
358 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
359 } 545 }
360 } 546 }
361 547
362 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
363 # 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
364 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait; 551 $signal->wait;
366 } else { 552 } else {
553 $busy = 0;
367 Coro::schedule; 554 Coro::schedule;
368 } 555 }
369 } 556 }
370}; 557};
371 558
372sub get_slot($;$$) { 559sub get_slot($;$$) {
560 return if tick_inhibit || $Coro::current == $Coro::main;
561
373 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
374 563
375 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
376 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
377 567
378 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
379 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
380 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
391 581
392BEGIN { *async = \&Coro::async_pool } 582BEGIN { *async = \&Coro::async_pool }
393 583
394=item cf::sync_job { BLOCK } 584=item cf::sync_job { BLOCK }
395 585
396The design of Crossfire TRT requires that the main coroutine ($Coro::main) 586The design of Deliantra requires that the main coroutine ($Coro::main)
397is always able to handle events or runnable, as Crossfire TRT is only 587is always able to handle events or runnable, as Deliantra is only
398partly 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
399acceptable. 589acceptable.
400 590
401If 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
402the given BLOCK in another coroutine while waiting for the result. The 592the given BLOCK in another coroutine while waiting for the result. The
406=cut 596=cut
407 597
408sub sync_job(&) { 598sub sync_job(&) {
409 my ($job) = @_; 599 my ($job) = @_;
410 600
411 if ($Coro::current == $Coro::main) { 601 if (in_main) {
412 my $time = Event::time; 602 my $time = AE::time;
413 603
414 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
415 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
416 606
417 # TODO: use suspend/resume instead 607 #LOG llevError, Carp::longmess "sync job";#d#
418 # (but this is cancel-safe) 608
419 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
420 610
421 my $busy = 1; 611 my $busy = 1;
422 my @res; 612 my @res;
423 613
424 (async { 614 (async {
615 $Coro::current->desc ("sync job coro");
425 @res = eval { $job->() }; 616 @res = eval { $job->() };
426 warn $@ if $@; 617 error $@ if $@;
427 undef $busy; 618 undef $busy;
428 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
429 620
430 while ($busy) { 621 while ($busy) {
431 Coro::cede or Event::one_event; 622 if (Coro::nready) {
623 Coro::cede_notself;
624 } else {
625 EV::loop EV::LOOP_ONESHOT;
432 } 626 }
627 }
433 628
434 $time = Event::time - $time; 629 my $time = AE::time - $time;
435 630
436 LOG llevError | logBacktrace, Carp::longmess "long sync job"
437 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
438
439 $tick_start += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
440 632
441 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
442 } else { 634 } else {
443 # we are in another coroutine, how wonderful, everything just works 635 # we are in another coroutine, how wonderful, everything just works
444 636
464 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
465 657
466 $coro 658 $coro
467} 659}
468 660
469=item fork_call { }, $args 661=item fork_call { }, @args
470 662
471Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
472process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
473Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
474never block itself or use any form of Event handling. 666never block itself or use any form of event handling.
475 667
476=cut 668=cut
669
670sub post_fork {
671 reset_signals;
672}
477 673
478sub fork_call(&@) { 674sub fork_call(&@) {
479 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
480 676
481 # 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,
482 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
484 680
485 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
486 reset_signals; 682 cf::post_fork;
487 &$cb 683 &$cb
488 }, @args; 684 } @args;
489 685
490 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
491} 725}
492 726
493=item $value = cf::db_get $family => $key 727=item $value = cf::db_get $family => $key
494 728
495Returns a single value from the environment database. 729Returns a single value from the environment database.
497=item cf::db_put $family => $key => $value 731=item cf::db_put $family => $key => $value
498 732
499Stores 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
500data 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).
501 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
502=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}
503 762
504our $DB; 763our $DB;
505 764
506sub db_init { 765sub db_init {
507 unless ($DB) { 766 $DB ||= db_table "db";
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job {
511 eval {
512 $DB->set_flags (BDB::CHKSUM);
513
514 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516 cf::cleanup "db_open(db): $!" if $!;
517 };
518 cf::cleanup "db_open(db): $@" if $@;
519 };
520 }
521} 767}
522 768
523sub db_get($$) { 769sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
525 771
526 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
527 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
528 776
529 $! ? () 777 $! ? ()
530 : $data 778 : $data
531 }
532} 779}
533 780
534sub db_put($$$) { 781sub db_put($$$) {
535 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
536 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
564 811
565 my @data; 812 my @data;
566 my $md5; 813 my $md5;
567 814
568 for (0 .. $#$src) { 815 for (0 .. $#$src) {
569 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
570 or Carp::croak "$src->[$_]: $!";
571 } 817 }
572 818
573 # if processing is expensive, check 819 # if processing is expensive, check
574 # checksum first 820 # checksum first
575 if (1) { 821 if (1) {
576 $md5 = 822 $md5 =
577 join "\x00", 823 join "\x00",
578 $processversion, 824 $processversion,
579 map { 825 map {
580 Coro::cede; 826 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 827 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 828 } 0.. $#$src;
583 829
584 830
585 my $dbmd5 = db_get cache => "$id/md5"; 831 my $dbmd5 = db_get cache => "$id/md5";
592 838
593 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
594 my $data = $process->(\@data); 840 my $data = $process->(\@data);
595 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
596 842
597 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
598 844
599 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
600 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
601 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
602 848
612 858
613=cut 859=cut
614 860
615sub datalog($@) { 861sub datalog($@) {
616 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
617 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
618} 864}
619 865
620=back 866=back
621 867
622=cut 868=cut
623 869
624############################################################################# 870#############################################################################
625 871
626=head2 ATTACHABLE OBJECTS 872=head2 ATTACHABLE OBJECTS
627 873
628Many 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
629attach callbacks/event handlers (a collection of which is called an "attachment") 875attach callbacks/event handlers (a collection of which is called an "attachment")
630to it. All such attachable objects support the following methods. 876to it. All such attachable objects support the following methods.
631 877
632In 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>
633C<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
634Crossfire TRT). 880Deliantra).
635 881
636=over 4 882=over 4
637 883
638=item $attachable->attach ($attachment, key => $value...) 884=item $attachable->attach ($attachment, key => $value...)
639 885
683=item cf::CLASS::attachment $name, ... 929=item cf::CLASS::attachment $name, ...
684 930
685Register an attachment by C<$name> through which attachable objects of the 931Register an attachment by C<$name> through which attachable objects of the
686given CLASS can refer to this attachment. 932given CLASS can refer to this attachment.
687 933
688Some classes such as crossfire maps and objects can specify attachments 934Some classes such as deliantra maps and objects can specify attachments
689that 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.
690 936
691These calls expect any number of the following handler/hook descriptions: 937These calls expect any number of the following handler/hook descriptions:
692 938
693=over 4 939=over 4
817 1063
818 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
819 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
820 1066
821 } elsif (ref $type) { 1067 } elsif (ref $type) {
822 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
823 1069
824 } else { 1070 } else {
825 shift @arg; 1071 shift @arg;
826 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
827 } 1073 }
828 } 1074 }
829} 1075}
830 1076
831sub _object_attach { 1077sub _object_attach {
841 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
842 } 1088 }
843 1089
844 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
845 } else { 1091 } else {
846 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
847 } 1093 }
848 1094
849 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
850} 1096}
851 1097
910 1156
911 for (@$callbacks) { 1157 for (@$callbacks) {
912 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
913 1159
914 if ($@) { 1160 if ($@) {
915 warn "$@";
916 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
917 override; 1162 override;
918 } 1163 }
919 1164
920 return 1 if $override; 1165 return 1 if $override;
921 } 1166 }
922 1167
923 0 1168 0
924} 1169}
925 1170
926=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1171=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
927 1172
928=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1173=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
929 1174
930Generate an object-specific event with the given arguments. 1175Generate an object-specific event with the given arguments.
931 1176
937 1182
938=cut 1183=cut
939 1184
940############################################################################# 1185#############################################################################
941# object support 1186# object support
942#
943 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#
944sub _can_merge { 1221sub _can_merge {
945 my ($ob1, $ob2) = @_; 1222 my ($ob1, $ob2) = @_;
946 1223
947 local $Storable::canonical = 1; 1224 ++$SLOW_MERGES;#d#
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950 1225
951 $fob1 eq $fob2 1226 # we do the slow way here
1227 return _object_equal $ob1, $ob2
952} 1228}
953 1229
954sub reattach { 1230sub reattach {
955 # basically do the same as instantiate, without calling instantiate 1231 # basically do the same as instantiate, without calling instantiate
956 my ($obj) = @_; 1232 my ($obj) = @_;
957 1233
1234 # no longer needed after getting rid of delete_package?
958 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
959 1236
960 my $registry = $obj->registry; 1237 my $registry = $obj->registry;
961 1238
962 @$registry = (); 1239 @$registry = ();
963 1240
968 for (@$attach) { 1245 for (@$attach) {
969 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
970 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
971 } 1248 }
972 } else { 1249 } else {
973 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
974 } 1251 }
975 } 1252 }
976} 1253}
977 1254
978cf::attachable->attach ( 1255cf::attachable->attach (
979 prio => -1000000, 1256 prio => -1000000,
980 on_instantiate => sub { 1257 on_instantiate => sub {
981 my ($obj, $data) = @_; 1258 my ($obj, $data) = @_;
982 1259
983 $data = from_json $data; 1260 $data = decode_json $data;
984 1261
985 for (@$data) { 1262 for (@$data) {
986 my ($name, $args) = @$_; 1263 my ($name, $args) = @$_;
987 1264
988 $obj->attach ($name, %{$args || {} }); 1265 $obj->attach ($name, %{$args || {} });
1004sub object_freezer_save { 1281sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1006 1283
1007 sync_job { 1284 sync_job {
1008 if (length $$rdata) { 1285 if (length $$rdata) {
1286 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1011 1290
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1292 aio_chmod $fh, SAVE_MODE;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 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 }
1016 close $fh; 1298 aio_close $fh;
1017 1299
1018 if (@$objs) { 1300 if (@$objs) {
1019 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) {
1020 chmod SAVE_MODE, $fh; 1302 aio_chmod $fh, SAVE_MODE;
1021 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1022 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1023 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 }
1024 close $fh; 1309 aio_close $fh;
1025 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1026 } 1311 }
1027 } else { 1312 } else {
1028 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1029 } 1314 }
1030 1315
1031 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1317
1318 $filename =~ s%/[^/]+$%%;
1319 aio_pathsync $filename if $cf::USE_FSYNC;
1032 } else { 1320 } else {
1033 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1034 } 1322 }
1035 } else { 1323 } else {
1036 aio_unlink $filename; 1324 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1038 } 1326 }
1039 } 1327 };
1040} 1328}
1041 1329
1042sub object_freezer_as_string { 1330sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1331 my ($rdata, $objs) = @_;
1044 1332
1056 or return; 1344 or return;
1057 1345
1058 unless (aio_stat "$filename.pst") { 1346 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1347 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1348 or return;
1349
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1350 my $st = eval { Coro::Storable::thaw $av };
1351 $av = $st->{objs};
1062 } 1352 }
1063 1353
1354 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1358
1066 return ($data, $av); 1359 ($data, $av)
1067} 1360}
1068 1361
1069=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1070 1363
1071=over 4 1364=over 4
1125 my ($name, $cb) = @_; 1418 my ($name, $cb) = @_;
1126 1419
1127 $EXTICMD{$name} = $cb; 1420 $EXTICMD{$name} = $cb;
1128} 1421}
1129 1422
1423use File::Glob ();
1424
1130cf::player->attach ( 1425cf::player->attach (
1131 on_command => sub { 1426 on_unknown_command => sub {
1132 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1133 1428
1134 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1135 or return; 1430 or return;
1136 1431
1149 my ($type, $reply, @payload) = 1444 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1445 "ARRAY" eq ref $msg
1151 ? @$msg 1446 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1447 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1448
1449 my @reply;
1450
1154 if (my $cb = $EXTCMD{$type}) { 1451 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1452 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1453 }
1454
1455 $pl->ext_reply ($reply, @reply)
1456 if $reply;
1457
1160 } else { 1458 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1460 }
1163 1461
1164 cf::override; 1462 cf::override;
1165 }, 1463 },
1166); 1464);
1167 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
1168sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1169 cf::sync_job { 1482 cf::sync_job {
1170 my %todo; 1483 my %todo;
1171 1484
1172 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1173 next unless -r $path; 1486 next unless -r $path;
1191 1504
1192 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1193 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1194 1507
1195 $ext{source} = 1508 $ext{source} =
1196 "package $pkg; use strict; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1197 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1198 . $source 1511 . $source
1199 . "\n};\n1"; 1512 . "\n};\n1";
1200 1513
1201 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1202 } 1515 }
1203 1516
1517 my $pass = 0;
1204 my %done; 1518 my %done;
1205 while (%todo) { 1519 while (%todo) {
1206 my $progress; 1520 my $progress;
1207 1521
1522 ++$pass;
1523
1524 ext:
1208 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1209 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1210 goto skip 1527 next ext
1211 unless exists $done{$_}; 1528 unless exists $done{$_};
1212 } 1529 }
1213 1530
1214 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1215 1532
1216 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1217 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1218 : "$v->{base}: extension inactive.\n";
1219 1537
1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1220 if (exists $v->{meta}{mandatory}) { 1539 if exists $v->{meta}{mandatory};
1221 warn $msg; 1540
1222 warn "mandatory extension failed to load, exiting.\n"; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1223 exit 1; 1542 delete $todo{$k};
1224 } 1543 } else {
1225 1544 $done{$k} = delete $todo{$k};
1226 warn $msg; 1545 push @EXTS, $v->{pkg};
1546 $progress = 1;
1547
1548 info "$v->{base}: extension inactive.\n"
1549 unless $active;
1227 } 1550 }
1228
1229 $done{$k} = delete $todo{$k};
1230 push @EXTS, $v->{pkg};
1231 $progress = 1;
1232 } 1551 }
1233 1552
1234 skip: 1553 unless ($progress) {
1235 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1236 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 }
1237 } 1563 }
1238 }; 1564 };
1239} 1565}
1240 1566
1241############################################################################# 1567#############################################################################
1242 1568
1243=back 1569=back
1244 1570
1245=head2 CORE EXTENSIONS 1571=head2 CORE EXTENSIONS
1246 1572
1247Functions and methods that extend core crossfire objects. 1573Functions and methods that extend core deliantra objects.
1248 1574
1249=cut 1575=cut
1250 1576
1251package cf::player; 1577package cf::player;
1252 1578
1253use Coro::AIO; 1579use Coro::AIO;
1254 1580
1255=head3 cf::player 1581=head3 cf::player
1256 1582
1257=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}
1258 1598
1259=item cf::player::find $login 1599=item cf::player::find $login
1260 1600
1261Returns the given player object, loading it if necessary (might block). 1601Returns the given player object, loading it if necessary (might block).
1262 1602
1281 1621
1282sub exists($) { 1622sub exists($) {
1283 my ($login) = @_; 1623 my ($login) = @_;
1284 1624
1285 $cf::PLAYER{$login} 1625 $cf::PLAYER{$login}
1286 or cf::sync_job { !aio_stat path $login } 1626 or !aio_stat path $login
1287} 1627}
1288 1628
1289sub find($) { 1629sub find($) {
1290 return $cf::PLAYER{$_[0]} || do { 1630 return $cf::PLAYER{$_[0]} || do {
1291 my $login = $_[0]; 1631 my $login = $_[0];
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1638 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1639 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1640 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl"; 1641 aio_unlink +(playerdir $login) . "/$login.pl";
1302 1642
1303 my $pl = load_pl path $login 1643 my $f = new_from_file cf::object::thawer path $login
1304 or return; 1644 or return;
1645
1646 my $pl = cf::player::load_pl $f
1647 or return;
1648
1649 local $cf::PLAYER_LOADING{$login} = $pl;
1650 $f->resolve_delayed_derefs;
1305 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1306 } 1652 }
1307 } 1653 }
1308} 1654}
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);
1309 1668
1310sub save($) { 1669sub save($) {
1311 my ($pl) = @_; 1670 my ($pl) = @_;
1312 1671
1313 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1318 return if $pl->{deny_save}; 1677 return if $pl->{deny_save};
1319 1678
1320 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1322 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];
1686
1323 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1324 Coro::cede; 1688 cf::cede_to_tick;
1325} 1689}
1326 1690
1327sub new($) { 1691sub new($) {
1328 my ($login) = @_; 1692 my ($login) = @_;
1329 1693
1358 my ($pl) = @_; 1722 my ($pl) = @_;
1359 1723
1360 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1361 1725
1362 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1363 $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
1364 1728
1365 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1366 $pl->deactivate; 1730 $pl->deactivate;
1731
1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1367 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1368 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1369 1737
1370 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1371 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1372 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
1407 or return []; 1775 or return [];
1408 1776
1409 my @logins; 1777 my @logins;
1410 1778
1411 for my $login (@$dirs) { 1779 for my $login (@$dirs) {
1780 my $path = path $login;
1781
1782 # a .pst is a dead give-away for a valid player
1783 # if no pst file found, open and chekc for blocked users
1784 if (aio_stat "$path.pst") {
1412 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1785 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413 aio_read $fh, 0, 512, my $buf, 0 or next; 1786 aio_read $fh, 0, 512, my $buf, 0 or next;
1414 $buf !~ /^password -------------$/m or next; # official not-valid tag 1787 $buf !~ /^password -------------$/m or next; # official not-valid tag
1788 }
1415 1789
1416 utf8::decode $login; 1790 utf8::decode $login;
1417 push @logins, $login; 1791 push @logins, $login;
1418 } 1792 }
1419 1793
1420 \@logins 1794 \@logins
1421} 1795}
1422 1796
1423=item $player->maps 1797=item $player->maps
1798
1799=item cf::player::maps $login
1424 1800
1425Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1426player. May block. 1802player. May block.
1427 1803
1428=cut 1804=cut
1446 } 1822 }
1447 1823
1448 \@paths 1824 \@paths
1449} 1825}
1450 1826
1451=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1827=item $protocol_xml = $player->expand_cfpod ($cfpod)
1452 1828
1453Expand crossfire pod fragments into protocol xml. 1829Expand deliantra pod fragments into protocol xml.
1454
1455=cut
1456
1457sub expand_cfpod {
1458 ((my $self), (local $_)) = @_;
1459
1460 # escape & and <
1461 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g;
1463
1464 # this is buggy, it needs to properly take care of nested <'s
1465
1466 1 while
1467 # replace B<>, I<>, U<> etc.
1468 s/B<([^\>]*)>/<b>$1<\/b>/
1469 || s/I<([^\>]*)>/<i>$1<\/i>/
1470 || s/U<([^\>]*)>/<u>$1<\/u>/
1471 # replace G<male|female> tags
1472 || s{G<([^>|]*)\|([^>]*)>}{
1473 $self->gender ? $2 : $1
1474 }ge
1475 # replace H<hint text>
1476 || s{H<([^\>]*)>}
1477 {
1478 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1479 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1480 "")
1481 [$self->{hintmode}]
1482 }ge;
1483
1484 # create single paragraphs (very hackish)
1485 s/(?<=\S)\n(?=\w)/ /g;
1486
1487 # compress some whitespace
1488 s/\s+\n/\n/g; # ws line-ends
1489 s/\n\n+/\n/g; # double lines
1490 s/^\n+//; # beginning lines
1491 s/\n+$//; # ending lines
1492
1493 $_
1494}
1495
1496sub hintmode {
1497 $_[0]{hintmode} = $_[1] if @_ > 1;
1498 $_[0]{hintmode}
1499}
1500 1830
1501=item $player->ext_reply ($msgid, @msg) 1831=item $player->ext_reply ($msgid, @msg)
1502 1832
1503Sends an ext reply to the player. 1833Sends an ext reply to the player.
1504 1834
1536 1866
1537=cut 1867=cut
1538 1868
1539sub find_by_path($) { 1869sub find_by_path($) {
1540 my ($path) = @_; 1870 my ($path) = @_;
1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1541 1873
1542 my ($match, $specificity); 1874 my ($match, $specificity);
1543 1875
1544 for my $region (list) { 1876 for my $region (list) {
1545 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1571our $MAX_RESET = 3600; 1903our $MAX_RESET = 3600;
1572our $DEFAULT_RESET = 3000; 1904our $DEFAULT_RESET = 3000;
1573 1905
1574sub generate_random_map { 1906sub generate_random_map {
1575 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1576 # mit "rum" bekleckern, nicht 1908
1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1910
1577 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1578 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1579 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1580 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1581 $rmp->{exit_on_final_map},
1582 $rmp->{xsize}, $rmp->{ysize},
1583 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1584 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1585 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1586 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1587 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1588 (cf::region::find $rmp->{region}), $rmp->{custom}
1589 )
1590} 1912}
1591 1913
1592=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1593 1915
1594Register 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
1599 1921
1600sub register { 1922sub register {
1601 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1602 my $pkg = caller; 1924 my $pkg = caller;
1603 1925
1604 no strict;
1605 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1606 1927
1607 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1608} 1929}
1609 1930
1610# also paths starting with '/' 1931# also paths starting with '/'
1611$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1612 1933
1613sub thawer_merge { 1934sub thawer_merge {
1614 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1615 1936
1616 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
1621} 1942}
1622 1943
1623sub normalise { 1944sub normalise {
1624 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1625 1946
1626 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1627 1948
1628 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1629 1950
1630 # map plan: 1951 # map plan:
1631 # 1952 #
1633 # {... are special paths that are not being touched 1954 # {... are special paths that are not being touched
1634 # ?xxx/... are special absolute paths 1955 # ?xxx/... are special absolute paths
1635 # ?random/... random maps 1956 # ?random/... random maps
1636 # /... normal maps 1957 # /... normal maps
1637 # ~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
1638 1960
1639 $path =~ s/$PATH_SEP/\//go; 1961 $path =~ s/$PATH_SEP/\//go;
1640 1962
1641 # treat it as relative path if it starts with 1963 # treat it as relative path if it starts with
1642 # something that looks reasonable 1964 # something that looks reasonable
1643 if ($path =~ m{^(?:\./|\.\./|\w)}) { 1965 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1644 $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'";
1645 1967
1646 $base =~ s{[^/]+/?$}{}; 1968 $base =~ s{[^/]+/?$}{};
1647 $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;
1648 } 1984 }
1649 1985
1650 for ($path) { 1986 for ($path) {
1651 redo if s{//}{/};
1652 redo if s{/\.?/}{/}; 1987 redo if s{/\.?/}{/};
1653 redo if s{/[^/]+/\.\./}{/}; 1988 redo if s{/[^/]+/\.\./}{/};
1654 } 1989 }
1655 1990
1656 $path 1991 $path
1670 $self->init; # pass $1 etc. 2005 $self->init; # pass $1 etc.
1671 return $self; 2006 return $self;
1672 } 2007 }
1673 } 2008 }
1674 2009
1675 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2010 Carp::cluck "unable to resolve path '$path' (base '$base')";
1676 () 2011 ()
1677} 2012}
1678 2013
2014# may re-bless or do other evil things
1679sub init { 2015sub init {
1680 my ($self) = @_; 2016 my ($self) = @_;
1681 2017
1682 $self 2018 $self
1683} 2019}
1702 2038
1703# the temporary/swap location 2039# the temporary/swap location
1704sub save_path { 2040sub save_path {
1705 my ($self) = @_; 2041 my ($self) = @_;
1706 2042
1707 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2043 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1708 "$TMPDIR/$path.map" 2044 "$TMPDIR/$path.map"
1709} 2045}
1710 2046
1711# the unique path, undef == no special unique path 2047# the unique path, undef == no special unique path
1712sub uniq_path { 2048sub uniq_path {
1713 my ($self) = @_; 2049 my ($self) = @_;
1714 2050
1715 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2051 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1716 "$UNIQUEDIR/$path" 2052 "$UNIQUEDIR/$path"
1717}
1718
1719# and all this just because we cannot iterate over
1720# all maps in C++...
1721sub change_all_map_light {
1722 my ($change) = @_;
1723
1724 $_->change_map_light ($change)
1725 for grep $_->outdoor, values %cf::MAP;
1726} 2053}
1727 2054
1728sub decay_objects { 2055sub decay_objects {
1729 my ($self) = @_; 2056 my ($self) = @_;
1730 2057
1743 2070
1744sub load_header_from($) { 2071sub load_header_from($) {
1745 my ($self, $path) = @_; 2072 my ($self, $path) = @_;
1746 2073
1747 utf8::encode $path; 2074 utf8::encode $path;
1748 #aio_open $path, O_RDONLY, 0 2075 my $f = new_from_file cf::object::thawer $path
1749 # or return;
1750
1751 $self->_load_header ($path)
1752 or return; 2076 or return;
2077
2078 $self->_load_header ($f)
2079 or return;
2080
2081 local $MAP_LOADING{$self->{path}} = $self;
2082 $f->resolve_delayed_derefs;
1753 2083
1754 $self->{load_path} = $path; 2084 $self->{load_path} = $path;
1755 2085
1756 1 2086 1
1757} 2087}
1809 2139
1810sub find; 2140sub find;
1811sub find { 2141sub find {
1812 my ($path, $origin) = @_; 2142 my ($path, $origin) = @_;
1813 2143
2144 cf::cede_to_tick;
2145
1814 $path = normalise $path, $origin && $origin->path; 2146 $path = normalise $path, $origin;
1815 2147
2148 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1816 cf::lock_wait "map_find:$path"; 2149 my $guard2 = cf::lock_acquire "map_find:$path";
1817 2150
1818 $cf::MAP{$path} || do { 2151 $cf::MAP{$path} || do {
1819 my $guard = cf::lock_acquire "map_find:$path";
1820 my $map = new_from_path cf::map $path 2152 my $map = new_from_path cf::map $path
1821 or return; 2153 or return;
1822 2154
1823 $map->{last_save} = $cf::RUNTIME; 2155 $map->{last_save} = $cf::RUNTIME;
1824 2156
1826 or return; 2158 or return;
1827 2159
1828 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2160 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1829 # doing this can freeze the server in a sync job, obviously 2161 # doing this can freeze the server in a sync job, obviously
1830 #$cf::WAIT_FOR_TICK->wait; 2162 #$cf::WAIT_FOR_TICK->wait;
2163 undef $guard2;
2164 undef $guard1;
1831 $map->reset; 2165 $map->reset;
1832 undef $guard;
1833 return find $path; 2166 return find $path;
1834 } 2167 }
1835 2168
1836 $cf::MAP{$path} = $map 2169 $cf::MAP{$path} = $map
1837 } 2170 }
1838} 2171}
1839 2172
1840sub pre_load { } 2173sub pre_load { }
1841sub post_load { } 2174#sub post_load { } # XS
1842 2175
1843sub load { 2176sub load {
1844 my ($self) = @_; 2177 my ($self) = @_;
1845 2178
1846 local $self->{deny_reset} = 1; # loading can take a long time 2179 local $self->{deny_reset} = 1; # loading can take a long time
1847 2180
1848 my $path = $self->{path}; 2181 my $path = $self->{path};
1849 2182
1850 { 2183 {
1851 my $guard = cf::lock_acquire "map_load:$path"; 2184 my $guard = cf::lock_acquire "map_data:$path";
1852 2185
2186 return unless $self->valid;
1853 return if $self->in_memory != cf::MAP_SWAPPED; 2187 return unless $self->in_memory == cf::MAP_SWAPPED;
1854 2188
1855 $self->in_memory (cf::MAP_LOADING); 2189 $self->in_memory (cf::MAP_LOADING);
1856 2190
1857 $self->alloc; 2191 $self->alloc;
1858 2192
1859 $self->pre_load; 2193 $self->pre_load;
1860 Coro::cede; 2194 cf::cede_to_tick;
1861 2195
1862 $self->_load_objects ($self->{load_path}, 1) 2196 if (exists $self->{load_path}) {
2197 my $f = new_from_file cf::object::thawer $self->{load_path};
2198 $f->skip_block;
2199 $self->_load_objects ($f)
1863 or return; 2200 or return;
1864 2201
1865 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2202 $self->post_load_original
1866 if delete $self->{load_original}; 2203 if delete $self->{load_original};
1867 2204
1868 if (my $uniq = $self->uniq_path) { 2205 if (my $uniq = $self->uniq_path) {
1869 utf8::encode $uniq; 2206 utf8::encode $uniq;
1870 if (aio_open $uniq, O_RDONLY, 0) { 2207 unless (aio_stat $uniq) {
2208 if (my $f = new_from_file cf::object::thawer $uniq) {
1871 $self->clear_unique_items; 2209 $self->clear_unique_items;
1872 $self->_load_objects ($uniq, 0); 2210 $self->_load_objects ($f);
2211 $f->resolve_delayed_derefs;
2212 }
2213 }
1873 } 2214 }
1874 }
1875 2215
1876 Coro::cede; 2216 $f->resolve_delayed_derefs;
2217 }
2218
2219 cf::cede_to_tick;
1877 # now do the right thing for maps 2220 # now do the right thing for maps
1878 $self->link_multipart_objects; 2221 $self->link_multipart_objects;
1879 $self->difficulty ($self->estimate_difficulty) 2222 $self->difficulty ($self->estimate_difficulty)
1880 unless $self->difficulty; 2223 unless $self->difficulty;
1881 Coro::cede; 2224 cf::cede_to_tick;
1882 2225
1883 unless ($self->{deny_activate}) { 2226 unless ($self->{deny_activate}) {
1884 $self->decay_objects; 2227 $self->decay_objects;
1885 $self->fix_auto_apply; 2228 $self->fix_auto_apply;
1886 $self->update_buttons; 2229 $self->update_buttons;
1887 Coro::cede; 2230 cf::cede_to_tick;
1888 $self->set_darkness_map;
1889 Coro::cede;
1890 $self->activate; 2231 $self->activate;
1891 } 2232 }
1892 2233
1893 $self->{last_save} = $cf::RUNTIME; 2234 $self->{last_save} = $cf::RUNTIME;
1894 $self->last_access ($cf::RUNTIME); 2235 $self->last_access ($cf::RUNTIME);
1895 2236
1896 $self->in_memory (cf::MAP_IN_MEMORY); 2237 $self->in_memory (cf::MAP_ACTIVE);
1897 } 2238 }
1898 2239
1899 $self->post_load; 2240 $self->post_load;
1900}
1901 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
1902sub customise_for { 2248sub customise_for {
1903 my ($self, $ob) = @_; 2249 my ($self, $ob) = @_;
1904 2250
1905 return find "~" . $ob->name . "/" . $self->{path} 2251 return find "~" . $ob->name . "/" . $self->{path}
1906 if $self->per_player; 2252 if $self->per_player;
1922 or next; 2268 or next;
1923 $neigh = find $neigh, $map 2269 $neigh = find $neigh, $map
1924 or next; 2270 or next;
1925 $neigh->load; 2271 $neigh->load;
1926 2272
2273 # now find the diagonal neighbours
1927 push @neigh, 2274 push @neigh,
1928 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2275 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1929 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2276 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1930 } 2277 }
1931 2278
1938} 2285}
1939 2286
1940sub find_sync { 2287sub find_sync {
1941 my ($path, $origin) = @_; 2288 my ($path, $origin) = @_;
1942 2289
1943 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
1944} 2294}
1945 2295
1946sub do_load_sync { 2296sub do_load_sync {
1947 my ($map) = @_; 2297 my ($map) = @_;
1948 2298
1949 cf::sync_job { $map->load }; 2299 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2300 if $Coro::current == $Coro::main;
2301
2302 $map->load;
1950} 2303}
1951 2304
1952our %MAP_PREFETCH; 2305our %MAP_PREFETCH;
1953our $MAP_PREFETCHER = undef; 2306our $MAP_PREFETCHER = undef;
1954 2307
1955sub find_async { 2308sub find_async {
1956 my ($path, $origin) = @_; 2309 my ($path, $origin, $load) = @_;
1957 2310
1958 $path = normalise $path, $origin && $origin->{path}; 2311 $path = normalise $path, $origin;
1959 2312
1960 if (my $map = $cf::MAP{$path}) { 2313 if (my $map = $cf::MAP{$path}) {
1961 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2314 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1962 } 2315 }
1963 2316
1964 undef $MAP_PREFETCH{$path}; 2317 $MAP_PREFETCH{$path} |= $load;
2318
1965 $MAP_PREFETCHER ||= cf::async { 2319 $MAP_PREFETCHER ||= cf::async {
2320 $Coro::current->{desc} = "map prefetcher";
2321
1966 while (%MAP_PREFETCH) { 2322 while (%MAP_PREFETCH) {
1967 for my $path (keys %MAP_PREFETCH) { 2323 while (my ($k, $v) = each %MAP_PREFETCH) {
1968 if (my $map = find $path) { 2324 if (my $map = find $k) {
1969 $map->load; 2325 $map->load if $v;
1970 } 2326 }
1971 2327
1972 delete $MAP_PREFETCH{$path}; 2328 delete $MAP_PREFETCH{$k};
1973 } 2329 }
1974 } 2330 }
1975 undef $MAP_PREFETCHER; 2331 undef $MAP_PREFETCHER;
1976 }; 2332 };
1977 $MAP_PREFETCHER->prio (6); 2333 $MAP_PREFETCHER->prio (6);
1978 2334
1979 () 2335 ()
1980} 2336}
1981 2337
2338# common code, used by both ->save and ->swapout
1982sub save { 2339sub _save {
1983 my ($self) = @_; 2340 my ($self) = @_;
1984
1985 my $lock = cf::lock_acquire "map_data:" . $self->path;
1986 2341
1987 $self->{last_save} = $cf::RUNTIME; 2342 $self->{last_save} = $cf::RUNTIME;
1988 2343
1989 return unless $self->dirty; 2344 return unless $self->dirty;
1990 2345
1996 return if $self->{deny_save}; 2351 return if $self->{deny_save};
1997 2352
1998 local $self->{last_access} = $self->last_access;#d# 2353 local $self->{last_access} = $self->last_access;#d#
1999 2354
2000 cf::async { 2355 cf::async {
2356 $Coro::current->{desc} = "map player save";
2001 $_->contr->save for $self->players; 2357 $_->contr->save for $self->players;
2002 }; 2358 };
2359
2360 cf::get_slot 0.02;
2003 2361
2004 if ($uniq) { 2362 if ($uniq) {
2005 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2363 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2006 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2364 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2007 } else { 2365 } else {
2008 $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);
2009 } 2367 }
2010} 2368}
2011 2369
2370sub save {
2371 my ($self) = @_;
2372
2373 my $lock = cf::lock_acquire "map_data:$self->{path}";
2374
2375 $self->_save;
2376}
2377
2012sub swap_out { 2378sub swap_out {
2013 my ($self) = @_; 2379 my ($self) = @_;
2014 2380
2015 # save first because save cedes
2016 $self->save;
2017
2018 my $lock = cf::lock_acquire "map_data:" . $self->path; 2381 my $lock = cf::lock_acquire "map_data:$self->{path}";
2019 2382
2383 return if $self->in_memory != cf::MAP_ACTIVE;
2384 return if $self->{deny_save};
2020 return if $self->players; 2385 return if $self->players;
2021 return if $self->in_memory != cf::MAP_IN_MEMORY;
2022 return if $self->{deny_save};
2023 2386
2387 # first deactivate the map and "unlink" it from the core
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
2024 $self->clear; 2396 $self->clear;
2025 $self->in_memory (cf::MAP_SWAPPED);
2026} 2397}
2027 2398
2028sub reset_at { 2399sub reset_at {
2029 my ($self) = @_; 2400 my ($self) = @_;
2030 2401
2048 2419
2049 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2420 my $lock = cf::lock_acquire "map_data:$self->{path}";
2050 2421
2051 return if $self->players; 2422 return if $self->players;
2052 2423
2053 warn "resetting map ", $self->path; 2424 cf::trace "resetting map ", $self->path, "\n";
2054 2425
2055 $self->in_memory (cf::MAP_SWAPPED); 2426 $self->in_memory (cf::MAP_SWAPPED);
2056 2427
2057 # need to save uniques path 2428 # need to save uniques path
2058 unless ($self->{deny_save}) { 2429 unless ($self->{deny_save}) {
2062 if $uniq; 2433 if $uniq;
2063 } 2434 }
2064 2435
2065 delete $cf::MAP{$self->path}; 2436 delete $cf::MAP{$self->path};
2066 2437
2438 $self->deactivate;
2439 $_->clear_links_to ($self) for values %cf::MAP;
2067 $self->clear; 2440 $self->clear;
2068
2069 $_->clear_links_to ($self) for values %cf::MAP;
2070 2441
2071 $self->unlink_save; 2442 $self->unlink_save;
2072 $self->destroy; 2443 $self->destroy;
2073} 2444}
2074 2445
2075my $nuke_counter = "aaaa"; 2446my $nuke_counter = "aaaa";
2076 2447
2077sub nuke { 2448sub nuke {
2078 my ($self) = @_; 2449 my ($self) = @_;
2079 2450
2451 {
2452 my $lock = cf::lock_acquire "map_data:$self->{path}";
2453
2080 delete $cf::MAP{$self->path}; 2454 delete $cf::MAP{$self->path};
2081 2455
2082 $self->unlink_save; 2456 $self->unlink_save;
2083 2457
2084 bless $self, "cf::map"; 2458 bless $self, "cf::map::wrap";
2085 delete $self->{deny_reset}; 2459 delete $self->{deny_reset};
2086 $self->{deny_save} = 1; 2460 $self->{deny_save} = 1;
2087 $self->reset_timeout (1); 2461 $self->reset_timeout (1);
2088 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2462 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2089 2463
2090 $cf::MAP{$self->path} = $self; 2464 $cf::MAP{$self->path} = $self;
2465 }
2091 2466
2092 $self->reset; # polite request, might not happen 2467 $self->reset; # polite request, might not happen
2093} 2468}
2094 2469
2095=item $maps = cf::map::tmp_maps 2470=item $maps = cf::map::tmp_maps
2137 2512
2138sub unique_maps() { 2513sub unique_maps() {
2139 [ 2514 [
2140 map { 2515 map {
2141 utf8::decode $_; 2516 utf8::decode $_;
2142 /\.map$/ 2517 s/\.map$//; # TODO future compatibility hack
2518 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2519 ? ()
2143 ? normalise $_ 2520 : normalise $_
2144 : ()
2145 } @{ aio_readdir $UNIQUEDIR or [] } 2521 } @{ aio_readdir $UNIQUEDIR or [] }
2146 ] 2522 ]
2147} 2523}
2148 2524
2149package 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}
2150 2556
2151=back 2557=back
2152 2558
2153=head3 cf::object 2559=head3 cf::object
2154 2560
2158 2564
2159=over 4 2565=over 4
2160 2566
2161=item $ob->inv_recursive 2567=item $ob->inv_recursive
2162 2568
2163Returns 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.
2164 2571
2165=cut 2572=cut
2166 2573
2167sub inv_recursive_; 2574sub inv_recursive_;
2168sub inv_recursive_ { 2575sub inv_recursive_ {
2171 2578
2172sub inv_recursive { 2579sub inv_recursive {
2173 inv_recursive_ inv $_[0] 2580 inv_recursive_ inv $_[0]
2174} 2581}
2175 2582
2583=item $ref = $ob->ref
2584
2585Creates and returns a persistent reference to an object that can be stored as a string.
2586
2587=item $ob = cf::object::deref ($refstring)
2588
2589returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2590even if the object actually exists. May block.
2591
2592=cut
2593
2594sub deref {
2595 my ($ref) = @_;
2596
2597 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2598 my ($uuid, $name) = ($1, $2);
2599 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2600 or return;
2601 $pl->ob->uuid eq $uuid
2602 or return;
2603
2604 $pl->ob
2605 } else {
2606 warn "$ref: cannot resolve object reference\n";
2607 undef
2608 }
2609}
2610
2176package cf; 2611package cf;
2177 2612
2178=back 2613=back
2179 2614
2180=head3 cf::object::player 2615=head3 cf::object::player
2186Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2621Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2187can 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
2188dialogue with the given NPC character. 2623dialogue with the given NPC character.
2189 2624
2190=cut 2625=cut
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};
2191 2640
2192# rough implementation of a future "reply" method that works 2641# rough implementation of a future "reply" method that works
2193# with dialog boxes. 2642# with dialog boxes.
2194#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
2195sub cf::object::player::reply($$$;$) { 2644sub cf::object::player::reply($$$;$) {
2207 my $dialog = $pl->{npc_dialog}; 2656 my $dialog = $pl->{npc_dialog};
2208 $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));
2209 2658
2210 } else { 2659 } else {
2211 $msg = $npc->name . " says: $msg" if $npc; 2660 $msg = $npc->name . " says: $msg" if $npc;
2212 $self->message ($msg, $flags); 2661 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2213 } 2662 }
2214 } 2663 }
2215} 2664}
2216 2665
2217=item $object->send_msg ($channel, $msg, $color, [extra...]) 2666=item $object->send_msg ($channel, $msg, $color, [extra...])
2242 2691
2243=item $player_object->enter_link 2692=item $player_object->enter_link
2244 2693
2245Freezes 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}>).
2246 2695
2247The 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.
2248I<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.
2249 2700
2250Will never block. 2701Will never block.
2251 2702
2252=item $player_object->leave_link ($map, $x, $y) 2703=item $player_object->leave_link ($map, $x, $y)
2253 2704
2273sub cf::object::player::enter_link { 2724sub cf::object::player::enter_link {
2274 my ($self) = @_; 2725 my ($self) = @_;
2275 2726
2276 $self->deactivate_recursive; 2727 $self->deactivate_recursive;
2277 2728
2729 ++$self->{_link_recursion};
2730
2278 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2731 return if UNIVERSAL::isa $self->map, "ext::map_link";
2279 2732
2280 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2733 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2281 if $self->map && $self->map->{path} ne "{link}"; 2734 if $self->map && $self->map->{path} ne "{link}";
2282 2735
2283 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2736 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2284} 2737}
2285 2738
2286sub cf::object::player::leave_link { 2739sub cf::object::player::leave_link {
2287 my ($self, $map, $x, $y) = @_; 2740 my ($self, $map, $x, $y) = @_;
2288 2741
2305 ($x, $y) = (-1, -1) 2758 ($x, $y) = (-1, -1)
2306 unless (defined $x) && (defined $y); 2759 unless (defined $x) && (defined $y);
2307 2760
2308 # use -1 or undef as default coordinates, not 0, 0 2761 # use -1 or undef as default coordinates, not 0, 0
2309 ($x, $y) = ($map->enter_x, $map->enter_y) 2762 ($x, $y) = ($map->enter_x, $map->enter_y)
2310 if $x <=0 && $y <= 0; 2763 if $x <= 0 && $y <= 0;
2311 2764
2312 $map->load; 2765 $map->load;
2313 $map->load_neighbours; 2766 $map->load_neighbours;
2314 2767
2315 return unless $self->contr->active; 2768 return unless $self->contr->active;
2316 $self->activate_recursive;
2317 2769
2318 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2770 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2319 $self->enter_map ($map, $x, $y); 2771 if ($self->enter_map ($map, $x, $y)) {
2320} 2772 # entering was successful
2773 delete $self->{_link_recursion};
2774 # only activate afterwards, to support waiting in hooks
2775 $self->activate_recursive;
2776 }
2321 2777
2778}
2779
2322=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)]])
2323 2781
2324Moves 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
2325her, loading and preparing them map, calling the provided $check callback 2783her, loading and preparing them map, calling the provided $check callback
2326that 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
2327the 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
2328be called at the end of this process. 2786be called at the end of this process.
2329 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
2330=cut 2791=cut
2331 2792
2332our $GOTOGEN; 2793our $GOTOGEN;
2333 2794
2334sub cf::object::player::goto { 2795sub cf::object::player::goto {
2335 my ($self, $path, $x, $y, $check, $done) = @_; 2796 my ($self, $path, $x, $y, $check, $done) = @_;
2336 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
2337 # 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
2338 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2805 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2339 2806
2340 $self->enter_link; 2807 $self->enter_link;
2341 2808
2342 (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
2343 my $map = eval { 2831 my $map = eval {
2344 my $map = cf::map::find $path; 2832 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2345 2833
2346 if ($map) { 2834 if ($map) {
2347 $map = $map->customise_for ($self); 2835 $map = $map->customise_for ($self);
2348 $map = $check->($map) if $check && $map; 2836 $map = $check->($map, $x, $y, $self) if $check && $map;
2349 } else { 2837 } else {
2350 $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);
2351 } 2839 }
2352 2840
2353 $map 2841 $map
2354 }; 2842 };
2355 2843
2361 if ($gen == $self->{_goto_generation}) { 2849 if ($gen == $self->{_goto_generation}) {
2362 delete $self->{_goto_generation}; 2850 delete $self->{_goto_generation};
2363 $self->leave_link ($map, $x, $y); 2851 $self->leave_link ($map, $x, $y);
2364 } 2852 }
2365 2853
2366 $done->() if $done; 2854 $done->($self) if $done;
2367 })->prio (1); 2855 })->prio (1);
2368} 2856}
2369 2857
2370=item $player_object->enter_exit ($exit_object) 2858=item $player_object->enter_exit ($exit_object)
2371 2859
2391} 2879}
2392 2880
2393sub prepare_random_map { 2881sub prepare_random_map {
2394 my ($exit) = @_; 2882 my ($exit) = @_;
2395 2883
2396 my $guard = cf::lock_acquire "exit_prepare:$exit";
2397
2398 # all this does is basically replace the /! path by 2884 # all this does is basically replace the /! path by
2399 # a new random map path (?random/...) with a seed 2885 # a new random map path (?random/...) with a seed
2400 # that depends on the exit object 2886 # that depends on the exit object
2401 2887
2402 my $rmp = parse_random_map_params $exit->msg; 2888 my $rmp = parse_random_map_params $exit->msg;
2404 if ($exit->map) { 2890 if ($exit->map) {
2405 $rmp->{region} = $exit->region->name; 2891 $rmp->{region} = $exit->region->name;
2406 $rmp->{origin_map} = $exit->map->path; 2892 $rmp->{origin_map} = $exit->map->path;
2407 $rmp->{origin_x} = $exit->x; 2893 $rmp->{origin_x} = $exit->x;
2408 $rmp->{origin_y} = $exit->y; 2894 $rmp->{origin_y} = $exit->y;
2895
2896 $exit->map->touch;
2409 } 2897 }
2410 2898
2411 $rmp->{random_seed} ||= $exit->random_seed; 2899 $rmp->{random_seed} ||= $exit->random_seed;
2412 2900
2413 my $data = cf::to_json $rmp; 2901 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2414 my $md5 = Digest::MD5::md5_hex $data; 2902 my $md5 = Digest::MD5::md5_hex $data;
2415 my $meta = "$RANDOMDIR/$md5.meta"; 2903 my $meta = "$RANDOMDIR/$md5.meta";
2416 2904
2417 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2905 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2418 aio_write $fh, 0, (length $data), $data, 0; 2906 aio_write $fh, 0, (length $data), $data, 0;
2419 undef $fh; 2907 undef $fh;
2420 aio_rename "$meta~", $meta; 2908 aio_rename "$meta~", $meta;
2421 2909
2910 my $slaying = "?random/$md5";
2911
2912 if ($exit->valid) {
2422 $exit->slaying ("?random/$md5"); 2913 $exit->slaying ("?random/$md5");
2423 $exit->msg (undef); 2914 $exit->msg (undef);
2915 }
2424 } 2916 }
2425} 2917}
2426 2918
2427sub cf::object::player::enter_exit { 2919sub cf::object::player::enter_exit {
2428 my ($self, $exit) = @_; 2920 my ($self, $exit) = @_;
2429 2921
2430 return unless $self->type == cf::PLAYER; 2922 return unless $self->type == cf::PLAYER;
2431 2923
2432 if ($exit->slaying eq "/!") {
2433 #TODO: this should de-fi-ni-te-ly not be a sync-job
2434 # the problem is that $exit might not survive long enough
2435 # so it needs to be done right now, right here
2436 cf::sync_job { prepare_random_map $exit };
2437 }
2438
2439 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2440 my $hp = $exit->stats->hp;
2441 my $sp = $exit->stats->sp;
2442
2443 $self->enter_link; 2924 $self->enter_link;
2444 2925
2445 # if exit is damned, update players death & WoR home-position
2446 $self->contr->savebed ($slaying, $hp, $sp)
2447 if $exit->flag (FLAG_DAMNED);
2448
2449 (async { 2926 (async {
2450 $self->deactivate_recursive; # just to be sure 2927 $Coro::current->{desc} = "enter_exit";
2928
2451 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
2452 $self->goto ($slaying, $hp, $sp); 2944 $self->goto ($map, $x, $y);
2453 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
2454 1; 2950 1
2455 }) { 2951 }) {
2456 $self->message ("Something went wrong deep within the crossfire server. " 2952 $self->message ("Something went wrong deep within the deliantra server. "
2457 . "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. "
2458 . "Please report this to the dungeon master!", 2954 . "Please report this to the dungeon master!",
2459 cf::NDI_UNIQUE | cf::NDI_RED); 2955 cf::NDI_UNIQUE | cf::NDI_RED);
2460 2956
2461 warn "ERROR in enter_exit: $@"; 2957 error "ERROR in enter_exit: $@";
2462 $self->leave_link; 2958 $self->leave_link;
2463 } 2959 }
2464 })->prio (1); 2960 })->prio (1);
2465} 2961}
2466 2962
2478sub cf::client::send_drawinfo { 2974sub cf::client::send_drawinfo {
2479 my ($self, $text, $flags) = @_; 2975 my ($self, $text, $flags) = @_;
2480 2976
2481 utf8::encode $text; 2977 utf8::encode $text;
2482 $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);
2483} 3004}
2484 3005
2485=item $client->send_msg ($channel, $msg, $color, [extra...]) 3006=item $client->send_msg ($channel, $msg, $color, [extra...])
2486 3007
2487Send 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
2489the 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
2490the message unless the client supports the msg packet. 3011the message unless the client supports the msg packet.
2491 3012
2492=cut 3013=cut
2493 3014
3015# non-persistent channels (usually the info channel)
3016our %CHANNEL = (
3017 "c/motd" => {
3018 id => "infobox",
3019 title => "MOTD",
3020 reply => undef,
3021 tooltip => "The message of the day",
3022 },
3023 "c/identify" => {
3024 id => "infobox",
3025 title => "Identify",
3026 reply => undef,
3027 tooltip => "Items recently identified",
3028 },
3029 "c/examine" => {
3030 id => "infobox",
3031 title => "Examine",
3032 reply => undef,
3033 tooltip => "Signs and other items you examined",
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,
3127);
3128
2494sub cf::client::send_msg { 3129sub cf::client::send_msg {
2495 my ($self, $channel, $msg, $color, @extra) = @_; 3130 my ($self, $channel, $msg, $color, @extra) = @_;
2496 3131
2497 $msg = $self->pl->expand_cfpod ($msg); 3132 $msg = $self->pl->expand_cfpod ($msg)
3133 unless $color & cf::NDI_VERBATIM;
2498 3134
2499 $color &= cf::NDI_CLIENT_MASK; # just in case... 3135 $color &= cf::NDI_CLIENT_MASK; # just in case...
2500 3136
3137 # check predefined channels, for the benefit of C
3138 if ($CHANNEL{$channel}) {
3139 $channel = $CHANNEL{$channel};
3140
3141 $self->ext_msg (channel_info => $channel);
3142 $channel = $channel->{id};
3143
2501 if (ref $channel) { 3144 } elsif (ref $channel) {
2502 # send meta info to client, if not yet sent 3145 # send meta info to client, if not yet sent
2503 unless (exists $self->{channel}{$channel->{id}}) { 3146 unless (exists $self->{channel}{$channel->{id}}) {
2504 $self->{channel}{$channel->{id}} = $channel; 3147 $self->{channel}{$channel->{id}} = $channel;
2505 $self->ext_msg (channel_info => $channel); 3148 $self->ext_msg (channel_info => $channel);
2506 } 3149 }
2508 $channel = $channel->{id}; 3151 $channel = $channel->{id};
2509 } 3152 }
2510 3153
2511 return unless @extra || length $msg; 3154 return unless @extra || length $msg;
2512 3155
2513 if ($self->can_msg) {
2514 # default colour, mask it out 3156 # default colour, mask it out
2515 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3157 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2516 if $color & cf::NDI_DEF; 3158 if $color & cf::NDI_DEF;
2517 3159
2518 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3160 my $pkt = "msg "
3161 . $self->{json_coder}->encode (
2519 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3162 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2520 } else { 3163 );
2521 if ($color >= 0) {
2522 # replace some tags by gcfclient-compatible ones
2523 for ($msg) {
2524 1 while
2525 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2526 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2527 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2528 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2529 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2530 }
2531 3164
2532 $color &= cf::NDI_COLOR_MASK; 3165 $self->send_big_packet ($pkt);
2533
2534 utf8::encode $msg;
2535
2536 if (0 && $msg =~ /\[/) {
2537 # COMMAND/INFO
2538 $self->send_packet ("drawextinfo $color 10 8 $msg")
2539 } else {
2540 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2541 $self->send_packet ("drawinfo $color $msg")
2542 }
2543 }
2544 }
2545} 3166}
2546 3167
2547=item $client->ext_msg ($type, @msg) 3168=item $client->ext_msg ($type, @msg)
2548 3169
2549Sends an ext event to the client. 3170Sends an ext event to the client.
2551=cut 3172=cut
2552 3173
2553sub cf::client::ext_msg($$@) { 3174sub cf::client::ext_msg($$@) {
2554 my ($self, $type, @msg) = @_; 3175 my ($self, $type, @msg) = @_;
2555 3176
2556 my $extcmd = $self->extcmd;
2557
2558 if ($extcmd == 2) { 3177 if ($self->extcmd == 2) {
2559 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3178 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2560 } elsif ($extcmd == 1) { # TODO: remove 3179 } elsif ($self->extcmd == 1) { # TODO: remove
2561 push @msg, msgtype => "event_$type"; 3180 push @msg, msgtype => "event_$type";
2562 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3181 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2563 } 3182 }
2564} 3183}
2565 3184
2566=item $client->ext_reply ($msgid, @msg) 3185=item $client->ext_reply ($msgid, @msg)
2567 3186
2571 3190
2572sub cf::client::ext_reply($$@) { 3191sub cf::client::ext_reply($$@) {
2573 my ($self, $id, @msg) = @_; 3192 my ($self, $id, @msg) = @_;
2574 3193
2575 if ($self->extcmd == 2) { 3194 if ($self->extcmd == 2) {
2576 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3195 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2577 } elsif ($self->ns->extcmd == 1) { 3196 } elsif ($self->extcmd == 1) {
2578 #TODO: version 1, remove 3197 #TODO: version 1, remove
2579 unshift @msg, msgtype => "reply", msgid => $id; 3198 unshift @msg, msgtype => "reply", msgid => $id;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3199 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 } 3200 }
2582} 3201}
2583 3202
2584=item $success = $client->query ($flags, "text", \&cb) 3203=item $success = $client->query ($flags, "text", \&cb)
2585 3204
2646 my ($type, $reply, @payload) = 3265 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg 3266 "ARRAY" eq ref $msg
2648 ? @$msg 3267 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 3268 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650 3269
3270 my @reply;
3271
2651 if (my $cb = $EXTICMD{$type}) { 3272 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload); 3273 @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 } 3274 }
3275
3276 $ns->ext_reply ($reply, @reply)
3277 if $reply;
3278
2657 } else { 3279 } else {
2658 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";
2659 } 3281 }
2660 3282
2661 cf::override; 3283 cf::override;
2662 }, 3284 },
2663); 3285);
2683 3305
2684 $coro 3306 $coro
2685} 3307}
2686 3308
2687cf::client->attach ( 3309cf::client->attach (
2688 on_destroy => sub { 3310 on_client_destroy => sub {
2689 my ($ns) = @_; 3311 my ($ns) = @_;
2690 3312
2691 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3313 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2692 }, 3314 },
2693); 3315);
2709our $safe_hole = new Safe::Hole; 3331our $safe_hole = new Safe::Hole;
2710 3332
2711$SIG{FPE} = 'IGNORE'; 3333$SIG{FPE} = 'IGNORE';
2712 3334
2713$safe->permit_only (Opcode::opset qw( 3335$safe->permit_only (Opcode::opset qw(
2714 :base_core :base_mem :base_orig :base_math 3336 :base_core :base_mem :base_orig :base_math :base_loop
2715 grepstart grepwhile mapstart mapwhile 3337 grepstart grepwhile mapstart mapwhile
2716 sort time 3338 sort time
2717)); 3339));
2718 3340
2719# here we export the classes and methods available to script code 3341# here we export the classes and methods available to script code
2721=pod 3343=pod
2722 3344
2723The following functions and methods are available within a safe environment: 3345The following functions and methods are available within a safe environment:
2724 3346
2725 cf::object 3347 cf::object
2726 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
2727 insert remove name archname title slaying race 3349 insert remove name archname title slaying race decrease split
3350 value
2728 3351
2729 cf::object::player 3352 cf::object::player
2730 player 3353 player
2731 3354
2732 cf::player 3355 cf::player
2737 3360
2738=cut 3361=cut
2739 3362
2740for ( 3363for (
2741 ["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
2742 insert remove inv name archname title slaying race)], 3365 insert remove inv nrof name archname title slaying race
3366 decrease split destroy change_exp value msg lore send_msg)],
2743 ["cf::object::player" => qw(player)], 3367 ["cf::object::player" => qw(player)],
2744 ["cf::player" => qw(peaceful)], 3368 ["cf::player" => qw(peaceful send_msg)],
2745 ["cf::map" => qw(trigger)], 3369 ["cf::map" => qw(trigger)],
2746) { 3370) {
2747 no strict 'refs';
2748 my ($pkg, @funs) = @$_; 3371 my ($pkg, @funs) = @$_;
2749 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3372 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2750 for @funs; 3373 for @funs;
2751} 3374}
2752 3375
2767 3390
2768 my $qcode = $code; 3391 my $qcode = $code;
2769 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3392 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2770 $qcode =~ s/\n/\\n/g; 3393 $qcode =~ s/\n/\\n/g;
2771 3394
3395 %vars = (_dummy => 0) unless %vars;
3396
3397 my @res;
2772 local $_; 3398 local $_;
2773 local @safe::cf::_safe_eval_args = values %vars;
2774 3399
2775 my $eval = 3400 my $eval =
2776 "do {\n" 3401 "do {\n"
2777 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3402 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2778 . "#line 0 \"{$qcode}\"\n" 3403 . "#line 0 \"{$qcode}\"\n"
2779 . $code 3404 . $code
2780 . "\n}" 3405 . "\n}"
2781 ; 3406 ;
2782 3407
3408 if ($CFG{safe_eval}) {
2783 sub_generation_inc; 3409 sub_generation_inc;
3410 local @safe::cf::_safe_eval_args = values %vars;
2784 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3411 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2785 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 }
2786 3417
2787 if ($@) { 3418 if ($@) {
2788 warn "$@"; 3419 warn "$@",
2789 warn "while executing safe code '$code'\n"; 3420 "while executing safe code '$code'\n",
2790 warn "with arguments " . (join " ", %vars) . "\n"; 3421 "with arguments " . (join " ", %vars) . "\n";
2791 } 3422 }
2792 3423
2793 wantarray ? @res : $res[0] 3424 wantarray ? @res : $res[0]
2794} 3425}
2795 3426
2809=cut 3440=cut
2810 3441
2811sub register_script_function { 3442sub register_script_function {
2812 my ($fun, $cb) = @_; 3443 my ($fun, $cb) = @_;
2813 3444
2814 no strict 'refs'; 3445 $fun = "safe::$fun" if $CFG{safe_eval};
2815 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3446 *$fun = $safe_hole->wrap ($cb);
2816} 3447}
2817 3448
2818=back 3449=back
2819 3450
2820=cut 3451=cut
2823# the server's init and main functions 3454# the server's init and main functions
2824 3455
2825sub load_facedata($) { 3456sub load_facedata($) {
2826 my ($path) = @_; 3457 my ($path) = @_;
2827 3458
3459 # HACK to clear player env face cache, we need some signal framework
3460 # for this (global event?)
3461 %ext::player_env::MUSIC_FACE_CACHE = ();
3462
2828 my $enc = JSON::XS->new->utf8->canonical; 3463 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2829 3464
2830 warn "loading facedata from $path\n"; 3465 trace "loading facedata from $path\n";
2831 3466
2832 my $facedata; 3467 my $facedata = decode_storable load_file $path;
2833 0 < aio_load $path, $facedata
2834 or die "$path: $!";
2835
2836 $facedata = Coro::Storable::thaw $facedata;
2837 3468
2838 $facedata->{version} == 2 3469 $facedata->{version} == 2
2839 or cf::cleanup "$path: version mismatch, cannot proceed."; 3470 or cf::cleanup "$path: version mismatch, cannot proceed.";
2840 3471
2841 # 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]);
2842 $facedata->{resource}{"res/exp_table"} = { 3474 $facedata->{resource}{"res/exp_table"} = {
2843 type => FT_RSRC, 3475 type => FT_RSRC,
2844 data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]), 3476 data => $exp_table,
3477 hash => (Digest::MD5::md5 $exp_table),
2845 }; 3478 };
2846 cf::cede_to_tick; 3479 cf::cede_to_tick;
2847 3480
2848 { 3481 {
2849 my $faces = $facedata->{faceinfo}; 3482 my $faces = $facedata->{faceinfo};
2850 3483
2851 while (my ($face, $info) = each %$faces) { 3484 while (my ($face, $info) = each %$faces) {
2852 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3485 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3486
2853 cf::face::set_visibility $idx, $info->{visibility}; 3487 cf::face::set_visibility $idx, $info->{visibility};
2854 cf::face::set_magicmap $idx, $info->{magicmap}; 3488 cf::face::set_magicmap $idx, $info->{magicmap};
2855 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3489 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2856 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} ;
2857 3492
2858 cf::cede_to_tick; 3493 cf::cede_to_tick;
2859 } 3494 }
2860 3495
2861 while (my ($face, $info) = each %$faces) { 3496 while (my ($face, $info) = each %$faces) {
2862 next unless $info->{smooth}; 3497 next unless $info->{smooth};
3498
2863 my $idx = cf::face::find $face 3499 my $idx = cf::face::find $face
2864 or next; 3500 or next;
3501
2865 if (my $smooth = cf::face::find $info->{smooth}) { 3502 if (my $smooth = cf::face::find $info->{smooth}) {
2866 cf::face::set_smooth $idx, $smooth; 3503 cf::face::set_smooth $idx, $smooth;
2867 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3504 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2868 } else { 3505 } else {
2869 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3506 error "smooth face '$info->{smooth}' not found for face '$face'";
2870 } 3507 }
2871 3508
2872 cf::cede_to_tick; 3509 cf::cede_to_tick;
2873 } 3510 }
2874 } 3511 }
2883 3520
2884 cf::anim::invalidate_all; # d'oh 3521 cf::anim::invalidate_all; # d'oh
2885 } 3522 }
2886 3523
2887 { 3524 {
2888 # TODO: for gcfclient pleasure, we should give resources
2889 # that gcfclient doesn't grok a >10000 face index.
2890 my $res = $facedata->{resource}; 3525 my $res = $facedata->{resource};
2891 3526
2892 my $soundconf = delete $res->{"res/sound.conf"};
2893
2894 while (my ($name, $info) = each %$res) { 3527 while (my ($name, $info) = each %$res) {
3528 if (defined $info->{type}) {
2895 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3529 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2896 my $data;
2897 3530
2898 if ($info->{type} & 1) { 3531 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
2899 # prepend meta info 3532 cf::face::set_type $idx, $info->{type};
2900 3533 } else {
2901 my $meta = $enc->encode ({ 3534 $RESOURCE{$name} = $info; # unused
2902 name => $name,
2903 %{ $info->{meta} || {} },
2904 });
2905
2906 $data = pack "(w/a*)*", $meta, $info->{data};
2907 } 3535 }
2908 3536
2909 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2910 cf::face::set_type $idx, $info->{type};
2911
2912 cf::cede_to_tick; 3537 cf::cede_to_tick;
2913 } 3538 }
2914
2915 if ($soundconf) {
2916 $soundconf = $enc->decode (delete $soundconf->{data});
2917
2918 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2919 my $sound = $soundconf->{compat}[$_]
2920 or next;
2921
2922 my $face = cf::face::find "sound/$sound->[1]";
2923 cf::sound::set $sound->[0] => $face;
2924 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2925 }
2926
2927 while (my ($k, $v) = each %{$soundconf->{event}}) {
2928 my $face = cf::face::find "sound/$v";
2929 cf::sound::set $k => $face;
2930 }
2931 }
2932 } 3539 }
3540
3541 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2933 3542
2934 1 3543 1
2935} 3544}
2936 3545
2937register_exticmd fx_want => sub { 3546register_exticmd fx_want => sub {
2940 while (my ($k, $v) = each %$want) { 3549 while (my ($k, $v) = each %$want) {
2941 $ns->fx_want ($k, $v); 3550 $ns->fx_want ($k, $v);
2942 } 3551 }
2943}; 3552};
2944 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}
3563
2945sub reload_regions { 3564sub reload_regions {
3565 # HACK to clear player env face cache, we need some signal framework
3566 # for this (global event?)
3567 %ext::player_env::MUSIC_FACE_CACHE = ();
3568
2946 load_resource_file "$MAPDIR/regions" 3569 load_resource_file "$MAPDIR/regions"
2947 or die "unable to load regions file\n"; 3570 or die "unable to load regions file\n";
2948 3571
2949 for (cf::region::list) { 3572 for (cf::region::list) {
2950 $_->{match} = qr/$_->{match}/ 3573 $_->{match} = qr/$_->{match}/
2958} 3581}
2959 3582
2960sub reload_archetypes { 3583sub reload_archetypes {
2961 load_resource_file "$DATADIR/archetypes" 3584 load_resource_file "$DATADIR/archetypes"
2962 or die "unable to load archetypes\n"; 3585 or die "unable to load archetypes\n";
2963 #d# NEED to laod twice to resolve forward references
2964 # this really needs to be done in an extra post-pass
2965 # (which needs to be synchronous, so solve it differently)
2966 load_resource_file "$DATADIR/archetypes"
2967 or die "unable to load archetypes\n";
2968} 3586}
2969 3587
2970sub reload_treasures { 3588sub reload_treasures {
2971 load_resource_file "$DATADIR/treasures" 3589 load_resource_file "$DATADIR/treasures"
2972 or die "unable to load treasurelists\n"; 3590 or die "unable to load treasurelists\n";
2973} 3591}
2974 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
2975sub reload_resources { 3613sub reload_resources {
2976 warn "reloading resource files...\n"; 3614 trace "reloading resource files...\n";
2977 3615
3616 reload_exp_table;
3617 reload_materials;
3618 reload_facedata;
3619 reload_sound;
3620 reload_archetypes;
2978 reload_regions; 3621 reload_regions;
2979 reload_facedata;
2980 #reload_archetypes;#d#
2981 reload_archetypes;
2982 reload_treasures; 3622 reload_treasures;
2983 3623
2984 warn "finished reloading resource files\n"; 3624 trace "finished reloading resource files\n";
2985} 3625}
2986 3626
2987sub init { 3627sub reload_config {
2988 reload_resources; 3628 trace "reloading config file...\n";
2989}
2990 3629
2991sub cfg_load { 3630 my $config = load_file "$CONFDIR/config";
2992 open my $fh, "<:utf8", "$CONFDIR/config" 3631 utf8::decode $config;
2993 or return; 3632 *CFG = decode_yaml $config;
2994 3633
2995 local $/;
2996 *CFG = YAML::Syck::Load <$fh>;
2997
2998 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3634 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2999 3635
3000 $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};
3001 $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};
3002 3638
3003 if (exists $CFG{mlockall}) { 3639 if (exists $CFG{mlockall}) {
3007 }; 3643 };
3008 warn $@ if $@; 3644 warn $@ if $@;
3009 } 3645 }
3010} 3646}
3011 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
3012sub 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
3013 # we must not ever block the main coroutine 3686 # we must not ever block the main coroutine
3014 local $Coro::idle = sub { 3687 local $Coro::idle = sub {
3015 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#
3016 (async { 3689 (async {
3017 Event::one_event; 3690 $Coro::current->{desc} = "IDLE BUG HANDLER";
3691 EV::loop EV::LOOP_ONESHOT;
3018 })->prio (Coro::PRIO_MAX); 3692 })->prio (Coro::PRIO_MAX);
3019 }; 3693 };
3020 3694
3021 cfg_load; 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;
3707 reload_config;
3022 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
3023 load_extensions; 3718 load_extensions;
3024 3719
3025 $TICK_WATCHER->start; 3720 utime time, time, $RUNTIMEFILE;
3026 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;
3027} 3738}
3028 3739
3029############################################################################# 3740#############################################################################
3030# initialisation and cleanup 3741# initialisation and cleanup
3031 3742
3032# install some emergency cleanup handlers 3743# install some emergency cleanup handlers
3033BEGIN { 3744BEGIN {
3745 our %SIGWATCHER = ();
3034 for my $signal (qw(INT HUP TERM)) { 3746 for my $signal (qw(INT HUP TERM)) {
3035 Event->signal ( 3747 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3036 reentrant => 0,
3037 data => WF_AUTOCANCEL,
3038 signal => $signal,
3039 prio => 0,
3040 cb => sub {
3041 cf::cleanup "SIG$signal"; 3748 cf::cleanup "SIG$signal";
3042 },
3043 ); 3749 };
3044 } 3750 }
3045} 3751}
3046 3752
3047sub write_runtime { 3753sub write_runtime_sync {
3048 my $runtime = "$LOCALDIR/runtime"; 3754 my $t0 = AE::time;
3049 3755
3050 # first touch the runtime file to show we are still running: 3756 # first touch the runtime file to show we are still running:
3051 # the fsync below can take a very very long time. 3757 # the fsync below can take a very very long time.
3052 3758
3053 IO::AIO::aio_utime $runtime, undef, undef; 3759 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3054 3760
3055 my $guard = cf::lock_acquire "write_runtime"; 3761 my $guard = cf::lock_acquire "write_runtime";
3056 3762
3057 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3763 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3058 or return; 3764 or return;
3059 3765
3060 my $value = $cf::RUNTIME + 90 + 10; 3766 my $value = $cf::RUNTIME + 90 + 10;
3061 # 10 is the runtime save interval, for a monotonic clock 3767 # 10 is the runtime save interval, for a monotonic clock
3062 # 60 allows for the watchdog to kill the server. 3768 # 60 allows for the watchdog to kill the server.
3072 aio_utime $fh, undef, undef; 3778 aio_utime $fh, undef, undef;
3073 3779
3074 close $fh 3780 close $fh
3075 or return; 3781 or return;
3076 3782
3077 aio_rename "$runtime~", $runtime 3783 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3078 and return; 3784 and return;
3079 3785
3080 warn "runtime file written.\n"; 3786 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3081 3787
3082 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 };
3083} 3839}
3084 3840
3085sub emergency_save() { 3841sub emergency_save() {
3086 my $freeze_guard = cf::freeze_mainloop; 3842 my $freeze_guard = cf::freeze_mainloop;
3087 3843
3088 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;
3089 3850
3090 cf::sync_job { 3851 cf::sync_job {
3852 cf::write_runtime_sync; # external watchdog should not bark
3853
3091 # use a peculiar iteration method to avoid tripping on perl 3854 # use a peculiar iteration method to avoid tripping on perl
3092 # refcount bugs in for. also avoids problems with players 3855 # refcount bugs in for. also avoids problems with players
3093 # and maps saved/destroyed asynchronously. 3856 # and maps saved/destroyed asynchronously.
3094 warn "begin emergency player save\n"; 3857 info "emergency_perl_save: begin player save\n";
3095 for my $login (keys %cf::PLAYER) { 3858 for my $login (keys %cf::PLAYER) {
3096 my $pl = $cf::PLAYER{$login} or next; 3859 my $pl = $cf::PLAYER{$login} or next;
3097 $pl->valid or next; 3860 $pl->valid or next;
3861 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3098 $pl->save; 3862 $pl->save;
3099 } 3863 }
3100 warn "end emergency player save\n"; 3864 info "emergency_perl_save: end player save\n";
3101 3865
3102 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";
3103 for my $path (keys %cf::MAP) { 3869 for my $path (keys %cf::MAP) {
3104 my $map = $cf::MAP{$path} or next; 3870 my $map = $cf::MAP{$path} or next;
3105 $map->valid or next; 3871 $map->valid or next;
3106 $map->save; 3872 $map->save;
3107 } 3873 }
3108 warn "end emergency map save\n"; 3874 info "emergency_perl_save: end map save\n";
3109 3875
3110 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";
3111 BDB::db_env_txn_checkpoint $DB_ENV; 3879 BDB::db_env_txn_checkpoint $DB_ENV;
3112 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
3113 }; 3904 };
3114 3905
3115 warn "leave emergency perl save\n"; 3906 info "emergency_perl_save: leave\n";
3116} 3907}
3117 3908
3118sub post_cleanup { 3909sub post_cleanup {
3119 my ($make_core) = @_; 3910 my ($make_core) = @_;
3120 3911
3912 IO::AIO::flush;
3913
3121 warn Carp::longmess "post_cleanup backtrace" 3914 error Carp::longmess "post_cleanup backtrace"
3122 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 }
3123} 3944}
3124 3945
3125sub do_reload_perl() { 3946sub do_reload_perl() {
3126 # can/must only be called in main 3947 # can/must only be called in main
3127 if ($Coro::current != $Coro::main) { 3948 unless (in_main) {
3128 warn "can only reload from main coroutine"; 3949 error "can only reload from main coroutine";
3129 return; 3950 return;
3130 } 3951 }
3131 3952
3132 warn "reloading..."; 3953 return if $RELOAD++;
3133 3954
3134 warn "entering sync_job"; 3955 my $t1 = AE::time;
3135 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
3136 cf::sync_job { 3963 cf::sync_job {
3137 cf::write_runtime; # external watchdog should not bark
3138 cf::emergency_save; 3964 #cf::emergency_save;
3139 cf::write_runtime; # external watchdog should not bark
3140 3965
3141 warn "syncing database to disk";
3142 BDB::db_env_txn_checkpoint $DB_ENV;
3143
3144 # if anything goes wrong in here, we should simply crash as we already saved
3145
3146 warn "cancelling all WF_AUTOCANCEL watchers";
3147 for (Event::all_watchers) {
3148 $_->cancel if $_->data & WF_AUTOCANCEL;
3149 }
3150
3151 warn "flushing outstanding aio requests";
3152 for (;;) {
3153 BDB::flush;
3154 IO::AIO::flush;
3155 Coro::cede;
3156 last unless IO::AIO::nreqs || BDB::nreqs;
3157 warn "iterate...";
3158 }
3159
3160 ++$RELOAD;
3161
3162 warn "cancelling all extension coros"; 3966 trace "perl_reload: cancelling all extension coros";
3163 $_->cancel for values %EXT_CORO; 3967 $_->cancel for values %EXT_CORO;
3164 %EXT_CORO = (); 3968 %EXT_CORO = ();
3165 3969
3166 warn "removing commands"; 3970 trace "perl_reload: removing commands";
3167 %COMMAND = (); 3971 %COMMAND = ();
3168 3972
3169 warn "removing ext/exti commands"; 3973 trace "perl_reload: removing ext/exti commands";
3170 %EXTCMD = (); 3974 %EXTCMD = ();
3171 %EXTICMD = (); 3975 %EXTICMD = ();
3172 3976
3173 warn "unloading/nuking all extensions"; 3977 trace "perl_reload: unloading/nuking all extensions";
3174 for my $pkg (@EXTS) { 3978 for my $pkg (@EXTS) {
3175 warn "... unloading $pkg"; 3979 trace "... unloading $pkg";
3176 3980
3177 if (my $cb = $pkg->can ("unload")) { 3981 if (my $cb = $pkg->can ("unload")) {
3178 eval { 3982 eval {
3179 $cb->($pkg); 3983 $cb->($pkg);
3180 1 3984 1
3181 } 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;
3182 } 3990 }
3183 3991
3184 warn "... nuking $pkg";
3185 Symbol::delete_package $pkg;
3186 }
3187
3188 warn "unloading all perl modules loaded from $LIBDIR"; 3992 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3189 while (my ($k, $v) = each %INC) { 3993 while (my ($k, $v) = each %INC) {
3190 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3994 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3191 3995
3192 warn "... unloading $k"; 3996 trace "... unloading $k";
3193 delete $INC{$k}; 3997 delete $INC{$k};
3194 3998
3195 $k =~ s/\.pm$//; 3999 $k =~ s/\.pm$//;
3196 $k =~ s/\//::/g; 4000 $k =~ s/\//::/g;
3197 4001
3198 if (my $cb = $k->can ("unload_module")) { 4002 if (my $cb = $k->can ("unload_module")) {
3199 $cb->(); 4003 $cb->();
4004 }
4005
4006 clear_package $k;
3200 } 4007 }
3201 4008
3202 Symbol::delete_package $k;
3203 }
3204
3205 warn "getting rid of safe::, as good as possible"; 4009 trace "perl_reload: getting rid of safe::, as good as possible";
3206 Symbol::delete_package "safe::$_" 4010 clear_package "safe::$_"
3207 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);
3208 4012
3209 warn "unloading cf.pm \"a bit\""; 4013 trace "perl_reload: unloading cf.pm \"a bit\"";
3210 delete $INC{"cf.pm"}; 4014 delete $INC{"cf.pm"};
3211 delete $INC{"cf/pod.pm"}; 4015 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3212 4016
3213 # don't, removes xs symbols, too, 4017 # don't, removes xs symbols, too,
3214 # and global variables created in xs 4018 # and global variables created in xs
3215 #Symbol::delete_package __PACKAGE__; 4019 #clear_package __PACKAGE__;
3216 4020
3217 warn "unload completed, starting to reload now"; 4021 info "perl_reload: unload completed, starting to reload now";
3218 4022
3219 warn "reloading cf.pm"; 4023 trace "perl_reload: reloading cf.pm";
3220 require cf; 4024 require cf;
3221 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4025 cf::_connect_to_perl_1;
3222 4026
3223 warn "loading config and database again"; 4027 trace "perl_reload: loading config and database again";
3224 cf::cfg_load; 4028 cf::reload_config;
3225 4029
3226 warn "loading extensions"; 4030 trace "perl_reload: loading extensions";
3227 cf::load_extensions; 4031 cf::load_extensions;
3228 4032
4033 if ($REATTACH_ON_RELOAD) {
3229 warn "reattaching attachments to objects/players"; 4034 trace "perl_reload: reattaching attachments to objects/players";
3230 _global_reattach; # objects, sockets 4035 _global_reattach; # objects, sockets
3231 warn "reattaching attachments to maps"; 4036 trace "perl_reload: reattaching attachments to maps";
3232 reattach $_ for values %MAP; 4037 reattach $_ for values %MAP;
3233 warn "reattaching attachments to players"; 4038 trace "perl_reload: reattaching attachments to players";
3234 reattach $_ for values %PLAYER; 4039 reattach $_ for values %PLAYER;
4040 }
3235 4041
3236 warn "leaving sync_job"; 4042 cf::_post_init 1;
3237 4043
4044 trace "perl_reload: leaving sync_job";
4045
3238 1 4046 1
3239 } or do { 4047 } or do {
3240 warn $@; 4048 error $@;
3241 warn "error while reloading, exiting."; 4049 cf::cleanup "perl_reload: error, exiting.";
3242 exit 1; 4050 };
4051
4052 --$RELOAD;
3243 }; 4053 }
3244 4054
3245 warn "reloaded"; 4055 $t1 = AE::time - $t1;
4056 info "perl_reload: completed in ${t1}s\n";
3246}; 4057};
3247 4058
3248our $RELOAD_WATCHER; # used only during reload 4059our $RELOAD_WATCHER; # used only during reload
3249 4060
3250sub reload_perl() { 4061sub reload_perl() {
3251 # doing reload synchronously and two reloads happen back-to-back, 4062 # doing reload synchronously and two reloads happen back-to-back,
3252 # coro crashes during coro_state_free->destroy here. 4063 # coro crashes during coro_state_free->destroy here.
3253 4064
3254 $RELOAD_WATCHER ||= Event->timer ( 4065 $RELOAD_WATCHER ||= cf::async {
3255 reentrant => 0, 4066 Coro::AIO::aio_wait cache_extensions;
3256 after => 0, 4067
3257 data => WF_AUTOCANCEL, 4068 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3258 cb => sub {
3259 do_reload_perl; 4069 do_reload_perl;
3260 undef $RELOAD_WATCHER; 4070 undef $RELOAD_WATCHER;
3261 }, 4071 };
3262 ); 4072 };
3263} 4073}
3264 4074
3265register_command "reload" => sub { 4075register_command "reload" => sub {
3266 my ($who, $arg) = @_; 4076 my ($who, $arg) = @_;
3267 4077
3268 if ($who->flag (FLAG_WIZ)) { 4078 if ($who->flag (FLAG_WIZ)) {
3269 $who->message ("reloading server."); 4079 $who->message ("reloading server.");
4080 async {
4081 $Coro::current->{desc} = "perl_reload";
3270 async { reload_perl }; 4082 reload_perl;
4083 };
3271 } 4084 }
3272}; 4085};
3273 4086
3274unshift @INC, $LIBDIR; 4087#############################################################################
3275 4088
3276my $bug_warning = 0; 4089my $bug_warning = 0;
3277 4090
3278our @WAIT_FOR_TICK; 4091our @WAIT_FOR_TICK;
3279our @WAIT_FOR_TICK_BEGIN; 4092our @WAIT_FOR_TICK_BEGIN;
3280 4093
3281sub wait_for_tick { 4094sub wait_for_tick() {
3282 return unless $TICK_WATCHER->is_active;
3283 return if $Coro::current == $Coro::main; 4095 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3284 4096
3285 my $signal = new Coro::Signal; 4097 my $signal = new Coro::Signal;
3286 push @WAIT_FOR_TICK, $signal; 4098 push @WAIT_FOR_TICK, $signal;
3287 $signal->wait; 4099 $signal->wait;
3288} 4100}
3289 4101
3290sub wait_for_tick_begin { 4102sub wait_for_tick_begin() {
3291 return unless $TICK_WATCHER->is_active;
3292 return if $Coro::current == $Coro::main; 4103 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3293 4104
3294 my $signal = new Coro::Signal; 4105 my $signal = new Coro::Signal;
3295 push @WAIT_FOR_TICK_BEGIN, $signal; 4106 push @WAIT_FOR_TICK_BEGIN, $signal;
3296 $signal->wait; 4107 $signal->wait;
3297} 4108}
3298 4109
3299 my $min = 1e6;#d# 4110sub tick {
3300 my $avg = 10;
3301$TICK_WATCHER = Event->timer (
3302 reentrant => 0,
3303 parked => 1,
3304 prio => 0,
3305 at => $NEXT_TICK || $TICK,
3306 data => WF_AUTOCANCEL,
3307 cb => sub {
3308 if ($Coro::current != $Coro::main) { 4111 if ($Coro::current != $Coro::main) {
3309 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"
3310 unless ++$bug_warning > 10; 4113 unless ++$bug_warning > 10;
3311 return; 4114 return;
3312 } 4115 }
3313 4116
3314 $NOW = $tick_start = Event::time;
3315
3316 cf::server_tick; # one server iteration 4117 cf::server_tick; # one server iteration
3317 4118
3318 0 && sync_job {#d# 4119 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3319 for(1..10) {
3320 my $t = Event::time;
3321 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3322 or die;
3323 4120
3324 $map->width (50); 4121 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3325 $map->height (50); 4122 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3326 $map->alloc; 4123 Coro::async_pool {
3327 $map->_load_objects ("/tmp/x.map", 1); 4124 $Coro::current->{desc} = "runtime saver";
3328 my $t = Event::time - $t; 4125 write_runtime_sync
3329 4126 or error "ERROR: unable to write runtime file: $!";
3330 #next unless $t < 0.0013;#d#
3331 if ($t < $min) {
3332 $min = $t;
3333 }
3334 $avg = $avg * 0.99 + $t * 0.01;
3335 }
3336 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3337 exit 0;
3338 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3339 }; 4127 };
4128 }
3340 4129
3341 $RUNTIME += $TICK;
3342 $NEXT_TICK += $TICK;
3343
3344 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3345 $NEXT_RUNTIME_WRITE = $NOW + 10;
3346 Coro::async_pool {
3347 write_runtime
3348 or warn "ERROR: unable to write runtime file: $!";
3349 };
3350 }
3351
3352# my $AFTER = Event::time;
3353# warn $AFTER - $NOW;#d#
3354
3355 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4130 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3356 $sig->send; 4131 $sig->send;
3357 } 4132 }
3358 while (my $sig = shift @WAIT_FOR_TICK) { 4133 while (my $sig = shift @WAIT_FOR_TICK) {
3359 $sig->send; 4134 $sig->send;
3360 } 4135 }
3361 4136
3362 $NOW = Event::time; 4137 $LOAD = ($NOW - $TICK_START) / $TICK;
3363
3364 # if we are delayed by four ticks or more, skip them all
3365 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3366
3367 $TICK_WATCHER->at ($NEXT_TICK);
3368 $TICK_WATCHER->start;
3369
3370 $LOAD = ($NOW - $tick_start) / $TICK;
3371 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4138 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3372 4139
3373 _post_tick; 4140 if (0) {
3374 4141 if ($NEXT_TICK) {
3375 4142 my $jitter = $TICK_START - $NEXT_TICK;
4143 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4144 debug "jitter $JITTER\n";#d#
4145 }
3376 }, 4146 }
3377); 4147}
3378 4148
3379{ 4149{
3380 BDB::max_poll_time $TICK * 0.1; 4150 # configure BDB
3381 $BDB_POLL_WATCHER = Event->io ( 4151
3382 reentrant => 0,
3383 fd => BDB::poll_fileno,
3384 poll => 'r',
3385 prio => 0,
3386 data => WF_AUTOCANCEL,
3387 cb => \&BDB::poll_cb,
3388 );
3389 BDB::min_parallel 8; 4152 BDB::min_parallel 16;
3390 4153 BDB::max_poll_reqs $TICK * 0.1;
3391 BDB::set_sync_prepare { 4154 $AnyEvent::BDB::WATCHER->priority (1);
3392 my $status;
3393 my $current = $Coro::current;
3394 (
3395 sub {
3396 $status = $!;
3397 $current->ready; undef $current;
3398 },
3399 sub {
3400 Coro::schedule while defined $current;
3401 $! = $status;
3402 },
3403 )
3404 };
3405 4155
3406 unless ($DB_ENV) { 4156 unless ($DB_ENV) {
3407 $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);
3408 4163
3409 cf::sync_job { 4164 cf::sync_job {
3410 eval { 4165 eval {
3411 BDB::db_env_open 4166 BDB::db_env_open
3412 $DB_ENV, 4167 $DB_ENV,
3414 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
3415 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4170 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3416 0666; 4171 0666;
3417 4172
3418 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4173 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3419
3420 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3421 $DB_ENV->set_lk_detect;
3422 }; 4174 };
3423 4175
3424 cf::cleanup "db_env_open(db): $@" if $@; 4176 cf::cleanup "db_env_open(db): $@" if $@;
3425 }; 4177 };
3426 } 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 };
3427} 4189}
3428 4190
3429{ 4191{
4192 # configure IO::AIO
4193
3430 IO::AIO::min_parallel 8; 4194 IO::AIO::min_parallel 8;
3431
3432 undef $Coro::AIO::WATCHER;
3433 IO::AIO::max_poll_time $TICK * 0.1; 4195 IO::AIO::max_poll_time $TICK * 0.1;
3434 $AIO_POLL_WATCHER = Event->io ( 4196 undef $AnyEvent::AIO::WATCHER;
3435 reentrant => 0,
3436 data => WF_AUTOCANCEL,
3437 fd => IO::AIO::poll_fileno,
3438 poll => 'r',
3439 prio => 6,
3440 cb => \&IO::AIO::poll_cb,
3441 );
3442} 4197}
3443 4198
3444my $_log_backtrace; 4199our $_log_backtrace;
4200our $_log_backtrace_last;
3445 4201
3446sub _log_backtrace { 4202sub _log_backtrace {
3447 my ($msg, @addr) = @_; 4203 my ($msg, @addr) = @_;
3448 4204
3449 $msg =~ s/\n//; 4205 $msg =~ s/\n$//;
3450 4206
4207 if ($_log_backtrace_last eq $msg) {
4208 LOG llevInfo, "[ABT] $msg\n";
4209 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3451 # limit the # of concurrent backtraces 4210 # limit the # of concurrent backtraces
3452 if ($_log_backtrace < 2) { 4211 } elsif ($_log_backtrace < 2) {
4212 $_log_backtrace_last = $msg;
3453 ++$_log_backtrace; 4213 ++$_log_backtrace;
4214 my $perl_bt = Carp::longmess $msg;
3454 async { 4215 async {
4216 $Coro::current->{desc} = "abt $msg";
4217
3455 my @bt = fork_call { 4218 my @bt = fork_call {
3456 @addr = map { sprintf "%x", $_ } @addr; 4219 @addr = map { sprintf "%x", $_ } @addr;
3457 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4220 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3458 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 |"
3459 or die "addr2line: $!"; 4222 or die "addr2line: $!";
3467 } 4230 }
3468 4231
3469 @funcs 4232 @funcs
3470 }; 4233 };
3471 4234
3472 LOG llevInfo, "[ABT] $msg\n"; 4235 LOG llevInfo, "[ABT] $perl_bt\n";
4236 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3473 LOG llevInfo, "[ABT] $_\n" for @bt; 4237 LOG llevInfo, "[ABT] $_\n" for @bt;
3474 --$_log_backtrace; 4238 --$_log_backtrace;
3475 }; 4239 };
3476 } else { 4240 } else {
3477 LOG llevInfo, "[ABT] $msg\n"; 4241 LOG llevInfo, "[ABT] $msg\n";
3478 LOG llevInfo, "[ABT] [suppressed]\n"; 4242 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3479 } 4243 }
3480} 4244}
3481 4245
3482# load additional modules 4246# load additional modules
3483use cf::pod; 4247require "cf/$_.pm" for @EXTRA_MODULES;
4248cf::_connect_to_perl_2;
3484 4249
3485END { cf::emergency_save } 4250END { cf::emergency_save }
3486 4251
34871 42521
3488 4253

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines