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.359 by root, Sat Sep 8 18:15:55 2007 UTC vs.
Revision 1.561 by root, Fri Apr 22 06:10:33 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines