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.386 by root, Mon Oct 15 17:50:27 2007 UTC vs.
Revision 1.552 by root, Mon May 17 21:12:59 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines