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.364 by root, Tue Sep 11 08:41:11 2007 UTC vs.
Revision 1.555 by root, Wed Jun 30 01:32:56 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines