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.382 by root, Thu Oct 11 00:34:31 2007 UTC vs.
Revision 1.555 by root, Wed Jun 30 01:32:56 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines