ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.387 by root, Mon Oct 15 23:49:10 2007 UTC vs.
Revision 1.558 by root, Tue Oct 5 22:35:30 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines