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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines