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.371 by root, Thu Sep 13 16:16:01 2007 UTC vs.
Revision 1.558 by root, Tue Oct 5 22:35:30 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use 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];
1353 aio_unlink +(playerdir $login) . "/$login.pl"; 1596 aio_unlink +(playerdir $login) . "/$login.pl";
1354 1597
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 $f->next;
1359 my $pl = cf::player::load_pl $f 1601 my $pl = cf::player::load_pl $f
1360 or return; 1602 or return;
1603
1361 local $cf::PLAYER_LOADING{$login} = $pl; 1604 local $cf::PLAYER_LOADING{$login} = $pl;
1362 $f->resolve_delayed_derefs; 1605 $f->resolve_delayed_derefs;
1363 $cf::PLAYER{$login} = $pl 1606 $cf::PLAYER{$login} = $pl
1364 } 1607 }
1365 } 1608 }
1366} 1609}
1367 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
1368sub save($) { 1624sub save($) {
1369 my ($pl) = @_; 1625 my ($pl) = @_;
1370 1626
1371 return if $pl->{deny_save}; 1627 return if $pl->{deny_save};
1372 1628
1375 1631
1376 return if $pl->{deny_save}; 1632 return if $pl->{deny_save};
1377 1633
1378 aio_mkdir playerdir $pl, 0770; 1634 aio_mkdir playerdir $pl, 0770;
1379 $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];
1380 1641
1381 $pl->save_pl ($path); 1642 $pl->save_pl ($path);
1382 cf::cede_to_tick; 1643 cf::cede_to_tick;
1383} 1644}
1384 1645
1416 my ($pl) = @_; 1677 my ($pl) = @_;
1417 1678
1418 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1419 1680
1420 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1421 $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
1422 1683
1423 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1424 $pl->deactivate; 1685 $pl->deactivate;
1686
1687 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1425 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1426 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1427 1692
1428 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1429 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1430 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
1468 1733
1469 for my $login (@$dirs) { 1734 for my $login (@$dirs) {
1470 my $path = path $login; 1735 my $path = path $login;
1471 1736
1472 # a .pst is a dead give-away for a valid player 1737 # a .pst is a dead give-away for a valid player
1473 unless (-e "$path.pst") { 1738 # if no pst file found, open and chekc for blocked users
1739 if (aio_stat "$path.pst") {
1474 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1740 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1475 aio_read $fh, 0, 512, my $buf, 0 or next; 1741 aio_read $fh, 0, 512, my $buf, 0 or next;
1476 $buf !~ /^password -------------$/m or next; # official not-valid tag 1742 $buf !~ /^password -------------$/m or next; # official not-valid tag
1477 } 1743 }
1478 1744
1482 1748
1483 \@logins 1749 \@logins
1484} 1750}
1485 1751
1486=item $player->maps 1752=item $player->maps
1753
1754=item cf::player::maps $login
1487 1755
1488Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1489player. May block. 1757player. May block.
1490 1758
1491=cut 1759=cut
1509 } 1777 }
1510 1778
1511 \@paths 1779 \@paths
1512} 1780}
1513 1781
1514=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1782=item $protocol_xml = $player->expand_cfpod ($cfpod)
1515 1783
1516Expand crossfire pod fragments into protocol xml. 1784Expand deliantra pod fragments into protocol xml.
1517
1518=cut
1519
1520sub expand_cfpod {
1521 ((my $self), (local $_)) = @_;
1522
1523 # escape & and <
1524 s/&/&amp;/g;
1525 s/(?<![BIUGHT])</&lt;/g;
1526
1527 # this is buggy, it needs to properly take care of nested <'s
1528
1529 1 while
1530 # replace B<>, I<>, U<> etc.
1531 s/B<([^\>]*)>/<b>$1<\/b>/
1532 || s/I<([^\>]*)>/<i>$1<\/i>/
1533 || s/U<([^\>]*)>/<u>$1<\/u>/
1534 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1535 # replace G<male|female> tags
1536 || s{G<([^>|]*)\|([^>]*)>}{
1537 $self->gender ? $2 : $1
1538 }ge
1539 # replace H<hint text>
1540 || s{H<([^\>]*)>}
1541 {
1542 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1543 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1544 "")
1545 [$self->{hintmode}]
1546 }ge;
1547
1548 # create single paragraphs (very hackish)
1549 s/(?<=\S)\n(?=\w)/ /g;
1550
1551 # compress some whitespace
1552 s/\s+\n/\n/g; # ws line-ends
1553 s/\n\n+/\n/g; # double lines
1554 s/^\n+//; # beginning lines
1555 s/\n+$//; # ending lines
1556
1557 $_
1558}
1559
1560sub hintmode {
1561 $_[0]{hintmode} = $_[1] if @_ > 1;
1562 $_[0]{hintmode}
1563}
1564 1785
1565=item $player->ext_reply ($msgid, @msg) 1786=item $player->ext_reply ($msgid, @msg)
1566 1787
1567Sends an ext reply to the player. 1788Sends an ext reply to the player.
1568 1789
1600 1821
1601=cut 1822=cut
1602 1823
1603sub find_by_path($) { 1824sub find_by_path($) {
1604 my ($path) = @_; 1825 my ($path) = @_;
1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1605 1828
1606 my ($match, $specificity); 1829 my ($match, $specificity);
1607 1830
1608 for my $region (list) { 1831 for my $region (list) {
1609 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1635our $MAX_RESET = 3600; 1858our $MAX_RESET = 3600;
1636our $DEFAULT_RESET = 3000; 1859our $DEFAULT_RESET = 3000;
1637 1860
1638sub generate_random_map { 1861sub generate_random_map {
1639 my ($self, $rmp) = @_; 1862 my ($self, $rmp) = @_;
1640 # mit "rum" bekleckern, nicht 1863
1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1865
1641 $self->_create_random_map ( 1866 $self->_create_random_map ($rmp);
1642 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1643 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1644 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1645 $rmp->{exit_on_final_map},
1646 $rmp->{xsize}, $rmp->{ysize},
1647 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1648 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1649 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1650 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1651 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1652 (cf::region::find $rmp->{region}), $rmp->{custom}
1653 )
1654} 1867}
1655 1868
1656=item cf::map->register ($regex, $prio) 1869=item cf::map->register ($regex, $prio)
1657 1870
1658Register a handler for the map path matching the given regex at the 1871Register a handler for the map path matching the given regex at the
1663 1876
1664sub register { 1877sub register {
1665 my (undef, $regex, $prio) = @_; 1878 my (undef, $regex, $prio) = @_;
1666 my $pkg = caller; 1879 my $pkg = caller;
1667 1880
1668 no strict;
1669 push @{"$pkg\::ISA"}, __PACKAGE__; 1881 push @{"$pkg\::ISA"}, __PACKAGE__;
1670 1882
1671 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1883 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1672} 1884}
1673 1885
1674# also paths starting with '/' 1886# also paths starting with '/'
1675$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1887$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1676 1888
1677sub thawer_merge { 1889sub thawer_merge {
1678 my ($self, $merge) = @_; 1890 my ($self, $merge) = @_;
1679 1891
1680 # we have to keep some variables in memory intact 1892 # we have to keep some variables in memory intact
1685} 1897}
1686 1898
1687sub normalise { 1899sub normalise {
1688 my ($path, $base) = @_; 1900 my ($path, $base) = @_;
1689 1901
1690 $path = "$path"; # make sure its a string 1902 $path = "$path"; # make sure it's a string
1691 1903
1692 $path =~ s/\.map$//; 1904 $path =~ s/\.map$//;
1693 1905
1694 # map plan: 1906 # map plan:
1695 # 1907 #
1710 $base =~ s{[^/]+/?$}{}; 1922 $base =~ s{[^/]+/?$}{};
1711 $path = "$base/$path"; 1923 $path = "$base/$path";
1712 } 1924 }
1713 1925
1714 for ($path) { 1926 for ($path) {
1715 redo if s{//}{/};
1716 redo if s{/\.?/}{/}; 1927 redo if s{/\.?/}{/};
1717 redo if s{/[^/]+/\.\./}{/}; 1928 redo if s{/[^/]+/\.\./}{/};
1718 } 1929 }
1719 1930
1720 $path 1931 $path
1734 $self->init; # pass $1 etc. 1945 $self->init; # pass $1 etc.
1735 return $self; 1946 return $self;
1736 } 1947 }
1737 } 1948 }
1738 1949
1739 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1950 Carp::cluck "unable to resolve path '$path' (base '$base')";
1740 () 1951 ()
1741} 1952}
1742 1953
1743sub init { 1954sub init {
1744 my ($self) = @_; 1955 my ($self) = @_;
1766 1977
1767# the temporary/swap location 1978# the temporary/swap location
1768sub save_path { 1979sub save_path {
1769 my ($self) = @_; 1980 my ($self) = @_;
1770 1981
1771 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1982 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1772 "$TMPDIR/$path.map" 1983 "$TMPDIR/$path.map"
1773} 1984}
1774 1985
1775# the unique path, undef == no special unique path 1986# the unique path, undef == no special unique path
1776sub uniq_path { 1987sub uniq_path {
1777 my ($self) = @_; 1988 my ($self) = @_;
1778 1989
1779 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1990 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1780 "$UNIQUEDIR/$path" 1991 "$UNIQUEDIR/$path"
1781}
1782
1783# and all this just because we cannot iterate over
1784# all maps in C++...
1785sub change_all_map_light {
1786 my ($change) = @_;
1787
1788 $_->change_map_light ($change)
1789 for grep $_->outdoor, values %cf::MAP;
1790} 1992}
1791 1993
1792sub decay_objects { 1994sub decay_objects {
1793 my ($self) = @_; 1995 my ($self) = @_;
1794 1996
1876 2078
1877sub find; 2079sub find;
1878sub find { 2080sub find {
1879 my ($path, $origin) = @_; 2081 my ($path, $origin) = @_;
1880 2082
2083 cf::cede_to_tick;
2084
1881 $path = normalise $path, $origin && $origin->path; 2085 $path = normalise $path, $origin && $origin->path;
1882 2086
1883 cf::lock_wait "map_data:$path";#d#remove 2087 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1884 cf::lock_wait "map_find:$path"; 2088 my $guard2 = cf::lock_acquire "map_find:$path";
1885 2089
1886 $cf::MAP{$path} || do { 2090 $cf::MAP{$path} || do {
1887 my $guard1 = cf::lock_acquire "map_find:$path";
1888 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1889
1890 my $map = new_from_path cf::map $path 2091 my $map = new_from_path cf::map $path
1891 or return; 2092 or return;
1892 2093
1893 $map->{last_save} = $cf::RUNTIME; 2094 $map->{last_save} = $cf::RUNTIME;
1894 2095
1896 or return; 2097 or return;
1897 2098
1898 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2099 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1899 # doing this can freeze the server in a sync job, obviously 2100 # doing this can freeze the server in a sync job, obviously
1900 #$cf::WAIT_FOR_TICK->wait; 2101 #$cf::WAIT_FOR_TICK->wait;
2102 undef $guard2;
1901 undef $guard1; 2103 undef $guard1;
1902 undef $guard2;
1903 $map->reset; 2104 $map->reset;
1904 return find $path; 2105 return find $path;
1905 } 2106 }
1906 2107
1907 $cf::MAP{$path} = $map 2108 $cf::MAP{$path} = $map
1908 } 2109 }
1909} 2110}
1910 2111
1911sub pre_load { } 2112sub pre_load { }
1912sub post_load { } 2113#sub post_load { } # XS
1913 2114
1914sub load { 2115sub load {
1915 my ($self) = @_; 2116 my ($self) = @_;
1916 2117
1917 local $self->{deny_reset} = 1; # loading can take a long time 2118 local $self->{deny_reset} = 1; # loading can take a long time
1934 my $f = new_from_file cf::object::thawer $self->{load_path}; 2135 my $f = new_from_file cf::object::thawer $self->{load_path};
1935 $f->skip_block; 2136 $f->skip_block;
1936 $self->_load_objects ($f) 2137 $self->_load_objects ($f)
1937 or return; 2138 or return;
1938 2139
1939 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2140 $self->post_load_original
1940 if delete $self->{load_original}; 2141 if delete $self->{load_original};
1941 2142
1942 if (my $uniq = $self->uniq_path) { 2143 if (my $uniq = $self->uniq_path) {
1943 utf8::encode $uniq; 2144 utf8::encode $uniq;
1944 unless (aio_stat $uniq) { 2145 unless (aio_stat $uniq) {
1962 unless ($self->{deny_activate}) { 2163 unless ($self->{deny_activate}) {
1963 $self->decay_objects; 2164 $self->decay_objects;
1964 $self->fix_auto_apply; 2165 $self->fix_auto_apply;
1965 $self->update_buttons; 2166 $self->update_buttons;
1966 cf::cede_to_tick; 2167 cf::cede_to_tick;
1967 $self->set_darkness_map;
1968 cf::cede_to_tick;
1969 $self->activate; 2168 $self->activate;
1970 } 2169 }
1971 2170
1972 $self->{last_save} = $cf::RUNTIME; 2171 $self->{last_save} = $cf::RUNTIME;
1973 $self->last_access ($cf::RUNTIME); 2172 $self->last_access ($cf::RUNTIME);
1974 2173
1975 $self->in_memory (cf::MAP_IN_MEMORY); 2174 $self->in_memory (cf::MAP_ACTIVE);
1976 } 2175 }
1977 2176
1978 $self->post_load; 2177 $self->post_load;
1979}
1980 2178
2179 1
2180}
2181
2182# customize the map for a given player, i.e.
2183# return the _real_ map. used by e.g. per-player
2184# maps to change the path to ~playername/mappath
1981sub customise_for { 2185sub customise_for {
1982 my ($self, $ob) = @_; 2186 my ($self, $ob) = @_;
1983 2187
1984 return find "~" . $ob->name . "/" . $self->{path} 2188 return find "~" . $ob->name . "/" . $self->{path}
1985 if $self->per_player; 2189 if $self->per_player;
2001 or next; 2205 or next;
2002 $neigh = find $neigh, $map 2206 $neigh = find $neigh, $map
2003 or next; 2207 or next;
2004 $neigh->load; 2208 $neigh->load;
2005 2209
2210 # now find the diagonal neighbours
2006 push @neigh, 2211 push @neigh,
2007 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2212 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2008 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2213 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2009 } 2214 }
2010 2215
2017} 2222}
2018 2223
2019sub find_sync { 2224sub find_sync {
2020 my ($path, $origin) = @_; 2225 my ($path, $origin) = @_;
2021 2226
2022 cf::sync_job { find $path, $origin } 2227 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2228 if $Coro::current == $Coro::main;
2229
2230 find $path, $origin
2023} 2231}
2024 2232
2025sub do_load_sync { 2233sub do_load_sync {
2026 my ($map) = @_; 2234 my ($map) = @_;
2027 2235
2028 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2236 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2029 if $Coro::current == $Coro::main; 2237 if $Coro::current == $Coro::main;
2030 2238
2031 cf::sync_job { $map->load }; 2239 $map->load;
2032} 2240}
2033 2241
2034our %MAP_PREFETCH; 2242our %MAP_PREFETCH;
2035our $MAP_PREFETCHER = undef; 2243our $MAP_PREFETCHER = undef;
2036 2244
2038 my ($path, $origin, $load) = @_; 2246 my ($path, $origin, $load) = @_;
2039 2247
2040 $path = normalise $path, $origin && $origin->{path}; 2248 $path = normalise $path, $origin && $origin->{path};
2041 2249
2042 if (my $map = $cf::MAP{$path}) { 2250 if (my $map = $cf::MAP{$path}) {
2043 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2251 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2044 } 2252 }
2045 2253
2046 $MAP_PREFETCH{$path} |= $load; 2254 $MAP_PREFETCH{$path} |= $load;
2047 2255
2048 $MAP_PREFETCHER ||= cf::async { 2256 $MAP_PREFETCHER ||= cf::async {
2257 $Coro::current->{desc} = "map prefetcher";
2258
2049 while (%MAP_PREFETCH) { 2259 while (%MAP_PREFETCH) {
2050 while (my ($k, $v) = each %MAP_PREFETCH) { 2260 while (my ($k, $v) = each %MAP_PREFETCH) {
2051 if (my $map = find $k) { 2261 if (my $map = find $k) {
2052 $map->load if $v; 2262 $map->load if $v;
2053 } 2263 }
2060 $MAP_PREFETCHER->prio (6); 2270 $MAP_PREFETCHER->prio (6);
2061 2271
2062 () 2272 ()
2063} 2273}
2064 2274
2275# common code, used by both ->save and ->swapout
2065sub save { 2276sub _save {
2066 my ($self) = @_; 2277 my ($self) = @_;
2067
2068 my $lock = cf::lock_acquire "map_data:$self->{path}";
2069 2278
2070 $self->{last_save} = $cf::RUNTIME; 2279 $self->{last_save} = $cf::RUNTIME;
2071 2280
2072 return unless $self->dirty; 2281 return unless $self->dirty;
2073 2282
2079 return if $self->{deny_save}; 2288 return if $self->{deny_save};
2080 2289
2081 local $self->{last_access} = $self->last_access;#d# 2290 local $self->{last_access} = $self->last_access;#d#
2082 2291
2083 cf::async { 2292 cf::async {
2293 $Coro::current->{desc} = "map player save";
2084 $_->contr->save for $self->players; 2294 $_->contr->save for $self->players;
2085 }; 2295 };
2296
2297 cf::get_slot 0.02;
2086 2298
2087 if ($uniq) { 2299 if ($uniq) {
2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2300 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2089 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2301 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2090 } else { 2302 } else {
2091 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2303 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2092 } 2304 }
2093} 2305}
2094 2306
2307sub save {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 $self->_save;
2313}
2314
2095sub swap_out { 2315sub swap_out {
2096 my ($self) = @_; 2316 my ($self) = @_;
2097 2317
2098 # save first because save cedes
2099 $self->save;
2100
2101 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2318 my $lock = cf::lock_acquire "map_data:$self->{path}";
2102 2319
2320 return if $self->in_memory != cf::MAP_ACTIVE;
2321 return if $self->{deny_save};
2103 return if $self->players; 2322 return if $self->players;
2104 return if $self->in_memory != cf::MAP_IN_MEMORY;
2105 return if $self->{deny_save};
2106 2323
2324 # first deactivate the map and "unlink" it from the core
2325 $self->deactivate;
2326 $_->clear_links_to ($self) for values %cf::MAP;
2107 $self->in_memory (cf::MAP_SWAPPED); 2327 $self->in_memory (cf::MAP_SWAPPED);
2328
2329 # then atomically save
2330 $self->_save;
2331
2332 # then free the map
2333 $self->clear;
2334}
2335
2336sub reset_at {
2337 my ($self) = @_;
2338
2339 # TODO: safety, remove and allow resettable per-player maps
2340 return 1e99 if $self->{deny_reset};
2341
2342 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2343 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2344
2345 $time + $to
2346}
2347
2348sub should_reset {
2349 my ($self) = @_;
2350
2351 $self->reset_at <= $cf::RUNTIME
2352}
2353
2354sub reset {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 return if $self->players;
2360
2361 cf::trace "resetting map ", $self->path, "\n";
2362
2363 $self->in_memory (cf::MAP_SWAPPED);
2364
2365 # need to save uniques path
2366 unless ($self->{deny_save}) {
2367 my $uniq = $self->uniq_path; utf8::encode $uniq;
2368
2369 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2370 if $uniq;
2371 }
2372
2373 delete $cf::MAP{$self->path};
2108 2374
2109 $self->deactivate; 2375 $self->deactivate;
2110 $_->clear_links_to ($self) for values %cf::MAP; 2376 $_->clear_links_to ($self) for values %cf::MAP;
2111 $self->clear; 2377 $self->clear;
2112}
2113
2114sub reset_at {
2115 my ($self) = @_;
2116
2117 # TODO: safety, remove and allow resettable per-player maps
2118 return 1e99 if $self->{deny_reset};
2119
2120 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2121 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2122
2123 $time + $to
2124}
2125
2126sub should_reset {
2127 my ($self) = @_;
2128
2129 $self->reset_at <= $cf::RUNTIME
2130}
2131
2132sub reset {
2133 my ($self) = @_;
2134
2135 my $lock = cf::lock_acquire "map_data:$self->{path}";
2136
2137 return if $self->players;
2138
2139 warn "resetting map ", $self->path;
2140
2141 $self->in_memory (cf::MAP_SWAPPED);
2142
2143 # need to save uniques path
2144 unless ($self->{deny_save}) {
2145 my $uniq = $self->uniq_path; utf8::encode $uniq;
2146
2147 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2148 if $uniq;
2149 }
2150
2151 delete $cf::MAP{$self->path};
2152
2153 $self->deactivate;
2154 $_->clear_links_to ($self) for values %cf::MAP;
2155 $self->clear;
2156 2378
2157 $self->unlink_save; 2379 $self->unlink_save;
2158 $self->destroy; 2380 $self->destroy;
2159} 2381}
2160 2382
2168 2390
2169 delete $cf::MAP{$self->path}; 2391 delete $cf::MAP{$self->path};
2170 2392
2171 $self->unlink_save; 2393 $self->unlink_save;
2172 2394
2173 bless $self, "cf::map"; 2395 bless $self, "cf::map::wrap";
2174 delete $self->{deny_reset}; 2396 delete $self->{deny_reset};
2175 $self->{deny_save} = 1; 2397 $self->{deny_save} = 1;
2176 $self->reset_timeout (1); 2398 $self->reset_timeout (1);
2177 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2399 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2178 2400
2227 2449
2228sub unique_maps() { 2450sub unique_maps() {
2229 [ 2451 [
2230 map { 2452 map {
2231 utf8::decode $_; 2453 utf8::decode $_;
2232 /\.map$/ 2454 s/\.map$//; # TODO future compatibility hack
2455 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2456 ? ()
2233 ? normalise $_ 2457 : normalise $_
2234 : ()
2235 } @{ aio_readdir $UNIQUEDIR or [] } 2458 } @{ aio_readdir $UNIQUEDIR or [] }
2236 ] 2459 ]
2237} 2460}
2238 2461
2239package cf; 2462=item cf::map::static_maps
2463
2464Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2465file in the shared directory excluding F</styles> and F</editor>). May
2466block.
2467
2468=cut
2469
2470sub static_maps() {
2471 my @dirs = "";
2472 my @maps;
2473
2474 while (@dirs) {
2475 my $dir = shift @dirs;
2476
2477 next if $dir eq "/styles" || $dir eq "/editor";
2478
2479 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2480 or return;
2481
2482 for (@$files) {
2483 s/\.map$// or next;
2484 utf8::decode $_;
2485 push @maps, "$dir/$_";
2486 }
2487
2488 push @dirs, map "$dir/$_", @$dirs;
2489 }
2490
2491 \@maps
2492}
2240 2493
2241=back 2494=back
2242 2495
2243=head3 cf::object 2496=head3 cf::object
2244 2497
2248 2501
2249=over 4 2502=over 4
2250 2503
2251=item $ob->inv_recursive 2504=item $ob->inv_recursive
2252 2505
2253Returns the inventory of the object _and_ their inventories, recursively. 2506Returns the inventory of the object I<and> their inventories, recursively,
2507but I<not> the object itself.
2254 2508
2255=cut 2509=cut
2256 2510
2257sub inv_recursive_; 2511sub inv_recursive_;
2258sub inv_recursive_ { 2512sub inv_recursive_ {
2263 inv_recursive_ inv $_[0] 2517 inv_recursive_ inv $_[0]
2264} 2518}
2265 2519
2266=item $ref = $ob->ref 2520=item $ref = $ob->ref
2267 2521
2268creates and returns a persistent reference to an objetc that can be stored as a string. 2522Creates and returns a persistent reference to an object that can be stored as a string.
2269 2523
2270=item $ob = cf::object::deref ($refstring) 2524=item $ob = cf::object::deref ($refstring)
2271 2525
2272returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2526returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2273even if the object actually exists. May block. 2527even if the object actually exists. May block.
2275=cut 2529=cut
2276 2530
2277sub deref { 2531sub deref {
2278 my ($ref) = @_; 2532 my ($ref) = @_;
2279 2533
2280 # temporary compatibility#TODO#remove
2281 $ref =~ s{^<}{player/<};
2282
2283 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2534 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2284 my ($uuid, $name) = ($1, $2); 2535 my ($uuid, $name) = ($1, $2);
2285 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2536 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2286 or return; 2537 or return;
2287 $pl->ob->uuid eq $uuid 2538 $pl->ob->uuid eq $uuid
2288 or return; 2539 or return;
2308can be C<undef>. Does the right thing when the player is currently in a 2559can be C<undef>. Does the right thing when the player is currently in a
2309dialogue with the given NPC character. 2560dialogue with the given NPC character.
2310 2561
2311=cut 2562=cut
2312 2563
2564our $SAY_CHANNEL = {
2565 id => "say",
2566 title => "Map",
2567 reply => "say ",
2568 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2569};
2570
2571our $CHAT_CHANNEL = {
2572 id => "chat",
2573 title => "Chat",
2574 reply => "chat ",
2575 tooltip => "Player chat and shouts, global to the server.",
2576};
2577
2313# rough implementation of a future "reply" method that works 2578# rough implementation of a future "reply" method that works
2314# with dialog boxes. 2579# with dialog boxes.
2315#TODO: the first argument must go, split into a $npc->reply_to ( method 2580#TODO: the first argument must go, split into a $npc->reply_to ( method
2316sub cf::object::player::reply($$$;$) { 2581sub cf::object::player::reply($$$;$) {
2317 my ($self, $npc, $msg, $flags) = @_; 2582 my ($self, $npc, $msg, $flags) = @_;
2328 my $dialog = $pl->{npc_dialog}; 2593 my $dialog = $pl->{npc_dialog};
2329 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2594 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2330 2595
2331 } else { 2596 } else {
2332 $msg = $npc->name . " says: $msg" if $npc; 2597 $msg = $npc->name . " says: $msg" if $npc;
2333 $self->message ($msg, $flags); 2598 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2334 } 2599 }
2335 } 2600 }
2336} 2601}
2337 2602
2338=item $object->send_msg ($channel, $msg, $color, [extra...]) 2603=item $object->send_msg ($channel, $msg, $color, [extra...])
2363 2628
2364=item $player_object->enter_link 2629=item $player_object->enter_link
2365 2630
2366Freezes the player and moves him/her to a special map (C<{link}>). 2631Freezes the player and moves him/her to a special map (C<{link}>).
2367 2632
2368The player should be reasonably safe there for short amounts of time. You 2633The player should be reasonably safe there for short amounts of time (e.g.
2369I<MUST> call C<leave_link> as soon as possible, though. 2634for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2635though, as the player cannot control the character while it is on the link
2636map.
2370 2637
2371Will never block. 2638Will never block.
2372 2639
2373=item $player_object->leave_link ($map, $x, $y) 2640=item $player_object->leave_link ($map, $x, $y)
2374 2641
2394sub cf::object::player::enter_link { 2661sub cf::object::player::enter_link {
2395 my ($self) = @_; 2662 my ($self) = @_;
2396 2663
2397 $self->deactivate_recursive; 2664 $self->deactivate_recursive;
2398 2665
2666 ++$self->{_link_recursion};
2667
2399 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2668 return if UNIVERSAL::isa $self->map, "ext::map_link";
2400 2669
2401 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2670 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2402 if $self->map && $self->map->{path} ne "{link}"; 2671 if $self->map && $self->map->{path} ne "{link}";
2403 2672
2404 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2673 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2405} 2674}
2406 2675
2407sub cf::object::player::leave_link { 2676sub cf::object::player::leave_link {
2408 my ($self, $map, $x, $y) = @_; 2677 my ($self, $map, $x, $y) = @_;
2409 2678
2426 ($x, $y) = (-1, -1) 2695 ($x, $y) = (-1, -1)
2427 unless (defined $x) && (defined $y); 2696 unless (defined $x) && (defined $y);
2428 2697
2429 # use -1 or undef as default coordinates, not 0, 0 2698 # use -1 or undef as default coordinates, not 0, 0
2430 ($x, $y) = ($map->enter_x, $map->enter_y) 2699 ($x, $y) = ($map->enter_x, $map->enter_y)
2431 if $x <=0 && $y <= 0; 2700 if $x <= 0 && $y <= 0;
2432 2701
2433 $map->load; 2702 $map->load;
2434 $map->load_neighbours; 2703 $map->load_neighbours;
2435 2704
2436 return unless $self->contr->active; 2705 return unless $self->contr->active;
2437 $self->activate_recursive;
2438 2706
2439 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2707 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2440 $self->enter_map ($map, $x, $y); 2708 if ($self->enter_map ($map, $x, $y)) {
2441} 2709 # entering was successful
2710 delete $self->{_link_recursion};
2711 # only activate afterwards, to support waiting in hooks
2712 $self->activate_recursive;
2713 }
2442 2714
2715}
2716
2443=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2717=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2444 2718
2445Moves the player to the given map-path and coordinates by first freezing 2719Moves the player to the given map-path and coordinates by first freezing
2446her, loading and preparing them map, calling the provided $check callback 2720her, loading and preparing them map, calling the provided $check callback
2447that has to return the map if sucecssful, and then unfreezes the player on 2721that has to return the map if sucecssful, and then unfreezes the player on
2448the new (success) or old (failed) map position. In either case, $done will 2722the new (success) or old (failed) map position. In either case, $done will
2449be called at the end of this process. 2723be called at the end of this process.
2450 2724
2725Note that $check will be called with a potentially non-loaded map, so if
2726it needs a loaded map it has to call C<< ->load >>.
2727
2451=cut 2728=cut
2452 2729
2453our $GOTOGEN; 2730our $GOTOGEN;
2454 2731
2455sub cf::object::player::goto { 2732sub cf::object::player::goto {
2456 my ($self, $path, $x, $y, $check, $done) = @_; 2733 my ($self, $path, $x, $y, $check, $done) = @_;
2457 2734
2735 if ($self->{_link_recursion} >= $MAX_LINKS) {
2736 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2737 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2738 ($path, $x, $y) = @$EMERGENCY_POSITION;
2739 }
2740
2458 # do generation counting so two concurrent goto's will be executed in-order 2741 # do generation counting so two concurrent goto's will be executed in-order
2459 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2742 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2460 2743
2461 $self->enter_link; 2744 $self->enter_link;
2462 2745
2463 (async { 2746 (async {
2747 $Coro::current->{desc} = "player::goto $path $x $y";
2748
2464 # *tag paths override both path and x|y 2749 # *tag paths override both path and x|y
2465 if ($path =~ /^\*(.*)$/) { 2750 if ($path =~ /^\*(.*)$/) {
2466 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2751 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2467 my $ob = $obs[rand @obs]; 2752 my $ob = $obs[rand @obs];
2468 2753
2483 my $map = eval { 2768 my $map = eval {
2484 my $map = defined $path ? cf::map::find $path : undef; 2769 my $map = defined $path ? cf::map::find $path : undef;
2485 2770
2486 if ($map) { 2771 if ($map) {
2487 $map = $map->customise_for ($self); 2772 $map = $map->customise_for ($self);
2488 $map = $check->($map) if $check && $map; 2773 $map = $check->($map, $x, $y, $self) if $check && $map;
2489 } else { 2774 } else {
2490 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2775 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2491 } 2776 }
2492 2777
2493 $map 2778 $map
2501 if ($gen == $self->{_goto_generation}) { 2786 if ($gen == $self->{_goto_generation}) {
2502 delete $self->{_goto_generation}; 2787 delete $self->{_goto_generation};
2503 $self->leave_link ($map, $x, $y); 2788 $self->leave_link ($map, $x, $y);
2504 } 2789 }
2505 2790
2506 $done->() if $done; 2791 $done->($self) if $done;
2507 })->prio (1); 2792 })->prio (1);
2508} 2793}
2509 2794
2510=item $player_object->enter_exit ($exit_object) 2795=item $player_object->enter_exit ($exit_object)
2511 2796
2531} 2816}
2532 2817
2533sub prepare_random_map { 2818sub prepare_random_map {
2534 my ($exit) = @_; 2819 my ($exit) = @_;
2535 2820
2536 my $guard = cf::lock_acquire "exit_prepare:$exit";
2537
2538 # all this does is basically replace the /! path by 2821 # all this does is basically replace the /! path by
2539 # a new random map path (?random/...) with a seed 2822 # a new random map path (?random/...) with a seed
2540 # that depends on the exit object 2823 # that depends on the exit object
2541 2824
2542 my $rmp = parse_random_map_params $exit->msg; 2825 my $rmp = parse_random_map_params $exit->msg;
2544 if ($exit->map) { 2827 if ($exit->map) {
2545 $rmp->{region} = $exit->region->name; 2828 $rmp->{region} = $exit->region->name;
2546 $rmp->{origin_map} = $exit->map->path; 2829 $rmp->{origin_map} = $exit->map->path;
2547 $rmp->{origin_x} = $exit->x; 2830 $rmp->{origin_x} = $exit->x;
2548 $rmp->{origin_y} = $exit->y; 2831 $rmp->{origin_y} = $exit->y;
2832
2833 $exit->map->touch;
2549 } 2834 }
2550 2835
2551 $rmp->{random_seed} ||= $exit->random_seed; 2836 $rmp->{random_seed} ||= $exit->random_seed;
2552 2837
2553 my $data = cf::to_json $rmp; 2838 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2554 my $md5 = Digest::MD5::md5_hex $data; 2839 my $md5 = Digest::MD5::md5_hex $data;
2555 my $meta = "$RANDOMDIR/$md5.meta"; 2840 my $meta = "$RANDOMDIR/$md5.meta";
2556 2841
2557 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2842 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2558 aio_write $fh, 0, (length $data), $data, 0; 2843 aio_write $fh, 0, (length $data), $data, 0;
2559 undef $fh; 2844 undef $fh;
2560 aio_rename "$meta~", $meta; 2845 aio_rename "$meta~", $meta;
2561 2846
2847 my $slaying = "?random/$md5";
2848
2849 if ($exit->valid) {
2562 $exit->slaying ("?random/$md5"); 2850 $exit->slaying ("?random/$md5");
2563 $exit->msg (undef); 2851 $exit->msg (undef);
2852 }
2564 } 2853 }
2565} 2854}
2566 2855
2567sub cf::object::player::enter_exit { 2856sub cf::object::player::enter_exit {
2568 my ($self, $exit) = @_; 2857 my ($self, $exit) = @_;
2569 2858
2570 return unless $self->type == cf::PLAYER; 2859 return unless $self->type == cf::PLAYER;
2571 2860
2572 if ($exit->slaying eq "/!") {
2573 #TODO: this should de-fi-ni-te-ly not be a sync-job
2574 # the problem is that $exit might not survive long enough
2575 # so it needs to be done right now, right here
2576 cf::sync_job { prepare_random_map $exit };
2577 }
2578
2579 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2580 my $hp = $exit->stats->hp;
2581 my $sp = $exit->stats->sp;
2582
2583 $self->enter_link; 2861 $self->enter_link;
2584 2862
2585 # if exit is damned, update players death & WoR home-position
2586 $self->contr->savebed ($slaying, $hp, $sp)
2587 if $exit->flag (FLAG_DAMNED);
2588
2589 (async { 2863 (async {
2590 $self->deactivate_recursive; # just to be sure 2864 $Coro::current->{desc} = "enter_exit";
2865
2591 unless (eval { 2866 unless (eval {
2867 $self->deactivate_recursive; # just to be sure
2868
2869 # random map handling
2870 {
2871 my $guard = cf::lock_acquire "exit_prepare:$exit";
2872
2873 prepare_random_map $exit
2874 if $exit->slaying eq "/!";
2875 }
2876
2877 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2878 my $x = $exit->stats->hp;
2879 my $y = $exit->stats->sp;
2880
2592 $self->goto ($slaying, $hp, $sp); 2881 $self->goto ($map, $x, $y);
2593 2882
2883 # if exit is damned, update players death & WoR home-position
2884 $self->contr->savebed ($map, $x, $y)
2885 if $exit->flag (cf::FLAG_DAMNED);
2886
2594 1; 2887 1
2595 }) { 2888 }) {
2596 $self->message ("Something went wrong deep within the crossfire server. " 2889 $self->message ("Something went wrong deep within the deliantra server. "
2597 . "I'll try to bring you back to the map you were before. " 2890 . "I'll try to bring you back to the map you were before. "
2598 . "Please report this to the dungeon master!", 2891 . "Please report this to the dungeon master!",
2599 cf::NDI_UNIQUE | cf::NDI_RED); 2892 cf::NDI_UNIQUE | cf::NDI_RED);
2600 2893
2601 warn "ERROR in enter_exit: $@"; 2894 error "ERROR in enter_exit: $@";
2602 $self->leave_link; 2895 $self->leave_link;
2603 } 2896 }
2604 })->prio (1); 2897 })->prio (1);
2605} 2898}
2606 2899
2618sub cf::client::send_drawinfo { 2911sub cf::client::send_drawinfo {
2619 my ($self, $text, $flags) = @_; 2912 my ($self, $text, $flags) = @_;
2620 2913
2621 utf8::encode $text; 2914 utf8::encode $text;
2622 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2915 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2916}
2917
2918=item $client->send_big_packet ($pkt)
2919
2920Like C<send_packet>, but tries to compress large packets, and fragments
2921them as required.
2922
2923=cut
2924
2925our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2926
2927sub cf::client::send_big_packet {
2928 my ($self, $pkt) = @_;
2929
2930 # try lzf for large packets
2931 $pkt = "lzf " . Compress::LZF::compress $pkt
2932 if 1024 <= length $pkt and $self->{can_lzf};
2933
2934 # split very large packets
2935 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2936 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2937 $pkt = "frag";
2938 }
2939
2940 $self->send_packet ($pkt);
2623} 2941}
2624 2942
2625=item $client->send_msg ($channel, $msg, $color, [extra...]) 2943=item $client->send_msg ($channel, $msg, $color, [extra...])
2626 2944
2627Send a drawinfo or msg packet to the client, formatting the msg for the 2945Send a drawinfo or msg packet to the client, formatting the msg for the
2629the message, with C<log> being the default. If C<$color> is negative, suppress 2947the message, with C<log> being the default. If C<$color> is negative, suppress
2630the message unless the client supports the msg packet. 2948the message unless the client supports the msg packet.
2631 2949
2632=cut 2950=cut
2633 2951
2952# non-persistent channels (usually the info channel)
2634our %CHANNEL = ( 2953our %CHANNEL = (
2954 "c/motd" => {
2955 id => "infobox",
2956 title => "MOTD",
2957 reply => undef,
2958 tooltip => "The message of the day",
2959 },
2635 "c/identify" => { 2960 "c/identify" => {
2636 id => "identify", 2961 id => "infobox",
2637 title => "Identify", 2962 title => "Identify",
2638 reply => undef, 2963 reply => undef,
2639 tooltip => "Items recently identified", 2964 tooltip => "Items recently identified",
2640 }, 2965 },
2641 "c/examine" => { 2966 "c/examine" => {
2642 id => "examine", 2967 id => "infobox",
2643 title => "Examine", 2968 title => "Examine",
2644 reply => undef, 2969 reply => undef,
2645 tooltip => "Signs and other items you examined", 2970 tooltip => "Signs and other items you examined",
2646 }, 2971 },
2972 "c/shopinfo" => {
2973 id => "infobox",
2974 title => "Shop Info",
2975 reply => undef,
2976 tooltip => "What your bargaining skill tells you about the shop",
2977 },
2978 "c/book" => {
2979 id => "infobox",
2980 title => "Book",
2981 reply => undef,
2982 tooltip => "The contents of a note or book",
2983 },
2984 "c/lookat" => {
2985 id => "infobox",
2986 title => "Look",
2987 reply => undef,
2988 tooltip => "What you saw there",
2989 },
2990 "c/who" => {
2991 id => "infobox",
2992 title => "Players",
2993 reply => undef,
2994 tooltip => "Shows players who are currently online",
2995 },
2996 "c/body" => {
2997 id => "infobox",
2998 title => "Body Parts",
2999 reply => undef,
3000 tooltip => "Shows which body parts you posess and are available",
3001 },
3002 "c/statistics" => {
3003 id => "infobox",
3004 title => "Statistics",
3005 reply => undef,
3006 tooltip => "Shows your primary statistics",
3007 },
3008 "c/skills" => {
3009 id => "infobox",
3010 title => "Skills",
3011 reply => undef,
3012 tooltip => "Shows your experience per skill and item power",
3013 },
3014 "c/shopitems" => {
3015 id => "infobox",
3016 title => "Shop Items",
3017 reply => undef,
3018 tooltip => "Shows the items currently for sale in this shop",
3019 },
3020 "c/resistances" => {
3021 id => "infobox",
3022 title => "Resistances",
3023 reply => undef,
3024 tooltip => "Shows your resistances",
3025 },
3026 "c/pets" => {
3027 id => "infobox",
3028 title => "Pets",
3029 reply => undef,
3030 tooltip => "Shows information abotu your pets/a specific pet",
3031 },
3032 "c/perceiveself" => {
3033 id => "infobox",
3034 title => "Perceive Self",
3035 reply => undef,
3036 tooltip => "You gained detailed knowledge about yourself",
3037 },
3038 "c/uptime" => {
3039 id => "infobox",
3040 title => "Uptime",
3041 reply => undef,
3042 tooltip => "How long the server has been running since last restart",
3043 },
3044 "c/mapinfo" => {
3045 id => "infobox",
3046 title => "Map Info",
3047 reply => undef,
3048 tooltip => "Information related to the maps",
3049 },
3050 "c/party" => {
3051 id => "party",
3052 title => "Party",
3053 reply => "gsay ",
3054 tooltip => "Messages and chat related to your party",
3055 },
3056 "c/death" => {
3057 id => "death",
3058 title => "Death",
3059 reply => undef,
3060 tooltip => "Reason for and more info about your most recent death",
3061 },
3062 "c/say" => $SAY_CHANNEL,
3063 "c/chat" => $CHAT_CHANNEL,
2647); 3064);
2648 3065
2649sub cf::client::send_msg { 3066sub cf::client::send_msg {
2650 my ($self, $channel, $msg, $color, @extra) = @_; 3067 my ($self, $channel, $msg, $color, @extra) = @_;
2651 3068
2652 $msg = $self->pl->expand_cfpod ($msg); 3069 $msg = $self->pl->expand_cfpod ($msg)
3070 unless $color & cf::NDI_VERBATIM;
2653 3071
2654 $color &= cf::NDI_CLIENT_MASK; # just in case... 3072 $color &= cf::NDI_CLIENT_MASK; # just in case...
2655 3073
2656 # check predefined channels, for the benefit of C 3074 # check predefined channels, for the benefit of C
2657 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 3075 if ($CHANNEL{$channel}) {
3076 $channel = $CHANNEL{$channel};
2658 3077
3078 $self->ext_msg (channel_info => $channel);
3079 $channel = $channel->{id};
3080
2659 if (ref $channel) { 3081 } elsif (ref $channel) {
2660 # send meta info to client, if not yet sent 3082 # send meta info to client, if not yet sent
2661 unless (exists $self->{channel}{$channel->{id}}) { 3083 unless (exists $self->{channel}{$channel->{id}}) {
2662 $self->{channel}{$channel->{id}} = $channel; 3084 $self->{channel}{$channel->{id}} = $channel;
2663 $self->ext_msg (channel_info => $channel) 3085 $self->ext_msg (channel_info => $channel);
2664 if $self->can_msg;
2665 } 3086 }
2666 3087
2667 $channel = $channel->{id}; 3088 $channel = $channel->{id};
2668 } 3089 }
2669 3090
2670 return unless @extra || length $msg; 3091 return unless @extra || length $msg;
2671 3092
2672 if ($self->can_msg) {
2673 # default colour, mask it out 3093 # default colour, mask it out
2674 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3094 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2675 if $color & cf::NDI_DEF; 3095 if $color & cf::NDI_DEF;
2676 3096
2677 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3097 my $pkt = "msg "
3098 . $self->{json_coder}->encode (
2678 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3099 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2679 } else { 3100 );
2680 if ($color >= 0) {
2681 # replace some tags by gcfclient-compatible ones
2682 for ($msg) {
2683 1 while
2684 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2685 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2686 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2687 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2688 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2689 }
2690 3101
2691 $color &= cf::NDI_COLOR_MASK; 3102 $self->send_big_packet ($pkt);
2692
2693 utf8::encode $msg;
2694
2695 if (0 && $msg =~ /\[/) {
2696 # COMMAND/INFO
2697 $self->send_packet ("drawextinfo $color 10 8 $msg")
2698 } else {
2699 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2700 $self->send_packet ("drawinfo $color $msg")
2701 }
2702 }
2703 }
2704} 3103}
2705 3104
2706=item $client->ext_msg ($type, @msg) 3105=item $client->ext_msg ($type, @msg)
2707 3106
2708Sends an ext event to the client. 3107Sends an ext event to the client.
2711 3110
2712sub cf::client::ext_msg($$@) { 3111sub cf::client::ext_msg($$@) {
2713 my ($self, $type, @msg) = @_; 3112 my ($self, $type, @msg) = @_;
2714 3113
2715 if ($self->extcmd == 2) { 3114 if ($self->extcmd == 2) {
2716 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2717 } elsif ($self->extcmd == 1) { # TODO: remove 3116 } elsif ($self->extcmd == 1) { # TODO: remove
2718 push @msg, msgtype => "event_$type"; 3117 push @msg, msgtype => "event_$type";
2719 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3118 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2720 } 3119 }
2721} 3120}
2722 3121
2723=item $client->ext_reply ($msgid, @msg) 3122=item $client->ext_reply ($msgid, @msg)
2724 3123
2728 3127
2729sub cf::client::ext_reply($$@) { 3128sub cf::client::ext_reply($$@) {
2730 my ($self, $id, @msg) = @_; 3129 my ($self, $id, @msg) = @_;
2731 3130
2732 if ($self->extcmd == 2) { 3131 if ($self->extcmd == 2) {
2733 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3132 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2734 } elsif ($self->extcmd == 1) { 3133 } elsif ($self->extcmd == 1) {
2735 #TODO: version 1, remove 3134 #TODO: version 1, remove
2736 unshift @msg, msgtype => "reply", msgid => $id; 3135 unshift @msg, msgtype => "reply", msgid => $id;
2737 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3136 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2738 } 3137 }
2739} 3138}
2740 3139
2741=item $success = $client->query ($flags, "text", \&cb) 3140=item $success = $client->query ($flags, "text", \&cb)
2742 3141
2813 3212
2814 $ns->ext_reply ($reply, @reply) 3213 $ns->ext_reply ($reply, @reply)
2815 if $reply; 3214 if $reply;
2816 3215
2817 } else { 3216 } else {
2818 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3217 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2819 } 3218 }
2820 3219
2821 cf::override; 3220 cf::override;
2822 }, 3221 },
2823); 3222);
2843 3242
2844 $coro 3243 $coro
2845} 3244}
2846 3245
2847cf::client->attach ( 3246cf::client->attach (
2848 on_destroy => sub { 3247 on_client_destroy => sub {
2849 my ($ns) = @_; 3248 my ($ns) = @_;
2850 3249
2851 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3250 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2852 }, 3251 },
2853); 3252);
2869our $safe_hole = new Safe::Hole; 3268our $safe_hole = new Safe::Hole;
2870 3269
2871$SIG{FPE} = 'IGNORE'; 3270$SIG{FPE} = 'IGNORE';
2872 3271
2873$safe->permit_only (Opcode::opset qw( 3272$safe->permit_only (Opcode::opset qw(
2874 :base_core :base_mem :base_orig :base_math 3273 :base_core :base_mem :base_orig :base_math :base_loop
2875 grepstart grepwhile mapstart mapwhile 3274 grepstart grepwhile mapstart mapwhile
2876 sort time 3275 sort time
2877)); 3276));
2878 3277
2879# here we export the classes and methods available to script code 3278# here we export the classes and methods available to script code
2881=pod 3280=pod
2882 3281
2883The following functions and methods are available within a safe environment: 3282The following functions and methods are available within a safe environment:
2884 3283
2885 cf::object 3284 cf::object
2886 contr pay_amount pay_player map x y force_find force_add 3285 contr pay_amount pay_player map x y force_find force_add destroy
2887 insert remove name archname title slaying race decrease_ob_nr 3286 insert remove name archname title slaying race decrease split
3287 value
2888 3288
2889 cf::object::player 3289 cf::object::player
2890 player 3290 player
2891 3291
2892 cf::player 3292 cf::player
2897 3297
2898=cut 3298=cut
2899 3299
2900for ( 3300for (
2901 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3301 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2902 insert remove inv name archname title slaying race 3302 insert remove inv nrof name archname title slaying race
2903 decrease_ob_nr)], 3303 decrease split destroy change_exp value msg lore send_msg)],
2904 ["cf::object::player" => qw(player)], 3304 ["cf::object::player" => qw(player)],
2905 ["cf::player" => qw(peaceful)], 3305 ["cf::player" => qw(peaceful send_msg)],
2906 ["cf::map" => qw(trigger)], 3306 ["cf::map" => qw(trigger)],
2907) { 3307) {
2908 no strict 'refs';
2909 my ($pkg, @funs) = @$_; 3308 my ($pkg, @funs) = @$_;
2910 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3309 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2911 for @funs; 3310 for @funs;
2912} 3311}
2913 3312
2928 3327
2929 my $qcode = $code; 3328 my $qcode = $code;
2930 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3329 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2931 $qcode =~ s/\n/\\n/g; 3330 $qcode =~ s/\n/\\n/g;
2932 3331
3332 %vars = (_dummy => 0) unless %vars;
3333
3334 my @res;
2933 local $_; 3335 local $_;
2934 local @safe::cf::_safe_eval_args = values %vars;
2935 3336
2936 my $eval = 3337 my $eval =
2937 "do {\n" 3338 "do {\n"
2938 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3339 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2939 . "#line 0 \"{$qcode}\"\n" 3340 . "#line 0 \"{$qcode}\"\n"
2940 . $code 3341 . $code
2941 . "\n}" 3342 . "\n}"
2942 ; 3343 ;
2943 3344
3345 if ($CFG{safe_eval}) {
2944 sub_generation_inc; 3346 sub_generation_inc;
3347 local @safe::cf::_safe_eval_args = values %vars;
2945 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3348 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2946 sub_generation_inc; 3349 sub_generation_inc;
3350 } else {
3351 local @cf::_safe_eval_args = values %vars;
3352 @res = wantarray ? eval eval : scalar eval $eval;
3353 }
2947 3354
2948 if ($@) { 3355 if ($@) {
2949 warn "$@"; 3356 warn "$@",
2950 warn "while executing safe code '$code'\n"; 3357 "while executing safe code '$code'\n",
2951 warn "with arguments " . (join " ", %vars) . "\n"; 3358 "with arguments " . (join " ", %vars) . "\n";
2952 } 3359 }
2953 3360
2954 wantarray ? @res : $res[0] 3361 wantarray ? @res : $res[0]
2955} 3362}
2956 3363
2970=cut 3377=cut
2971 3378
2972sub register_script_function { 3379sub register_script_function {
2973 my ($fun, $cb) = @_; 3380 my ($fun, $cb) = @_;
2974 3381
2975 no strict 'refs'; 3382 $fun = "safe::$fun" if $CFG{safe_eval};
2976 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3383 *$fun = $safe_hole->wrap ($cb);
2977} 3384}
2978 3385
2979=back 3386=back
2980 3387
2981=cut 3388=cut
2990 # for this (global event?) 3397 # for this (global event?)
2991 %ext::player_env::MUSIC_FACE_CACHE = (); 3398 %ext::player_env::MUSIC_FACE_CACHE = ();
2992 3399
2993 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3400 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2994 3401
2995 warn "loading facedata from $path\n"; 3402 trace "loading facedata from $path\n";
2996 3403
2997 my $facedata;
2998 0 < aio_load $path, $facedata 3404 0 < aio_load $path, my $facedata
2999 or die "$path: $!"; 3405 or die "$path: $!";
3000 3406
3001 $facedata = Coro::Storable::thaw $facedata; 3407 $facedata = Coro::Storable::thaw $facedata;
3002 3408
3003 $facedata->{version} == 2 3409 $facedata->{version} == 2
3004 or cf::cleanup "$path: version mismatch, cannot proceed."; 3410 or cf::cleanup "$path: version mismatch, cannot proceed.";
3005 3411
3006 # patch in the exptable 3412 # patch in the exptable
3413 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3007 $facedata->{resource}{"res/exp_table"} = { 3414 $facedata->{resource}{"res/exp_table"} = {
3008 type => FT_RSRC, 3415 type => FT_RSRC,
3009 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3416 data => $exp_table,
3417 hash => (Digest::MD5::md5 $exp_table),
3010 }; 3418 };
3011 cf::cede_to_tick; 3419 cf::cede_to_tick;
3012 3420
3013 { 3421 {
3014 my $faces = $facedata->{faceinfo}; 3422 my $faces = $facedata->{faceinfo};
3015 3423
3016 while (my ($face, $info) = each %$faces) { 3424 while (my ($face, $info) = each %$faces) {
3017 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3425 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3426
3018 cf::face::set_visibility $idx, $info->{visibility}; 3427 cf::face::set_visibility $idx, $info->{visibility};
3019 cf::face::set_magicmap $idx, $info->{magicmap}; 3428 cf::face::set_magicmap $idx, $info->{magicmap};
3020 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3429 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3021 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3430 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3431 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3022 3432
3023 cf::cede_to_tick; 3433 cf::cede_to_tick;
3024 } 3434 }
3025 3435
3026 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
3027 next unless $info->{smooth}; 3437 next unless $info->{smooth};
3438
3028 my $idx = cf::face::find $face 3439 my $idx = cf::face::find $face
3029 or next; 3440 or next;
3441
3030 if (my $smooth = cf::face::find $info->{smooth}) { 3442 if (my $smooth = cf::face::find $info->{smooth}) {
3031 cf::face::set_smooth $idx, $smooth; 3443 cf::face::set_smooth $idx, $smooth;
3032 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3444 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3033 } else { 3445 } else {
3034 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3446 error "smooth face '$info->{smooth}' not found for face '$face'";
3035 } 3447 }
3036 3448
3037 cf::cede_to_tick; 3449 cf::cede_to_tick;
3038 } 3450 }
3039 } 3451 }
3048 3460
3049 cf::anim::invalidate_all; # d'oh 3461 cf::anim::invalidate_all; # d'oh
3050 } 3462 }
3051 3463
3052 { 3464 {
3053 # TODO: for gcfclient pleasure, we should give resources
3054 # that gcfclient doesn't grok a >10000 face index.
3055 my $res = $facedata->{resource}; 3465 my $res = $facedata->{resource};
3056 3466
3057 my $soundconf = delete $res->{"res/sound.conf"};
3058
3059 while (my ($name, $info) = each %$res) { 3467 while (my ($name, $info) = each %$res) {
3468 if (defined $info->{type}) {
3060 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3469 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3061 my $data;
3062 3470
3063 if ($info->{type} & 1) { 3471 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3064 # prepend meta info 3472 cf::face::set_type $idx, $info->{type};
3065
3066 my $meta = $enc->encode ({
3067 name => $name,
3068 %{ $info->{meta} || {} },
3069 });
3070
3071 $data = pack "(w/a*)*", $meta, $info->{data};
3072 } else { 3473 } else {
3073 $data = $info->{data}; 3474 $RESOURCE{$name} = $info; # unused
3074 } 3475 }
3075 3476
3076 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3077 cf::face::set_type $idx, $info->{type};
3078
3079 cf::cede_to_tick; 3477 cf::cede_to_tick;
3080 } 3478 }
3081
3082 if ($soundconf) {
3083 $soundconf = $enc->decode (delete $soundconf->{data});
3084
3085 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3086 my $sound = $soundconf->{compat}[$_]
3087 or next;
3088
3089 my $face = cf::face::find "sound/$sound->[1]";
3090 cf::sound::set $sound->[0] => $face;
3091 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3092 }
3093
3094 while (my ($k, $v) = each %{$soundconf->{event}}) {
3095 my $face = cf::face::find "sound/$v";
3096 cf::sound::set $k => $face;
3097 }
3098 }
3099 } 3479 }
3480
3481 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3100 3482
3101 1 3483 1
3102} 3484}
3103 3485
3104register_exticmd fx_want => sub { 3486register_exticmd fx_want => sub {
3106 3488
3107 while (my ($k, $v) = each %$want) { 3489 while (my ($k, $v) = each %$want) {
3108 $ns->fx_want ($k, $v); 3490 $ns->fx_want ($k, $v);
3109 } 3491 }
3110}; 3492};
3493
3494sub load_resource_file($) {
3495 my $guard = lock_acquire "load_resource_file";
3496
3497 my $status = load_resource_file_ $_[0];
3498 get_slot 0.1, 100;
3499 cf::arch::commit_load;
3500
3501 $status
3502}
3111 3503
3112sub reload_regions { 3504sub reload_regions {
3113 # HACK to clear player env face cache, we need some signal framework 3505 # HACK to clear player env face cache, we need some signal framework
3114 # for this (global event?) 3506 # for this (global event?)
3115 %ext::player_env::MUSIC_FACE_CACHE = (); 3507 %ext::player_env::MUSIC_FACE_CACHE = ();
3129} 3521}
3130 3522
3131sub reload_archetypes { 3523sub reload_archetypes {
3132 load_resource_file "$DATADIR/archetypes" 3524 load_resource_file "$DATADIR/archetypes"
3133 or die "unable to load archetypes\n"; 3525 or die "unable to load archetypes\n";
3134 #d# NEED to laod twice to resolve forward references
3135 # this really needs to be done in an extra post-pass
3136 # (which needs to be synchronous, so solve it differently)
3137 load_resource_file "$DATADIR/archetypes"
3138 or die "unable to load archetypes\n";
3139} 3526}
3140 3527
3141sub reload_treasures { 3528sub reload_treasures {
3142 load_resource_file "$DATADIR/treasures" 3529 load_resource_file "$DATADIR/treasures"
3143 or die "unable to load treasurelists\n"; 3530 or die "unable to load treasurelists\n";
3144} 3531}
3145 3532
3533sub reload_sound {
3534 trace "loading sound config from $DATADIR/sound\n";
3535
3536 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3537 or die "$DATADIR/sound $!";
3538
3539 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3540
3541 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3542 my $sound = $soundconf->{compat}[$_]
3543 or next;
3544
3545 my $face = cf::face::find "sound/$sound->[1]";
3546 cf::sound::set $sound->[0] => $face;
3547 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3548 }
3549
3550 while (my ($k, $v) = each %{$soundconf->{event}}) {
3551 my $face = cf::face::find "sound/$v";
3552 cf::sound::set $k => $face;
3553 }
3554}
3555
3146sub reload_resources { 3556sub reload_resources {
3147 warn "reloading resource files...\n"; 3557 trace "reloading resource files...\n";
3148 3558
3559 reload_exp_table;
3560 reload_materials;
3561 reload_facedata;
3562 reload_sound;
3563 reload_archetypes;
3149 reload_regions; 3564 reload_regions;
3150 reload_facedata;
3151 #reload_archetypes;#d#
3152 reload_archetypes;
3153 reload_treasures; 3565 reload_treasures;
3154 3566
3155 warn "finished reloading resource files\n"; 3567 trace "finished reloading resource files\n";
3156}
3157
3158sub init {
3159 reload_resources;
3160} 3568}
3161 3569
3162sub reload_config { 3570sub reload_config {
3163 open my $fh, "<:utf8", "$CONFDIR/config" 3571 trace "reloading config file...\n";
3164 or return;
3165 3572
3166 local $/; 3573 0 < aio_load "$CONFDIR/config", my $config
3167 *CFG = YAML::Syck::Load <$fh>; 3574 or die "$CONFDIR/config: $!";
3168 3575
3576 utf8::decode $config;
3577 *CFG = yaml_load $config;
3578
3169 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3579 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3170 3580
3171 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3581 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3172 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3582 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3173 3583
3174 if (exists $CFG{mlockall}) { 3584 if (exists $CFG{mlockall}) {
3178 }; 3588 };
3179 warn $@ if $@; 3589 warn $@ if $@;
3180 } 3590 }
3181} 3591}
3182 3592
3593sub pidfile() {
3594 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3595 or die "$PIDFILE: $!";
3596 flock $fh, &Fcntl::LOCK_EX
3597 or die "$PIDFILE: flock: $!";
3598 $fh
3599}
3600
3601# make sure only one server instance is running at any one time
3602sub atomic {
3603 my $fh = pidfile;
3604
3605 my $pid = <$fh>;
3606 kill 9, $pid if $pid > 0;
3607
3608 seek $fh, 0, 0;
3609 print $fh $$;
3610}
3611
3612sub main_loop {
3613 trace "EV::loop starting\n";
3614 if (1) {
3615 EV::loop;
3616 }
3617 trace "EV::loop returned\n";
3618 goto &main_loop unless $REALLY_UNLOOP;
3619}
3620
3183sub main { 3621sub main {
3622 cf::init_globals; # initialise logging
3623
3624 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3625 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3626 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3627 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3628
3629 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3630
3184 # we must not ever block the main coroutine 3631 # we must not ever block the main coroutine
3185 local $Coro::idle = sub { 3632 local $Coro::idle = sub {
3186 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3633 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3187 (async { 3634 (async {
3188 Event::one_event; 3635 $Coro::current->{desc} = "IDLE BUG HANDLER";
3636 EV::loop EV::LOOP_ONESHOT;
3189 })->prio (Coro::PRIO_MAX); 3637 })->prio (Coro::PRIO_MAX);
3190 }; 3638 };
3191 3639
3640 evthread_start IO::AIO::poll_fileno;
3641
3642 cf::sync_job {
3643 cf::incloader::init ();
3644
3645 cf::init_anim;
3646 cf::init_attackmess;
3647 cf::init_dynamic;
3648
3649 cf::load_settings;
3650
3651 reload_resources;
3192 reload_config; 3652 reload_config;
3193 db_init; 3653 db_init;
3654
3655 cf::init_uuid;
3656 cf::init_signals;
3657 cf::init_skills;
3658
3659 cf::init_beforeplay;
3660
3661 atomic;
3662
3194 load_extensions; 3663 load_extensions;
3195 3664
3196 $TICK_WATCHER->start; 3665 utime time, time, $RUNTIMEFILE;
3197 Event::loop; 3666
3667 # no (long-running) fork's whatsoever before this point(!)
3668 use POSIX ();
3669 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3670
3671 cf::_post_init 0;
3672 };
3673
3674 cf::object::thawer::errors_are_fatal 0;
3675 info "parse errors in files are no longer fatal from this point on.\n";
3676
3677 my $free_main; $free_main = EV::idle sub {
3678 undef $free_main;
3679 undef &main; # free gobs of memory :)
3680 };
3681
3682 goto &main_loop;
3198} 3683}
3199 3684
3200############################################################################# 3685#############################################################################
3201# initialisation and cleanup 3686# initialisation and cleanup
3202 3687
3203# install some emergency cleanup handlers 3688# install some emergency cleanup handlers
3204BEGIN { 3689BEGIN {
3690 our %SIGWATCHER = ();
3205 for my $signal (qw(INT HUP TERM)) { 3691 for my $signal (qw(INT HUP TERM)) {
3206 Event->signal ( 3692 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3207 reentrant => 0,
3208 data => WF_AUTOCANCEL,
3209 signal => $signal,
3210 prio => 0,
3211 cb => sub {
3212 cf::cleanup "SIG$signal"; 3693 cf::cleanup "SIG$signal";
3213 },
3214 ); 3694 };
3215 } 3695 }
3216} 3696}
3217 3697
3218sub write_runtime { 3698sub write_runtime_sync {
3219 my $runtime = "$LOCALDIR/runtime"; 3699 my $t0 = AE::time;
3220 3700
3221 # first touch the runtime file to show we are still running: 3701 # first touch the runtime file to show we are still running:
3222 # the fsync below can take a very very long time. 3702 # the fsync below can take a very very long time.
3223 3703
3224 IO::AIO::aio_utime $runtime, undef, undef; 3704 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3225 3705
3226 my $guard = cf::lock_acquire "write_runtime"; 3706 my $guard = cf::lock_acquire "write_runtime";
3227 3707
3228 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3708 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3229 or return; 3709 or return;
3230 3710
3231 my $value = $cf::RUNTIME + 90 + 10; 3711 my $value = $cf::RUNTIME + 90 + 10;
3232 # 10 is the runtime save interval, for a monotonic clock 3712 # 10 is the runtime save interval, for a monotonic clock
3233 # 60 allows for the watchdog to kill the server. 3713 # 60 allows for the watchdog to kill the server.
3243 aio_utime $fh, undef, undef; 3723 aio_utime $fh, undef, undef;
3244 3724
3245 close $fh 3725 close $fh
3246 or return; 3726 or return;
3247 3727
3248 aio_rename "$runtime~", $runtime 3728 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3249 and return; 3729 and return;
3250 3730
3251 warn "runtime file written.\n"; 3731 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3252 3732
3253 1 3733 1
3734}
3735
3736our $uuid_lock;
3737our $uuid_skip;
3738
3739sub write_uuid_sync($) {
3740 $uuid_skip ||= $_[0];
3741
3742 return if $uuid_lock;
3743 local $uuid_lock = 1;
3744
3745 my $uuid = "$LOCALDIR/uuid";
3746
3747 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3748 or return;
3749
3750 my $value = uuid_seq uuid_cur;
3751
3752 unless ($value) {
3753 info "cowardly refusing to write zero uuid value!\n";
3754 return;
3755 }
3756
3757 my $value = uuid_str $value + $uuid_skip;
3758 $uuid_skip = 0;
3759
3760 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3761 and return;
3762
3763 # always fsync - this file is important
3764 aio_fsync $fh
3765 and return;
3766
3767 close $fh
3768 or return;
3769
3770 aio_rename "$uuid~", $uuid
3771 and return;
3772
3773 trace "uuid file written ($value).\n";
3774
3775 1
3776
3777}
3778
3779sub write_uuid($$) {
3780 my ($skip, $sync) = @_;
3781
3782 $sync ? write_uuid_sync $skip
3783 : async { write_uuid_sync $skip };
3254} 3784}
3255 3785
3256sub emergency_save() { 3786sub emergency_save() {
3257 my $freeze_guard = cf::freeze_mainloop; 3787 my $freeze_guard = cf::freeze_mainloop;
3258 3788
3259 warn "enter emergency perl save\n"; 3789 info "emergency_perl_save: enter\n";
3790
3791 # this is a trade-off: we want to be very quick here, so
3792 # save all maps without fsync, and later call a global sync
3793 # (which in turn might be very very slow)
3794 local $USE_FSYNC = 0;
3260 3795
3261 cf::sync_job { 3796 cf::sync_job {
3797 cf::write_runtime_sync; # external watchdog should not bark
3798
3262 # use a peculiar iteration method to avoid tripping on perl 3799 # use a peculiar iteration method to avoid tripping on perl
3263 # refcount bugs in for. also avoids problems with players 3800 # refcount bugs in for. also avoids problems with players
3264 # and maps saved/destroyed asynchronously. 3801 # and maps saved/destroyed asynchronously.
3265 warn "begin emergency player save\n"; 3802 info "emergency_perl_save: begin player save\n";
3266 for my $login (keys %cf::PLAYER) { 3803 for my $login (keys %cf::PLAYER) {
3267 my $pl = $cf::PLAYER{$login} or next; 3804 my $pl = $cf::PLAYER{$login} or next;
3268 $pl->valid or next; 3805 $pl->valid or next;
3806 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3269 $pl->save; 3807 $pl->save;
3270 } 3808 }
3271 warn "end emergency player save\n"; 3809 info "emergency_perl_save: end player save\n";
3272 3810
3273 warn "begin emergency map save\n"; 3811 cf::write_runtime_sync; # external watchdog should not bark
3812
3813 info "emergency_perl_save: begin map save\n";
3274 for my $path (keys %cf::MAP) { 3814 for my $path (keys %cf::MAP) {
3275 my $map = $cf::MAP{$path} or next; 3815 my $map = $cf::MAP{$path} or next;
3276 $map->valid or next; 3816 $map->valid or next;
3277 $map->save; 3817 $map->save;
3278 } 3818 }
3279 warn "end emergency map save\n"; 3819 info "emergency_perl_save: end map save\n";
3280 3820
3281 warn "begin emergency database checkpoint\n"; 3821 cf::write_runtime_sync; # external watchdog should not bark
3822
3823 info "emergency_perl_save: begin database checkpoint\n";
3282 BDB::db_env_txn_checkpoint $DB_ENV; 3824 BDB::db_env_txn_checkpoint $DB_ENV;
3283 warn "end emergency database checkpoint\n"; 3825 info "emergency_perl_save: end database checkpoint\n";
3826
3827 info "emergency_perl_save: begin write uuid\n";
3828 write_uuid_sync 1;
3829 info "emergency_perl_save: end write uuid\n";
3830
3831 cf::write_runtime_sync; # external watchdog should not bark
3832
3833 trace "emergency_perl_save: syncing database to disk";
3834 BDB::db_env_txn_checkpoint $DB_ENV;
3835
3836 info "emergency_perl_save: starting sync\n";
3837 IO::AIO::aio_sync sub {
3838 info "emergency_perl_save: finished sync\n";
3839 };
3840
3841 cf::write_runtime_sync; # external watchdog should not bark
3842
3843 trace "emergency_perl_save: flushing outstanding aio requests";
3844 while (IO::AIO::nreqs || BDB::nreqs) {
3845 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3846 }
3847
3848 cf::write_runtime_sync; # external watchdog should not bark
3284 }; 3849 };
3285 3850
3286 warn "leave emergency perl save\n"; 3851 info "emergency_perl_save: leave\n";
3287} 3852}
3288 3853
3289sub post_cleanup { 3854sub post_cleanup {
3290 my ($make_core) = @_; 3855 my ($make_core) = @_;
3291 3856
3857 IO::AIO::flush;
3858
3292 warn Carp::longmess "post_cleanup backtrace" 3859 error Carp::longmess "post_cleanup backtrace"
3293 if $make_core; 3860 if $make_core;
3861
3862 my $fh = pidfile;
3863 unlink $PIDFILE if <$fh> == $$;
3864}
3865
3866# a safer delete_package, copied from Symbol
3867sub clear_package($) {
3868 my $pkg = shift;
3869
3870 # expand to full symbol table name if needed
3871 unless ($pkg =~ /^main::.*::$/) {
3872 $pkg = "main$pkg" if $pkg =~ /^::/;
3873 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3874 $pkg .= '::' unless $pkg =~ /::$/;
3875 }
3876
3877 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3878 my $stem_symtab = *{$stem}{HASH};
3879
3880 defined $stem_symtab and exists $stem_symtab->{$leaf}
3881 or return;
3882
3883 # clear all symbols
3884 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3885 for my $name (keys %$leaf_symtab) {
3886 _gv_clear *{"$pkg$name"};
3887# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3888 }
3294} 3889}
3295 3890
3296sub do_reload_perl() { 3891sub do_reload_perl() {
3297 # can/must only be called in main 3892 # can/must only be called in main
3298 if ($Coro::current != $Coro::main) { 3893 unless (in_main) {
3299 warn "can only reload from main coroutine"; 3894 error "can only reload from main coroutine";
3300 return; 3895 return;
3301 } 3896 }
3302 3897
3303 warn "reloading..."; 3898 return if $RELOAD++;
3304 3899
3305 warn "entering sync_job"; 3900 my $t1 = AE::time;
3306 3901
3902 while ($RELOAD) {
3903 cf::get_slot 0.1, -1, "reload_perl";
3904 info "perl_reload: reloading...";
3905
3906 trace "perl_reload: entering sync_job";
3907
3307 cf::sync_job { 3908 cf::sync_job {
3308 cf::write_runtime; # external watchdog should not bark
3309 cf::emergency_save; 3909 #cf::emergency_save;
3310 cf::write_runtime; # external watchdog should not bark
3311 3910
3312 warn "syncing database to disk";
3313 BDB::db_env_txn_checkpoint $DB_ENV;
3314
3315 # if anything goes wrong in here, we should simply crash as we already saved
3316
3317 warn "cancelling all WF_AUTOCANCEL watchers";
3318 for (Event::all_watchers) {
3319 $_->cancel if $_->data & WF_AUTOCANCEL;
3320 }
3321
3322 warn "flushing outstanding aio requests";
3323 for (;;) {
3324 BDB::flush;
3325 IO::AIO::flush;
3326 Coro::cede;
3327 last unless IO::AIO::nreqs || BDB::nreqs;
3328 warn "iterate...";
3329 }
3330
3331 ++$RELOAD;
3332
3333 warn "cancelling all extension coros"; 3911 trace "perl_reload: cancelling all extension coros";
3334 $_->cancel for values %EXT_CORO; 3912 $_->cancel for values %EXT_CORO;
3335 %EXT_CORO = (); 3913 %EXT_CORO = ();
3336 3914
3337 warn "removing commands"; 3915 trace "perl_reload: removing commands";
3338 %COMMAND = (); 3916 %COMMAND = ();
3339 3917
3340 warn "removing ext/exti commands"; 3918 trace "perl_reload: removing ext/exti commands";
3341 %EXTCMD = (); 3919 %EXTCMD = ();
3342 %EXTICMD = (); 3920 %EXTICMD = ();
3343 3921
3344 warn "unloading/nuking all extensions"; 3922 trace "perl_reload: unloading/nuking all extensions";
3345 for my $pkg (@EXTS) { 3923 for my $pkg (@EXTS) {
3346 warn "... unloading $pkg"; 3924 trace "... unloading $pkg";
3347 3925
3348 if (my $cb = $pkg->can ("unload")) { 3926 if (my $cb = $pkg->can ("unload")) {
3349 eval { 3927 eval {
3350 $cb->($pkg); 3928 $cb->($pkg);
3351 1 3929 1
3352 } or warn "$pkg unloaded, but with errors: $@"; 3930 } or error "$pkg unloaded, but with errors: $@";
3931 }
3932
3933 trace "... clearing $pkg";
3934 clear_package $pkg;
3353 } 3935 }
3354 3936
3355 warn "... nuking $pkg";
3356 Symbol::delete_package $pkg;
3357 }
3358
3359 warn "unloading all perl modules loaded from $LIBDIR"; 3937 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3360 while (my ($k, $v) = each %INC) { 3938 while (my ($k, $v) = each %INC) {
3361 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3939 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3362 3940
3363 warn "... unloading $k"; 3941 trace "... unloading $k";
3364 delete $INC{$k}; 3942 delete $INC{$k};
3365 3943
3366 $k =~ s/\.pm$//; 3944 $k =~ s/\.pm$//;
3367 $k =~ s/\//::/g; 3945 $k =~ s/\//::/g;
3368 3946
3369 if (my $cb = $k->can ("unload_module")) { 3947 if (my $cb = $k->can ("unload_module")) {
3370 $cb->(); 3948 $cb->();
3949 }
3950
3951 clear_package $k;
3371 } 3952 }
3372 3953
3373 Symbol::delete_package $k;
3374 }
3375
3376 warn "getting rid of safe::, as good as possible"; 3954 trace "perl_reload: getting rid of safe::, as good as possible";
3377 Symbol::delete_package "safe::$_" 3955 clear_package "safe::$_"
3378 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3956 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3379 3957
3380 warn "unloading cf.pm \"a bit\""; 3958 trace "perl_reload: unloading cf.pm \"a bit\"";
3381 delete $INC{"cf.pm"}; 3959 delete $INC{"cf.pm"};
3382 delete $INC{"cf/pod.pm"}; 3960 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3383 3961
3384 # don't, removes xs symbols, too, 3962 # don't, removes xs symbols, too,
3385 # and global variables created in xs 3963 # and global variables created in xs
3386 #Symbol::delete_package __PACKAGE__; 3964 #clear_package __PACKAGE__;
3387 3965
3388 warn "unload completed, starting to reload now"; 3966 info "perl_reload: unload completed, starting to reload now";
3389 3967
3390 warn "reloading cf.pm"; 3968 trace "perl_reload: reloading cf.pm";
3391 require cf; 3969 require cf;
3392 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3970 cf::_connect_to_perl_1;
3393 3971
3394 warn "loading config and database again"; 3972 trace "perl_reload: loading config and database again";
3395 cf::reload_config; 3973 cf::reload_config;
3396 3974
3397 warn "loading extensions"; 3975 trace "perl_reload: loading extensions";
3398 cf::load_extensions; 3976 cf::load_extensions;
3399 3977
3978 if ($REATTACH_ON_RELOAD) {
3400 warn "reattaching attachments to objects/players"; 3979 trace "perl_reload: reattaching attachments to objects/players";
3401 _global_reattach; # objects, sockets 3980 _global_reattach; # objects, sockets
3402 warn "reattaching attachments to maps"; 3981 trace "perl_reload: reattaching attachments to maps";
3403 reattach $_ for values %MAP; 3982 reattach $_ for values %MAP;
3404 warn "reattaching attachments to players"; 3983 trace "perl_reload: reattaching attachments to players";
3405 reattach $_ for values %PLAYER; 3984 reattach $_ for values %PLAYER;
3985 }
3406 3986
3407 warn "leaving sync_job"; 3987 cf::_post_init 1;
3408 3988
3989 trace "perl_reload: leaving sync_job";
3990
3409 1 3991 1
3410 } or do { 3992 } or do {
3411 warn $@; 3993 error $@;
3412 warn "error while reloading, exiting."; 3994 cf::cleanup "perl_reload: error, exiting.";
3413 exit 1; 3995 };
3996
3997 --$RELOAD;
3414 }; 3998 }
3415 3999
3416 warn "reloaded"; 4000 $t1 = AE::time - $t1;
4001 info "perl_reload: completed in ${t1}s\n";
3417}; 4002};
3418 4003
3419our $RELOAD_WATCHER; # used only during reload 4004our $RELOAD_WATCHER; # used only during reload
3420 4005
3421sub reload_perl() { 4006sub reload_perl() {
3422 # doing reload synchronously and two reloads happen back-to-back, 4007 # doing reload synchronously and two reloads happen back-to-back,
3423 # coro crashes during coro_state_free->destroy here. 4008 # coro crashes during coro_state_free->destroy here.
3424 4009
3425 $RELOAD_WATCHER ||= Event->timer ( 4010 $RELOAD_WATCHER ||= cf::async {
3426 reentrant => 0, 4011 Coro::AIO::aio_wait cache_extensions;
3427 after => 0, 4012
3428 data => WF_AUTOCANCEL, 4013 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3429 cb => sub {
3430 do_reload_perl; 4014 do_reload_perl;
3431 undef $RELOAD_WATCHER; 4015 undef $RELOAD_WATCHER;
3432 }, 4016 };
3433 ); 4017 };
3434} 4018}
3435 4019
3436register_command "reload" => sub { 4020register_command "reload" => sub {
3437 my ($who, $arg) = @_; 4021 my ($who, $arg) = @_;
3438 4022
3439 if ($who->flag (FLAG_WIZ)) { 4023 if ($who->flag (FLAG_WIZ)) {
3440 $who->message ("reloading server."); 4024 $who->message ("reloading server.");
4025 async {
4026 $Coro::current->{desc} = "perl_reload";
3441 async { reload_perl }; 4027 reload_perl;
4028 };
3442 } 4029 }
3443}; 4030};
3444 4031
3445unshift @INC, $LIBDIR; 4032#############################################################################
3446 4033
3447my $bug_warning = 0; 4034my $bug_warning = 0;
3448 4035
3449our @WAIT_FOR_TICK; 4036our @WAIT_FOR_TICK;
3450our @WAIT_FOR_TICK_BEGIN; 4037our @WAIT_FOR_TICK_BEGIN;
3451 4038
3452sub wait_for_tick { 4039sub wait_for_tick() {
3453 return unless $TICK_WATCHER->is_active;
3454 return if $Coro::current == $Coro::main; 4040 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3455 4041
3456 my $signal = new Coro::Signal; 4042 my $signal = new Coro::Signal;
3457 push @WAIT_FOR_TICK, $signal; 4043 push @WAIT_FOR_TICK, $signal;
3458 $signal->wait; 4044 $signal->wait;
3459} 4045}
3460 4046
3461sub wait_for_tick_begin { 4047sub wait_for_tick_begin() {
3462 return unless $TICK_WATCHER->is_active;
3463 return if $Coro::current == $Coro::main; 4048 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3464 4049
3465 my $signal = new Coro::Signal; 4050 my $signal = new Coro::Signal;
3466 push @WAIT_FOR_TICK_BEGIN, $signal; 4051 push @WAIT_FOR_TICK_BEGIN, $signal;
3467 $signal->wait; 4052 $signal->wait;
3468} 4053}
3469 4054
3470$TICK_WATCHER = Event->timer ( 4055sub tick {
3471 reentrant => 0,
3472 parked => 1,
3473 prio => 0,
3474 at => $NEXT_TICK || $TICK,
3475 data => WF_AUTOCANCEL,
3476 cb => sub {
3477 if ($Coro::current != $Coro::main) { 4056 if ($Coro::current != $Coro::main) {
3478 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4057 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3479 unless ++$bug_warning > 10; 4058 unless ++$bug_warning > 10;
3480 return; 4059 return;
3481 } 4060 }
3482 4061
3483 $NOW = $tick_start = Event::time;
3484
3485 cf::server_tick; # one server iteration 4062 cf::server_tick; # one server iteration
3486 4063
3487 $RUNTIME += $TICK; 4064 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3488 $NEXT_TICK += $TICK;
3489 4065
3490 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4066 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3491 $NEXT_RUNTIME_WRITE = $NOW + 10; 4067 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3492 Coro::async_pool { 4068 Coro::async_pool {
4069 $Coro::current->{desc} = "runtime saver";
3493 write_runtime 4070 write_runtime_sync
3494 or warn "ERROR: unable to write runtime file: $!"; 4071 or error "ERROR: unable to write runtime file: $!";
3495 };
3496 } 4072 };
4073 }
3497 4074
3498 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4075 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3499 $sig->send; 4076 $sig->send;
3500 } 4077 }
3501 while (my $sig = shift @WAIT_FOR_TICK) { 4078 while (my $sig = shift @WAIT_FOR_TICK) {
3502 $sig->send; 4079 $sig->send;
3503 } 4080 }
3504 4081
3505 $NOW = Event::time; 4082 $LOAD = ($NOW - $TICK_START) / $TICK;
3506
3507 # if we are delayed by four ticks or more, skip them all
3508 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3509
3510 $TICK_WATCHER->at ($NEXT_TICK);
3511 $TICK_WATCHER->start;
3512
3513 $LOAD = ($NOW - $tick_start) / $TICK;
3514 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4083 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3515 4084
3516 _post_tick; 4085 if (0) {
4086 if ($NEXT_TICK) {
4087 my $jitter = $TICK_START - $NEXT_TICK;
4088 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4089 debug "jitter $JITTER\n";#d#
4090 }
3517 }, 4091 }
3518); 4092}
3519 4093
3520{ 4094{
4095 # configure BDB
4096
3521 BDB::min_parallel 8; 4097 BDB::min_parallel 16;
3522 BDB::max_poll_time $TICK * 0.1; 4098 BDB::max_poll_reqs $TICK * 0.1;
3523 $BDB_POLL_WATCHER = Event->io ( 4099 $AnyEvent::BDB::WATCHER->priority (1);
3524 reentrant => 0,
3525 fd => BDB::poll_fileno,
3526 poll => 'r',
3527 prio => 0,
3528 data => WF_AUTOCANCEL,
3529 cb => \&BDB::poll_cb,
3530 );
3531
3532 BDB::set_sync_prepare {
3533 my $status;
3534 my $current = $Coro::current;
3535 (
3536 sub {
3537 $status = $!;
3538 $current->ready; undef $current;
3539 },
3540 sub {
3541 Coro::schedule while defined $current;
3542 $! = $status;
3543 },
3544 )
3545 };
3546 4100
3547 unless ($DB_ENV) { 4101 unless ($DB_ENV) {
3548 $DB_ENV = BDB::db_env_create; 4102 $DB_ENV = BDB::db_env_create;
3549 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4103 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3550 | BDB::LOG_AUTOREMOVE, 1); 4104 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4105 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3551 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4106 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3552 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4107 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3553 4108
3554 cf::sync_job { 4109 cf::sync_job {
3555 eval { 4110 eval {
3565 4120
3566 cf::cleanup "db_env_open(db): $@" if $@; 4121 cf::cleanup "db_env_open(db): $@" if $@;
3567 }; 4122 };
3568 } 4123 }
3569 4124
3570 $BDB_DEADLOCK_WATCHER = Event->timer ( 4125 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3571 after => 3,
3572 interval => 1,
3573 hard => 1,
3574 prio => 0,
3575 data => WF_AUTOCANCEL,
3576 cb => sub {
3577 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4126 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3578 },
3579 ); 4127 };
3580 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4128 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3581 after => 11,
3582 interval => 60,
3583 hard => 1,
3584 prio => 0,
3585 data => WF_AUTOCANCEL,
3586 cb => sub {
3587 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4129 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3588 },
3589 ); 4130 };
3590 $BDB_TRICKLE_WATCHER = Event->timer ( 4131 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3591 after => 5,
3592 interval => 10,
3593 hard => 1,
3594 prio => 0,
3595 data => WF_AUTOCANCEL,
3596 cb => sub {
3597 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4132 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3598 },
3599 ); 4133 };
3600} 4134}
3601 4135
3602{ 4136{
4137 # configure IO::AIO
4138
3603 IO::AIO::min_parallel 8; 4139 IO::AIO::min_parallel 8;
3604
3605 undef $Coro::AIO::WATCHER;
3606 IO::AIO::max_poll_time $TICK * 0.1; 4140 IO::AIO::max_poll_time $TICK * 0.1;
3607 $AIO_POLL_WATCHER = Event->io ( 4141 undef $AnyEvent::AIO::WATCHER;
3608 reentrant => 0,
3609 data => WF_AUTOCANCEL,
3610 fd => IO::AIO::poll_fileno,
3611 poll => 'r',
3612 prio => 6,
3613 cb => \&IO::AIO::poll_cb,
3614 );
3615} 4142}
3616 4143
3617my $_log_backtrace; 4144our $_log_backtrace;
4145our $_log_backtrace_last;
3618 4146
3619sub _log_backtrace { 4147sub _log_backtrace {
3620 my ($msg, @addr) = @_; 4148 my ($msg, @addr) = @_;
3621 4149
3622 $msg =~ s/\n//; 4150 $msg =~ s/\n$//;
3623 4151
4152 if ($_log_backtrace_last eq $msg) {
4153 LOG llevInfo, "[ABT] $msg\n";
4154 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3624 # limit the # of concurrent backtraces 4155 # limit the # of concurrent backtraces
3625 if ($_log_backtrace < 2) { 4156 } elsif ($_log_backtrace < 2) {
4157 $_log_backtrace_last = $msg;
3626 ++$_log_backtrace; 4158 ++$_log_backtrace;
4159 my $perl_bt = Carp::longmess $msg;
3627 async { 4160 async {
4161 $Coro::current->{desc} = "abt $msg";
4162
3628 my @bt = fork_call { 4163 my @bt = fork_call {
3629 @addr = map { sprintf "%x", $_ } @addr; 4164 @addr = map { sprintf "%x", $_ } @addr;
3630 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4165 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3631 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4166 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3632 or die "addr2line: $!"; 4167 or die "addr2line: $!";
3640 } 4175 }
3641 4176
3642 @funcs 4177 @funcs
3643 }; 4178 };
3644 4179
3645 LOG llevInfo, "[ABT] $msg\n"; 4180 LOG llevInfo, "[ABT] $perl_bt\n";
4181 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3646 LOG llevInfo, "[ABT] $_\n" for @bt; 4182 LOG llevInfo, "[ABT] $_\n" for @bt;
3647 --$_log_backtrace; 4183 --$_log_backtrace;
3648 }; 4184 };
3649 } else { 4185 } else {
3650 LOG llevInfo, "[ABT] $msg\n"; 4186 LOG llevInfo, "[ABT] $msg\n";
3651 LOG llevInfo, "[ABT] [suppressed]\n"; 4187 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3652 } 4188 }
3653} 4189}
3654 4190
3655# load additional modules 4191# load additional modules
3656use cf::pod; 4192require "cf/$_.pm" for @EXTRA_MODULES;
4193cf::_connect_to_perl_2;
3657 4194
3658END { cf::emergency_save } 4195END { cf::emergency_save }
3659 4196
36601 41971
3661 4198

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines