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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines