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.356 by root, Tue Sep 4 05:43:21 2007 UTC vs.
Revision 1.570 by root, Wed May 4 07:41:14 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines