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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines