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.372 by root, Sat Sep 15 13:25:33 2007 UTC vs.
Revision 1.553 by root, Tue May 18 21:30:16 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines