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.393 by root, Fri Oct 26 04:47:00 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 Event; 30use EV;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 4.1 (); 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.51 (); 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 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
433 608
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
437 610
438 my $busy = 1; 611 my $busy = 1;
439 my @res; 612 my @res;
440 613
441 (async { 614 (async {
442 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
443 @res = eval { $job->() }; 616 @res = eval { $job->() };
444 warn $@ if $@; 617 error $@ if $@;
445 undef $busy; 618 undef $busy;
446 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
447 620
448 while ($busy) { 621 while ($busy) {
449 if (Coro::nready) { 622 if (Coro::nready) {
450 Coro::cede_notself; 623 Coro::cede_notself;
451 } else { 624 } else {
452 Event::one_event; 625 EV::loop EV::LOOP_ONESHOT;
453 } 626 }
454 } 627 }
455 628
456 $time = Event::time - $time; 629 my $time = AE::time - $time;
457 630
458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
459 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460
461 $tick_start += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
462 632
463 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
464 } else { 634 } else {
465 # we are in another coroutine, how wonderful, everything just works 635 # we are in another coroutine, how wonderful, everything just works
466 636
… …
486 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
487 657
488 $coro 658 $coro
489} 659}
490 660
491=item fork_call { }, $args 661=item fork_call { }, @args
492 662
493Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 666never block itself or use any form of event handling.
497 667
498=cut 668=cut
669
670sub post_fork {
671 reset_signals;
672}
499 673
500sub fork_call(&@) { 674sub fork_call(&@) {
501 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
502 676
503 # 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,
504 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
505 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
506 680
507 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
508 reset_signals; 682 cf::post_fork;
509 &$cb 683 &$cb
510 }, @args; 684 } @args;
511 685
512 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
513} 725}
514 726
515=item $value = cf::db_get $family => $key 727=item $value = cf::db_get $family => $key
516 728
517Returns a single value from the environment database. 729Returns a single value from the environment database.
… …
527within each server. 739within each server.
528 740
529=cut 741=cut
530 742
531sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
532 my ($name) = @_; 747 my ($name) = @_;
533 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
534 749
535 eval { 750 eval {
536 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
… …
546} 761}
547 762
548our $DB; 763our $DB;
549 764
550sub db_init { 765sub db_init {
551 cf::sync_job {
552 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
553 };
554} 767}
555 768
556sub db_get($$) { 769sub db_get($$) {
557 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
558 771
559 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
560 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
561 776
562 $! ? () 777 $! ? ()
563 : $data 778 : $data
564 }
565} 779}
566 780
567sub db_put($$$) { 781sub db_put($$$) {
568 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
569 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
597 811
598 my @data; 812 my @data;
599 my $md5; 813 my $md5;
600 814
601 for (0 .. $#$src) { 815 for (0 .. $#$src) {
602 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
603 or Carp::croak "$src->[$_]: $!";
604 } 817 }
605 818
606 # if processing is expensive, check 819 # if processing is expensive, check
607 # checksum first 820 # checksum first
608 if (1) { 821 if (1) {
… …
625 838
626 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
627 my $data = $process->(\@data); 840 my $data = $process->(\@data);
628 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
629 842
630 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
631 844
632 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
633 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
634 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
635 848
… …
645 858
646=cut 859=cut
647 860
648sub datalog($@) { 861sub datalog($@) {
649 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
650 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
651} 864}
652 865
653=back 866=back
654 867
655=cut 868=cut
656 869
657############################################################################# 870#############################################################################
658 871
659=head2 ATTACHABLE OBJECTS 872=head2 ATTACHABLE OBJECTS
660 873
661Many 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
662attach callbacks/event handlers (a collection of which is called an "attachment") 875attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 876to it. All such attachable objects support the following methods.
664 877
665In 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>
666C<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
667Crossfire TRT). 880Deliantra).
668 881
669=over 4 882=over 4
670 883
671=item $attachable->attach ($attachment, key => $value...) 884=item $attachable->attach ($attachment, key => $value...)
672 885
… …
716=item cf::CLASS::attachment $name, ... 929=item cf::CLASS::attachment $name, ...
717 930
718Register an attachment by C<$name> through which attachable objects of the 931Register an attachment by C<$name> through which attachable objects of the
719given CLASS can refer to this attachment. 932given CLASS can refer to this attachment.
720 933
721Some classes such as crossfire maps and objects can specify attachments 934Some classes such as deliantra maps and objects can specify attachments
722that 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.
723 936
724These calls expect any number of the following handler/hook descriptions: 937These calls expect any number of the following handler/hook descriptions:
725 938
726=over 4 939=over 4
… …
850 1063
851 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
852 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
853 1066
854 } elsif (ref $type) { 1067 } elsif (ref $type) {
855 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
856 1069
857 } else { 1070 } else {
858 shift @arg; 1071 shift @arg;
859 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
860 } 1073 }
861 } 1074 }
862} 1075}
863 1076
864sub _object_attach { 1077sub _object_attach {
… …
874 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
875 } 1088 }
876 1089
877 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
878 } else { 1091 } else {
879 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
880 } 1093 }
881 1094
882 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
883} 1096}
884 1097
… …
943 1156
944 for (@$callbacks) { 1157 for (@$callbacks) {
945 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
946 1159
947 if ($@) { 1160 if ($@) {
948 warn "$@";
949 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
950 override; 1162 override;
951 } 1163 }
952 1164
953 return 1 if $override; 1165 return 1 if $override;
954 } 1166 }
955 1167
956 0 1168 0
957} 1169}
958 1170
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1171=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 1172
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1173=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 1174
963Generate an object-specific event with the given arguments. 1175Generate an object-specific event with the given arguments.
964 1176
… …
1017 1229
1018sub reattach { 1230sub reattach {
1019 # basically do the same as instantiate, without calling instantiate 1231 # basically do the same as instantiate, without calling instantiate
1020 my ($obj) = @_; 1232 my ($obj) = @_;
1021 1233
1234 # no longer needed after getting rid of delete_package?
1022 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
1023 1236
1024 my $registry = $obj->registry; 1237 my $registry = $obj->registry;
1025 1238
1026 @$registry = (); 1239 @$registry = ();
1027 1240
… …
1032 for (@$attach) { 1245 for (@$attach) {
1033 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1034 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1035 } 1248 }
1036 } else { 1249 } else {
1037 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1038 } 1251 }
1039 } 1252 }
1040} 1253}
1041 1254
1042cf::attachable->attach ( 1255cf::attachable->attach (
1043 prio => -1000000, 1256 prio => -1000000,
1044 on_instantiate => sub { 1257 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1258 my ($obj, $data) = @_;
1046 1259
1047 $data = from_json $data; 1260 $data = decode_json $data;
1048 1261
1049 for (@$data) { 1262 for (@$data) {
1050 my ($name, $args) = @$_; 1263 my ($name, $args) = @$_;
1051 1264
1052 $obj->attach ($name, %{$args || {} }); 1265 $obj->attach ($name, %{$args || {} });
… …
1069 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1070 1283
1071 sync_job { 1284 sync_job {
1072 if (length $$rdata) { 1285 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1074 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1075 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1076 1290
1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1078 chmod SAVE_MODE, $fh; 1292 aio_chmod $fh, SAVE_MODE;
1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1080 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 }
1081 close $fh; 1298 aio_close $fh;
1082 1299
1083 if (@$objs) { 1300 if (@$objs) {
1084 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) {
1085 chmod SAVE_MODE, $fh; 1302 aio_chmod $fh, SAVE_MODE;
1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1088 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 }
1089 close $fh; 1309 aio_close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1311 }
1092 } else { 1312 } else {
1093 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1094 } 1314 }
1095 1315
1096 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1317
1318 $filename =~ s%/[^/]+$%%;
1319 aio_pathsync $filename if $cf::USE_FSYNC;
1097 } else { 1320 } else {
1098 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1099 } 1322 }
1100 } else { 1323 } else {
1101 aio_unlink $filename; 1324 aio_unlink $filename;
1102 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1103 } 1326 }
… …
1127 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs}; 1351 $av = $st->{objs};
1129 } 1352 }
1130 1353
1131 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1132 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1133 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1134 1358
1135 ($data, $av) 1359 ($data, $av)
1136} 1360}
1137 1361
1138=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
… …
1194 my ($name, $cb) = @_; 1418 my ($name, $cb) = @_;
1195 1419
1196 $EXTICMD{$name} = $cb; 1420 $EXTICMD{$name} = $cb;
1197} 1421}
1198 1422
1423use File::Glob ();
1424
1199cf::player->attach ( 1425cf::player->attach (
1200 on_command => sub { 1426 on_unknown_command => sub {
1201 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1202 1428
1203 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1204 or return; 1430 or return;
1205 1431
… …
1228 1454
1229 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1230 if $reply; 1456 if $reply;
1231 1457
1232 } else { 1458 } else {
1233 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1234 } 1460 }
1235 1461
1236 cf::override; 1462 cf::override;
1237 }, 1463 },
1238); 1464);
1239 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
1240sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1241 cf::sync_job { 1482 cf::sync_job {
1242 my %todo; 1483 my %todo;
1243 1484
1244 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1245 next unless -r $path; 1486 next unless -r $path;
… …
1263 1504
1264 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1265 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1266 1507
1267 $ext{source} = 1508 $ext{source} =
1268 "package $pkg; use strict; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1269 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1270 . $source 1511 . $source
1271 . "\n};\n1"; 1512 . "\n};\n1";
1272 1513
1273 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1274 } 1515 }
1275 1516
1517 my $pass = 0;
1276 my %done; 1518 my %done;
1277 while (%todo) { 1519 while (%todo) {
1278 my $progress; 1520 my $progress;
1279 1521
1522 ++$pass;
1523
1524 ext:
1280 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1281 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1282 goto skip 1527 next ext
1283 unless exists $done{$_}; 1528 unless exists $done{$_};
1284 } 1529 }
1285 1530
1286 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1287 1532
1288 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1289 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1290 : "$v->{base}: extension inactive.\n";
1291 1537
1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1292 if (exists $v->{meta}{mandatory}) { 1539 if exists $v->{meta}{mandatory};
1293 warn $msg; 1540
1294 warn "mandatory extension failed to load, exiting.\n"; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1295 exit 1; 1542 delete $todo{$k};
1296 } 1543 } else {
1297 1544 $done{$k} = delete $todo{$k};
1298 warn $msg; 1545 push @EXTS, $v->{pkg};
1546 $progress = 1;
1547
1548 info "$v->{base}: extension inactive.\n"
1549 unless $active;
1299 } 1550 }
1300
1301 $done{$k} = delete $todo{$k};
1302 push @EXTS, $v->{pkg};
1303 $progress = 1;
1304 } 1551 }
1305 1552
1306 skip: 1553 unless ($progress) {
1307 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1308 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 }
1309 } 1561 }
1310 }; 1562 };
1311} 1563}
1312 1564
1313############################################################################# 1565#############################################################################
1314 1566
1315=back 1567=back
1316 1568
1317=head2 CORE EXTENSIONS 1569=head2 CORE EXTENSIONS
1318 1570
1319Functions and methods that extend core crossfire objects. 1571Functions and methods that extend core deliantra objects.
1320 1572
1321=cut 1573=cut
1322 1574
1323package cf::player; 1575package cf::player;
1324 1576
… …
1367 1619
1368sub exists($) { 1620sub exists($) {
1369 my ($login) = @_; 1621 my ($login) = @_;
1370 1622
1371 $cf::PLAYER{$login} 1623 $cf::PLAYER{$login}
1372 or cf::sync_job { !aio_stat path $login } 1624 or !aio_stat path $login
1373} 1625}
1374 1626
1375sub find($) { 1627sub find($) {
1376 return $cf::PLAYER{$_[0]} || do { 1628 return $cf::PLAYER{$_[0]} || do {
1377 my $login = $_[0]; 1629 my $login = $_[0];
… …
1389 my $f = new_from_file cf::object::thawer path $login 1641 my $f = new_from_file cf::object::thawer path $login
1390 or return; 1642 or return;
1391 1643
1392 my $pl = cf::player::load_pl $f 1644 my $pl = cf::player::load_pl $f
1393 or return; 1645 or return;
1646
1394 local $cf::PLAYER_LOADING{$login} = $pl; 1647 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs; 1648 $f->resolve_delayed_derefs;
1396 $cf::PLAYER{$login} = $pl 1649 $cf::PLAYER{$login} = $pl
1397 } 1650 }
1398 } 1651 }
1399} 1652}
1400 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
1401sub save($) { 1667sub save($) {
1402 my ($pl) = @_; 1668 my ($pl) = @_;
1403 1669
1404 return if $pl->{deny_save}; 1670 return if $pl->{deny_save};
1405 1671
… …
1408 1674
1409 return if $pl->{deny_save}; 1675 return if $pl->{deny_save};
1410 1676
1411 aio_mkdir playerdir $pl, 0770; 1677 aio_mkdir playerdir $pl, 0770;
1412 $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];
1413 1684
1414 $pl->save_pl ($path); 1685 $pl->save_pl ($path);
1415 cf::cede_to_tick; 1686 cf::cede_to_tick;
1416} 1687}
1417 1688
… …
1449 my ($pl) = @_; 1720 my ($pl) = @_;
1450 1721
1451 my $name = $pl->ob->name; 1722 my $name = $pl->ob->name;
1452 1723
1453 $pl->{deny_save} = 1; 1724 $pl->{deny_save} = 1;
1454 $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
1455 1726
1456 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1727 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1457 $pl->deactivate; 1728 $pl->deactivate;
1729
1730 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1458 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1731 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1732 ext::highscore::check ($pl->ob);
1733
1459 $pl->ns->destroy if $pl->ns; 1734 $pl->ns->destroy if $pl->ns;
1460 1735
1461 my $path = playerdir $pl; 1736 my $path = playerdir $pl;
1462 my $temp = "$path~$cf::RUNTIME~deleting~"; 1737 my $temp = "$path~$cf::RUNTIME~deleting~";
1463 aio_rename $path, $temp; 1738 aio_rename $path, $temp;
… …
1501 1776
1502 for my $login (@$dirs) { 1777 for my $login (@$dirs) {
1503 my $path = path $login; 1778 my $path = path $login;
1504 1779
1505 # a .pst is a dead give-away for a valid player 1780 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") { 1781 # if no pst file found, open and chekc for blocked users
1782 if (aio_stat "$path.pst") {
1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1783 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508 aio_read $fh, 0, 512, my $buf, 0 or next; 1784 aio_read $fh, 0, 512, my $buf, 0 or next;
1509 $buf !~ /^password -------------$/m or next; # official not-valid tag 1785 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 } 1786 }
1511 1787
… …
1515 1791
1516 \@logins 1792 \@logins
1517} 1793}
1518 1794
1519=item $player->maps 1795=item $player->maps
1796
1797=item cf::player::maps $login
1520 1798
1521Returns an arrayref of map paths that are private for this 1799Returns an arrayref of map paths that are private for this
1522player. May block. 1800player. May block.
1523 1801
1524=cut 1802=cut
… …
1542 } 1820 }
1543 1821
1544 \@paths 1822 \@paths
1545} 1823}
1546 1824
1547=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1825=item $protocol_xml = $player->expand_cfpod ($cfpod)
1548 1826
1549Expand crossfire pod fragments into protocol xml. 1827Expand deliantra pod fragments into protocol xml.
1550
1551=cut
1552
1553use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 # match a pod interior sequence sans C<< >>
1558 (?:
1559 \ (.*?)\ (?{ $group = $^N })
1560 | < (??{$interior}) >
1561 )
1562}x;
1563
1564sub expand_cfpod {
1565 my ($self, $pod) = @_;
1566
1567 my $xml;
1568
1569 while () {
1570 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1571 $group = $1;
1572
1573 $group =~ s/&/&amp;/g;
1574 $group =~ s/</&lt;/g;
1575
1576 $xml .= $group;
1577 } elsif ($pod =~ m%\G
1578 ([BCGHITU])
1579 <
1580 (?:
1581 ([^<>]*) (?{ $group = $^N })
1582 | < $interior >
1583 )
1584 >
1585 %gcsx
1586 ) {
1587 my ($code, $data) = ($1, $group);
1588
1589 if ($code eq "B") {
1590 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1591 } elsif ($code eq "I") {
1592 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1593 } elsif ($code eq "U") {
1594 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1595 } elsif ($code eq "C") {
1596 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1597 } elsif ($code eq "T") {
1598 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1599 } elsif ($code eq "G") {
1600 my ($male, $female) = split /\|/, $data;
1601 $data = $self->gender ? $female : $male;
1602 $xml .= expand_cfpod ($self, $data);
1603 } elsif ($code eq "H") {
1604 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1605 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1606 "")
1607 [$self->{hintmode}];
1608 } else {
1609 $xml .= "error processing '$code($data)' directive";
1610 }
1611 } else {
1612 if ($pod =~ /\G(.+)/) {
1613 warn "parse error while expanding $pod (at $1)";
1614 }
1615 last;
1616 }
1617 }
1618
1619 for ($xml) {
1620 # create single paragraphs (very hackish)
1621 s/(?<=\S)\n(?=\w)/ /g;
1622
1623 # compress some whitespace
1624 s/\s+\n/\n/g; # ws line-ends
1625 s/\n\n+/\n/g; # double lines
1626 s/^\n+//; # beginning lines
1627 s/\n+$//; # ending lines
1628 }
1629
1630 $xml
1631}
1632
1633no re 'eval';
1634
1635sub hintmode {
1636 $_[0]{hintmode} = $_[1] if @_ > 1;
1637 $_[0]{hintmode}
1638}
1639 1828
1640=item $player->ext_reply ($msgid, @msg) 1829=item $player->ext_reply ($msgid, @msg)
1641 1830
1642Sends an ext reply to the player. 1831Sends an ext reply to the player.
1643 1832
… …
1675 1864
1676=cut 1865=cut
1677 1866
1678sub find_by_path($) { 1867sub find_by_path($) {
1679 my ($path) = @_; 1868 my ($path) = @_;
1869
1870 $path =~ s/^~[^\/]*//; # skip ~login
1680 1871
1681 my ($match, $specificity); 1872 my ($match, $specificity);
1682 1873
1683 for my $region (list) { 1874 for my $region (list) {
1684 if ($region->{match} && $path =~ $region->{match}) { 1875 if ($region->{match} && $path =~ $region->{match}) {
… …
1710our $MAX_RESET = 3600; 1901our $MAX_RESET = 3600;
1711our $DEFAULT_RESET = 3000; 1902our $DEFAULT_RESET = 3000;
1712 1903
1713sub generate_random_map { 1904sub generate_random_map {
1714 my ($self, $rmp) = @_; 1905 my ($self, $rmp) = @_;
1715 # mit "rum" bekleckern, nicht 1906
1907 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1908
1716 $self->_create_random_map ( 1909 $self->_create_random_map ($rmp);
1717 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1718 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1719 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1720 $rmp->{exit_on_final_map},
1721 $rmp->{xsize}, $rmp->{ysize},
1722 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1723 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1724 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1725 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1726 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1727 (cf::region::find $rmp->{region}), $rmp->{custom}
1728 )
1729} 1910}
1730 1911
1731=item cf::map->register ($regex, $prio) 1912=item cf::map->register ($regex, $prio)
1732 1913
1733Register 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
… …
1738 1919
1739sub register { 1920sub register {
1740 my (undef, $regex, $prio) = @_; 1921 my (undef, $regex, $prio) = @_;
1741 my $pkg = caller; 1922 my $pkg = caller;
1742 1923
1743 no strict;
1744 push @{"$pkg\::ISA"}, __PACKAGE__; 1924 push @{"$pkg\::ISA"}, __PACKAGE__;
1745 1925
1746 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1926 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1747} 1927}
1748 1928
1749# also paths starting with '/' 1929# also paths starting with '/'
1750$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1930$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1751 1931
1752sub thawer_merge { 1932sub thawer_merge {
1753 my ($self, $merge) = @_; 1933 my ($self, $merge) = @_;
1754 1934
1755 # we have to keep some variables in memory intact 1935 # we have to keep some variables in memory intact
… …
1760} 1940}
1761 1941
1762sub normalise { 1942sub normalise {
1763 my ($path, $base) = @_; 1943 my ($path, $base) = @_;
1764 1944
1765 $path = "$path"; # make sure its a string 1945 $path = "$path"; # make sure it's a string
1766 1946
1767 $path =~ s/\.map$//; 1947 $path =~ s/\.map$//;
1768 1948
1769 # map plan: 1949 # map plan:
1770 # 1950 #
… …
1785 $base =~ s{[^/]+/?$}{}; 1965 $base =~ s{[^/]+/?$}{};
1786 $path = "$base/$path"; 1966 $path = "$base/$path";
1787 } 1967 }
1788 1968
1789 for ($path) { 1969 for ($path) {
1790 redo if s{//}{/};
1791 redo if s{/\.?/}{/}; 1970 redo if s{/\.?/}{/};
1792 redo if s{/[^/]+/\.\./}{/}; 1971 redo if s{/[^/]+/\.\./}{/};
1793 } 1972 }
1794 1973
1795 $path 1974 $path
… …
1809 $self->init; # pass $1 etc. 1988 $self->init; # pass $1 etc.
1810 return $self; 1989 return $self;
1811 } 1990 }
1812 } 1991 }
1813 1992
1814 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1993 Carp::cluck "unable to resolve path '$path' (base '$base')";
1815 () 1994 ()
1816} 1995}
1817 1996
1818sub init { 1997sub init {
1819 my ($self) = @_; 1998 my ($self) = @_;
… …
1841 2020
1842# the temporary/swap location 2021# the temporary/swap location
1843sub save_path { 2022sub save_path {
1844 my ($self) = @_; 2023 my ($self) = @_;
1845 2024
1846 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2025 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1847 "$TMPDIR/$path.map" 2026 "$TMPDIR/$path.map"
1848} 2027}
1849 2028
1850# the unique path, undef == no special unique path 2029# the unique path, undef == no special unique path
1851sub uniq_path { 2030sub uniq_path {
1852 my ($self) = @_; 2031 my ($self) = @_;
1853 2032
1854 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2033 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1855 "$UNIQUEDIR/$path" 2034 "$UNIQUEDIR/$path"
1856}
1857
1858# and all this just because we cannot iterate over
1859# all maps in C++...
1860sub change_all_map_light {
1861 my ($change) = @_;
1862
1863 $_->change_map_light ($change)
1864 for grep $_->outdoor, values %cf::MAP;
1865} 2035}
1866 2036
1867sub decay_objects { 2037sub decay_objects {
1868 my ($self) = @_; 2038 my ($self) = @_;
1869 2039
… …
1951 2121
1952sub find; 2122sub find;
1953sub find { 2123sub find {
1954 my ($path, $origin) = @_; 2124 my ($path, $origin) = @_;
1955 2125
2126 cf::cede_to_tick;
2127
1956 $path = normalise $path, $origin && $origin->path; 2128 $path = normalise $path, $origin && $origin->path;
1957 2129
1958 cf::lock_wait "map_data:$path";#d#remove 2130 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1959 cf::lock_wait "map_find:$path"; 2131 my $guard2 = cf::lock_acquire "map_find:$path";
1960 2132
1961 $cf::MAP{$path} || do { 2133 $cf::MAP{$path} || do {
1962 my $guard1 = cf::lock_acquire "map_find:$path";
1963 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1964
1965 my $map = new_from_path cf::map $path 2134 my $map = new_from_path cf::map $path
1966 or return; 2135 or return;
1967 2136
1968 $map->{last_save} = $cf::RUNTIME; 2137 $map->{last_save} = $cf::RUNTIME;
1969 2138
… …
1971 or return; 2140 or return;
1972 2141
1973 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2142 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1974 # doing this can freeze the server in a sync job, obviously 2143 # doing this can freeze the server in a sync job, obviously
1975 #$cf::WAIT_FOR_TICK->wait; 2144 #$cf::WAIT_FOR_TICK->wait;
2145 undef $guard2;
1976 undef $guard1; 2146 undef $guard1;
1977 undef $guard2;
1978 $map->reset; 2147 $map->reset;
1979 return find $path; 2148 return find $path;
1980 } 2149 }
1981 2150
1982 $cf::MAP{$path} = $map 2151 $cf::MAP{$path} = $map
1983 } 2152 }
1984} 2153}
1985 2154
1986sub pre_load { } 2155sub pre_load { }
1987sub post_load { } 2156#sub post_load { } # XS
1988 2157
1989sub load { 2158sub load {
1990 my ($self) = @_; 2159 my ($self) = @_;
1991 2160
1992 local $self->{deny_reset} = 1; # loading can take a long time 2161 local $self->{deny_reset} = 1; # loading can take a long time
… …
2009 my $f = new_from_file cf::object::thawer $self->{load_path}; 2178 my $f = new_from_file cf::object::thawer $self->{load_path};
2010 $f->skip_block; 2179 $f->skip_block;
2011 $self->_load_objects ($f) 2180 $self->_load_objects ($f)
2012 or return; 2181 or return;
2013 2182
2014 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2183 $self->post_load_original
2015 if delete $self->{load_original}; 2184 if delete $self->{load_original};
2016 2185
2017 if (my $uniq = $self->uniq_path) { 2186 if (my $uniq = $self->uniq_path) {
2018 utf8::encode $uniq; 2187 utf8::encode $uniq;
2019 unless (aio_stat $uniq) { 2188 unless (aio_stat $uniq) {
… …
2037 unless ($self->{deny_activate}) { 2206 unless ($self->{deny_activate}) {
2038 $self->decay_objects; 2207 $self->decay_objects;
2039 $self->fix_auto_apply; 2208 $self->fix_auto_apply;
2040 $self->update_buttons; 2209 $self->update_buttons;
2041 cf::cede_to_tick; 2210 cf::cede_to_tick;
2042 $self->set_darkness_map;
2043 cf::cede_to_tick;
2044 $self->activate; 2211 $self->activate;
2045 } 2212 }
2046 2213
2047 $self->{last_save} = $cf::RUNTIME; 2214 $self->{last_save} = $cf::RUNTIME;
2048 $self->last_access ($cf::RUNTIME); 2215 $self->last_access ($cf::RUNTIME);
2049 2216
2050 $self->in_memory (cf::MAP_IN_MEMORY); 2217 $self->in_memory (cf::MAP_ACTIVE);
2051 } 2218 }
2052 2219
2053 $self->post_load; 2220 $self->post_load;
2054}
2055 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
2056sub customise_for { 2228sub customise_for {
2057 my ($self, $ob) = @_; 2229 my ($self, $ob) = @_;
2058 2230
2059 return find "~" . $ob->name . "/" . $self->{path} 2231 return find "~" . $ob->name . "/" . $self->{path}
2060 if $self->per_player; 2232 if $self->per_player;
… …
2076 or next; 2248 or next;
2077 $neigh = find $neigh, $map 2249 $neigh = find $neigh, $map
2078 or next; 2250 or next;
2079 $neigh->load; 2251 $neigh->load;
2080 2252
2253 # now find the diagonal neighbours
2081 push @neigh, 2254 push @neigh,
2082 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2255 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2083 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2256 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2084 } 2257 }
2085 2258
… …
2092} 2265}
2093 2266
2094sub find_sync { 2267sub find_sync {
2095 my ($path, $origin) = @_; 2268 my ($path, $origin) = @_;
2096 2269
2097 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
2098} 2274}
2099 2275
2100sub do_load_sync { 2276sub do_load_sync {
2101 my ($map) = @_; 2277 my ($map) = @_;
2102 2278
2103 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2279 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2104 if $Coro::current == $Coro::main; 2280 if $Coro::current == $Coro::main;
2105 2281
2106 cf::sync_job { $map->load }; 2282 $map->load;
2107} 2283}
2108 2284
2109our %MAP_PREFETCH; 2285our %MAP_PREFETCH;
2110our $MAP_PREFETCHER = undef; 2286our $MAP_PREFETCHER = undef;
2111 2287
… …
2113 my ($path, $origin, $load) = @_; 2289 my ($path, $origin, $load) = @_;
2114 2290
2115 $path = normalise $path, $origin && $origin->{path}; 2291 $path = normalise $path, $origin && $origin->{path};
2116 2292
2117 if (my $map = $cf::MAP{$path}) { 2293 if (my $map = $cf::MAP{$path}) {
2118 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2294 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2119 } 2295 }
2120 2296
2121 $MAP_PREFETCH{$path} |= $load; 2297 $MAP_PREFETCH{$path} |= $load;
2122 2298
2123 $MAP_PREFETCHER ||= cf::async { 2299 $MAP_PREFETCHER ||= cf::async {
… …
2137 $MAP_PREFETCHER->prio (6); 2313 $MAP_PREFETCHER->prio (6);
2138 2314
2139 () 2315 ()
2140} 2316}
2141 2317
2318# common code, used by both ->save and ->swapout
2142sub save { 2319sub _save {
2143 my ($self) = @_; 2320 my ($self) = @_;
2144
2145 my $lock = cf::lock_acquire "map_data:$self->{path}";
2146 2321
2147 $self->{last_save} = $cf::RUNTIME; 2322 $self->{last_save} = $cf::RUNTIME;
2148 2323
2149 return unless $self->dirty; 2324 return unless $self->dirty;
2150 2325
… …
2159 2334
2160 cf::async { 2335 cf::async {
2161 $Coro::current->{desc} = "map player save"; 2336 $Coro::current->{desc} = "map player save";
2162 $_->contr->save for $self->players; 2337 $_->contr->save for $self->players;
2163 }; 2338 };
2339
2340 cf::get_slot 0.02;
2164 2341
2165 if ($uniq) { 2342 if ($uniq) {
2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2343 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2167 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2344 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2168 } else { 2345 } else {
2169 $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);
2170 } 2347 }
2171} 2348}
2172 2349
2350sub save {
2351 my ($self) = @_;
2352
2353 my $lock = cf::lock_acquire "map_data:$self->{path}";
2354
2355 $self->_save;
2356}
2357
2173sub swap_out { 2358sub swap_out {
2174 my ($self) = @_; 2359 my ($self) = @_;
2175 2360
2176 # save first because save cedes
2177 $self->save;
2178
2179 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2361 my $lock = cf::lock_acquire "map_data:$self->{path}";
2180 2362
2363 return if $self->in_memory != cf::MAP_ACTIVE;
2364 return if $self->{deny_save};
2181 return if $self->players; 2365 return if $self->players;
2182 return if $self->in_memory != cf::MAP_IN_MEMORY;
2183 return if $self->{deny_save};
2184 2366
2367 # first deactivate the map and "unlink" it from the core
2368 $self->deactivate;
2369 $_->clear_links_to ($self) for values %cf::MAP;
2185 $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};
2186 2417
2187 $self->deactivate; 2418 $self->deactivate;
2188 $_->clear_links_to ($self) for values %cf::MAP; 2419 $_->clear_links_to ($self) for values %cf::MAP;
2189 $self->clear; 2420 $self->clear;
2190}
2191
2192sub reset_at {
2193 my ($self) = @_;
2194
2195 # TODO: safety, remove and allow resettable per-player maps
2196 return 1e99 if $self->{deny_reset};
2197
2198 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2199 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2200
2201 $time + $to
2202}
2203
2204sub should_reset {
2205 my ($self) = @_;
2206
2207 $self->reset_at <= $cf::RUNTIME
2208}
2209
2210sub reset {
2211 my ($self) = @_;
2212
2213 my $lock = cf::lock_acquire "map_data:$self->{path}";
2214
2215 return if $self->players;
2216
2217 warn "resetting map ", $self->path;
2218
2219 $self->in_memory (cf::MAP_SWAPPED);
2220
2221 # need to save uniques path
2222 unless ($self->{deny_save}) {
2223 my $uniq = $self->uniq_path; utf8::encode $uniq;
2224
2225 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2226 if $uniq;
2227 }
2228
2229 delete $cf::MAP{$self->path};
2230
2231 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP;
2233 $self->clear;
2234 2421
2235 $self->unlink_save; 2422 $self->unlink_save;
2236 $self->destroy; 2423 $self->destroy;
2237} 2424}
2238 2425
… …
2246 2433
2247 delete $cf::MAP{$self->path}; 2434 delete $cf::MAP{$self->path};
2248 2435
2249 $self->unlink_save; 2436 $self->unlink_save;
2250 2437
2251 bless $self, "cf::map"; 2438 bless $self, "cf::map::wrap";
2252 delete $self->{deny_reset}; 2439 delete $self->{deny_reset};
2253 $self->{deny_save} = 1; 2440 $self->{deny_save} = 1;
2254 $self->reset_timeout (1); 2441 $self->reset_timeout (1);
2255 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2442 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2256 2443
… …
2305 2492
2306sub unique_maps() { 2493sub unique_maps() {
2307 [ 2494 [
2308 map { 2495 map {
2309 utf8::decode $_; 2496 utf8::decode $_;
2310 /\.map$/ 2497 s/\.map$//; # TODO future compatibility hack
2498 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2499 ? ()
2311 ? normalise $_ 2500 : normalise $_
2312 : ()
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2501 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2502 ]
2315} 2503}
2316 2504
2317package 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}
2318 2536
2319=back 2537=back
2320 2538
2321=head3 cf::object 2539=head3 cf::object
2322 2540
… …
2326 2544
2327=over 4 2545=over 4
2328 2546
2329=item $ob->inv_recursive 2547=item $ob->inv_recursive
2330 2548
2331Returns 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.
2332 2551
2333=cut 2552=cut
2334 2553
2335sub inv_recursive_; 2554sub inv_recursive_;
2336sub inv_recursive_ { 2555sub inv_recursive_ {
… …
2341 inv_recursive_ inv $_[0] 2560 inv_recursive_ inv $_[0]
2342} 2561}
2343 2562
2344=item $ref = $ob->ref 2563=item $ref = $ob->ref
2345 2564
2346creates 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.
2347 2566
2348=item $ob = cf::object::deref ($refstring) 2567=item $ob = cf::object::deref ($refstring)
2349 2568
2350returns 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,
2351even if the object actually exists. May block. 2570even if the object actually exists. May block.
… …
2383can 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
2384dialogue with the given NPC character. 2603dialogue with the given NPC character.
2385 2604
2386=cut 2605=cut
2387 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
2388# rough implementation of a future "reply" method that works 2621# rough implementation of a future "reply" method that works
2389# with dialog boxes. 2622# with dialog boxes.
2390#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
2391sub cf::object::player::reply($$$;$) { 2624sub cf::object::player::reply($$$;$) {
2392 my ($self, $npc, $msg, $flags) = @_; 2625 my ($self, $npc, $msg, $flags) = @_;
… …
2403 my $dialog = $pl->{npc_dialog}; 2636 my $dialog = $pl->{npc_dialog};
2404 $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));
2405 2638
2406 } else { 2639 } else {
2407 $msg = $npc->name . " says: $msg" if $npc; 2640 $msg = $npc->name . " says: $msg" if $npc;
2408 $self->message ($msg, $flags); 2641 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2409 } 2642 }
2410 } 2643 }
2411} 2644}
2412 2645
2413=item $object->send_msg ($channel, $msg, $color, [extra...]) 2646=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2438 2671
2439=item $player_object->enter_link 2672=item $player_object->enter_link
2440 2673
2441Freezes 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}>).
2442 2675
2443The 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.
2444I<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.
2445 2680
2446Will never block. 2681Will never block.
2447 2682
2448=item $player_object->leave_link ($map, $x, $y) 2683=item $player_object->leave_link ($map, $x, $y)
2449 2684
… …
2469sub cf::object::player::enter_link { 2704sub cf::object::player::enter_link {
2470 my ($self) = @_; 2705 my ($self) = @_;
2471 2706
2472 $self->deactivate_recursive; 2707 $self->deactivate_recursive;
2473 2708
2709 ++$self->{_link_recursion};
2710
2474 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2711 return if UNIVERSAL::isa $self->map, "ext::map_link";
2475 2712
2476 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2713 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2477 if $self->map && $self->map->{path} ne "{link}"; 2714 if $self->map && $self->map->{path} ne "{link}";
2478 2715
2479 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2716 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2480} 2717}
2481 2718
2482sub cf::object::player::leave_link { 2719sub cf::object::player::leave_link {
2483 my ($self, $map, $x, $y) = @_; 2720 my ($self, $map, $x, $y) = @_;
2484 2721
… …
2501 ($x, $y) = (-1, -1) 2738 ($x, $y) = (-1, -1)
2502 unless (defined $x) && (defined $y); 2739 unless (defined $x) && (defined $y);
2503 2740
2504 # use -1 or undef as default coordinates, not 0, 0 2741 # use -1 or undef as default coordinates, not 0, 0
2505 ($x, $y) = ($map->enter_x, $map->enter_y) 2742 ($x, $y) = ($map->enter_x, $map->enter_y)
2506 if $x <=0 && $y <= 0; 2743 if $x <= 0 && $y <= 0;
2507 2744
2508 $map->load; 2745 $map->load;
2509 $map->load_neighbours; 2746 $map->load_neighbours;
2510 2747
2511 return unless $self->contr->active; 2748 return unless $self->contr->active;
2512 $self->activate_recursive;
2513 2749
2514 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2750 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2515 $self->enter_map ($map, $x, $y); 2751 if ($self->enter_map ($map, $x, $y)) {
2516} 2752 # entering was successful
2753 delete $self->{_link_recursion};
2754 # only activate afterwards, to support waiting in hooks
2755 $self->activate_recursive;
2756 }
2517 2757
2758}
2759
2518=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)]])
2519 2761
2520Moves 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
2521her, loading and preparing them map, calling the provided $check callback 2763her, loading and preparing them map, calling the provided $check callback
2522that 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
2523the 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
2524be called at the end of this process. 2766be called at the end of this process.
2525 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
2526=cut 2771=cut
2527 2772
2528our $GOTOGEN; 2773our $GOTOGEN;
2529 2774
2530sub cf::object::player::goto { 2775sub cf::object::player::goto {
2531 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 }
2532 2783
2533 # 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
2534 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2785 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2535 2786
2536 $self->enter_link; 2787 $self->enter_link;
… …
2560 my $map = eval { 2811 my $map = eval {
2561 my $map = defined $path ? cf::map::find $path : undef; 2812 my $map = defined $path ? cf::map::find $path : undef;
2562 2813
2563 if ($map) { 2814 if ($map) {
2564 $map = $map->customise_for ($self); 2815 $map = $map->customise_for ($self);
2565 $map = $check->($map) if $check && $map; 2816 $map = $check->($map, $x, $y, $self) if $check && $map;
2566 } else { 2817 } else {
2567 $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);
2568 } 2819 }
2569 2820
2570 $map 2821 $map
… …
2578 if ($gen == $self->{_goto_generation}) { 2829 if ($gen == $self->{_goto_generation}) {
2579 delete $self->{_goto_generation}; 2830 delete $self->{_goto_generation};
2580 $self->leave_link ($map, $x, $y); 2831 $self->leave_link ($map, $x, $y);
2581 } 2832 }
2582 2833
2583 $done->() if $done; 2834 $done->($self) if $done;
2584 })->prio (1); 2835 })->prio (1);
2585} 2836}
2586 2837
2587=item $player_object->enter_exit ($exit_object) 2838=item $player_object->enter_exit ($exit_object)
2588 2839
… …
2608} 2859}
2609 2860
2610sub prepare_random_map { 2861sub prepare_random_map {
2611 my ($exit) = @_; 2862 my ($exit) = @_;
2612 2863
2613 my $guard = cf::lock_acquire "exit_prepare:$exit";
2614
2615 # all this does is basically replace the /! path by 2864 # all this does is basically replace the /! path by
2616 # a new random map path (?random/...) with a seed 2865 # a new random map path (?random/...) with a seed
2617 # that depends on the exit object 2866 # that depends on the exit object
2618 2867
2619 my $rmp = parse_random_map_params $exit->msg; 2868 my $rmp = parse_random_map_params $exit->msg;
… …
2621 if ($exit->map) { 2870 if ($exit->map) {
2622 $rmp->{region} = $exit->region->name; 2871 $rmp->{region} = $exit->region->name;
2623 $rmp->{origin_map} = $exit->map->path; 2872 $rmp->{origin_map} = $exit->map->path;
2624 $rmp->{origin_x} = $exit->x; 2873 $rmp->{origin_x} = $exit->x;
2625 $rmp->{origin_y} = $exit->y; 2874 $rmp->{origin_y} = $exit->y;
2875
2876 $exit->map->touch;
2626 } 2877 }
2627 2878
2628 $rmp->{random_seed} ||= $exit->random_seed; 2879 $rmp->{random_seed} ||= $exit->random_seed;
2629 2880
2630 my $data = cf::to_json $rmp; 2881 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2631 my $md5 = Digest::MD5::md5_hex $data; 2882 my $md5 = Digest::MD5::md5_hex $data;
2632 my $meta = "$RANDOMDIR/$md5.meta"; 2883 my $meta = "$RANDOMDIR/$md5.meta";
2633 2884
2634 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2885 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2635 aio_write $fh, 0, (length $data), $data, 0; 2886 aio_write $fh, 0, (length $data), $data, 0;
2636 undef $fh; 2887 undef $fh;
2637 aio_rename "$meta~", $meta; 2888 aio_rename "$meta~", $meta;
2638 2889
2890 my $slaying = "?random/$md5";
2891
2892 if ($exit->valid) {
2639 $exit->slaying ("?random/$md5"); 2893 $exit->slaying ("?random/$md5");
2640 $exit->msg (undef); 2894 $exit->msg (undef);
2895 }
2641 } 2896 }
2642} 2897}
2643 2898
2644sub cf::object::player::enter_exit { 2899sub cf::object::player::enter_exit {
2645 my ($self, $exit) = @_; 2900 my ($self, $exit) = @_;
2646 2901
2647 return unless $self->type == cf::PLAYER; 2902 return unless $self->type == cf::PLAYER;
2648 2903
2649 if ($exit->slaying eq "/!") {
2650 #TODO: this should de-fi-ni-te-ly not be a sync-job
2651 # the problem is that $exit might not survive long enough
2652 # so it needs to be done right now, right here
2653 cf::sync_job { prepare_random_map $exit };
2654 }
2655
2656 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2657 my $hp = $exit->stats->hp;
2658 my $sp = $exit->stats->sp;
2659
2660 $self->enter_link; 2904 $self->enter_link;
2661 2905
2662 # if exit is damned, update players death & WoR home-position
2663 $self->contr->savebed ($slaying, $hp, $sp)
2664 if $exit->flag (FLAG_DAMNED);
2665
2666 (async { 2906 (async {
2667 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2907 $Coro::current->{desc} = "enter_exit";
2668 2908
2669 $self->deactivate_recursive; # just to be sure
2670 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
2671 $self->goto ($slaying, $hp, $sp); 2924 $self->goto ($map, $x, $y);
2672 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
2673 1; 2930 1
2674 }) { 2931 }) {
2675 $self->message ("Something went wrong deep within the crossfire server. " 2932 $self->message ("Something went wrong deep within the deliantra server. "
2676 . "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. "
2677 . "Please report this to the dungeon master!", 2934 . "Please report this to the dungeon master!",
2678 cf::NDI_UNIQUE | cf::NDI_RED); 2935 cf::NDI_UNIQUE | cf::NDI_RED);
2679 2936
2680 warn "ERROR in enter_exit: $@"; 2937 error "ERROR in enter_exit: $@";
2681 $self->leave_link; 2938 $self->leave_link;
2682 } 2939 }
2683 })->prio (1); 2940 })->prio (1);
2684} 2941}
2685 2942
… …
2697sub cf::client::send_drawinfo { 2954sub cf::client::send_drawinfo {
2698 my ($self, $text, $flags) = @_; 2955 my ($self, $text, $flags) = @_;
2699 2956
2700 utf8::encode $text; 2957 utf8::encode $text;
2701 $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);
2702} 2984}
2703 2985
2704=item $client->send_msg ($channel, $msg, $color, [extra...]) 2986=item $client->send_msg ($channel, $msg, $color, [extra...])
2705 2987
2706Send 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
… …
2710 2992
2711=cut 2993=cut
2712 2994
2713# non-persistent channels (usually the info channel) 2995# non-persistent channels (usually the info channel)
2714our %CHANNEL = ( 2996our %CHANNEL = (
2997 "c/motd" => {
2998 id => "infobox",
2999 title => "MOTD",
3000 reply => undef,
3001 tooltip => "The message of the day",
3002 },
2715 "c/identify" => { 3003 "c/identify" => {
2716 id => "infobox", 3004 id => "infobox",
2717 title => "Identify", 3005 title => "Identify",
2718 reply => undef, 3006 reply => undef,
2719 tooltip => "Items recently identified", 3007 tooltip => "Items recently identified",
… …
2721 "c/examine" => { 3009 "c/examine" => {
2722 id => "infobox", 3010 id => "infobox",
2723 title => "Examine", 3011 title => "Examine",
2724 reply => undef, 3012 reply => undef,
2725 tooltip => "Signs and other items you examined", 3013 tooltip => "Signs and other items you examined",
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",
2726 }, 3020 },
2727 "c/book" => { 3021 "c/book" => {
2728 id => "infobox", 3022 id => "infobox",
2729 title => "Book", 3023 title => "Book",
2730 reply => undef, 3024 reply => undef,
… …
2746 id => "infobox", 3040 id => "infobox",
2747 title => "Body Parts", 3041 title => "Body Parts",
2748 reply => undef, 3042 reply => undef,
2749 tooltip => "Shows which body parts you posess and are available", 3043 tooltip => "Shows which body parts you posess and are available",
2750 }, 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 },
2751 "c/uptime" => { 3081 "c/uptime" => {
2752 id => "infobox", 3082 id => "infobox",
2753 title => "Uptime", 3083 title => "Uptime",
2754 reply => undef, 3084 reply => undef,
2755 tooltip => "How long the server has been running since last restart", 3085 tooltip => "How long the server has been running since last restart",
… …
2758 id => "infobox", 3088 id => "infobox",
2759 title => "Map Info", 3089 title => "Map Info",
2760 reply => undef, 3090 reply => undef,
2761 tooltip => "Information related to the maps", 3091 tooltip => "Information related to the maps",
2762 }, 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,
2763); 3107);
2764 3108
2765sub cf::client::send_msg { 3109sub cf::client::send_msg {
2766 my ($self, $channel, $msg, $color, @extra) = @_; 3110 my ($self, $channel, $msg, $color, @extra) = @_;
2767 3111
2768 $msg = $self->pl->expand_cfpod ($msg); 3112 $msg = $self->pl->expand_cfpod ($msg)
3113 unless $color & cf::NDI_VERBATIM;
2769 3114
2770 $color &= cf::NDI_CLIENT_MASK; # just in case... 3115 $color &= cf::NDI_CLIENT_MASK; # just in case...
2771 3116
2772 # check predefined channels, for the benefit of C 3117 # check predefined channels, for the benefit of C
2773 if ($CHANNEL{$channel}) { 3118 if ($CHANNEL{$channel}) {
2774 $channel = $CHANNEL{$channel}; 3119 $channel = $CHANNEL{$channel};
2775 3120
2776 $self->ext_msg (channel_info => $channel) 3121 $self->ext_msg (channel_info => $channel);
2777 if $self->can_msg;
2778
2779 $channel = $channel->{id}; 3122 $channel = $channel->{id};
2780 3123
2781 } elsif (ref $channel) { 3124 } elsif (ref $channel) {
2782 # send meta info to client, if not yet sent 3125 # send meta info to client, if not yet sent
2783 unless (exists $self->{channel}{$channel->{id}}) { 3126 unless (exists $self->{channel}{$channel->{id}}) {
2784 $self->{channel}{$channel->{id}} = $channel; 3127 $self->{channel}{$channel->{id}} = $channel;
2785 $self->ext_msg (channel_info => $channel) 3128 $self->ext_msg (channel_info => $channel);
2786 if $self->can_msg;
2787 } 3129 }
2788 3130
2789 $channel = $channel->{id}; 3131 $channel = $channel->{id};
2790 } 3132 }
2791 3133
2792 return unless @extra || length $msg; 3134 return unless @extra || length $msg;
2793 3135
2794 if ($self->can_msg) {
2795 # default colour, mask it out 3136 # default colour, mask it out
2796 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3137 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2797 if $color & cf::NDI_DEF; 3138 if $color & cf::NDI_DEF;
2798 3139
2799 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3140 my $pkt = "msg "
3141 . $self->{json_coder}->encode (
2800 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3142 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2801 } else { 3143 );
2802 if ($color >= 0) {
2803 # replace some tags by gcfclient-compatible ones
2804 for ($msg) {
2805 1 while
2806 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2807 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2808 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2809 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2810 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2811 }
2812 3144
2813 $color &= cf::NDI_COLOR_MASK; 3145 $self->send_big_packet ($pkt);
2814
2815 utf8::encode $msg;
2816
2817 if (0 && $msg =~ /\[/) {
2818 # COMMAND/INFO
2819 $self->send_packet ("drawextinfo $color 10 8 $msg")
2820 } else {
2821 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2822 $self->send_packet ("drawinfo $color $msg")
2823 }
2824 }
2825 }
2826} 3146}
2827 3147
2828=item $client->ext_msg ($type, @msg) 3148=item $client->ext_msg ($type, @msg)
2829 3149
2830Sends an ext event to the client. 3150Sends an ext event to the client.
… …
2833 3153
2834sub cf::client::ext_msg($$@) { 3154sub cf::client::ext_msg($$@) {
2835 my ($self, $type, @msg) = @_; 3155 my ($self, $type, @msg) = @_;
2836 3156
2837 if ($self->extcmd == 2) { 3157 if ($self->extcmd == 2) {
2838 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3158 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2839 } elsif ($self->extcmd == 1) { # TODO: remove 3159 } elsif ($self->extcmd == 1) { # TODO: remove
2840 push @msg, msgtype => "event_$type"; 3160 push @msg, msgtype => "event_$type";
2841 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3161 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2842 } 3162 }
2843} 3163}
2844 3164
2845=item $client->ext_reply ($msgid, @msg) 3165=item $client->ext_reply ($msgid, @msg)
2846 3166
… …
2850 3170
2851sub cf::client::ext_reply($$@) { 3171sub cf::client::ext_reply($$@) {
2852 my ($self, $id, @msg) = @_; 3172 my ($self, $id, @msg) = @_;
2853 3173
2854 if ($self->extcmd == 2) { 3174 if ($self->extcmd == 2) {
2855 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3175 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2856 } elsif ($self->extcmd == 1) { 3176 } elsif ($self->extcmd == 1) {
2857 #TODO: version 1, remove 3177 #TODO: version 1, remove
2858 unshift @msg, msgtype => "reply", msgid => $id; 3178 unshift @msg, msgtype => "reply", msgid => $id;
2859 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2860 } 3180 }
2861} 3181}
2862 3182
2863=item $success = $client->query ($flags, "text", \&cb) 3183=item $success = $client->query ($flags, "text", \&cb)
2864 3184
… …
2935 3255
2936 $ns->ext_reply ($reply, @reply) 3256 $ns->ext_reply ($reply, @reply)
2937 if $reply; 3257 if $reply;
2938 3258
2939 } else { 3259 } else {
2940 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";
2941 } 3261 }
2942 3262
2943 cf::override; 3263 cf::override;
2944 }, 3264 },
2945); 3265);
… …
2965 3285
2966 $coro 3286 $coro
2967} 3287}
2968 3288
2969cf::client->attach ( 3289cf::client->attach (
2970 on_destroy => sub { 3290 on_client_destroy => sub {
2971 my ($ns) = @_; 3291 my ($ns) = @_;
2972 3292
2973 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3293 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2974 }, 3294 },
2975); 3295);
… …
2991our $safe_hole = new Safe::Hole; 3311our $safe_hole = new Safe::Hole;
2992 3312
2993$SIG{FPE} = 'IGNORE'; 3313$SIG{FPE} = 'IGNORE';
2994 3314
2995$safe->permit_only (Opcode::opset qw( 3315$safe->permit_only (Opcode::opset qw(
2996 :base_core :base_mem :base_orig :base_math 3316 :base_core :base_mem :base_orig :base_math :base_loop
2997 grepstart grepwhile mapstart mapwhile 3317 grepstart grepwhile mapstart mapwhile
2998 sort time 3318 sort time
2999)); 3319));
3000 3320
3001# here we export the classes and methods available to script code 3321# here we export the classes and methods available to script code
… …
3004 3324
3005The following functions and methods are available within a safe environment: 3325The following functions and methods are available within a safe environment:
3006 3326
3007 cf::object 3327 cf::object
3008 contr pay_amount pay_player map x y force_find force_add destroy 3328 contr pay_amount pay_player map x y force_find force_add destroy
3009 insert remove name archname title slaying race decrease_ob_nr 3329 insert remove name archname title slaying race decrease split
3330 value
3010 3331
3011 cf::object::player 3332 cf::object::player
3012 player 3333 player
3013 3334
3014 cf::player 3335 cf::player
… …
3019 3340
3020=cut 3341=cut
3021 3342
3022for ( 3343for (
3023 ["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
3024 insert remove inv name archname title slaying race 3345 insert remove inv nrof name archname title slaying race
3025 decrease_ob_nr destroy)], 3346 decrease split destroy change_exp value msg lore send_msg)],
3026 ["cf::object::player" => qw(player)], 3347 ["cf::object::player" => qw(player)],
3027 ["cf::player" => qw(peaceful)], 3348 ["cf::player" => qw(peaceful send_msg)],
3028 ["cf::map" => qw(trigger)], 3349 ["cf::map" => qw(trigger)],
3029) { 3350) {
3030 no strict 'refs';
3031 my ($pkg, @funs) = @$_; 3351 my ($pkg, @funs) = @$_;
3032 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3352 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3033 for @funs; 3353 for @funs;
3034} 3354}
3035 3355
… …
3050 3370
3051 my $qcode = $code; 3371 my $qcode = $code;
3052 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3372 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3053 $qcode =~ s/\n/\\n/g; 3373 $qcode =~ s/\n/\\n/g;
3054 3374
3375 %vars = (_dummy => 0) unless %vars;
3376
3377 my @res;
3055 local $_; 3378 local $_;
3056 local @safe::cf::_safe_eval_args = values %vars;
3057 3379
3058 my $eval = 3380 my $eval =
3059 "do {\n" 3381 "do {\n"
3060 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3382 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3061 . "#line 0 \"{$qcode}\"\n" 3383 . "#line 0 \"{$qcode}\"\n"
3062 . $code 3384 . $code
3063 . "\n}" 3385 . "\n}"
3064 ; 3386 ;
3065 3387
3388 if ($CFG{safe_eval}) {
3066 sub_generation_inc; 3389 sub_generation_inc;
3390 local @safe::cf::_safe_eval_args = values %vars;
3067 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3391 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3068 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 }
3069 3397
3070 if ($@) { 3398 if ($@) {
3071 warn "$@"; 3399 warn "$@",
3072 warn "while executing safe code '$code'\n"; 3400 "while executing safe code '$code'\n",
3073 warn "with arguments " . (join " ", %vars) . "\n"; 3401 "with arguments " . (join " ", %vars) . "\n";
3074 } 3402 }
3075 3403
3076 wantarray ? @res : $res[0] 3404 wantarray ? @res : $res[0]
3077} 3405}
3078 3406
… …
3092=cut 3420=cut
3093 3421
3094sub register_script_function { 3422sub register_script_function {
3095 my ($fun, $cb) = @_; 3423 my ($fun, $cb) = @_;
3096 3424
3097 no strict 'refs'; 3425 $fun = "safe::$fun" if $CFG{safe_eval};
3098 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3426 *$fun = $safe_hole->wrap ($cb);
3099} 3427}
3100 3428
3101=back 3429=back
3102 3430
3103=cut 3431=cut
… …
3112 # for this (global event?) 3440 # for this (global event?)
3113 %ext::player_env::MUSIC_FACE_CACHE = (); 3441 %ext::player_env::MUSIC_FACE_CACHE = ();
3114 3442
3115 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3443 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3116 3444
3117 warn "loading facedata from $path\n"; 3445 trace "loading facedata from $path\n";
3118 3446
3119 my $facedata; 3447 my $facedata = decode_storable load_file $path;
3120 0 < aio_load $path, $facedata
3121 or die "$path: $!";
3122
3123 $facedata = Coro::Storable::thaw $facedata;
3124 3448
3125 $facedata->{version} == 2 3449 $facedata->{version} == 2
3126 or cf::cleanup "$path: version mismatch, cannot proceed."; 3450 or cf::cleanup "$path: version mismatch, cannot proceed.";
3127 3451
3128 # 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]);
3129 $facedata->{resource}{"res/exp_table"} = { 3454 $facedata->{resource}{"res/exp_table"} = {
3130 type => FT_RSRC, 3455 type => FT_RSRC,
3131 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),
3132 }; 3458 };
3133 cf::cede_to_tick; 3459 cf::cede_to_tick;
3134 3460
3135 { 3461 {
3136 my $faces = $facedata->{faceinfo}; 3462 my $faces = $facedata->{faceinfo};
3137 3463
3138 while (my ($face, $info) = each %$faces) { 3464 while (my ($face, $info) = each %$faces) {
3139 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3465 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3466
3140 cf::face::set_visibility $idx, $info->{visibility}; 3467 cf::face::set_visibility $idx, $info->{visibility};
3141 cf::face::set_magicmap $idx, $info->{magicmap}; 3468 cf::face::set_magicmap $idx, $info->{magicmap};
3142 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3469 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3143 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} ;
3144 3472
3145 cf::cede_to_tick; 3473 cf::cede_to_tick;
3146 } 3474 }
3147 3475
3148 while (my ($face, $info) = each %$faces) { 3476 while (my ($face, $info) = each %$faces) {
3149 next unless $info->{smooth}; 3477 next unless $info->{smooth};
3478
3150 my $idx = cf::face::find $face 3479 my $idx = cf::face::find $face
3151 or next; 3480 or next;
3481
3152 if (my $smooth = cf::face::find $info->{smooth}) { 3482 if (my $smooth = cf::face::find $info->{smooth}) {
3153 cf::face::set_smooth $idx, $smooth; 3483 cf::face::set_smooth $idx, $smooth;
3154 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3484 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3155 } else { 3485 } else {
3156 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3486 error "smooth face '$info->{smooth}' not found for face '$face'";
3157 } 3487 }
3158 3488
3159 cf::cede_to_tick; 3489 cf::cede_to_tick;
3160 } 3490 }
3161 } 3491 }
… …
3170 3500
3171 cf::anim::invalidate_all; # d'oh 3501 cf::anim::invalidate_all; # d'oh
3172 } 3502 }
3173 3503
3174 { 3504 {
3175 # TODO: for gcfclient pleasure, we should give resources
3176 # that gcfclient doesn't grok a >10000 face index.
3177 my $res = $facedata->{resource}; 3505 my $res = $facedata->{resource};
3178 3506
3179 my $soundconf = delete $res->{"res/sound.conf"};
3180
3181 while (my ($name, $info) = each %$res) { 3507 while (my ($name, $info) = each %$res) {
3508 if (defined $info->{type}) {
3182 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3509 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3183 my $data;
3184 3510
3185 if ($info->{type} & 1) { 3511 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3186 # prepend meta info 3512 cf::face::set_type $idx, $info->{type};
3187
3188 my $meta = $enc->encode ({
3189 name => $name,
3190 %{ $info->{meta} || {} },
3191 });
3192
3193 $data = pack "(w/a*)*", $meta, $info->{data};
3194 } else { 3513 } else {
3195 $data = $info->{data}; 3514 $RESOURCE{$name} = $info; # unused
3196 } 3515 }
3197 3516
3198 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3199 cf::face::set_type $idx, $info->{type};
3200
3201 cf::cede_to_tick; 3517 cf::cede_to_tick;
3202 } 3518 }
3203
3204 if ($soundconf) {
3205 $soundconf = $enc->decode (delete $soundconf->{data});
3206
3207 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3208 my $sound = $soundconf->{compat}[$_]
3209 or next;
3210
3211 my $face = cf::face::find "sound/$sound->[1]";
3212 cf::sound::set $sound->[0] => $face;
3213 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3214 }
3215
3216 while (my ($k, $v) = each %{$soundconf->{event}}) {
3217 my $face = cf::face::find "sound/$v";
3218 cf::sound::set $k => $face;
3219 }
3220 }
3221 } 3519 }
3520
3521 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3222 3522
3223 1 3523 1
3224} 3524}
3225 3525
3226register_exticmd fx_want => sub { 3526register_exticmd fx_want => sub {
… …
3228 3528
3229 while (my ($k, $v) = each %$want) { 3529 while (my ($k, $v) = each %$want) {
3230 $ns->fx_want ($k, $v); 3530 $ns->fx_want ($k, $v);
3231 } 3531 }
3232}; 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}
3233 3543
3234sub reload_regions { 3544sub reload_regions {
3235 # 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
3236 # for this (global event?) 3546 # for this (global event?)
3237 %ext::player_env::MUSIC_FACE_CACHE = (); 3547 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3251} 3561}
3252 3562
3253sub reload_archetypes { 3563sub reload_archetypes {
3254 load_resource_file "$DATADIR/archetypes" 3564 load_resource_file "$DATADIR/archetypes"
3255 or die "unable to load archetypes\n"; 3565 or die "unable to load archetypes\n";
3256 #d# NEED to laod twice to resolve forward references
3257 # this really needs to be done in an extra post-pass
3258 # (which needs to be synchronous, so solve it differently)
3259 load_resource_file "$DATADIR/archetypes"
3260 or die "unable to load archetypes\n";
3261} 3566}
3262 3567
3263sub reload_treasures { 3568sub reload_treasures {
3264 load_resource_file "$DATADIR/treasures" 3569 load_resource_file "$DATADIR/treasures"
3265 or die "unable to load treasurelists\n"; 3570 or die "unable to load treasurelists\n";
3266} 3571}
3267 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
3268sub reload_resources { 3593sub reload_resources {
3269 warn "reloading resource files...\n"; 3594 trace "reloading resource files...\n";
3270 3595
3596 reload_exp_table;
3597 reload_materials;
3598 reload_facedata;
3599 reload_sound;
3600 reload_archetypes;
3271 reload_regions; 3601 reload_regions;
3272 reload_facedata;
3273 #reload_archetypes;#d#
3274 reload_archetypes;
3275 reload_treasures; 3602 reload_treasures;
3276 3603
3277 warn "finished reloading resource files\n"; 3604 trace "finished reloading resource files\n";
3278}
3279
3280sub init {
3281 reload_resources;
3282} 3605}
3283 3606
3284sub reload_config { 3607sub reload_config {
3285 open my $fh, "<:utf8", "$CONFDIR/config" 3608 trace "reloading config file...\n";
3286 or return;
3287 3609
3288 local $/; 3610 my $config = load_file "$CONFDIR/config";
3289 *CFG = YAML::Syck::Load <$fh>; 3611 utf8::decode $config;
3612 *CFG = decode_yaml $config;
3290 3613
3291 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3614 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3292 3615
3293 $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};
3294 $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};
3295 3618
3296 if (exists $CFG{mlockall}) { 3619 if (exists $CFG{mlockall}) {
… …
3300 }; 3623 };
3301 warn $@ if $@; 3624 warn $@ if $@;
3302 } 3625 }
3303} 3626}
3304 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
3305sub 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
3306 # we must not ever block the main coroutine 3666 # we must not ever block the main coroutine
3307 local $Coro::idle = sub { 3667 local $Coro::idle = sub {
3308 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#
3309 (async { 3669 (async {
3310 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3670 $Coro::current->{desc} = "IDLE BUG HANDLER";
3311 Event::one_event; 3671 EV::loop EV::LOOP_ONESHOT;
3312 })->prio (Coro::PRIO_MAX); 3672 })->prio (Coro::PRIO_MAX);
3313 }; 3673 };
3314 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;
3315 reload_config; 3687 reload_config;
3316 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
3317 load_extensions; 3698 load_extensions;
3318 3699
3319 $TICK_WATCHER->start; 3700 utime time, time, $RUNTIMEFILE;
3320 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;
3321} 3718}
3322 3719
3323############################################################################# 3720#############################################################################
3324# initialisation and cleanup 3721# initialisation and cleanup
3325 3722
3326# install some emergency cleanup handlers 3723# install some emergency cleanup handlers
3327BEGIN { 3724BEGIN {
3725 our %SIGWATCHER = ();
3328 for my $signal (qw(INT HUP TERM)) { 3726 for my $signal (qw(INT HUP TERM)) {
3329 Event->signal ( 3727 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3330 reentrant => 0,
3331 data => WF_AUTOCANCEL,
3332 signal => $signal,
3333 prio => 0,
3334 cb => sub {
3335 cf::cleanup "SIG$signal"; 3728 cf::cleanup "SIG$signal";
3336 },
3337 ); 3729 };
3338 } 3730 }
3339} 3731}
3340 3732
3341sub write_runtime { 3733sub write_runtime_sync {
3342 my $runtime = "$LOCALDIR/runtime"; 3734 my $t0 = AE::time;
3343 3735
3344 # first touch the runtime file to show we are still running: 3736 # first touch the runtime file to show we are still running:
3345 # the fsync below can take a very very long time. 3737 # the fsync below can take a very very long time.
3346 3738
3347 IO::AIO::aio_utime $runtime, undef, undef; 3739 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3348 3740
3349 my $guard = cf::lock_acquire "write_runtime"; 3741 my $guard = cf::lock_acquire "write_runtime";
3350 3742
3351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3743 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3352 or return; 3744 or return;
3353 3745
3354 my $value = $cf::RUNTIME + 90 + 10; 3746 my $value = $cf::RUNTIME + 90 + 10;
3355 # 10 is the runtime save interval, for a monotonic clock 3747 # 10 is the runtime save interval, for a monotonic clock
3356 # 60 allows for the watchdog to kill the server. 3748 # 60 allows for the watchdog to kill the server.
… …
3366 aio_utime $fh, undef, undef; 3758 aio_utime $fh, undef, undef;
3367 3759
3368 close $fh 3760 close $fh
3369 or return; 3761 or return;
3370 3762
3371 aio_rename "$runtime~", $runtime 3763 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3372 and return; 3764 and return;
3373 3765
3374 warn "runtime file written.\n"; 3766 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3375 3767
3376 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 };
3377} 3819}
3378 3820
3379sub emergency_save() { 3821sub emergency_save() {
3380 my $freeze_guard = cf::freeze_mainloop; 3822 my $freeze_guard = cf::freeze_mainloop;
3381 3823
3382 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;
3383 3830
3384 cf::sync_job { 3831 cf::sync_job {
3832 cf::write_runtime_sync; # external watchdog should not bark
3833
3385 # use a peculiar iteration method to avoid tripping on perl 3834 # use a peculiar iteration method to avoid tripping on perl
3386 # refcount bugs in for. also avoids problems with players 3835 # refcount bugs in for. also avoids problems with players
3387 # and maps saved/destroyed asynchronously. 3836 # and maps saved/destroyed asynchronously.
3388 warn "begin emergency player save\n"; 3837 info "emergency_perl_save: begin player save\n";
3389 for my $login (keys %cf::PLAYER) { 3838 for my $login (keys %cf::PLAYER) {
3390 my $pl = $cf::PLAYER{$login} or next; 3839 my $pl = $cf::PLAYER{$login} or next;
3391 $pl->valid or next; 3840 $pl->valid or next;
3392 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3841 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3393 $pl->save; 3842 $pl->save;
3394 } 3843 }
3395 warn "end emergency player save\n"; 3844 info "emergency_perl_save: end player save\n";
3396 3845
3397 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";
3398 for my $path (keys %cf::MAP) { 3849 for my $path (keys %cf::MAP) {
3399 my $map = $cf::MAP{$path} or next; 3850 my $map = $cf::MAP{$path} or next;
3400 $map->valid or next; 3851 $map->valid or next;
3401 $map->save; 3852 $map->save;
3402 } 3853 }
3403 warn "end emergency map save\n"; 3854 info "emergency_perl_save: end map save\n";
3404 3855
3405 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";
3406 BDB::db_env_txn_checkpoint $DB_ENV; 3859 BDB::db_env_txn_checkpoint $DB_ENV;
3407 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
3408 }; 3884 };
3409 3885
3410 warn "leave emergency perl save\n"; 3886 info "emergency_perl_save: leave\n";
3411} 3887}
3412 3888
3413sub post_cleanup { 3889sub post_cleanup {
3414 my ($make_core) = @_; 3890 my ($make_core) = @_;
3415 3891
3892 IO::AIO::flush;
3893
3416 warn Carp::longmess "post_cleanup backtrace" 3894 error Carp::longmess "post_cleanup backtrace"
3417 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 }
3418} 3924}
3419 3925
3420sub do_reload_perl() { 3926sub do_reload_perl() {
3421 # can/must only be called in main 3927 # can/must only be called in main
3422 if ($Coro::current != $Coro::main) { 3928 unless (in_main) {
3423 warn "can only reload from main coroutine"; 3929 error "can only reload from main coroutine";
3424 return; 3930 return;
3425 } 3931 }
3426 3932
3427 warn "reloading..."; 3933 return if $RELOAD++;
3428 3934
3429 warn "entering sync_job"; 3935 my $t1 = AE::time;
3430 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
3431 cf::sync_job { 3943 cf::sync_job {
3432 cf::write_runtime; # external watchdog should not bark
3433 cf::emergency_save; 3944 #cf::emergency_save;
3434 cf::write_runtime; # external watchdog should not bark
3435 3945
3436 warn "syncing database to disk";
3437 BDB::db_env_txn_checkpoint $DB_ENV;
3438
3439 # if anything goes wrong in here, we should simply crash as we already saved
3440
3441 warn "cancelling all WF_AUTOCANCEL watchers";
3442 for (Event::all_watchers) {
3443 $_->cancel if $_->data & WF_AUTOCANCEL;
3444 }
3445
3446 warn "flushing outstanding aio requests";
3447 for (;;) {
3448 BDB::flush;
3449 IO::AIO::flush;
3450 Coro::cede_notself;
3451 last unless IO::AIO::nreqs || BDB::nreqs;
3452 warn "iterate...";
3453 }
3454
3455 ++$RELOAD;
3456
3457 warn "cancelling all extension coros"; 3946 trace "perl_reload: cancelling all extension coros";
3458 $_->cancel for values %EXT_CORO; 3947 $_->cancel for values %EXT_CORO;
3459 %EXT_CORO = (); 3948 %EXT_CORO = ();
3460 3949
3461 warn "removing commands"; 3950 trace "perl_reload: removing commands";
3462 %COMMAND = (); 3951 %COMMAND = ();
3463 3952
3464 warn "removing ext/exti commands"; 3953 trace "perl_reload: removing ext/exti commands";
3465 %EXTCMD = (); 3954 %EXTCMD = ();
3466 %EXTICMD = (); 3955 %EXTICMD = ();
3467 3956
3468 warn "unloading/nuking all extensions"; 3957 trace "perl_reload: unloading/nuking all extensions";
3469 for my $pkg (@EXTS) { 3958 for my $pkg (@EXTS) {
3470 warn "... unloading $pkg"; 3959 trace "... unloading $pkg";
3471 3960
3472 if (my $cb = $pkg->can ("unload")) { 3961 if (my $cb = $pkg->can ("unload")) {
3473 eval { 3962 eval {
3474 $cb->($pkg); 3963 $cb->($pkg);
3475 1 3964 1
3476 } 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;
3477 } 3970 }
3478 3971
3479 warn "... nuking $pkg";
3480 Symbol::delete_package $pkg;
3481 }
3482
3483 warn "unloading all perl modules loaded from $LIBDIR"; 3972 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3484 while (my ($k, $v) = each %INC) { 3973 while (my ($k, $v) = each %INC) {
3485 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3974 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3486 3975
3487 warn "... unloading $k"; 3976 trace "... unloading $k";
3488 delete $INC{$k}; 3977 delete $INC{$k};
3489 3978
3490 $k =~ s/\.pm$//; 3979 $k =~ s/\.pm$//;
3491 $k =~ s/\//::/g; 3980 $k =~ s/\//::/g;
3492 3981
3493 if (my $cb = $k->can ("unload_module")) { 3982 if (my $cb = $k->can ("unload_module")) {
3494 $cb->(); 3983 $cb->();
3984 }
3985
3986 clear_package $k;
3495 } 3987 }
3496 3988
3497 Symbol::delete_package $k;
3498 }
3499
3500 warn "getting rid of safe::, as good as possible"; 3989 trace "perl_reload: getting rid of safe::, as good as possible";
3501 Symbol::delete_package "safe::$_" 3990 clear_package "safe::$_"
3502 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);
3503 3992
3504 warn "unloading cf.pm \"a bit\""; 3993 trace "perl_reload: unloading cf.pm \"a bit\"";
3505 delete $INC{"cf.pm"}; 3994 delete $INC{"cf.pm"};
3506 delete $INC{"cf/pod.pm"}; 3995 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3507 3996
3508 # don't, removes xs symbols, too, 3997 # don't, removes xs symbols, too,
3509 # and global variables created in xs 3998 # and global variables created in xs
3510 #Symbol::delete_package __PACKAGE__; 3999 #clear_package __PACKAGE__;
3511 4000
3512 warn "unload completed, starting to reload now"; 4001 info "perl_reload: unload completed, starting to reload now";
3513 4002
3514 warn "reloading cf.pm"; 4003 trace "perl_reload: reloading cf.pm";
3515 require cf; 4004 require cf;
3516 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4005 cf::_connect_to_perl_1;
3517 4006
3518 warn "loading config and database again"; 4007 trace "perl_reload: loading config and database again";
3519 cf::reload_config; 4008 cf::reload_config;
3520 4009
3521 warn "loading extensions"; 4010 trace "perl_reload: loading extensions";
3522 cf::load_extensions; 4011 cf::load_extensions;
3523 4012
4013 if ($REATTACH_ON_RELOAD) {
3524 warn "reattaching attachments to objects/players"; 4014 trace "perl_reload: reattaching attachments to objects/players";
3525 _global_reattach; # objects, sockets 4015 _global_reattach; # objects, sockets
3526 warn "reattaching attachments to maps"; 4016 trace "perl_reload: reattaching attachments to maps";
3527 reattach $_ for values %MAP; 4017 reattach $_ for values %MAP;
3528 warn "reattaching attachments to players"; 4018 trace "perl_reload: reattaching attachments to players";
3529 reattach $_ for values %PLAYER; 4019 reattach $_ for values %PLAYER;
4020 }
3530 4021
3531 warn "leaving sync_job"; 4022 cf::_post_init 1;
3532 4023
4024 trace "perl_reload: leaving sync_job";
4025
3533 1 4026 1
3534 } or do { 4027 } or do {
3535 warn $@; 4028 error $@;
3536 warn "error while reloading, exiting."; 4029 cf::cleanup "perl_reload: error, exiting.";
3537 exit 1; 4030 };
4031
4032 --$RELOAD;
3538 }; 4033 }
3539 4034
3540 warn "reloaded"; 4035 $t1 = AE::time - $t1;
4036 info "perl_reload: completed in ${t1}s\n";
3541}; 4037};
3542 4038
3543our $RELOAD_WATCHER; # used only during reload 4039our $RELOAD_WATCHER; # used only during reload
3544 4040
3545sub reload_perl() { 4041sub reload_perl() {
3546 # doing reload synchronously and two reloads happen back-to-back, 4042 # doing reload synchronously and two reloads happen back-to-back,
3547 # coro crashes during coro_state_free->destroy here. 4043 # coro crashes during coro_state_free->destroy here.
3548 4044
3549 $RELOAD_WATCHER ||= Event->timer ( 4045 $RELOAD_WATCHER ||= cf::async {
3550 reentrant => 0, 4046 Coro::AIO::aio_wait cache_extensions;
3551 after => 0, 4047
3552 data => WF_AUTOCANCEL, 4048 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3553 cb => sub {
3554 do_reload_perl; 4049 do_reload_perl;
3555 undef $RELOAD_WATCHER; 4050 undef $RELOAD_WATCHER;
3556 }, 4051 };
3557 ); 4052 };
3558} 4053}
3559 4054
3560register_command "reload" => sub { 4055register_command "reload" => sub {
3561 my ($who, $arg) = @_; 4056 my ($who, $arg) = @_;
3562 4057
… …
3567 reload_perl; 4062 reload_perl;
3568 }; 4063 };
3569 } 4064 }
3570}; 4065};
3571 4066
3572unshift @INC, $LIBDIR; 4067#############################################################################
3573 4068
3574my $bug_warning = 0; 4069my $bug_warning = 0;
3575 4070
3576our @WAIT_FOR_TICK; 4071our @WAIT_FOR_TICK;
3577our @WAIT_FOR_TICK_BEGIN; 4072our @WAIT_FOR_TICK_BEGIN;
3578 4073
3579sub wait_for_tick { 4074sub wait_for_tick() {
3580 return unless $TICK_WATCHER->is_active;
3581 return if $Coro::current == $Coro::main; 4075 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3582 4076
3583 my $signal = new Coro::Signal; 4077 my $signal = new Coro::Signal;
3584 push @WAIT_FOR_TICK, $signal; 4078 push @WAIT_FOR_TICK, $signal;
3585 $signal->wait; 4079 $signal->wait;
3586} 4080}
3587 4081
3588sub wait_for_tick_begin { 4082sub wait_for_tick_begin() {
3589 return unless $TICK_WATCHER->is_active;
3590 return if $Coro::current == $Coro::main; 4083 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3591 4084
3592 my $signal = new Coro::Signal; 4085 my $signal = new Coro::Signal;
3593 push @WAIT_FOR_TICK_BEGIN, $signal; 4086 push @WAIT_FOR_TICK_BEGIN, $signal;
3594 $signal->wait; 4087 $signal->wait;
3595} 4088}
3596 4089
3597$TICK_WATCHER = Event->timer ( 4090sub tick {
3598 reentrant => 0,
3599 parked => 1,
3600 prio => 0,
3601 at => $NEXT_TICK || $TICK,
3602 data => WF_AUTOCANCEL,
3603 cb => sub {
3604 if ($Coro::current != $Coro::main) { 4091 if ($Coro::current != $Coro::main) {
3605 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"
3606 unless ++$bug_warning > 10; 4093 unless ++$bug_warning > 10;
3607 return; 4094 return;
3608 } 4095 }
3609 4096
3610 $NOW = $tick_start = Event::time;
3611
3612 cf::server_tick; # one server iteration 4097 cf::server_tick; # one server iteration
3613 4098
3614 $RUNTIME += $TICK; 4099 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3615 $NEXT_TICK += $TICK;
3616 4100
3617 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4101 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3618 $NEXT_RUNTIME_WRITE = $NOW + 10; 4102 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3619 Coro::async_pool { 4103 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver"; 4104 $Coro::current->{desc} = "runtime saver";
3621 write_runtime 4105 write_runtime_sync
3622 or warn "ERROR: unable to write runtime file: $!"; 4106 or error "ERROR: unable to write runtime file: $!";
3623 };
3624 } 4107 };
4108 }
3625 4109
3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4110 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3627 $sig->send; 4111 $sig->send;
3628 } 4112 }
3629 while (my $sig = shift @WAIT_FOR_TICK) { 4113 while (my $sig = shift @WAIT_FOR_TICK) {
3630 $sig->send; 4114 $sig->send;
3631 } 4115 }
3632 4116
3633 $NOW = Event::time; 4117 $LOAD = ($NOW - $TICK_START) / $TICK;
3634
3635 # if we are delayed by four ticks or more, skip them all
3636 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3637
3638 $TICK_WATCHER->at ($NEXT_TICK);
3639 $TICK_WATCHER->start;
3640
3641 $LOAD = ($NOW - $tick_start) / $TICK;
3642 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4118 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3643 4119
3644 _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 }
3645 }, 4126 }
3646); 4127}
3647 4128
3648{ 4129{
4130 # configure BDB
4131
3649 BDB::min_parallel 8; 4132 BDB::min_parallel 16;
3650 BDB::max_poll_time $TICK * 0.1; 4133 BDB::max_poll_reqs $TICK * 0.1;
3651 $BDB_POLL_WATCHER = Event->io ( 4134 $AnyEvent::BDB::WATCHER->priority (1);
3652 reentrant => 0,
3653 fd => BDB::poll_fileno,
3654 poll => 'r',
3655 prio => 0,
3656 data => WF_AUTOCANCEL,
3657 cb => \&BDB::poll_cb,
3658 );
3659
3660 BDB::set_sync_prepare {
3661 my $status;
3662 my $current = $Coro::current;
3663 (
3664 sub {
3665 $status = $!;
3666 $current->ready; undef $current;
3667 },
3668 sub {
3669 Coro::schedule while defined $current;
3670 $! = $status;
3671 },
3672 )
3673 };
3674 4135
3675 unless ($DB_ENV) { 4136 unless ($DB_ENV) {
3676 $DB_ENV = BDB::db_env_create; 4137 $DB_ENV = BDB::db_env_create;
3677 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4138 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3678 | 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;
3679 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4141 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3680 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4142 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3681 4143
3682 cf::sync_job { 4144 cf::sync_job {
3683 eval { 4145 eval {
… …
3693 4155
3694 cf::cleanup "db_env_open(db): $@" if $@; 4156 cf::cleanup "db_env_open(db): $@" if $@;
3695 }; 4157 };
3696 } 4158 }
3697 4159
3698 $BDB_DEADLOCK_WATCHER = Event->timer ( 4160 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3699 after => 3,
3700 interval => 1,
3701 hard => 1,
3702 prio => 0,
3703 data => WF_AUTOCANCEL,
3704 cb => sub {
3705 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 { };
3706 },
3707 ); 4162 };
3708 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4163 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3709 after => 11,
3710 interval => 60,
3711 hard => 1,
3712 prio => 0,
3713 data => WF_AUTOCANCEL,
3714 cb => sub {
3715 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4164 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3716 },
3717 ); 4165 };
3718 $BDB_TRICKLE_WATCHER = Event->timer ( 4166 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3719 after => 5,
3720 interval => 10,
3721 hard => 1,
3722 prio => 0,
3723 data => WF_AUTOCANCEL,
3724 cb => sub {
3725 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4167 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3726 },
3727 ); 4168 };
3728} 4169}
3729 4170
3730{ 4171{
4172 # configure IO::AIO
4173
3731 IO::AIO::min_parallel 8; 4174 IO::AIO::min_parallel 8;
3732
3733 undef $Coro::AIO::WATCHER;
3734 IO::AIO::max_poll_time $TICK * 0.1; 4175 IO::AIO::max_poll_time $TICK * 0.1;
3735 $AIO_POLL_WATCHER = Event->io ( 4176 undef $AnyEvent::AIO::WATCHER;
3736 reentrant => 0,
3737 data => WF_AUTOCANCEL,
3738 fd => IO::AIO::poll_fileno,
3739 poll => 'r',
3740 prio => 0,
3741 cb => \&IO::AIO::poll_cb,
3742 );
3743} 4177}
3744 4178
3745my $_log_backtrace; 4179our $_log_backtrace;
4180our $_log_backtrace_last;
3746 4181
3747sub _log_backtrace { 4182sub _log_backtrace {
3748 my ($msg, @addr) = @_; 4183 my ($msg, @addr) = @_;
3749 4184
3750 $msg =~ s/\n//; 4185 $msg =~ s/\n$//;
3751 4186
4187 if ($_log_backtrace_last eq $msg) {
4188 LOG llevInfo, "[ABT] $msg\n";
4189 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3752 # limit the # of concurrent backtraces 4190 # limit the # of concurrent backtraces
3753 if ($_log_backtrace < 2) { 4191 } elsif ($_log_backtrace < 2) {
4192 $_log_backtrace_last = $msg;
3754 ++$_log_backtrace; 4193 ++$_log_backtrace;
4194 my $perl_bt = Carp::longmess $msg;
3755 async { 4195 async {
3756 $Coro::current->{desc} = "abt $msg"; 4196 $Coro::current->{desc} = "abt $msg";
3757 4197
3758 my @bt = fork_call { 4198 my @bt = fork_call {
3759 @addr = map { sprintf "%x", $_ } @addr; 4199 @addr = map { sprintf "%x", $_ } @addr;
… …
3770 } 4210 }
3771 4211
3772 @funcs 4212 @funcs
3773 }; 4213 };
3774 4214
3775 LOG llevInfo, "[ABT] $msg\n"; 4215 LOG llevInfo, "[ABT] $perl_bt\n";
4216 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3776 LOG llevInfo, "[ABT] $_\n" for @bt; 4217 LOG llevInfo, "[ABT] $_\n" for @bt;
3777 --$_log_backtrace; 4218 --$_log_backtrace;
3778 }; 4219 };
3779 } else { 4220 } else {
3780 LOG llevInfo, "[ABT] $msg\n"; 4221 LOG llevInfo, "[ABT] $msg\n";
3781 LOG llevInfo, "[ABT] [suppressed]\n"; 4222 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3782 } 4223 }
3783} 4224}
3784 4225
3785# load additional modules 4226# load additional modules
3786use cf::pod; 4227require "cf/$_.pm" for @EXTRA_MODULES;
4228cf::_connect_to_perl_2;
3787 4229
3788END { cf::emergency_save } 4230END { cf::emergency_save }
3789 4231
37901 42321
3791 4233

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines