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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines