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.381 by root, Mon Oct 8 18:19:39 2007 UTC vs.
Revision 1.559 by root, Sat Feb 26 12:50:27 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines