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.388 by root, Thu Oct 18 02:56:13 2007 UTC vs.
Revision 1.515 by root, Thu Apr 15 04:56:47 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use Event; 32use EV;
10use Opcode; 33use Opcode;
11use Safe; 34use Safe;
12use Safe::Hole; 35use Safe::Hole;
13use Storable (); 36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 4.1 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
43use Coro::EV;
18use Coro::Event; 44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
51use Coro::BDB 1.6;
23use Coro::Storable; 52use Coro::Storable;
24use Coro::Util (); 53use Coro::Util ();
25 54
26use JSON::XS (); 55use JSON::XS 2.01 ();
27use BDB (); 56use BDB ();
28use Data::Dumper; 57use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 58use Fcntl;
31use YAML::Syck (); 59use YAML::XS ();
32use IO::AIO 2.51 (); 60use IO::AIO ();
33use Time::HiRes; 61use Time::HiRes;
34use Compress::LZF; 62use Compress::LZF;
35use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
36 66
37# configure various modules to our taste 67# configure various modules to our taste
38# 68#
39$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 77
43$Event::Eval = 1; # no idea why this is required, but it is 78# strictly for debugging
44 79$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 80
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
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;
112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
75 115
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $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 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 118our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
83 120
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 124our $DB_ENV;
89 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
90our %CFG; 128our %CFG;
91 129
92our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 131our $RUNTIME;
132our $NOW;
94 133
95our (%PLAYER, %PLAYER_LOADING); # all users 134our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 135our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 136our $LINK_MAP; # the special {link} map, which is always available
98 137
99# used to convert map paths into valid unix filenames by replacing / by ∕ 138# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 139our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 140
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
145
146our @POST_INIT;
147
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
105 150
106binmode STDOUT; 151binmode STDOUT;
107binmode STDERR; 152binmode STDERR;
108 153
109# read virtual server time, if available 154# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 155unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 156 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
114} 159}
160
161eval "sub TICK() { $TICK } 1" or die;
115 162
116mkdir $_ 163mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 165
119our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
120 167
121sub cf::map::normalise; 168sub cf::map::normalise;
169
170#############################################################################
171
172%REFLECT = ();
173for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_;
175 $REFLECT{$reflect->{class}} = $reflect;
176}
177
178# this is decidedly evil
179$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
122 180
123############################################################################# 181#############################################################################
124 182
125=head2 GLOBAL VARIABLES 183=head2 GLOBAL VARIABLES
126 184
162 220
163The raw value load value from the last tick. 221The raw value load value from the last tick.
164 222
165=item %cf::CFG 223=item %cf::CFG
166 224
167Configuration for the server, loaded from C</etc/crossfire/config>, or 225Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 226from wherever your confdir points to.
169 227
170=item cf::wait_for_tick, cf::wait_for_tick_begin 228=item cf::wait_for_tick, cf::wait_for_tick_begin
171 229
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 230These 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 231returns directly I<after> the tick processing (and consequently, can only wake one process
174per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 232per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
175 233
176=item @cf::INVOKE_RESULTS 234=item @cf::INVOKE_RESULTS
177 235
178This array contains the results of the last C<invoke ()> call. When 236This 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 237C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call. 238that call.
181 239
240=item %cf::REFLECT
241
242Contains, for each (C++) class name, a hash reference with information
243about object members (methods, scalars, arrays and flags) and other
244metadata, which is useful for introspection.
245
182=back 246=back
183 247
184=cut 248=cut
185 249
186BEGIN { 250$Coro::State::WARNHOOK = sub {
187 *CORE::GLOBAL::warn = sub {
188 my $msg = join "", @_; 251 my $msg = join "", @_;
189 252
190 $msg .= "\n" 253 $msg .= "\n"
191 unless $msg =~ /\n$/; 254 unless $msg =~ /\n$/;
192 255
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 256 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 257
195 LOG llevError, $msg; 258 LOG llevError, $msg;
196 }; 259};
197} 260
261$Coro::State::DIEHOOK = sub {
262 return unless $^S eq 0; # "eq", not "=="
263
264 warn Carp::longmess $_[0];
265
266 if ($Coro::current == $Coro::main) {#d#
267 warn "DIEHOOK called in main context, Coro bug?\n";#d#
268 return;#d#
269 }#d#
270
271 # kill coroutine otherwise
272 Coro::terminate
273};
198 274
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 275@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 276@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 277@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 278@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 285for my $pkg (qw(
210 cf::global cf::attachable 286 cf::global cf::attachable
211 cf::object cf::object::player 287 cf::object cf::object::player
212 cf::client cf::player 288 cf::client cf::player
213 cf::arch cf::living 289 cf::arch cf::living
290 cf::map cf::mapspace
214 cf::map cf::party cf::region 291 cf::party cf::region
215)) { 292)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 294}
219 295
220$Event::DIED = sub { 296$EV::DIED = sub {
221 warn "error in event callback: @_"; 297 Carp::cluck "error in event callback: @_";
222}; 298};
223 299
224############################################################################# 300#############################################################################
225 301
226=head2 UTILITY FUNCTIONS 302=head2 UTILITY FUNCTIONS
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 324 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 325 $d
250 } || "[unable to dump $_[0]: '$@']"; 326 } || "[unable to dump $_[0]: '$@']";
251} 327}
252 328
253=item $ref = cf::from_json $json 329=item $ref = cf::decode_json $json
254 330
255Converts a JSON string into the corresponding perl data structure. 331Converts a JSON string into the corresponding perl data structure.
256 332
257=item $json = cf::to_json $ref 333=item $json = cf::encode_json $ref
258 334
259Converts a perl data structure into its JSON representation. 335Converts a perl data structure into its JSON representation.
260 336
261=cut 337=cut
262 338
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 339our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 340
265sub to_json ($) { $json_coder->encode ($_[0]) } 341sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 342sub decode_json($) { $json_coder->decode ($_[0]) }
343
344=item cf::post_init { BLOCK }
345
346Execute the given codeblock, I<after> all extensions have been (re-)loaded,
347but I<before> the server starts ticking again.
348
349The cdoeblock will have a single boolean argument to indicate whether this
350is a reload or not.
351
352=cut
353
354sub post_init(&) {
355 push @POST_INIT, shift;
356}
267 357
268=item cf::lock_wait $string 358=item cf::lock_wait $string
269 359
270Wait until the given lock is available. See cf::lock_acquire. 360Wait until the given lock is available. See cf::lock_acquire.
271 361
272=item my $lock = cf::lock_acquire $string 362=item my $lock = cf::lock_acquire $string
273 363
274Wait until the given lock is available and then acquires it and returns 364Wait 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, 365a L<Guard> object. If the guard object gets destroyed (goes out of scope,
276for example when the coroutine gets canceled), the lock is automatically 366for example when the coroutine gets canceled), the lock is automatically
277returned. 367returned.
278 368
279Locks are *not* recursive, locking from the same coro twice results in a 369Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro. 370deadlocked coro.
286 376
287Return true if the lock is currently active, i.e. somebody has locked it. 377Return true if the lock is currently active, i.e. somebody has locked it.
288 378
289=cut 379=cut
290 380
291our %LOCK; 381our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 382
294sub lock_wait($) { 383sub lock_wait($) {
295 my ($key) = @_; 384 $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} 385}
308 386
309sub lock_acquire($) { 387sub lock_acquire($) {
310 my ($key) = @_; 388 $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} 389}
324 390
325sub lock_active($) { 391sub lock_active($) {
326 my ($key) = @_; 392 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 393}
330 394
331sub freeze_mainloop { 395sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 396 tick_inhibit_inc;
333 397
334 my $guard = Coro::guard { 398 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start; 399}
336 }; 400
337 $TICK_WATCHER->stop; 401=item cf::periodic $interval, $cb
338 $guard 402
403Like EV::periodic, but randomly selects a starting point so that the actions
404get spread over time.
405
406=cut
407
408sub periodic($$) {
409 my ($interval, $cb) = @_;
410
411 my $start = rand List::Util::min 180, $interval;
412
413 EV::periodic $start, $interval, 0, $cb
339} 414}
340 415
341=item cf::get_slot $time[, $priority[, $name]] 416=item cf::get_slot $time[, $priority[, $name]]
342 417
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 418Allocate $time seconds of blocking CPU time at priority C<$priority>:
351 426
352=cut 427=cut
353 428
354our @SLOT_QUEUE; 429our @SLOT_QUEUE;
355our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
356 432
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager"); 435 $Coro::current->desc ("timeslot manager");
360 436
361 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
362 439
363 while () { 440 while () {
364 next_job: 441 next_job:
442
365 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
366 if ($avail > 0.01) { 444
367 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
369 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send; 449 $job->[2]->send;
371 Coro::cede; 450 Coro::cede;
372 goto next_job; 451 goto next_job;
373 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
374 } 454 }
375 } 455 }
376 456
377 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
378 # we do not use wait_for_tick() as it returns immediately when tick is inactive 458 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 460 $signal->wait;
381 } else { 461 } else {
462 $busy = 0;
382 Coro::schedule; 463 Coro::schedule;
383 } 464 }
384 } 465 }
385}; 466};
386 467
387sub get_slot($;$$) { 468sub get_slot($;$$) {
469 return if tick_inhibit || $Coro::current == $Coro::main;
470
388 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
389 472
390 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
391 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
392 476
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
406 490
407BEGIN { *async = \&Coro::async_pool } 491BEGIN { *async = \&Coro::async_pool }
408 492
409=item cf::sync_job { BLOCK } 493=item cf::sync_job { BLOCK }
410 494
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 495The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 496is 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 497partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 498acceptable.
415 499
416If it must be done, put the blocking parts into C<sync_job>. This will run 500If 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 501the given BLOCK in another coroutine while waiting for the result. The
422 506
423sub sync_job(&) { 507sub sync_job(&) {
424 my ($job) = @_; 508 my ($job) = @_;
425 509
426 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 511 my $time = AE::time;
428 512
429 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
431 515
432 LOG llevError, Carp::longmess "sync job";#d# 516 LOG llevError, Carp::longmess "sync job";#d#
433 517
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 518 my $freeze_guard = freeze_mainloop;
437 519
438 my $busy = 1; 520 my $busy = 1;
439 my @res; 521 my @res;
440 522
447 529
448 while ($busy) { 530 while ($busy) {
449 if (Coro::nready) { 531 if (Coro::nready) {
450 Coro::cede_notself; 532 Coro::cede_notself;
451 } else { 533 } else {
452 Event::one_event; 534 EV::loop EV::LOOP_ONESHOT;
453 } 535 }
454 } 536 }
455 537
456 $time = Event::time - $time; 538 my $time = AE::time - $time;
457 539
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 540 $TICK_START += $time; # do not account sync jobs to server load
462 541
463 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
464 } else { 543 } else {
465 # we are in another coroutine, how wonderful, everything just works 544 # we are in another coroutine, how wonderful, everything just works
466 545
491=item fork_call { }, $args 570=item fork_call { }, $args
492 571
493Executes the given code block with the given arguments in a seperate 572Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 573process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 574Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 575never block itself or use any form of event handling.
497 576
498=cut 577=cut
499 578
500sub fork_call(&@) { 579sub fork_call(&@) {
501 my ($cb, @args) = @_; 580 my ($cb, @args) = @_;
508 reset_signals; 587 reset_signals;
509 &$cb 588 &$cb
510 }, @args; 589 }, @args;
511 590
512 wantarray ? @res : $res[-1] 591 wantarray ? @res : $res[-1]
592}
593
594sub objinfo {
595 (
596 "counter value" => cf::object::object_count,
597 "objects created" => cf::object::create_count,
598 "objects destroyed" => cf::object::destroy_count,
599 "freelist size" => cf::object::free_count,
600 "allocated objects" => cf::object::objects_size,
601 "active objects" => cf::object::actives_size,
602 )
603}
604
605=item $coin = coin_from_name $name
606
607=cut
608
609our %coin_alias = (
610 "silver" => "silvercoin",
611 "silvercoin" => "silvercoin",
612 "silvercoins" => "silvercoin",
613 "gold" => "goldcoin",
614 "goldcoin" => "goldcoin",
615 "goldcoins" => "goldcoin",
616 "platinum" => "platinacoin",
617 "platinumcoin" => "platinacoin",
618 "platinumcoins" => "platinacoin",
619 "platina" => "platinacoin",
620 "platinacoin" => "platinacoin",
621 "platinacoins" => "platinacoin",
622 "royalty" => "royalty",
623 "royalties" => "royalty",
624);
625
626sub coin_from_name($) {
627 $coin_alias{$_[0]}
628 ? cf::arch::find $coin_alias{$_[0]}
629 : undef
513} 630}
514 631
515=item $value = cf::db_get $family => $key 632=item $value = cf::db_get $family => $key
516 633
517Returns a single value from the environment database. 634Returns a single value from the environment database.
656 773
657############################################################################# 774#############################################################################
658 775
659=head2 ATTACHABLE OBJECTS 776=head2 ATTACHABLE OBJECTS
660 777
661Many objects in crossfire are so-called attachable objects. That means you can 778Many objects in deliantra are so-called attachable objects. That means you can
662attach callbacks/event handlers (a collection of which is called an "attachment") 779attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 780to it. All such attachable objects support the following methods.
664 781
665In the following description, CLASS can be any of C<global>, C<object> 782In 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 783C<player>, C<client> or C<map> (i.e. the attachable objects in
667Crossfire TRT). 784Deliantra).
668 785
669=over 4 786=over 4
670 787
671=item $attachable->attach ($attachment, key => $value...) 788=item $attachable->attach ($attachment, key => $value...)
672 789
716=item cf::CLASS::attachment $name, ... 833=item cf::CLASS::attachment $name, ...
717 834
718Register an attachment by C<$name> through which attachable objects of the 835Register an attachment by C<$name> through which attachable objects of the
719given CLASS can refer to this attachment. 836given CLASS can refer to this attachment.
720 837
721Some classes such as crossfire maps and objects can specify attachments 838Some classes such as deliantra maps and objects can specify attachments
722that are attached at load/instantiate time, thus the need for a name. 839that are attached at load/instantiate time, thus the need for a name.
723 840
724These calls expect any number of the following handler/hook descriptions: 841These calls expect any number of the following handler/hook descriptions:
725 842
726=over 4 843=over 4
954 } 1071 }
955 1072
956 0 1073 0
957} 1074}
958 1075
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1076=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 1077
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1078=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 1079
963Generate an object-specific event with the given arguments. 1080Generate an object-specific event with the given arguments.
964 1081
1017 1134
1018sub reattach { 1135sub reattach {
1019 # basically do the same as instantiate, without calling instantiate 1136 # basically do the same as instantiate, without calling instantiate
1020 my ($obj) = @_; 1137 my ($obj) = @_;
1021 1138
1139 # no longer needed after getting rid of delete_package?
1022 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1140 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1023 1141
1024 my $registry = $obj->registry; 1142 my $registry = $obj->registry;
1025 1143
1026 @$registry = (); 1144 @$registry = ();
1027 1145
1042cf::attachable->attach ( 1160cf::attachable->attach (
1043 prio => -1000000, 1161 prio => -1000000,
1044 on_instantiate => sub { 1162 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1163 my ($obj, $data) = @_;
1046 1164
1047 $data = from_json $data; 1165 $data = decode_json $data;
1048 1166
1049 for (@$data) { 1167 for (@$data) {
1050 my ($name, $args) = @$_; 1168 my ($name, $args) = @$_;
1051 1169
1052 $obj->attach ($name, %{$args || {} }); 1170 $obj->attach ($name, %{$args || {} });
1073 utf8::decode (my $decname = $filename); 1191 utf8::decode (my $decname = $filename);
1074 warn sprintf "saving %s (%d,%d)\n", 1192 warn sprintf "saving %s (%d,%d)\n",
1075 $decname, length $$rdata, scalar @$objs; 1193 $decname, length $$rdata, scalar @$objs;
1076 1194
1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1078 chmod SAVE_MODE, $fh; 1196 aio_chmod $fh, SAVE_MODE;
1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1080 aio_fsync $fh if $cf::USE_FSYNC; 1198 if ($cf::USE_FSYNC) {
1199 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;
1200 aio_fsync $fh;
1201 }
1081 close $fh; 1202 aio_close $fh;
1082 1203
1083 if (@$objs) { 1204 if (@$objs) {
1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1205 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1085 chmod SAVE_MODE, $fh; 1206 aio_chmod $fh, SAVE_MODE;
1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1207 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1208 aio_write $fh, 0, (length $data), $data, 0;
1088 aio_fsync $fh if $cf::USE_FSYNC; 1209 if ($cf::USE_FSYNC) {
1210 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;
1211 aio_fsync $fh;
1212 }
1089 close $fh; 1213 aio_close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1214 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1215 }
1092 } else { 1216 } else {
1093 aio_unlink "$filename.pst"; 1217 aio_unlink "$filename.pst";
1094 } 1218 }
1095 1219
1096 aio_rename "$filename~", $filename; 1220 aio_rename "$filename~", $filename;
1221
1222 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC;
1097 } else { 1224 } else {
1098 warn "FATAL: $filename~: $!\n"; 1225 warn "unable to save objects: $filename~: $!\n";
1099 } 1226 }
1100 } else { 1227 } else {
1101 aio_unlink $filename; 1228 aio_unlink $filename;
1102 aio_unlink "$filename.pst"; 1229 aio_unlink "$filename.pst";
1103 } 1230 }
1194 my ($name, $cb) = @_; 1321 my ($name, $cb) = @_;
1195 1322
1196 $EXTICMD{$name} = $cb; 1323 $EXTICMD{$name} = $cb;
1197} 1324}
1198 1325
1326use File::Glob ();
1327
1199cf::player->attach ( 1328cf::player->attach (
1200 on_command => sub { 1329 on_unknown_command => sub {
1201 my ($pl, $name, $params) = @_; 1330 my ($pl, $name, $params) = @_;
1202 1331
1203 my $cb = $COMMAND{$name} 1332 my $cb = $COMMAND{$name}
1204 or return; 1333 or return;
1205 1334
1235 1364
1236 cf::override; 1365 cf::override;
1237 }, 1366 },
1238); 1367);
1239 1368
1369# "readahead" all extensions
1370sub cache_extensions {
1371 my $grp = IO::AIO::aio_group;
1372
1373 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1374 for (grep /\.ext$/, @{$_[0]}) {
1375 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1376 }
1377 };
1378
1379 $grp
1380}
1381
1240sub load_extensions { 1382sub load_extensions {
1241 cf::sync_job { 1383 cf::sync_job {
1242 my %todo; 1384 my %todo;
1243 1385
1244 for my $path (<$LIBDIR/*.ext>) { 1386 for my $path (<$LIBDIR/*.ext>) {
1263 1405
1264 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1406 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1265 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1407 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1266 1408
1267 $ext{source} = 1409 $ext{source} =
1268 "package $pkg; use strict; use utf8;\n" 1410 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1269 . "#line 1 \"$path\"\n{\n" 1411 . "#line 1 \"$path\"\n{\n"
1270 . $source 1412 . $source
1271 . "\n};\n1"; 1413 . "\n};\n1";
1272 1414
1273 $todo{$base} = \%ext; 1415 $todo{$base} = \%ext;
1274 } 1416 }
1275 1417
1418 my $pass = 0;
1276 my %done; 1419 my %done;
1277 while (%todo) { 1420 while (%todo) {
1278 my $progress; 1421 my $progress;
1279 1422
1423 ++$pass;
1424
1425 ext:
1280 while (my ($k, $v) = each %todo) { 1426 while (my ($k, $v) = each %todo) {
1281 for (split /,\s*/, $v->{meta}{depends}) { 1427 for (split /,\s*/, $v->{meta}{depends}) {
1282 goto skip 1428 next ext
1283 unless exists $done{$_}; 1429 unless exists $done{$_};
1284 } 1430 }
1285 1431
1286 warn "... loading '$k' into '$v->{pkg}'\n"; 1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1287 1433
1288 unless (eval $v->{source}) { 1434 my $active = eval $v->{source};
1435
1436 if (length $@) {
1289 my $msg = $@ ? "$v->{path}: $@\n" 1437 warn "$v->{path}: $@\n";
1290 : "$v->{base}: extension inactive.\n";
1291 1438
1439 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1292 if (exists $v->{meta}{mandatory}) { 1440 if exists $v->{meta}{mandatory};
1293 warn $msg; 1441 } else {
1294 warn "mandatory extension failed to load, exiting.\n"; 1442 $done{$k} = delete $todo{$k};
1295 exit 1; 1443 push @EXTS, $v->{pkg};
1296 } 1444 $progress = 1;
1297 1445
1298 warn $msg; 1446 warn "$v->{base}: extension inactive.\n"
1447 unless $active;
1299 } 1448 }
1300
1301 $done{$k} = delete $todo{$k};
1302 push @EXTS, $v->{pkg};
1303 $progress = 1;
1304 } 1449 }
1305 1450
1306 skip: 1451 unless ($progress) {
1307 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1452 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1308 unless $progress; 1453
1454 while (my ($k, $v) = each %todo) {
1455 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1456 if exists $v->{meta}{mandatory};
1457 }
1458 }
1309 } 1459 }
1310 }; 1460 };
1311} 1461}
1312 1462
1313############################################################################# 1463#############################################################################
1314 1464
1315=back 1465=back
1316 1466
1317=head2 CORE EXTENSIONS 1467=head2 CORE EXTENSIONS
1318 1468
1319Functions and methods that extend core crossfire objects. 1469Functions and methods that extend core deliantra objects.
1320 1470
1321=cut 1471=cut
1322 1472
1323package cf::player; 1473package cf::player;
1324 1474
1367 1517
1368sub exists($) { 1518sub exists($) {
1369 my ($login) = @_; 1519 my ($login) = @_;
1370 1520
1371 $cf::PLAYER{$login} 1521 $cf::PLAYER{$login}
1372 or cf::sync_job { !aio_stat path $login } 1522 or !aio_stat path $login
1373} 1523}
1374 1524
1375sub find($) { 1525sub find($) {
1376 return $cf::PLAYER{$_[0]} || do { 1526 return $cf::PLAYER{$_[0]} || do {
1377 my $login = $_[0]; 1527 my $login = $_[0];
1389 my $f = new_from_file cf::object::thawer path $login 1539 my $f = new_from_file cf::object::thawer path $login
1390 or return; 1540 or return;
1391 1541
1392 my $pl = cf::player::load_pl $f 1542 my $pl = cf::player::load_pl $f
1393 or return; 1543 or return;
1544
1394 local $cf::PLAYER_LOADING{$login} = $pl; 1545 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs; 1546 $f->resolve_delayed_derefs;
1396 $cf::PLAYER{$login} = $pl 1547 $cf::PLAYER{$login} = $pl
1397 } 1548 }
1398 } 1549 }
1399} 1550}
1400 1551
1552cf::player->attach (
1553 on_load => sub {
1554 my ($pl, $path) = @_;
1555
1556 # restore slots saved in save, below
1557 my $slots = delete $pl->{_slots};
1558
1559 $pl->ob->current_weapon ($slots->[0]);
1560 $pl->combat_ob ($slots->[1]);
1561 $pl->ranged_ob ($slots->[2]);
1562 },
1563);
1564
1401sub save($) { 1565sub save($) {
1402 my ($pl) = @_; 1566 my ($pl) = @_;
1403 1567
1404 return if $pl->{deny_save}; 1568 return if $pl->{deny_save};
1405 1569
1408 1572
1409 return if $pl->{deny_save}; 1573 return if $pl->{deny_save};
1410 1574
1411 aio_mkdir playerdir $pl, 0770; 1575 aio_mkdir playerdir $pl, 0770;
1412 $pl->{last_save} = $cf::RUNTIME; 1576 $pl->{last_save} = $cf::RUNTIME;
1577
1578 cf::get_slot 0.01;
1579
1580 # save slots, to be restored later
1581 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1413 1582
1414 $pl->save_pl ($path); 1583 $pl->save_pl ($path);
1415 cf::cede_to_tick; 1584 cf::cede_to_tick;
1416} 1585}
1417 1586
1449 my ($pl) = @_; 1618 my ($pl) = @_;
1450 1619
1451 my $name = $pl->ob->name; 1620 my $name = $pl->ob->name;
1452 1621
1453 $pl->{deny_save} = 1; 1622 $pl->{deny_save} = 1;
1454 $pl->password ("*"); # this should lock out the player until we nuked the dir 1623 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1455 1624
1456 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1625 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1457 $pl->deactivate; 1626 $pl->deactivate;
1627 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1628 $pl->ob->check_score;
1458 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1629 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1459 $pl->ns->destroy if $pl->ns; 1630 $pl->ns->destroy if $pl->ns;
1460 1631
1461 my $path = playerdir $pl; 1632 my $path = playerdir $pl;
1462 my $temp = "$path~$cf::RUNTIME~deleting~"; 1633 my $temp = "$path~$cf::RUNTIME~deleting~";
1501 1672
1502 for my $login (@$dirs) { 1673 for my $login (@$dirs) {
1503 my $path = path $login; 1674 my $path = path $login;
1504 1675
1505 # a .pst is a dead give-away for a valid player 1676 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") { 1677 # if no pst file found, open and chekc for blocked users
1678 if (aio_stat "$path.pst") {
1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1679 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508 aio_read $fh, 0, 512, my $buf, 0 or next; 1680 aio_read $fh, 0, 512, my $buf, 0 or next;
1509 $buf !~ /^password -------------$/m or next; # official not-valid tag 1681 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 } 1682 }
1511 1683
1542 } 1714 }
1543 1715
1544 \@paths 1716 \@paths
1545} 1717}
1546 1718
1547=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1719=item $protocol_xml = $player->expand_cfpod ($cfpod)
1548 1720
1549Expand crossfire pod fragments into protocol xml. 1721Expand deliantra pod fragments into protocol xml.
1550
1551=cut
1552
1553sub expand_cfpod {
1554 ((my $self), (local $_)) = @_;
1555
1556 # escape & and <
1557 s/&/&amp;/g;
1558 s/(?<![BIUGHT])</&lt;/g;
1559
1560 # this is buggy, it needs to properly take care of nested <'s
1561
1562 1 while
1563 # replace B<>, I<>, U<> etc.
1564 s/B<([^\>]*)>/<b>$1<\/b>/
1565 || s/I<([^\>]*)>/<i>$1<\/i>/
1566 || s/U<([^\>]*)>/<u>$1<\/u>/
1567 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1568 # replace G<male|female> tags
1569 || s{G<([^>|]*)\|([^>]*)>}{
1570 $self->gender ? $2 : $1
1571 }ge
1572 # replace H<hint text>
1573 || s{H<([^\>]*)>}
1574 {
1575 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1576 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1577 "")
1578 [$self->{hintmode}]
1579 }ge;
1580
1581 # create single paragraphs (very hackish)
1582 s/(?<=\S)\n(?=\w)/ /g;
1583
1584 # compress some whitespace
1585 s/\s+\n/\n/g; # ws line-ends
1586 s/\n\n+/\n/g; # double lines
1587 s/^\n+//; # beginning lines
1588 s/\n+$//; # ending lines
1589
1590 $_
1591}
1592
1593sub hintmode {
1594 $_[0]{hintmode} = $_[1] if @_ > 1;
1595 $_[0]{hintmode}
1596}
1597 1722
1598=item $player->ext_reply ($msgid, @msg) 1723=item $player->ext_reply ($msgid, @msg)
1599 1724
1600Sends an ext reply to the player. 1725Sends an ext reply to the player.
1601 1726
1668our $MAX_RESET = 3600; 1793our $MAX_RESET = 3600;
1669our $DEFAULT_RESET = 3000; 1794our $DEFAULT_RESET = 3000;
1670 1795
1671sub generate_random_map { 1796sub generate_random_map {
1672 my ($self, $rmp) = @_; 1797 my ($self, $rmp) = @_;
1798
1799 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1800
1673 # mit "rum" bekleckern, nicht 1801 # mit "rum" bekleckern, nicht
1674 $self->_create_random_map ( 1802 $self->_create_random_map (
1675 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1676 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1677 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1678 $rmp->{exit_on_final_map}, 1806 $rmp->{exit_on_final_map},
1679 $rmp->{xsize}, $rmp->{ysize}, 1807 $rmp->{xsize}, $rmp->{ysize},
1680 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1681 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1799 1927
1800# the temporary/swap location 1928# the temporary/swap location
1801sub save_path { 1929sub save_path {
1802 my ($self) = @_; 1930 my ($self) = @_;
1803 1931
1804 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1932 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1805 "$TMPDIR/$path.map" 1933 "$TMPDIR/$path.map"
1806} 1934}
1807 1935
1808# the unique path, undef == no special unique path 1936# the unique path, undef == no special unique path
1809sub uniq_path { 1937sub uniq_path {
1810 my ($self) = @_; 1938 my ($self) = @_;
1811 1939
1812 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1940 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1813 "$UNIQUEDIR/$path" 1941 "$UNIQUEDIR/$path"
1814}
1815
1816# and all this just because we cannot iterate over
1817# all maps in C++...
1818sub change_all_map_light {
1819 my ($change) = @_;
1820
1821 $_->change_map_light ($change)
1822 for grep $_->outdoor, values %cf::MAP;
1823} 1942}
1824 1943
1825sub decay_objects { 1944sub decay_objects {
1826 my ($self) = @_; 1945 my ($self) = @_;
1827 1946
1911sub find { 2030sub find {
1912 my ($path, $origin) = @_; 2031 my ($path, $origin) = @_;
1913 2032
1914 $path = normalise $path, $origin && $origin->path; 2033 $path = normalise $path, $origin && $origin->path;
1915 2034
1916 cf::lock_wait "map_data:$path";#d#remove 2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1917 cf::lock_wait "map_find:$path"; 2036 my $guard2 = cf::lock_acquire "map_find:$path";
1918 2037
1919 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
1920 my $guard1 = cf::lock_acquire "map_find:$path";
1921 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1922
1923 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
1924 or return; 2040 or return;
1925 2041
1926 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
1927 2043
1929 or return; 2045 or return;
1930 2046
1931 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1932 # doing this can freeze the server in a sync job, obviously 2048 # doing this can freeze the server in a sync job, obviously
1933 #$cf::WAIT_FOR_TICK->wait; 2049 #$cf::WAIT_FOR_TICK->wait;
2050 undef $guard2;
1934 undef $guard1; 2051 undef $guard1;
1935 undef $guard2;
1936 $map->reset; 2052 $map->reset;
1937 return find $path; 2053 return find $path;
1938 } 2054 }
1939 2055
1940 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
1941 } 2057 }
1942} 2058}
1943 2059
1944sub pre_load { } 2060sub pre_load { }
1945sub post_load { } 2061#sub post_load { } # XS
1946 2062
1947sub load { 2063sub load {
1948 my ($self) = @_; 2064 my ($self) = @_;
1949 2065
1950 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
1967 my $f = new_from_file cf::object::thawer $self->{load_path}; 2083 my $f = new_from_file cf::object::thawer $self->{load_path};
1968 $f->skip_block; 2084 $f->skip_block;
1969 $self->_load_objects ($f) 2085 $self->_load_objects ($f)
1970 or return; 2086 or return;
1971 2087
1972 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2088 $self->post_load_original
1973 if delete $self->{load_original}; 2089 if delete $self->{load_original};
1974 2090
1975 if (my $uniq = $self->uniq_path) { 2091 if (my $uniq = $self->uniq_path) {
1976 utf8::encode $uniq; 2092 utf8::encode $uniq;
1977 unless (aio_stat $uniq) { 2093 unless (aio_stat $uniq) {
1995 unless ($self->{deny_activate}) { 2111 unless ($self->{deny_activate}) {
1996 $self->decay_objects; 2112 $self->decay_objects;
1997 $self->fix_auto_apply; 2113 $self->fix_auto_apply;
1998 $self->update_buttons; 2114 $self->update_buttons;
1999 cf::cede_to_tick; 2115 cf::cede_to_tick;
2000 $self->set_darkness_map;
2001 cf::cede_to_tick;
2002 $self->activate; 2116 $self->activate;
2003 } 2117 }
2004 2118
2005 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
2006 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
2007 2121
2008 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
2009 } 2123 }
2010 2124
2011 $self->post_load; 2125 $self->post_load;
2012} 2126}
2013 2127
2128# customize the map for a given player, i.e.
2129# return the _real_ map. used by e.g. per-player
2130# maps to change the path to ~playername/mappath
2014sub customise_for { 2131sub customise_for {
2015 my ($self, $ob) = @_; 2132 my ($self, $ob) = @_;
2016 2133
2017 return find "~" . $ob->name . "/" . $self->{path} 2134 return find "~" . $ob->name . "/" . $self->{path}
2018 if $self->per_player; 2135 if $self->per_player;
2071 my ($path, $origin, $load) = @_; 2188 my ($path, $origin, $load) = @_;
2072 2189
2073 $path = normalise $path, $origin && $origin->{path}; 2190 $path = normalise $path, $origin && $origin->{path};
2074 2191
2075 if (my $map = $cf::MAP{$path}) { 2192 if (my $map = $cf::MAP{$path}) {
2076 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2193 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2077 } 2194 }
2078 2195
2079 $MAP_PREFETCH{$path} |= $load; 2196 $MAP_PREFETCH{$path} |= $load;
2080 2197
2081 $MAP_PREFETCHER ||= cf::async { 2198 $MAP_PREFETCHER ||= cf::async {
2118 cf::async { 2235 cf::async {
2119 $Coro::current->{desc} = "map player save"; 2236 $Coro::current->{desc} = "map player save";
2120 $_->contr->save for $self->players; 2237 $_->contr->save for $self->players;
2121 }; 2238 };
2122 2239
2240 cf::get_slot 0.02;
2241
2123 if ($uniq) { 2242 if ($uniq) {
2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2243 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2125 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2244 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2126 } else { 2245 } else {
2127 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2246 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2135 $self->save; 2254 $self->save;
2136 2255
2137 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2256 my $lock = cf::lock_acquire "map_data:$self->{path}";
2138 2257
2139 return if $self->players; 2258 return if $self->players;
2140 return if $self->in_memory != cf::MAP_IN_MEMORY; 2259 return if $self->in_memory != cf::MAP_ACTIVE;
2141 return if $self->{deny_save}; 2260 return if $self->{deny_save};
2142 2261
2143 $self->in_memory (cf::MAP_SWAPPED); 2262 $self->in_memory (cf::MAP_SWAPPED);
2144 2263
2145 $self->deactivate; 2264 $self->deactivate;
2170 2289
2171 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2290 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172 2291
2173 return if $self->players; 2292 return if $self->players;
2174 2293
2175 warn "resetting map ", $self->path; 2294 warn "resetting map ", $self->path, "\n";
2176 2295
2177 $self->in_memory (cf::MAP_SWAPPED); 2296 $self->in_memory (cf::MAP_SWAPPED);
2178 2297
2179 # need to save uniques path 2298 # need to save uniques path
2180 unless ($self->{deny_save}) { 2299 unless ($self->{deny_save}) {
2263 2382
2264sub unique_maps() { 2383sub unique_maps() {
2265 [ 2384 [
2266 map { 2385 map {
2267 utf8::decode $_; 2386 utf8::decode $_;
2268 /\.map$/ 2387 s/\.map$//; # TODO future compatibility hack
2388 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2389 ? ()
2269 ? normalise $_ 2390 : normalise $_
2270 : ()
2271 } @{ aio_readdir $UNIQUEDIR or [] } 2391 } @{ aio_readdir $UNIQUEDIR or [] }
2272 ] 2392 ]
2273} 2393}
2274 2394
2275package cf; 2395=item cf::map::static_maps
2396
2397Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2398file in the shared directory excluding F</styles> and F</editor>). May
2399block.
2400
2401=cut
2402
2403sub static_maps() {
2404 my @dirs = "";
2405 my @maps;
2406
2407 while (@dirs) {
2408 my $dir = shift @dirs;
2409
2410 next if $dir eq "/styles" || $dir eq "/editor";
2411
2412 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2413 or return;
2414
2415 for (@$files) {
2416 s/\.map$// or next;
2417 utf8::decode $_;
2418 push @maps, "$dir/$_";
2419 }
2420
2421 push @dirs, map "$dir/$_", @$dirs;
2422 }
2423
2424 \@maps
2425}
2276 2426
2277=back 2427=back
2278 2428
2279=head3 cf::object 2429=head3 cf::object
2280 2430
2284 2434
2285=over 4 2435=over 4
2286 2436
2287=item $ob->inv_recursive 2437=item $ob->inv_recursive
2288 2438
2289Returns the inventory of the object _and_ their inventories, recursively. 2439Returns the inventory of the object I<and> their inventories, recursively,
2440but I<not> the object itself.
2290 2441
2291=cut 2442=cut
2292 2443
2293sub inv_recursive_; 2444sub inv_recursive_;
2294sub inv_recursive_ { 2445sub inv_recursive_ {
2299 inv_recursive_ inv $_[0] 2450 inv_recursive_ inv $_[0]
2300} 2451}
2301 2452
2302=item $ref = $ob->ref 2453=item $ref = $ob->ref
2303 2454
2304creates and returns a persistent reference to an objetc that can be stored as a string. 2455Creates and returns a persistent reference to an object that can be stored as a string.
2305 2456
2306=item $ob = cf::object::deref ($refstring) 2457=item $ob = cf::object::deref ($refstring)
2307 2458
2308returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2459returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2309even if the object actually exists. May block. 2460even if the object actually exists. May block.
2341can be C<undef>. Does the right thing when the player is currently in a 2492can be C<undef>. Does the right thing when the player is currently in a
2342dialogue with the given NPC character. 2493dialogue with the given NPC character.
2343 2494
2344=cut 2495=cut
2345 2496
2497our $SAY_CHANNEL = {
2498 id => "say",
2499 title => "Map",
2500 reply => "say ",
2501 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2502};
2503
2504our $CHAT_CHANNEL = {
2505 id => "chat",
2506 title => "Chat",
2507 reply => "chat ",
2508 tooltip => "Player chat and shouts, global to the server.",
2509};
2510
2346# rough implementation of a future "reply" method that works 2511# rough implementation of a future "reply" method that works
2347# with dialog boxes. 2512# with dialog boxes.
2348#TODO: the first argument must go, split into a $npc->reply_to ( method 2513#TODO: the first argument must go, split into a $npc->reply_to ( method
2349sub cf::object::player::reply($$$;$) { 2514sub cf::object::player::reply($$$;$) {
2350 my ($self, $npc, $msg, $flags) = @_; 2515 my ($self, $npc, $msg, $flags) = @_;
2361 my $dialog = $pl->{npc_dialog}; 2526 my $dialog = $pl->{npc_dialog};
2362 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2527 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2363 2528
2364 } else { 2529 } else {
2365 $msg = $npc->name . " says: $msg" if $npc; 2530 $msg = $npc->name . " says: $msg" if $npc;
2366 $self->message ($msg, $flags); 2531 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2367 } 2532 }
2368 } 2533 }
2369} 2534}
2370 2535
2371=item $object->send_msg ($channel, $msg, $color, [extra...]) 2536=item $object->send_msg ($channel, $msg, $color, [extra...])
2396 2561
2397=item $player_object->enter_link 2562=item $player_object->enter_link
2398 2563
2399Freezes the player and moves him/her to a special map (C<{link}>). 2564Freezes the player and moves him/her to a special map (C<{link}>).
2400 2565
2401The player should be reasonably safe there for short amounts of time. You 2566The player should be reasonably safe there for short amounts of time (e.g.
2402I<MUST> call C<leave_link> as soon as possible, though. 2567for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2568though, as the palyer cannot control the character while it is on the link
2569map.
2403 2570
2404Will never block. 2571Will never block.
2405 2572
2406=item $player_object->leave_link ($map, $x, $y) 2573=item $player_object->leave_link ($map, $x, $y)
2407 2574
2459 ($x, $y) = (-1, -1) 2626 ($x, $y) = (-1, -1)
2460 unless (defined $x) && (defined $y); 2627 unless (defined $x) && (defined $y);
2461 2628
2462 # use -1 or undef as default coordinates, not 0, 0 2629 # use -1 or undef as default coordinates, not 0, 0
2463 ($x, $y) = ($map->enter_x, $map->enter_y) 2630 ($x, $y) = ($map->enter_x, $map->enter_y)
2464 if $x <=0 && $y <= 0; 2631 if $x <= 0 && $y <= 0;
2465 2632
2466 $map->load; 2633 $map->load;
2467 $map->load_neighbours; 2634 $map->load_neighbours;
2468 2635
2469 return unless $self->contr->active; 2636 return unless $self->contr->active;
2470 $self->activate_recursive;
2471 2637
2472 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2638 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2473 $self->enter_map ($map, $x, $y); 2639 $self->enter_map ($map, $x, $y);
2640
2641 # only activate afterwards, to support waiting in hooks
2642 $self->activate_recursive;
2474} 2643}
2475 2644
2476=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2645=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2477 2646
2478Moves the player to the given map-path and coordinates by first freezing 2647Moves the player to the given map-path and coordinates by first freezing
2479her, loading and preparing them map, calling the provided $check callback 2648her, loading and preparing them map, calling the provided $check callback
2480that has to return the map if sucecssful, and then unfreezes the player on 2649that has to return the map if sucecssful, and then unfreezes the player on
2481the new (success) or old (failed) map position. In either case, $done will 2650the new (success) or old (failed) map position. In either case, $done will
2482be called at the end of this process. 2651be called at the end of this process.
2652
2653Note that $check will be called with a potentially non-loaded map, so if
2654it needs a loaded map it has to call C<< ->load >>.
2483 2655
2484=cut 2656=cut
2485 2657
2486our $GOTOGEN; 2658our $GOTOGEN;
2487 2659
2566} 2738}
2567 2739
2568sub prepare_random_map { 2740sub prepare_random_map {
2569 my ($exit) = @_; 2741 my ($exit) = @_;
2570 2742
2571 my $guard = cf::lock_acquire "exit_prepare:$exit";
2572
2573 # all this does is basically replace the /! path by 2743 # all this does is basically replace the /! path by
2574 # a new random map path (?random/...) with a seed 2744 # a new random map path (?random/...) with a seed
2575 # that depends on the exit object 2745 # that depends on the exit object
2576 2746
2577 my $rmp = parse_random_map_params $exit->msg; 2747 my $rmp = parse_random_map_params $exit->msg;
2579 if ($exit->map) { 2749 if ($exit->map) {
2580 $rmp->{region} = $exit->region->name; 2750 $rmp->{region} = $exit->region->name;
2581 $rmp->{origin_map} = $exit->map->path; 2751 $rmp->{origin_map} = $exit->map->path;
2582 $rmp->{origin_x} = $exit->x; 2752 $rmp->{origin_x} = $exit->x;
2583 $rmp->{origin_y} = $exit->y; 2753 $rmp->{origin_y} = $exit->y;
2754
2755 $exit->map->touch;
2584 } 2756 }
2585 2757
2586 $rmp->{random_seed} ||= $exit->random_seed; 2758 $rmp->{random_seed} ||= $exit->random_seed;
2587 2759
2588 my $data = cf::to_json $rmp; 2760 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2589 my $md5 = Digest::MD5::md5_hex $data; 2761 my $md5 = Digest::MD5::md5_hex $data;
2590 my $meta = "$RANDOMDIR/$md5.meta"; 2762 my $meta = "$RANDOMDIR/$md5.meta";
2591 2763
2592 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2764 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2593 aio_write $fh, 0, (length $data), $data, 0; 2765 aio_write $fh, 0, (length $data), $data, 0;
2594 undef $fh; 2766 undef $fh;
2595 aio_rename "$meta~", $meta; 2767 aio_rename "$meta~", $meta;
2596 2768
2769 my $slaying = "?random/$md5";
2770
2771 if ($exit->valid) {
2597 $exit->slaying ("?random/$md5"); 2772 $exit->slaying ("?random/$md5");
2598 $exit->msg (undef); 2773 $exit->msg (undef);
2774 }
2599 } 2775 }
2600} 2776}
2601 2777
2602sub cf::object::player::enter_exit { 2778sub cf::object::player::enter_exit {
2603 my ($self, $exit) = @_; 2779 my ($self, $exit) = @_;
2604 2780
2605 return unless $self->type == cf::PLAYER; 2781 return unless $self->type == cf::PLAYER;
2606 2782
2607 if ($exit->slaying eq "/!") {
2608 #TODO: this should de-fi-ni-te-ly not be a sync-job
2609 # the problem is that $exit might not survive long enough
2610 # so it needs to be done right now, right here
2611 cf::sync_job { prepare_random_map $exit };
2612 }
2613
2614 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2615 my $hp = $exit->stats->hp;
2616 my $sp = $exit->stats->sp;
2617
2618 $self->enter_link; 2783 $self->enter_link;
2619 2784
2620 # if exit is damned, update players death & WoR home-position
2621 $self->contr->savebed ($slaying, $hp, $sp)
2622 if $exit->flag (FLAG_DAMNED);
2623
2624 (async { 2785 (async {
2625 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2786 $Coro::current->{desc} = "enter_exit";
2626 2787
2627 $self->deactivate_recursive; # just to be sure
2628 unless (eval { 2788 unless (eval {
2789 $self->deactivate_recursive; # just to be sure
2790
2791 # random map handling
2792 {
2793 my $guard = cf::lock_acquire "exit_prepare:$exit";
2794
2795 prepare_random_map $exit
2796 if $exit->slaying eq "/!";
2797 }
2798
2799 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2800 my $x = $exit->stats->hp;
2801 my $y = $exit->stats->sp;
2802
2629 $self->goto ($slaying, $hp, $sp); 2803 $self->goto ($map, $x, $y);
2630 2804
2805 # if exit is damned, update players death & WoR home-position
2806 $self->contr->savebed ($map, $x, $y)
2807 if $exit->flag (cf::FLAG_DAMNED);
2808
2631 1; 2809 1
2632 }) { 2810 }) {
2633 $self->message ("Something went wrong deep within the crossfire server. " 2811 $self->message ("Something went wrong deep within the deliantra server. "
2634 . "I'll try to bring you back to the map you were before. " 2812 . "I'll try to bring you back to the map you were before. "
2635 . "Please report this to the dungeon master!", 2813 . "Please report this to the dungeon master!",
2636 cf::NDI_UNIQUE | cf::NDI_RED); 2814 cf::NDI_UNIQUE | cf::NDI_RED);
2637 2815
2638 warn "ERROR in enter_exit: $@"; 2816 warn "ERROR in enter_exit: $@";
2655sub cf::client::send_drawinfo { 2833sub cf::client::send_drawinfo {
2656 my ($self, $text, $flags) = @_; 2834 my ($self, $text, $flags) = @_;
2657 2835
2658 utf8::encode $text; 2836 utf8::encode $text;
2659 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2837 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2838}
2839
2840=item $client->send_big_packet ($pkt)
2841
2842Like C<send_packet>, but tries to compress large packets, and fragments
2843them as required.
2844
2845=cut
2846
2847our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2848
2849sub cf::client::send_big_packet {
2850 my ($self, $pkt) = @_;
2851
2852 # try lzf for large packets
2853 $pkt = "lzf " . Compress::LZF::compress $pkt
2854 if 1024 <= length $pkt and $self->{can_lzf};
2855
2856 # split very large packets
2857 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2858 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2859 $pkt = "frag";
2860 }
2861
2862 $self->send_packet ($pkt);
2660} 2863}
2661 2864
2662=item $client->send_msg ($channel, $msg, $color, [extra...]) 2865=item $client->send_msg ($channel, $msg, $color, [extra...])
2663 2866
2664Send a drawinfo or msg packet to the client, formatting the msg for the 2867Send a drawinfo or msg packet to the client, formatting the msg for the
2666the message, with C<log> being the default. If C<$color> is negative, suppress 2869the message, with C<log> being the default. If C<$color> is negative, suppress
2667the message unless the client supports the msg packet. 2870the message unless the client supports the msg packet.
2668 2871
2669=cut 2872=cut
2670 2873
2874# non-persistent channels (usually the info channel)
2671our %CHANNEL = ( 2875our %CHANNEL = (
2876 "c/motd" => {
2877 id => "infobox",
2878 title => "MOTD",
2879 reply => undef,
2880 tooltip => "The message of the day",
2881 },
2672 "c/identify" => { 2882 "c/identify" => {
2673 id => "infobox", 2883 id => "infobox",
2674 title => "Identify", 2884 title => "Identify",
2675 reply => undef, 2885 reply => undef,
2676 tooltip => "Items recently identified", 2886 tooltip => "Items recently identified",
2679 id => "infobox", 2889 id => "infobox",
2680 title => "Examine", 2890 title => "Examine",
2681 reply => undef, 2891 reply => undef,
2682 tooltip => "Signs and other items you examined", 2892 tooltip => "Signs and other items you examined",
2683 }, 2893 },
2894 "c/shopinfo" => {
2895 id => "infobox",
2896 title => "Shop Info",
2897 reply => undef,
2898 tooltip => "What your bargaining skill tells you about the shop",
2899 },
2900 "c/book" => {
2901 id => "infobox",
2902 title => "Book",
2903 reply => undef,
2904 tooltip => "The contents of a note or book",
2905 },
2684 "c/lookat" => { 2906 "c/lookat" => {
2685 id => "infobox", 2907 id => "infobox",
2686 title => "Look", 2908 title => "Look",
2687 reply => undef, 2909 reply => undef,
2688 tooltip => "What you saw there", 2910 tooltip => "What you saw there",
2689 }, 2911 },
2912 "c/who" => {
2913 id => "infobox",
2914 title => "Players",
2915 reply => undef,
2916 tooltip => "Shows players who are currently online",
2917 },
2918 "c/body" => {
2919 id => "infobox",
2920 title => "Body Parts",
2921 reply => undef,
2922 tooltip => "Shows which body parts you posess and are available",
2923 },
2924 "c/statistics" => {
2925 id => "infobox",
2926 title => "Statistics",
2927 reply => undef,
2928 tooltip => "Shows your primary statistics",
2929 },
2930 "c/skills" => {
2931 id => "infobox",
2932 title => "Skills",
2933 reply => undef,
2934 tooltip => "Shows your experience per skill and item power",
2935 },
2936 "c/shopitems" => {
2937 id => "infobox",
2938 title => "Shop Items",
2939 reply => undef,
2940 tooltip => "Shows the items currently for sale in this shop",
2941 },
2942 "c/resistances" => {
2943 id => "infobox",
2944 title => "Resistances",
2945 reply => undef,
2946 tooltip => "Shows your resistances",
2947 },
2948 "c/pets" => {
2949 id => "infobox",
2950 title => "Pets",
2951 reply => undef,
2952 tooltip => "Shows information abotu your pets/a specific pet",
2953 },
2954 "c/perceiveself" => {
2955 id => "infobox",
2956 title => "Perceive Self",
2957 reply => undef,
2958 tooltip => "You gained detailed knowledge about yourself",
2959 },
2960 "c/uptime" => {
2961 id => "infobox",
2962 title => "Uptime",
2963 reply => undef,
2964 tooltip => "How long the server has been running since last restart",
2965 },
2966 "c/mapinfo" => {
2967 id => "infobox",
2968 title => "Map Info",
2969 reply => undef,
2970 tooltip => "Information related to the maps",
2971 },
2972 "c/party" => {
2973 id => "party",
2974 title => "Party",
2975 reply => "gsay ",
2976 tooltip => "Messages and chat related to your party",
2977 },
2978 "c/death" => {
2979 id => "death",
2980 title => "Death",
2981 reply => undef,
2982 tooltip => "Reason for and more info about your most recent death",
2983 },
2984 "c/say" => $SAY_CHANNEL,
2985 "c/chat" => $CHAT_CHANNEL,
2690); 2986);
2691 2987
2692sub cf::client::send_msg { 2988sub cf::client::send_msg {
2693 my ($self, $channel, $msg, $color, @extra) = @_; 2989 my ($self, $channel, $msg, $color, @extra) = @_;
2694 2990
2695 $msg = $self->pl->expand_cfpod ($msg); 2991 $msg = $self->pl->expand_cfpod ($msg)
2992 unless $color & cf::NDI_VERBATIM;
2696 2993
2697 $color &= cf::NDI_CLIENT_MASK; # just in case... 2994 $color &= cf::NDI_CLIENT_MASK; # just in case...
2698 2995
2699 # check predefined channels, for the benefit of C 2996 # check predefined channels, for the benefit of C
2700 if ($CHANNEL{$channel}) { 2997 if ($CHANNEL{$channel}) {
2701 $channel = $CHANNEL{$channel}; 2998 $channel = $CHANNEL{$channel};
2702 2999
2703 $self->ext_msg (channel_info => $channel) 3000 $self->ext_msg (channel_info => $channel);
2704 if $self->can_msg;
2705
2706 $channel = $channel->{id}; 3001 $channel = $channel->{id};
2707 3002
2708 } elsif (ref $channel) { 3003 } elsif (ref $channel) {
2709 # send meta info to client, if not yet sent 3004 # send meta info to client, if not yet sent
2710 unless (exists $self->{channel}{$channel->{id}}) { 3005 unless (exists $self->{channel}{$channel->{id}}) {
2711 $self->{channel}{$channel->{id}} = $channel; 3006 $self->{channel}{$channel->{id}} = $channel;
2712 $self->ext_msg (channel_info => $channel) 3007 $self->ext_msg (channel_info => $channel);
2713 if $self->can_msg;
2714 } 3008 }
2715 3009
2716 $channel = $channel->{id}; 3010 $channel = $channel->{id};
2717 } 3011 }
2718 3012
2719 return unless @extra || length $msg; 3013 return unless @extra || length $msg;
2720 3014
2721 if ($self->can_msg) {
2722 # default colour, mask it out 3015 # default colour, mask it out
2723 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3016 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2724 if $color & cf::NDI_DEF; 3017 if $color & cf::NDI_DEF;
2725 3018
2726 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3019 my $pkt = "msg "
3020 . $self->{json_coder}->encode (
2727 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3021 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2728 } else { 3022 );
2729 if ($color >= 0) {
2730 # replace some tags by gcfclient-compatible ones
2731 for ($msg) {
2732 1 while
2733 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2734 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2735 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2736 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2737 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2738 }
2739 3023
2740 $color &= cf::NDI_COLOR_MASK; 3024 $self->send_big_packet ($pkt);
2741
2742 utf8::encode $msg;
2743
2744 if (0 && $msg =~ /\[/) {
2745 # COMMAND/INFO
2746 $self->send_packet ("drawextinfo $color 10 8 $msg")
2747 } else {
2748 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2749 $self->send_packet ("drawinfo $color $msg")
2750 }
2751 }
2752 }
2753} 3025}
2754 3026
2755=item $client->ext_msg ($type, @msg) 3027=item $client->ext_msg ($type, @msg)
2756 3028
2757Sends an ext event to the client. 3029Sends an ext event to the client.
2760 3032
2761sub cf::client::ext_msg($$@) { 3033sub cf::client::ext_msg($$@) {
2762 my ($self, $type, @msg) = @_; 3034 my ($self, $type, @msg) = @_;
2763 3035
2764 if ($self->extcmd == 2) { 3036 if ($self->extcmd == 2) {
2765 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3037 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2766 } elsif ($self->extcmd == 1) { # TODO: remove 3038 } elsif ($self->extcmd == 1) { # TODO: remove
2767 push @msg, msgtype => "event_$type"; 3039 push @msg, msgtype => "event_$type";
2768 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2769 } 3041 }
2770} 3042}
2771 3043
2772=item $client->ext_reply ($msgid, @msg) 3044=item $client->ext_reply ($msgid, @msg)
2773 3045
2777 3049
2778sub cf::client::ext_reply($$@) { 3050sub cf::client::ext_reply($$@) {
2779 my ($self, $id, @msg) = @_; 3051 my ($self, $id, @msg) = @_;
2780 3052
2781 if ($self->extcmd == 2) { 3053 if ($self->extcmd == 2) {
2782 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3054 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2783 } elsif ($self->extcmd == 1) { 3055 } elsif ($self->extcmd == 1) {
2784 #TODO: version 1, remove 3056 #TODO: version 1, remove
2785 unshift @msg, msgtype => "reply", msgid => $id; 3057 unshift @msg, msgtype => "reply", msgid => $id;
2786 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3058 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2787 } 3059 }
2788} 3060}
2789 3061
2790=item $success = $client->query ($flags, "text", \&cb) 3062=item $success = $client->query ($flags, "text", \&cb)
2791 3063
2892 3164
2893 $coro 3165 $coro
2894} 3166}
2895 3167
2896cf::client->attach ( 3168cf::client->attach (
2897 on_destroy => sub { 3169 on_client_destroy => sub {
2898 my ($ns) = @_; 3170 my ($ns) = @_;
2899 3171
2900 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3172 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2901 }, 3173 },
2902); 3174);
2918our $safe_hole = new Safe::Hole; 3190our $safe_hole = new Safe::Hole;
2919 3191
2920$SIG{FPE} = 'IGNORE'; 3192$SIG{FPE} = 'IGNORE';
2921 3193
2922$safe->permit_only (Opcode::opset qw( 3194$safe->permit_only (Opcode::opset qw(
2923 :base_core :base_mem :base_orig :base_math 3195 :base_core :base_mem :base_orig :base_math :base_loop
2924 grepstart grepwhile mapstart mapwhile 3196 grepstart grepwhile mapstart mapwhile
2925 sort time 3197 sort time
2926)); 3198));
2927 3199
2928# here we export the classes and methods available to script code 3200# here we export the classes and methods available to script code
2931 3203
2932The following functions and methods are available within a safe environment: 3204The following functions and methods are available within a safe environment:
2933 3205
2934 cf::object 3206 cf::object
2935 contr pay_amount pay_player map x y force_find force_add destroy 3207 contr pay_amount pay_player map x y force_find force_add destroy
2936 insert remove name archname title slaying race decrease_ob_nr 3208 insert remove name archname title slaying race decrease split
3209 value
2937 3210
2938 cf::object::player 3211 cf::object::player
2939 player 3212 player
2940 3213
2941 cf::player 3214 cf::player
2946 3219
2947=cut 3220=cut
2948 3221
2949for ( 3222for (
2950 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3223 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2951 insert remove inv name archname title slaying race 3224 insert remove inv nrof name archname title slaying race
2952 decrease_ob_nr destroy)], 3225 decrease split destroy change_exp value msg lore send_msg)],
2953 ["cf::object::player" => qw(player)], 3226 ["cf::object::player" => qw(player)],
2954 ["cf::player" => qw(peaceful)], 3227 ["cf::player" => qw(peaceful send_msg)],
2955 ["cf::map" => qw(trigger)], 3228 ["cf::map" => qw(trigger)],
2956) { 3229) {
2957 no strict 'refs'; 3230 no strict 'refs';
2958 my ($pkg, @funs) = @$_; 3231 my ($pkg, @funs) = @$_;
2959 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3232 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2977 3250
2978 my $qcode = $code; 3251 my $qcode = $code;
2979 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3252 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2980 $qcode =~ s/\n/\\n/g; 3253 $qcode =~ s/\n/\\n/g;
2981 3254
3255 %vars = (_dummy => 0) unless %vars;
3256
3257 my @res;
2982 local $_; 3258 local $_;
2983 local @safe::cf::_safe_eval_args = values %vars;
2984 3259
2985 my $eval = 3260 my $eval =
2986 "do {\n" 3261 "do {\n"
2987 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3262 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2988 . "#line 0 \"{$qcode}\"\n" 3263 . "#line 0 \"{$qcode}\"\n"
2989 . $code 3264 . $code
2990 . "\n}" 3265 . "\n}"
2991 ; 3266 ;
2992 3267
3268 if ($CFG{safe_eval}) {
2993 sub_generation_inc; 3269 sub_generation_inc;
3270 local @safe::cf::_safe_eval_args = values %vars;
2994 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3271 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2995 sub_generation_inc; 3272 sub_generation_inc;
3273 } else {
3274 local @cf::_safe_eval_args = values %vars;
3275 @res = wantarray ? eval eval : scalar eval $eval;
3276 }
2996 3277
2997 if ($@) { 3278 if ($@) {
2998 warn "$@"; 3279 warn "$@";
2999 warn "while executing safe code '$code'\n"; 3280 warn "while executing safe code '$code'\n";
3000 warn "with arguments " . (join " ", %vars) . "\n"; 3281 warn "with arguments " . (join " ", %vars) . "\n";
3019=cut 3300=cut
3020 3301
3021sub register_script_function { 3302sub register_script_function {
3022 my ($fun, $cb) = @_; 3303 my ($fun, $cb) = @_;
3023 3304
3024 no strict 'refs'; 3305 $fun = "safe::$fun" if $CFG{safe_eval};
3025 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3306 *$fun = $safe_hole->wrap ($cb);
3026} 3307}
3027 3308
3028=back 3309=back
3029 3310
3030=cut 3311=cut
3051 3332
3052 $facedata->{version} == 2 3333 $facedata->{version} == 2
3053 or cf::cleanup "$path: version mismatch, cannot proceed."; 3334 or cf::cleanup "$path: version mismatch, cannot proceed.";
3054 3335
3055 # patch in the exptable 3336 # patch in the exptable
3337 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3056 $facedata->{resource}{"res/exp_table"} = { 3338 $facedata->{resource}{"res/exp_table"} = {
3057 type => FT_RSRC, 3339 type => FT_RSRC,
3058 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3340 data => $exp_table,
3341 hash => (Digest::MD5::md5 $exp_table),
3059 }; 3342 };
3060 cf::cede_to_tick; 3343 cf::cede_to_tick;
3061 3344
3062 { 3345 {
3063 my $faces = $facedata->{faceinfo}; 3346 my $faces = $facedata->{faceinfo};
3064 3347
3065 while (my ($face, $info) = each %$faces) { 3348 while (my ($face, $info) = each %$faces) {
3066 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3349 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3350
3067 cf::face::set_visibility $idx, $info->{visibility}; 3351 cf::face::set_visibility $idx, $info->{visibility};
3068 cf::face::set_magicmap $idx, $info->{magicmap}; 3352 cf::face::set_magicmap $idx, $info->{magicmap};
3069 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3353 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3070 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3354 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3071 3355
3072 cf::cede_to_tick; 3356 cf::cede_to_tick;
3073 } 3357 }
3074 3358
3075 while (my ($face, $info) = each %$faces) { 3359 while (my ($face, $info) = each %$faces) {
3076 next unless $info->{smooth}; 3360 next unless $info->{smooth};
3361
3077 my $idx = cf::face::find $face 3362 my $idx = cf::face::find $face
3078 or next; 3363 or next;
3364
3079 if (my $smooth = cf::face::find $info->{smooth}) { 3365 if (my $smooth = cf::face::find $info->{smooth}) {
3080 cf::face::set_smooth $idx, $smooth; 3366 cf::face::set_smooth $idx, $smooth;
3081 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3367 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3082 } else { 3368 } else {
3083 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3369 warn "smooth face '$info->{smooth}' not found for face '$face'";
3097 3383
3098 cf::anim::invalidate_all; # d'oh 3384 cf::anim::invalidate_all; # d'oh
3099 } 3385 }
3100 3386
3101 { 3387 {
3102 # TODO: for gcfclient pleasure, we should give resources
3103 # that gcfclient doesn't grok a >10000 face index.
3104 my $res = $facedata->{resource}; 3388 my $res = $facedata->{resource};
3105 3389
3106 my $soundconf = delete $res->{"res/sound.conf"};
3107
3108 while (my ($name, $info) = each %$res) { 3390 while (my ($name, $info) = each %$res) {
3391 if (defined $info->{type}) {
3109 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3392 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3110 my $data;
3111 3393
3112 if ($info->{type} & 1) { 3394 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3113 # prepend meta info 3395 cf::face::set_type $idx, $info->{type};
3114
3115 my $meta = $enc->encode ({
3116 name => $name,
3117 %{ $info->{meta} || {} },
3118 });
3119
3120 $data = pack "(w/a*)*", $meta, $info->{data};
3121 } else { 3396 } else {
3122 $data = $info->{data}; 3397 $RESOURCE{$name} = $info;
3123 } 3398 }
3124 3399
3125 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3126 cf::face::set_type $idx, $info->{type};
3127
3128 cf::cede_to_tick; 3400 cf::cede_to_tick;
3129 } 3401 }
3130
3131 if ($soundconf) {
3132 $soundconf = $enc->decode (delete $soundconf->{data});
3133
3134 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3135 my $sound = $soundconf->{compat}[$_]
3136 or next;
3137
3138 my $face = cf::face::find "sound/$sound->[1]";
3139 cf::sound::set $sound->[0] => $face;
3140 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3141 }
3142
3143 while (my ($k, $v) = each %{$soundconf->{event}}) {
3144 my $face = cf::face::find "sound/$v";
3145 cf::sound::set $k => $face;
3146 }
3147 }
3148 } 3402 }
3403
3404 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3149 3405
3150 1 3406 1
3151} 3407}
3408
3409cf::global->attach (on_resource_update => sub {
3410 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3411 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3412
3413 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3414 my $sound = $soundconf->{compat}[$_]
3415 or next;
3416
3417 my $face = cf::face::find "sound/$sound->[1]";
3418 cf::sound::set $sound->[0] => $face;
3419 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3420 }
3421
3422 while (my ($k, $v) = each %{$soundconf->{event}}) {
3423 my $face = cf::face::find "sound/$v";
3424 cf::sound::set $k => $face;
3425 }
3426 }
3427});
3152 3428
3153register_exticmd fx_want => sub { 3429register_exticmd fx_want => sub {
3154 my ($ns, $want) = @_; 3430 my ($ns, $want) = @_;
3155 3431
3156 while (my ($k, $v) = each %$want) { 3432 while (my ($k, $v) = each %$want) {
3157 $ns->fx_want ($k, $v); 3433 $ns->fx_want ($k, $v);
3158 } 3434 }
3159}; 3435};
3436
3437sub load_resource_file($) {
3438 my $guard = lock_acquire "load_resource_file";
3439
3440 my $status = load_resource_file_ $_[0];
3441 get_slot 0.1, 100;
3442 cf::arch::commit_load;
3443
3444 $status
3445}
3160 3446
3161sub reload_regions { 3447sub reload_regions {
3162 # HACK to clear player env face cache, we need some signal framework 3448 # HACK to clear player env face cache, we need some signal framework
3163 # for this (global event?) 3449 # for this (global event?)
3164 %ext::player_env::MUSIC_FACE_CACHE = (); 3450 %ext::player_env::MUSIC_FACE_CACHE = ();
3178} 3464}
3179 3465
3180sub reload_archetypes { 3466sub reload_archetypes {
3181 load_resource_file "$DATADIR/archetypes" 3467 load_resource_file "$DATADIR/archetypes"
3182 or die "unable to load archetypes\n"; 3468 or die "unable to load archetypes\n";
3183 #d# NEED to laod twice to resolve forward references
3184 # this really needs to be done in an extra post-pass
3185 # (which needs to be synchronous, so solve it differently)
3186 load_resource_file "$DATADIR/archetypes"
3187 or die "unable to load archetypes\n";
3188} 3469}
3189 3470
3190sub reload_treasures { 3471sub reload_treasures {
3191 load_resource_file "$DATADIR/treasures" 3472 load_resource_file "$DATADIR/treasures"
3192 or die "unable to load treasurelists\n"; 3473 or die "unable to load treasurelists\n";
3193} 3474}
3194 3475
3195sub reload_resources { 3476sub reload_resources {
3196 warn "reloading resource files...\n"; 3477 warn "reloading resource files...\n";
3197 3478
3479 reload_facedata;
3480 reload_archetypes;
3198 reload_regions; 3481 reload_regions;
3199 reload_facedata;
3200 #reload_archetypes;#d#
3201 reload_archetypes;
3202 reload_treasures; 3482 reload_treasures;
3203 3483
3204 warn "finished reloading resource files\n"; 3484 warn "finished reloading resource files\n";
3205} 3485}
3206 3486
3207sub init {
3208 reload_resources;
3209}
3210
3211sub reload_config { 3487sub reload_config {
3488 warn "reloading config file...\n";
3489
3212 open my $fh, "<:utf8", "$CONFDIR/config" 3490 open my $fh, "<:utf8", "$CONFDIR/config"
3213 or return; 3491 or return;
3214 3492
3215 local $/; 3493 local $/;
3216 *CFG = YAML::Syck::Load <$fh>; 3494 *CFG = YAML::XS::Load scalar <$fh>;
3217 3495
3218 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3496 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3219 3497
3220 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3498 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3221 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3499 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3225 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3503 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3226 and die "WARNING: m(un)lockall failed: $!\n"; 3504 and die "WARNING: m(un)lockall failed: $!\n";
3227 }; 3505 };
3228 warn $@ if $@; 3506 warn $@ if $@;
3229 } 3507 }
3508
3509 warn "finished reloading resource files\n";
3510}
3511
3512sub pidfile() {
3513 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3514 or die "$PIDFILE: $!";
3515 flock $fh, &Fcntl::LOCK_EX
3516 or die "$PIDFILE: flock: $!";
3517 $fh
3518}
3519
3520# make sure only one server instance is running at any one time
3521sub atomic {
3522 my $fh = pidfile;
3523
3524 my $pid = <$fh>;
3525 kill 9, $pid if $pid > 0;
3526
3527 seek $fh, 0, 0;
3528 print $fh $$;
3529}
3530
3531sub main_loop {
3532 warn "EV::loop starting\n";
3533 if (1) {
3534 EV::loop;
3535 }
3536 warn "EV::loop returned\n";
3537 goto &main_loop unless $REALLY_UNLOOP;
3230} 3538}
3231 3539
3232sub main { 3540sub main {
3541 cf::init_globals; # initialise logging
3542
3543 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3544 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3545 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3546 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3547
3548 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3549
3233 # we must not ever block the main coroutine 3550 # we must not ever block the main coroutine
3234 local $Coro::idle = sub { 3551 local $Coro::idle = sub {
3235 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3552 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3236 (async { 3553 (async {
3237 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3554 $Coro::current->{desc} = "IDLE BUG HANDLER";
3238 Event::one_event; 3555 EV::loop EV::LOOP_ONESHOT;
3239 })->prio (Coro::PRIO_MAX); 3556 })->prio (Coro::PRIO_MAX);
3240 }; 3557 };
3241 3558
3559 evthread_start IO::AIO::poll_fileno;
3560
3561 cf::sync_job {
3562 cf::init_experience;
3563 cf::init_anim;
3564 cf::init_attackmess;
3565 cf::init_dynamic;
3566
3567 cf::load_settings;
3568 cf::load_materials;
3569
3570 reload_resources;
3242 reload_config; 3571 reload_config;
3243 db_init; 3572 db_init;
3573
3574 cf::init_uuid;
3575 cf::init_signals;
3576 cf::init_skills;
3577
3578 cf::init_beforeplay;
3579
3580 atomic;
3581
3244 load_extensions; 3582 load_extensions;
3245 3583
3246 $TICK_WATCHER->start; 3584 utime time, time, $RUNTIMEFILE;
3247 Event::loop; 3585
3586 # no (long-running) fork's whatsoever before this point(!)
3587 use POSIX ();
3588 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3589
3590 (pop @POST_INIT)->(0) while @POST_INIT;
3591 };
3592
3593 main_loop;
3248} 3594}
3249 3595
3250############################################################################# 3596#############################################################################
3251# initialisation and cleanup 3597# initialisation and cleanup
3252 3598
3253# install some emergency cleanup handlers 3599# install some emergency cleanup handlers
3254BEGIN { 3600BEGIN {
3601 our %SIGWATCHER = ();
3255 for my $signal (qw(INT HUP TERM)) { 3602 for my $signal (qw(INT HUP TERM)) {
3256 Event->signal ( 3603 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3257 reentrant => 0,
3258 data => WF_AUTOCANCEL,
3259 signal => $signal,
3260 prio => 0,
3261 cb => sub {
3262 cf::cleanup "SIG$signal"; 3604 cf::cleanup "SIG$signal";
3263 },
3264 ); 3605 };
3265 } 3606 }
3266} 3607}
3267 3608
3268sub write_runtime { 3609sub write_runtime_sync {
3269 my $runtime = "$LOCALDIR/runtime"; 3610 my $t0 = AE::time;
3270 3611
3271 # first touch the runtime file to show we are still running: 3612 # first touch the runtime file to show we are still running:
3272 # the fsync below can take a very very long time. 3613 # the fsync below can take a very very long time.
3273 3614
3274 IO::AIO::aio_utime $runtime, undef, undef; 3615 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3275 3616
3276 my $guard = cf::lock_acquire "write_runtime"; 3617 my $guard = cf::lock_acquire "write_runtime";
3277 3618
3278 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3619 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3279 or return; 3620 or return;
3280 3621
3281 my $value = $cf::RUNTIME + 90 + 10; 3622 my $value = $cf::RUNTIME + 90 + 10;
3282 # 10 is the runtime save interval, for a monotonic clock 3623 # 10 is the runtime save interval, for a monotonic clock
3283 # 60 allows for the watchdog to kill the server. 3624 # 60 allows for the watchdog to kill the server.
3293 aio_utime $fh, undef, undef; 3634 aio_utime $fh, undef, undef;
3294 3635
3295 close $fh 3636 close $fh
3296 or return; 3637 or return;
3297 3638
3298 aio_rename "$runtime~", $runtime 3639 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3299 and return; 3640 and return;
3300 3641
3301 warn "runtime file written.\n"; 3642 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3302 3643
3303 1 3644 1
3645}
3646
3647our $uuid_lock;
3648our $uuid_skip;
3649
3650sub write_uuid_sync($) {
3651 $uuid_skip ||= $_[0];
3652
3653 return if $uuid_lock;
3654 local $uuid_lock = 1;
3655
3656 my $uuid = "$LOCALDIR/uuid";
3657
3658 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3659 or return;
3660
3661 my $value = uuid_seq uuid_cur;
3662
3663 unless ($value) {
3664 warn "cowardly refusing to write zero uuid value!\n";
3665 return;
3666 }
3667
3668 my $value = uuid_str $value + $uuid_skip;
3669 $uuid_skip = 0;
3670
3671 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3672 and return;
3673
3674 # always fsync - this file is important
3675 aio_fsync $fh
3676 and return;
3677
3678 close $fh
3679 or return;
3680
3681 aio_rename "$uuid~", $uuid
3682 and return;
3683
3684 warn "uuid file written ($value).\n";
3685
3686 1
3687
3688}
3689
3690sub write_uuid($$) {
3691 my ($skip, $sync) = @_;
3692
3693 $sync ? write_uuid_sync $skip
3694 : async { write_uuid_sync $skip };
3304} 3695}
3305 3696
3306sub emergency_save() { 3697sub emergency_save() {
3307 my $freeze_guard = cf::freeze_mainloop; 3698 my $freeze_guard = cf::freeze_mainloop;
3308 3699
3309 warn "enter emergency perl save\n"; 3700 warn "emergency_perl_save: enter\n";
3310 3701
3311 cf::sync_job { 3702 cf::sync_job {
3703 # this is a trade-off: we want to be very quick here, so
3704 # save all maps without fsync, and later call a global sync
3705 # (which in turn might be very very slow)
3706 local $USE_FSYNC = 0;
3707
3312 # use a peculiar iteration method to avoid tripping on perl 3708 # use a peculiar iteration method to avoid tripping on perl
3313 # refcount bugs in for. also avoids problems with players 3709 # refcount bugs in for. also avoids problems with players
3314 # and maps saved/destroyed asynchronously. 3710 # and maps saved/destroyed asynchronously.
3315 warn "begin emergency player save\n"; 3711 warn "emergency_perl_save: begin player save\n";
3316 for my $login (keys %cf::PLAYER) { 3712 for my $login (keys %cf::PLAYER) {
3317 my $pl = $cf::PLAYER{$login} or next; 3713 my $pl = $cf::PLAYER{$login} or next;
3318 $pl->valid or next; 3714 $pl->valid or next;
3319 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3715 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3320 $pl->save; 3716 $pl->save;
3321 } 3717 }
3322 warn "end emergency player save\n"; 3718 warn "emergency_perl_save: end player save\n";
3323 3719
3324 warn "begin emergency map save\n"; 3720 warn "emergency_perl_save: begin map save\n";
3325 for my $path (keys %cf::MAP) { 3721 for my $path (keys %cf::MAP) {
3326 my $map = $cf::MAP{$path} or next; 3722 my $map = $cf::MAP{$path} or next;
3327 $map->valid or next; 3723 $map->valid or next;
3328 $map->save; 3724 $map->save;
3329 } 3725 }
3330 warn "end emergency map save\n"; 3726 warn "emergency_perl_save: end map save\n";
3331 3727
3332 warn "begin emergency database checkpoint\n"; 3728 warn "emergency_perl_save: begin database checkpoint\n";
3333 BDB::db_env_txn_checkpoint $DB_ENV; 3729 BDB::db_env_txn_checkpoint $DB_ENV;
3334 warn "end emergency database checkpoint\n"; 3730 warn "emergency_perl_save: end database checkpoint\n";
3731
3732 warn "emergency_perl_save: begin write uuid\n";
3733 write_uuid_sync 1;
3734 warn "emergency_perl_save: end write uuid\n";
3335 }; 3735 };
3336 3736
3737 warn "emergency_perl_save: starting sync()\n";
3738 IO::AIO::aio_sync sub {
3739 warn "emergency_perl_save: finished sync()\n";
3740 };
3741
3337 warn "leave emergency perl save\n"; 3742 warn "emergency_perl_save: leave\n";
3338} 3743}
3339 3744
3340sub post_cleanup { 3745sub post_cleanup {
3341 my ($make_core) = @_; 3746 my ($make_core) = @_;
3342 3747
3343 warn Carp::longmess "post_cleanup backtrace" 3748 warn Carp::longmess "post_cleanup backtrace"
3344 if $make_core; 3749 if $make_core;
3750
3751 my $fh = pidfile;
3752 unlink $PIDFILE if <$fh> == $$;
3753}
3754
3755# a safer delete_package, copied from Symbol
3756sub clear_package($) {
3757 my $pkg = shift;
3758
3759 # expand to full symbol table name if needed
3760 unless ($pkg =~ /^main::.*::$/) {
3761 $pkg = "main$pkg" if $pkg =~ /^::/;
3762 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3763 $pkg .= '::' unless $pkg =~ /::$/;
3764 }
3765
3766 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3767 my $stem_symtab = *{$stem}{HASH};
3768
3769 defined $stem_symtab and exists $stem_symtab->{$leaf}
3770 or return;
3771
3772 # clear all symbols
3773 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3774 for my $name (keys %$leaf_symtab) {
3775 _gv_clear *{"$pkg$name"};
3776# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3777 }
3778 warn "cleared package $pkg\n";#d#
3345} 3779}
3346 3780
3347sub do_reload_perl() { 3781sub do_reload_perl() {
3348 # can/must only be called in main 3782 # can/must only be called in main
3349 if ($Coro::current != $Coro::main) { 3783 if ($Coro::current != $Coro::main) {
3350 warn "can only reload from main coroutine"; 3784 warn "can only reload from main coroutine";
3351 return; 3785 return;
3352 } 3786 }
3353 3787
3788 return if $RELOAD++;
3789
3790 my $t1 = AE::time;
3791
3792 while ($RELOAD) {
3354 warn "reloading..."; 3793 warn "reloading...";
3355 3794
3356 warn "entering sync_job"; 3795 warn "entering sync_job";
3357 3796
3358 cf::sync_job { 3797 cf::sync_job {
3359 cf::write_runtime; # external watchdog should not bark 3798 cf::write_runtime_sync; # external watchdog should not bark
3360 cf::emergency_save; 3799 cf::emergency_save;
3361 cf::write_runtime; # external watchdog should not bark 3800 cf::write_runtime_sync; # external watchdog should not bark
3362 3801
3363 warn "syncing database to disk"; 3802 warn "syncing database to disk";
3364 BDB::db_env_txn_checkpoint $DB_ENV; 3803 BDB::db_env_txn_checkpoint $DB_ENV;
3365 3804
3366 # if anything goes wrong in here, we should simply crash as we already saved 3805 # if anything goes wrong in here, we should simply crash as we already saved
3367 3806
3368 warn "cancelling all WF_AUTOCANCEL watchers";
3369 for (Event::all_watchers) {
3370 $_->cancel if $_->data & WF_AUTOCANCEL;
3371 }
3372
3373 warn "flushing outstanding aio requests"; 3807 warn "flushing outstanding aio requests";
3374 for (;;) {
3375 BDB::flush;
3376 IO::AIO::flush;
3377 Coro::cede_notself;
3378 last unless IO::AIO::nreqs || BDB::nreqs; 3808 while (IO::AIO::nreqs || BDB::nreqs) {
3379 warn "iterate..."; 3809 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3380 }
3381
3382 ++$RELOAD;
3383
3384 warn "cancelling all extension coros";
3385 $_->cancel for values %EXT_CORO;
3386 %EXT_CORO = ();
3387
3388 warn "removing commands";
3389 %COMMAND = ();
3390
3391 warn "removing ext/exti commands";
3392 %EXTCMD = ();
3393 %EXTICMD = ();
3394
3395 warn "unloading/nuking all extensions";
3396 for my $pkg (@EXTS) {
3397 warn "... unloading $pkg";
3398
3399 if (my $cb = $pkg->can ("unload")) {
3400 eval {
3401 $cb->($pkg);
3402 1
3403 } or warn "$pkg unloaded, but with errors: $@";
3404 } 3810 }
3405 3811
3406 warn "... nuking $pkg"; 3812 warn "cancelling all extension coros";
3407 Symbol::delete_package $pkg; 3813 $_->cancel for values %EXT_CORO;
3408 } 3814 %EXT_CORO = ();
3409 3815
3410 warn "unloading all perl modules loaded from $LIBDIR"; 3816 warn "removing commands";
3411 while (my ($k, $v) = each %INC) { 3817 %COMMAND = ();
3412 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3413 3818
3819 warn "removing ext/exti commands";
3820 %EXTCMD = ();
3821 %EXTICMD = ();
3822
3823 warn "unloading/nuking all extensions";
3824 for my $pkg (@EXTS) {
3414 warn "... unloading $k"; 3825 warn "... unloading $pkg";
3415 delete $INC{$k};
3416 3826
3417 $k =~ s/\.pm$//;
3418 $k =~ s/\//::/g;
3419
3420 if (my $cb = $k->can ("unload_module")) { 3827 if (my $cb = $pkg->can ("unload")) {
3828 eval {
3421 $cb->(); 3829 $cb->($pkg);
3830 1
3831 } or warn "$pkg unloaded, but with errors: $@";
3832 }
3833
3834 warn "... clearing $pkg";
3835 clear_package $pkg;
3422 } 3836 }
3423 3837
3424 Symbol::delete_package $k; 3838 warn "unloading all perl modules loaded from $LIBDIR";
3839 while (my ($k, $v) = each %INC) {
3840 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3841
3842 warn "... unloading $k";
3843 delete $INC{$k};
3844
3845 $k =~ s/\.pm$//;
3846 $k =~ s/\//::/g;
3847
3848 if (my $cb = $k->can ("unload_module")) {
3849 $cb->();
3850 }
3851
3852 clear_package $k;
3425 } 3853 }
3426 3854
3427 warn "getting rid of safe::, as good as possible"; 3855 warn "getting rid of safe::, as good as possible";
3428 Symbol::delete_package "safe::$_" 3856 clear_package "safe::$_"
3429 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3857 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3430 3858
3431 warn "unloading cf.pm \"a bit\""; 3859 warn "unloading cf.pm \"a bit\"";
3432 delete $INC{"cf.pm"}; 3860 delete $INC{"cf.pm"};
3433 delete $INC{"cf/pod.pm"}; 3861 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3434 3862
3435 # don't, removes xs symbols, too, 3863 # don't, removes xs symbols, too,
3436 # and global variables created in xs 3864 # and global variables created in xs
3437 #Symbol::delete_package __PACKAGE__; 3865 #clear_package __PACKAGE__;
3438 3866
3439 warn "unload completed, starting to reload now"; 3867 warn "unload completed, starting to reload now";
3440 3868
3441 warn "reloading cf.pm"; 3869 warn "reloading cf.pm";
3442 require cf; 3870 require cf;
3443 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3871 cf::_connect_to_perl_1;
3444 3872
3445 warn "loading config and database again"; 3873 warn "loading config and database again";
3446 cf::reload_config; 3874 cf::reload_config;
3447 3875
3448 warn "loading extensions"; 3876 warn "loading extensions";
3449 cf::load_extensions; 3877 cf::load_extensions;
3450 3878
3879 if ($REATTACH_ON_RELOAD) {
3451 warn "reattaching attachments to objects/players"; 3880 warn "reattaching attachments to objects/players";
3452 _global_reattach; # objects, sockets 3881 _global_reattach; # objects, sockets
3453 warn "reattaching attachments to maps"; 3882 warn "reattaching attachments to maps";
3454 reattach $_ for values %MAP; 3883 reattach $_ for values %MAP;
3455 warn "reattaching attachments to players"; 3884 warn "reattaching attachments to players";
3456 reattach $_ for values %PLAYER; 3885 reattach $_ for values %PLAYER;
3886 }
3457 3887
3888 warn "running post_init jobs";
3889 (pop @POST_INIT)->(1) while @POST_INIT;
3890
3458 warn "leaving sync_job"; 3891 warn "leaving sync_job";
3459 3892
3460 1 3893 1
3461 } or do { 3894 } or do {
3462 warn $@; 3895 warn $@;
3463 warn "error while reloading, exiting."; 3896 cf::cleanup "error while reloading, exiting.";
3464 exit 1;
3465 }; 3897 };
3466 3898
3467 warn "reloaded"; 3899 warn "reloaded";
3900 --$RELOAD;
3901 }
3902
3903 $t1 = AE::time - $t1;
3904 warn "reload completed in ${t1}s\n";
3468}; 3905};
3469 3906
3470our $RELOAD_WATCHER; # used only during reload 3907our $RELOAD_WATCHER; # used only during reload
3471 3908
3472sub reload_perl() { 3909sub reload_perl() {
3473 # doing reload synchronously and two reloads happen back-to-back, 3910 # doing reload synchronously and two reloads happen back-to-back,
3474 # coro crashes during coro_state_free->destroy here. 3911 # coro crashes during coro_state_free->destroy here.
3475 3912
3476 $RELOAD_WATCHER ||= Event->timer ( 3913 $RELOAD_WATCHER ||= cf::async {
3477 reentrant => 0, 3914 Coro::AIO::aio_wait cache_extensions;
3478 after => 0, 3915
3479 data => WF_AUTOCANCEL, 3916 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3480 cb => sub {
3481 do_reload_perl; 3917 do_reload_perl;
3482 undef $RELOAD_WATCHER; 3918 undef $RELOAD_WATCHER;
3483 }, 3919 };
3484 ); 3920 };
3485} 3921}
3486 3922
3487register_command "reload" => sub { 3923register_command "reload" => sub {
3488 my ($who, $arg) = @_; 3924 my ($who, $arg) = @_;
3489 3925
3502 3938
3503our @WAIT_FOR_TICK; 3939our @WAIT_FOR_TICK;
3504our @WAIT_FOR_TICK_BEGIN; 3940our @WAIT_FOR_TICK_BEGIN;
3505 3941
3506sub wait_for_tick { 3942sub wait_for_tick {
3507 return unless $TICK_WATCHER->is_active;
3508 return if $Coro::current == $Coro::main; 3943 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3509 3944
3510 my $signal = new Coro::Signal; 3945 my $signal = new Coro::Signal;
3511 push @WAIT_FOR_TICK, $signal; 3946 push @WAIT_FOR_TICK, $signal;
3512 $signal->wait; 3947 $signal->wait;
3513} 3948}
3514 3949
3515sub wait_for_tick_begin { 3950sub wait_for_tick_begin {
3516 return unless $TICK_WATCHER->is_active;
3517 return if $Coro::current == $Coro::main; 3951 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3518 3952
3519 my $signal = new Coro::Signal; 3953 my $signal = new Coro::Signal;
3520 push @WAIT_FOR_TICK_BEGIN, $signal; 3954 push @WAIT_FOR_TICK_BEGIN, $signal;
3521 $signal->wait; 3955 $signal->wait;
3522} 3956}
3523 3957
3524$TICK_WATCHER = Event->timer ( 3958sub tick {
3525 reentrant => 0,
3526 parked => 1,
3527 prio => 0,
3528 at => $NEXT_TICK || $TICK,
3529 data => WF_AUTOCANCEL,
3530 cb => sub {
3531 if ($Coro::current != $Coro::main) { 3959 if ($Coro::current != $Coro::main) {
3532 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3960 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3533 unless ++$bug_warning > 10; 3961 unless ++$bug_warning > 10;
3534 return; 3962 return;
3535 } 3963 }
3536 3964
3537 $NOW = $tick_start = Event::time;
3538
3539 cf::server_tick; # one server iteration 3965 cf::server_tick; # one server iteration
3540 3966
3541 $RUNTIME += $TICK; 3967 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3542 $NEXT_TICK += $TICK;
3543 3968
3544 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3969 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3545 $NEXT_RUNTIME_WRITE = $NOW + 10; 3970 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3546 Coro::async_pool { 3971 Coro::async_pool {
3547 $Coro::current->{desc} = "runtime saver"; 3972 $Coro::current->{desc} = "runtime saver";
3548 write_runtime 3973 write_runtime_sync
3549 or warn "ERROR: unable to write runtime file: $!"; 3974 or warn "ERROR: unable to write runtime file: $!";
3550 };
3551 } 3975 };
3976 }
3552 3977
3553 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3978 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3554 $sig->send; 3979 $sig->send;
3555 } 3980 }
3556 while (my $sig = shift @WAIT_FOR_TICK) { 3981 while (my $sig = shift @WAIT_FOR_TICK) {
3557 $sig->send; 3982 $sig->send;
3558 } 3983 }
3559 3984
3560 $NOW = Event::time; 3985 $LOAD = ($NOW - $TICK_START) / $TICK;
3561
3562 # if we are delayed by four ticks or more, skip them all
3563 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3564
3565 $TICK_WATCHER->at ($NEXT_TICK);
3566 $TICK_WATCHER->start;
3567
3568 $LOAD = ($NOW - $tick_start) / $TICK;
3569 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3986 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3570 3987
3571 _post_tick; 3988 if (0) {
3989 if ($NEXT_TICK) {
3990 my $jitter = $TICK_START - $NEXT_TICK;
3991 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3992 warn "jitter $JITTER\n";#d#
3993 }
3572 }, 3994 }
3573); 3995}
3574 3996
3575{ 3997{
3998 # configure BDB
3999
3576 BDB::min_parallel 8; 4000 BDB::min_parallel 16;
3577 BDB::max_poll_time $TICK * 0.1; 4001 BDB::max_poll_reqs $TICK * 0.1;
3578 $BDB_POLL_WATCHER = Event->io ( 4002 $AnyEvent::BDB::WATCHER->priority (1);
3579 reentrant => 0,
3580 fd => BDB::poll_fileno,
3581 poll => 'r',
3582 prio => 0,
3583 data => WF_AUTOCANCEL,
3584 cb => \&BDB::poll_cb,
3585 );
3586
3587 BDB::set_sync_prepare {
3588 my $status;
3589 my $current = $Coro::current;
3590 (
3591 sub {
3592 $status = $!;
3593 $current->ready; undef $current;
3594 },
3595 sub {
3596 Coro::schedule while defined $current;
3597 $! = $status;
3598 },
3599 )
3600 };
3601 4003
3602 unless ($DB_ENV) { 4004 unless ($DB_ENV) {
3603 $DB_ENV = BDB::db_env_create; 4005 $DB_ENV = BDB::db_env_create;
3604 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4006 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3605 | BDB::LOG_AUTOREMOVE, 1); 4007 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4008 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3606 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4009 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3607 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4010 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3608 4011
3609 cf::sync_job { 4012 cf::sync_job {
3610 eval { 4013 eval {
3620 4023
3621 cf::cleanup "db_env_open(db): $@" if $@; 4024 cf::cleanup "db_env_open(db): $@" if $@;
3622 }; 4025 };
3623 } 4026 }
3624 4027
3625 $BDB_DEADLOCK_WATCHER = Event->timer ( 4028 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3626 after => 3,
3627 interval => 1,
3628 hard => 1,
3629 prio => 0,
3630 data => WF_AUTOCANCEL,
3631 cb => sub {
3632 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4029 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3633 },
3634 ); 4030 };
3635 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4031 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3636 after => 11,
3637 interval => 60,
3638 hard => 1,
3639 prio => 0,
3640 data => WF_AUTOCANCEL,
3641 cb => sub {
3642 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4032 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3643 },
3644 ); 4033 };
3645 $BDB_TRICKLE_WATCHER = Event->timer ( 4034 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3646 after => 5,
3647 interval => 10,
3648 hard => 1,
3649 prio => 0,
3650 data => WF_AUTOCANCEL,
3651 cb => sub {
3652 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4035 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3653 },
3654 ); 4036 };
3655} 4037}
3656 4038
3657{ 4039{
4040 # configure IO::AIO
4041
3658 IO::AIO::min_parallel 8; 4042 IO::AIO::min_parallel 8;
3659
3660 undef $Coro::AIO::WATCHER;
3661 IO::AIO::max_poll_time $TICK * 0.1; 4043 IO::AIO::max_poll_time $TICK * 0.1;
3662 $AIO_POLL_WATCHER = Event->io ( 4044 undef $AnyEvent::AIO::WATCHER;
3663 reentrant => 0,
3664 data => WF_AUTOCANCEL,
3665 fd => IO::AIO::poll_fileno,
3666 poll => 'r',
3667 prio => 0,
3668 cb => \&IO::AIO::poll_cb,
3669 );
3670} 4045}
3671 4046
3672my $_log_backtrace; 4047my $_log_backtrace;
3673 4048
3674sub _log_backtrace { 4049sub _log_backtrace {
3677 $msg =~ s/\n//; 4052 $msg =~ s/\n//;
3678 4053
3679 # limit the # of concurrent backtraces 4054 # limit the # of concurrent backtraces
3680 if ($_log_backtrace < 2) { 4055 if ($_log_backtrace < 2) {
3681 ++$_log_backtrace; 4056 ++$_log_backtrace;
4057 my $perl_bt = Carp::longmess $msg;
3682 async { 4058 async {
3683 $Coro::current->{desc} = "abt $msg"; 4059 $Coro::current->{desc} = "abt $msg";
3684 4060
3685 my @bt = fork_call { 4061 my @bt = fork_call {
3686 @addr = map { sprintf "%x", $_ } @addr; 4062 @addr = map { sprintf "%x", $_ } @addr;
3697 } 4073 }
3698 4074
3699 @funcs 4075 @funcs
3700 }; 4076 };
3701 4077
3702 LOG llevInfo, "[ABT] $msg\n"; 4078 LOG llevInfo, "[ABT] $perl_bt\n";
4079 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3703 LOG llevInfo, "[ABT] $_\n" for @bt; 4080 LOG llevInfo, "[ABT] $_\n" for @bt;
3704 --$_log_backtrace; 4081 --$_log_backtrace;
3705 }; 4082 };
3706 } else { 4083 } else {
3707 LOG llevInfo, "[ABT] $msg\n"; 4084 LOG llevInfo, "[ABT] $msg\n";
3708 LOG llevInfo, "[ABT] [suppressed]\n"; 4085 LOG llevInfo, "[ABT] [suppressed]\n";
3709 } 4086 }
3710} 4087}
3711 4088
3712# load additional modules 4089# load additional modules
3713use cf::pod; 4090require "cf/$_.pm" for @EXTRA_MODULES;
4091cf::_connect_to_perl_2;
3714 4092
3715END { cf::emergency_save } 4093END { cf::emergency_save }
3716 4094
37171 40951
3718 4096

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines