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.393 by root, Fri Oct 26 04:47:00 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 Event; 30use EV;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 4.1 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
24use Coro::Util (); 51use Coro::Util ();
25 52
26use JSON::XS (); 53use JSON::XS 2.01 ();
27use BDB (); 54use BDB ();
28use Data::Dumper; 55use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 56use Fcntl;
31use YAML::Syck (); 57use YAML::XS ();
32use IO::AIO 2.51 (); 58use IO::AIO ();
33use Time::HiRes; 59use Time::HiRes;
34use Compress::LZF; 60use Compress::LZF;
35use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
36 64
37# configure various modules to our taste 65# configure various modules to our taste
38# 66#
39$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 75
43$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
44 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 78
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
54 85
55our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
56our %EXTCMD = (); 87our %EXTCMD = ();
57our %EXTICMD = (); 88our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
60 91
61our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
63 96
64our $CONFDIR = confdir; 97our $CONFDIR = confdir;
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, 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 if (Coro::nready) { 580 if (Coro::nready) {
450 Coro::cede_notself; 581 Coro::cede_notself;
451 } else { 582 } else {
452 Event::one_event; 583 EV::loop EV::LOOP_ONESHOT;
453 } 584 }
454 } 585 }
455 586
456 $time = Event::time - $time; 587 my $time = AE::time - $time;
457 588
458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
459 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460
461 $tick_start += $time; # do not account sync jobs to server load 589 $TICK_START += $time; # do not account sync jobs to server load
462 590
463 wantarray ? @res : $res[0] 591 wantarray ? @res : $res[0]
464 } else { 592 } else {
465 # we are in another coroutine, how wonderful, everything just works 593 # we are in another coroutine, how wonderful, everything just works
466 594
486 $EXT_CORO{$coro+0} = $coro; 614 $EXT_CORO{$coro+0} = $coro;
487 615
488 $coro 616 $coro
489} 617}
490 618
491=item fork_call { }, $args 619=item fork_call { }, @args
492 620
493Executes the given code block with the given arguments in a seperate 621Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 622process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 623Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 624never block itself or use any form of event handling.
497 625
498=cut 626=cut
627
628sub post_fork {
629 reset_signals;
630}
499 631
500sub fork_call(&@) { 632sub fork_call(&@) {
501 my ($cb, @args) = @_; 633 my ($cb, @args) = @_;
502 634
503 # 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,
504 # otherwise perl prematurely frees the stuff :/ 636 # otherwise perl prematurely frees the stuff :/
505 # TODO: investigate and fix (likely this will be rather laborious) 637 # TODO: investigate and fix (likely this will be rather laborious)
506 638
507 my @res = Coro::Util::fork_eval { 639 my @res = Coro::Util::fork_eval {
508 reset_signals; 640 cf::post_fork;
509 &$cb 641 &$cb
510 }, @args; 642 } @args;
511 643
512 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
513} 683}
514 684
515=item $value = cf::db_get $family => $key 685=item $value = cf::db_get $family => $key
516 686
517Returns a single value from the environment database. 687Returns a single value from the environment database.
527within each server. 697within each server.
528 698
529=cut 699=cut
530 700
531sub db_table($) { 701sub db_table($) {
702 cf::error "db_get called from main context"
703 if $Coro::current == $Coro::main;
704
532 my ($name) = @_; 705 my ($name) = @_;
533 my $db = BDB::db_create $DB_ENV; 706 my $db = BDB::db_create $DB_ENV;
534 707
535 eval { 708 eval {
536 $db->set_flags (BDB::CHKSUM); 709 $db->set_flags (BDB::CHKSUM);
546} 719}
547 720
548our $DB; 721our $DB;
549 722
550sub db_init { 723sub db_init {
551 cf::sync_job {
552 $DB ||= db_table "db"; 724 $DB ||= db_table "db";
553 };
554} 725}
555 726
556sub db_get($$) { 727sub db_get($$) {
557 my $key = "$_[0]/$_[1]"; 728 my $key = "$_[0]/$_[1]";
558 729
559 cf::sync_job { 730 cf::error "db_get called from main context"
731 if $Coro::current == $Coro::main;
732
560 BDB::db_get $DB, undef, $key, my $data; 733 BDB::db_get $DB, undef, $key, my $data;
561 734
562 $! ? () 735 $! ? ()
563 : $data 736 : $data
564 }
565} 737}
566 738
567sub db_put($$$) { 739sub db_put($$$) {
568 BDB::dbreq_pri 4; 740 BDB::dbreq_pri 4;
569 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 741 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
625 797
626 my $t1 = Time::HiRes::time; 798 my $t1 = Time::HiRes::time;
627 my $data = $process->(\@data); 799 my $data = $process->(\@data);
628 my $t2 = Time::HiRes::time; 800 my $t2 = Time::HiRes::time;
629 801
630 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 802 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
631 803
632 db_put cache => "$id/data", $data; 804 db_put cache => "$id/data", $data;
633 db_put cache => "$id/md5" , $md5; 805 db_put cache => "$id/md5" , $md5;
634 db_put cache => "$id/meta", $meta; 806 db_put cache => "$id/meta", $meta;
635 807
645 817
646=cut 818=cut
647 819
648sub datalog($@) { 820sub datalog($@) {
649 my ($type, %kv) = @_; 821 my ($type, %kv) = @_;
650 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 822 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
651} 823}
652 824
653=back 825=back
654 826
655=cut 827=cut
656 828
657############################################################################# 829#############################################################################
658 830
659=head2 ATTACHABLE OBJECTS 831=head2 ATTACHABLE OBJECTS
660 832
661Many 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
662attach callbacks/event handlers (a collection of which is called an "attachment") 834attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 835to it. All such attachable objects support the following methods.
664 836
665In 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>
666C<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
667Crossfire TRT). 839Deliantra).
668 840
669=over 4 841=over 4
670 842
671=item $attachable->attach ($attachment, key => $value...) 843=item $attachable->attach ($attachment, key => $value...)
672 844
716=item cf::CLASS::attachment $name, ... 888=item cf::CLASS::attachment $name, ...
717 889
718Register an attachment by C<$name> through which attachable objects of the 890Register an attachment by C<$name> through which attachable objects of the
719given CLASS can refer to this attachment. 891given CLASS can refer to this attachment.
720 892
721Some classes such as crossfire maps and objects can specify attachments 893Some classes such as deliantra maps and objects can specify attachments
722that 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.
723 895
724These calls expect any number of the following handler/hook descriptions: 896These calls expect any number of the following handler/hook descriptions:
725 897
726=over 4 898=over 4
850 1022
851 } elsif (exists $cb_id{$type}) { 1023 } elsif (exists $cb_id{$type}) {
852 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1024 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
853 1025
854 } elsif (ref $type) { 1026 } elsif (ref $type) {
855 warn "attaching objects not supported, ignoring.\n"; 1027 error "attaching objects not supported, ignoring.\n";
856 1028
857 } else { 1029 } else {
858 shift @arg; 1030 shift @arg;
859 warn "attach argument '$type' not supported, ignoring.\n"; 1031 error "attach argument '$type' not supported, ignoring.\n";
860 } 1032 }
861 } 1033 }
862} 1034}
863 1035
864sub _object_attach { 1036sub _object_attach {
874 _attach $registry, $klass, @attach; 1046 _attach $registry, $klass, @attach;
875 } 1047 }
876 1048
877 $obj->{$name} = \%arg; 1049 $obj->{$name} = \%arg;
878 } else { 1050 } else {
879 warn "object uses attachment '$name' which is not available, postponing.\n"; 1051 info "object uses attachment '$name' which is not available, postponing.\n";
880 } 1052 }
881 1053
882 $obj->{_attachment}{$name} = undef; 1054 $obj->{_attachment}{$name} = undef;
883} 1055}
884 1056
943 1115
944 for (@$callbacks) { 1116 for (@$callbacks) {
945 eval { &{$_->[1]} }; 1117 eval { &{$_->[1]} };
946 1118
947 if ($@) { 1119 if ($@) {
948 warn "$@";
949 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1120 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
950 override; 1121 override;
951 } 1122 }
952 1123
953 return 1 if $override; 1124 return 1 if $override;
954 } 1125 }
955 1126
956 0 1127 0
957} 1128}
958 1129
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1130=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 1131
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1132=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 1133
963Generate an object-specific event with the given arguments. 1134Generate an object-specific event with the given arguments.
964 1135
1017 1188
1018sub reattach { 1189sub reattach {
1019 # basically do the same as instantiate, without calling instantiate 1190 # basically do the same as instantiate, without calling instantiate
1020 my ($obj) = @_; 1191 my ($obj) = @_;
1021 1192
1193 # no longer needed after getting rid of delete_package?
1022 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
1023 1195
1024 my $registry = $obj->registry; 1196 my $registry = $obj->registry;
1025 1197
1026 @$registry = (); 1198 @$registry = ();
1027 1199
1032 for (@$attach) { 1204 for (@$attach) {
1033 my ($klass, @attach) = @$_; 1205 my ($klass, @attach) = @$_;
1034 _attach $registry, $klass, @attach; 1206 _attach $registry, $klass, @attach;
1035 } 1207 }
1036 } else { 1208 } else {
1037 warn "object uses attachment '$name' that is not available, postponing.\n"; 1209 info "object uses attachment '$name' that is not available, postponing.\n";
1038 } 1210 }
1039 } 1211 }
1040} 1212}
1041 1213
1042cf::attachable->attach ( 1214cf::attachable->attach (
1043 prio => -1000000, 1215 prio => -1000000,
1044 on_instantiate => sub { 1216 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1217 my ($obj, $data) = @_;
1046 1218
1047 $data = from_json $data; 1219 $data = decode_json $data;
1048 1220
1049 for (@$data) { 1221 for (@$data) {
1050 my ($name, $args) = @$_; 1222 my ($name, $args) = @$_;
1051 1223
1052 $obj->attach ($name, %{$args || {} }); 1224 $obj->attach ($name, %{$args || {} });
1069 my ($filename, $rdata, $objs) = @_; 1241 my ($filename, $rdata, $objs) = @_;
1070 1242
1071 sync_job { 1243 sync_job {
1072 if (length $$rdata) { 1244 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename); 1245 utf8::decode (my $decname = $filename);
1074 warn sprintf "saving %s (%d,%d)\n", 1246 trace sprintf "saving %s (%d,%d)\n",
1075 $decname, length $$rdata, scalar @$objs; 1247 $decname, length $$rdata, scalar @$objs
1248 if $VERBOSE_IO;
1076 1249
1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1250 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1078 chmod SAVE_MODE, $fh; 1251 aio_chmod $fh, SAVE_MODE;
1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1252 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1080 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 }
1081 close $fh; 1257 aio_close $fh;
1082 1258
1083 if (@$objs) { 1259 if (@$objs) {
1084 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) {
1085 chmod SAVE_MODE, $fh; 1261 aio_chmod $fh, SAVE_MODE;
1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1262 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1263 aio_write $fh, 0, (length $data), $data, 0;
1088 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 }
1089 close $fh; 1268 aio_close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1269 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1270 }
1092 } else { 1271 } else {
1093 aio_unlink "$filename.pst"; 1272 aio_unlink "$filename.pst";
1094 } 1273 }
1095 1274
1096 aio_rename "$filename~", $filename; 1275 aio_rename "$filename~", $filename;
1276
1277 $filename =~ s%/[^/]+$%%;
1278 aio_pathsync $filename if $cf::USE_FSYNC;
1097 } else { 1279 } else {
1098 warn "FATAL: $filename~: $!\n"; 1280 error "unable to save objects: $filename~: $!\n";
1099 } 1281 }
1100 } else { 1282 } else {
1101 aio_unlink $filename; 1283 aio_unlink $filename;
1102 aio_unlink "$filename.pst"; 1284 aio_unlink "$filename.pst";
1103 } 1285 }
1127 my $st = eval { Coro::Storable::thaw $av }; 1309 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs}; 1310 $av = $st->{objs};
1129 } 1311 }
1130 1312
1131 utf8::decode (my $decname = $filename); 1313 utf8::decode (my $decname = $filename);
1132 warn sprintf "loading %s (%d,%d)\n", 1314 trace sprintf "loading %s (%d,%d)\n",
1133 $decname, length $data, scalar @{$av || []}; 1315 $decname, length $data, scalar @{$av || []}
1316 if $VERBOSE_IO;
1134 1317
1135 ($data, $av) 1318 ($data, $av)
1136} 1319}
1137 1320
1138=head2 COMMAND CALLBACKS 1321=head2 COMMAND CALLBACKS
1194 my ($name, $cb) = @_; 1377 my ($name, $cb) = @_;
1195 1378
1196 $EXTICMD{$name} = $cb; 1379 $EXTICMD{$name} = $cb;
1197} 1380}
1198 1381
1382use File::Glob ();
1383
1199cf::player->attach ( 1384cf::player->attach (
1200 on_command => sub { 1385 on_unknown_command => sub {
1201 my ($pl, $name, $params) = @_; 1386 my ($pl, $name, $params) = @_;
1202 1387
1203 my $cb = $COMMAND{$name} 1388 my $cb = $COMMAND{$name}
1204 or return; 1389 or return;
1205 1390
1228 1413
1229 $pl->ext_reply ($reply, @reply) 1414 $pl->ext_reply ($reply, @reply)
1230 if $reply; 1415 if $reply;
1231 1416
1232 } else { 1417 } else {
1233 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1418 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1234 } 1419 }
1235 1420
1236 cf::override; 1421 cf::override;
1237 }, 1422 },
1238); 1423);
1239 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
1240sub load_extensions { 1438sub load_extensions {
1439 info "loading extensions...";
1440
1241 cf::sync_job { 1441 cf::sync_job {
1242 my %todo; 1442 my %todo;
1243 1443
1244 for my $path (<$LIBDIR/*.ext>) { 1444 for my $path (<$LIBDIR/*.ext>) {
1245 next unless -r $path; 1445 next unless -r $path;
1263 1463
1264 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1464 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1265 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1465 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1266 1466
1267 $ext{source} = 1467 $ext{source} =
1268 "package $pkg; use strict; use utf8;\n" 1468 "package $pkg; use common::sense;\n"
1269 . "#line 1 \"$path\"\n{\n" 1469 . "#line 1 \"$path\"\n{\n"
1270 . $source 1470 . $source
1271 . "\n};\n1"; 1471 . "\n};\n1";
1272 1472
1273 $todo{$base} = \%ext; 1473 $todo{$base} = \%ext;
1274 } 1474 }
1275 1475
1476 my $pass = 0;
1276 my %done; 1477 my %done;
1277 while (%todo) { 1478 while (%todo) {
1278 my $progress; 1479 my $progress;
1279 1480
1481 ++$pass;
1482
1483 ext:
1280 while (my ($k, $v) = each %todo) { 1484 while (my ($k, $v) = each %todo) {
1281 for (split /,\s*/, $v->{meta}{depends}) { 1485 for (split /,\s*/, $v->{meta}{depends}) {
1282 goto skip 1486 next ext
1283 unless exists $done{$_}; 1487 unless exists $done{$_};
1284 } 1488 }
1285 1489
1286 warn "... loading '$k' into '$v->{pkg}'\n"; 1490 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1287 1491
1288 unless (eval $v->{source}) { 1492 my $active = eval $v->{source};
1493
1494 if (length $@) {
1289 my $msg = $@ ? "$v->{path}: $@\n" 1495 error "$v->{path}: $@\n";
1290 : "$v->{base}: extension inactive.\n";
1291 1496
1497 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1292 if (exists $v->{meta}{mandatory}) { 1498 if exists $v->{meta}{mandatory};
1293 warn $msg; 1499
1294 warn "mandatory extension failed to load, exiting.\n"; 1500 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1295 exit 1; 1501 delete $todo{$k};
1296 } 1502 } else {
1297 1503 $done{$k} = delete $todo{$k};
1298 warn $msg; 1504 push @EXTS, $v->{pkg};
1505 $progress = 1;
1506
1507 info "$v->{base}: extension inactive.\n"
1508 unless $active;
1299 } 1509 }
1300
1301 $done{$k} = delete $todo{$k};
1302 push @EXTS, $v->{pkg};
1303 $progress = 1;
1304 } 1510 }
1305 1511
1306 skip: 1512 unless ($progress) {
1307 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1513 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1308 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 }
1309 } 1520 }
1310 }; 1521 };
1311} 1522}
1312 1523
1313############################################################################# 1524#############################################################################
1314 1525
1315=back 1526=back
1316 1527
1317=head2 CORE EXTENSIONS 1528=head2 CORE EXTENSIONS
1318 1529
1319Functions and methods that extend core crossfire objects. 1530Functions and methods that extend core deliantra objects.
1320 1531
1321=cut 1532=cut
1322 1533
1323package cf::player; 1534package cf::player;
1324 1535
1367 1578
1368sub exists($) { 1579sub exists($) {
1369 my ($login) = @_; 1580 my ($login) = @_;
1370 1581
1371 $cf::PLAYER{$login} 1582 $cf::PLAYER{$login}
1372 or cf::sync_job { !aio_stat path $login } 1583 or !aio_stat path $login
1373} 1584}
1374 1585
1375sub find($) { 1586sub find($) {
1376 return $cf::PLAYER{$_[0]} || do { 1587 return $cf::PLAYER{$_[0]} || do {
1377 my $login = $_[0]; 1588 my $login = $_[0];
1389 my $f = new_from_file cf::object::thawer path $login 1600 my $f = new_from_file cf::object::thawer path $login
1390 or return; 1601 or return;
1391 1602
1392 my $pl = cf::player::load_pl $f 1603 my $pl = cf::player::load_pl $f
1393 or return; 1604 or return;
1605
1394 local $cf::PLAYER_LOADING{$login} = $pl; 1606 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs; 1607 $f->resolve_delayed_derefs;
1396 $cf::PLAYER{$login} = $pl 1608 $cf::PLAYER{$login} = $pl
1397 } 1609 }
1398 } 1610 }
1399} 1611}
1400 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
1401sub save($) { 1626sub save($) {
1402 my ($pl) = @_; 1627 my ($pl) = @_;
1403 1628
1404 return if $pl->{deny_save}; 1629 return if $pl->{deny_save};
1405 1630
1408 1633
1409 return if $pl->{deny_save}; 1634 return if $pl->{deny_save};
1410 1635
1411 aio_mkdir playerdir $pl, 0770; 1636 aio_mkdir playerdir $pl, 0770;
1412 $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];
1413 1643
1414 $pl->save_pl ($path); 1644 $pl->save_pl ($path);
1415 cf::cede_to_tick; 1645 cf::cede_to_tick;
1416} 1646}
1417 1647
1449 my ($pl) = @_; 1679 my ($pl) = @_;
1450 1680
1451 my $name = $pl->ob->name; 1681 my $name = $pl->ob->name;
1452 1682
1453 $pl->{deny_save} = 1; 1683 $pl->{deny_save} = 1;
1454 $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
1455 1685
1456 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1686 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1457 $pl->deactivate; 1687 $pl->deactivate;
1688
1689 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1458 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1690 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1691 ext::highscore::check ($pl->ob);
1692
1459 $pl->ns->destroy if $pl->ns; 1693 $pl->ns->destroy if $pl->ns;
1460 1694
1461 my $path = playerdir $pl; 1695 my $path = playerdir $pl;
1462 my $temp = "$path~$cf::RUNTIME~deleting~"; 1696 my $temp = "$path~$cf::RUNTIME~deleting~";
1463 aio_rename $path, $temp; 1697 aio_rename $path, $temp;
1501 1735
1502 for my $login (@$dirs) { 1736 for my $login (@$dirs) {
1503 my $path = path $login; 1737 my $path = path $login;
1504 1738
1505 # a .pst is a dead give-away for a valid player 1739 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") { 1740 # if no pst file found, open and chekc for blocked users
1741 if (aio_stat "$path.pst") {
1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1742 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508 aio_read $fh, 0, 512, my $buf, 0 or next; 1743 aio_read $fh, 0, 512, my $buf, 0 or next;
1509 $buf !~ /^password -------------$/m or next; # official not-valid tag 1744 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 } 1745 }
1511 1746
1515 1750
1516 \@logins 1751 \@logins
1517} 1752}
1518 1753
1519=item $player->maps 1754=item $player->maps
1755
1756=item cf::player::maps $login
1520 1757
1521Returns an arrayref of map paths that are private for this 1758Returns an arrayref of map paths that are private for this
1522player. May block. 1759player. May block.
1523 1760
1524=cut 1761=cut
1542 } 1779 }
1543 1780
1544 \@paths 1781 \@paths
1545} 1782}
1546 1783
1547=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1784=item $protocol_xml = $player->expand_cfpod ($cfpod)
1548 1785
1549Expand crossfire pod fragments into protocol xml. 1786Expand deliantra pod fragments into protocol xml.
1550
1551=cut
1552
1553use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 # match a pod interior sequence sans C<< >>
1558 (?:
1559 \ (.*?)\ (?{ $group = $^N })
1560 | < (??{$interior}) >
1561 )
1562}x;
1563
1564sub expand_cfpod {
1565 my ($self, $pod) = @_;
1566
1567 my $xml;
1568
1569 while () {
1570 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1571 $group = $1;
1572
1573 $group =~ s/&/&amp;/g;
1574 $group =~ s/</&lt;/g;
1575
1576 $xml .= $group;
1577 } elsif ($pod =~ m%\G
1578 ([BCGHITU])
1579 <
1580 (?:
1581 ([^<>]*) (?{ $group = $^N })
1582 | < $interior >
1583 )
1584 >
1585 %gcsx
1586 ) {
1587 my ($code, $data) = ($1, $group);
1588
1589 if ($code eq "B") {
1590 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1591 } elsif ($code eq "I") {
1592 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1593 } elsif ($code eq "U") {
1594 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1595 } elsif ($code eq "C") {
1596 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1597 } elsif ($code eq "T") {
1598 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1599 } elsif ($code eq "G") {
1600 my ($male, $female) = split /\|/, $data;
1601 $data = $self->gender ? $female : $male;
1602 $xml .= expand_cfpod ($self, $data);
1603 } elsif ($code eq "H") {
1604 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1605 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1606 "")
1607 [$self->{hintmode}];
1608 } else {
1609 $xml .= "error processing '$code($data)' directive";
1610 }
1611 } else {
1612 if ($pod =~ /\G(.+)/) {
1613 warn "parse error while expanding $pod (at $1)";
1614 }
1615 last;
1616 }
1617 }
1618
1619 for ($xml) {
1620 # create single paragraphs (very hackish)
1621 s/(?<=\S)\n(?=\w)/ /g;
1622
1623 # compress some whitespace
1624 s/\s+\n/\n/g; # ws line-ends
1625 s/\n\n+/\n/g; # double lines
1626 s/^\n+//; # beginning lines
1627 s/\n+$//; # ending lines
1628 }
1629
1630 $xml
1631}
1632
1633no re 'eval';
1634
1635sub hintmode {
1636 $_[0]{hintmode} = $_[1] if @_ > 1;
1637 $_[0]{hintmode}
1638}
1639 1787
1640=item $player->ext_reply ($msgid, @msg) 1788=item $player->ext_reply ($msgid, @msg)
1641 1789
1642Sends an ext reply to the player. 1790Sends an ext reply to the player.
1643 1791
1675 1823
1676=cut 1824=cut
1677 1825
1678sub find_by_path($) { 1826sub find_by_path($) {
1679 my ($path) = @_; 1827 my ($path) = @_;
1828
1829 $path =~ s/^~[^\/]*//; # skip ~login
1680 1830
1681 my ($match, $specificity); 1831 my ($match, $specificity);
1682 1832
1683 for my $region (list) { 1833 for my $region (list) {
1684 if ($region->{match} && $path =~ $region->{match}) { 1834 if ($region->{match} && $path =~ $region->{match}) {
1710our $MAX_RESET = 3600; 1860our $MAX_RESET = 3600;
1711our $DEFAULT_RESET = 3000; 1861our $DEFAULT_RESET = 3000;
1712 1862
1713sub generate_random_map { 1863sub generate_random_map {
1714 my ($self, $rmp) = @_; 1864 my ($self, $rmp) = @_;
1715 # mit "rum" bekleckern, nicht 1865
1866 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1867
1716 $self->_create_random_map ( 1868 $self->_create_random_map ($rmp);
1717 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1718 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1719 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1720 $rmp->{exit_on_final_map},
1721 $rmp->{xsize}, $rmp->{ysize},
1722 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1723 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1724 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1725 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1726 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1727 (cf::region::find $rmp->{region}), $rmp->{custom}
1728 )
1729} 1869}
1730 1870
1731=item cf::map->register ($regex, $prio) 1871=item cf::map->register ($regex, $prio)
1732 1872
1733Register 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
1738 1878
1739sub register { 1879sub register {
1740 my (undef, $regex, $prio) = @_; 1880 my (undef, $regex, $prio) = @_;
1741 my $pkg = caller; 1881 my $pkg = caller;
1742 1882
1743 no strict;
1744 push @{"$pkg\::ISA"}, __PACKAGE__; 1883 push @{"$pkg\::ISA"}, __PACKAGE__;
1745 1884
1746 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1885 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1747} 1886}
1748 1887
1749# also paths starting with '/' 1888# also paths starting with '/'
1750$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1889$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1751 1890
1752sub thawer_merge { 1891sub thawer_merge {
1753 my ($self, $merge) = @_; 1892 my ($self, $merge) = @_;
1754 1893
1755 # we have to keep some variables in memory intact 1894 # we have to keep some variables in memory intact
1760} 1899}
1761 1900
1762sub normalise { 1901sub normalise {
1763 my ($path, $base) = @_; 1902 my ($path, $base) = @_;
1764 1903
1765 $path = "$path"; # make sure its a string 1904 $path = "$path"; # make sure it's a string
1766 1905
1767 $path =~ s/\.map$//; 1906 $path =~ s/\.map$//;
1768 1907
1769 # map plan: 1908 # map plan:
1770 # 1909 #
1785 $base =~ s{[^/]+/?$}{}; 1924 $base =~ s{[^/]+/?$}{};
1786 $path = "$base/$path"; 1925 $path = "$base/$path";
1787 } 1926 }
1788 1927
1789 for ($path) { 1928 for ($path) {
1790 redo if s{//}{/};
1791 redo if s{/\.?/}{/}; 1929 redo if s{/\.?/}{/};
1792 redo if s{/[^/]+/\.\./}{/}; 1930 redo if s{/[^/]+/\.\./}{/};
1793 } 1931 }
1794 1932
1795 $path 1933 $path
1809 $self->init; # pass $1 etc. 1947 $self->init; # pass $1 etc.
1810 return $self; 1948 return $self;
1811 } 1949 }
1812 } 1950 }
1813 1951
1814 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1952 Carp::cluck "unable to resolve path '$path' (base '$base')";
1815 () 1953 ()
1816} 1954}
1817 1955
1818sub init { 1956sub init {
1819 my ($self) = @_; 1957 my ($self) = @_;
1841 1979
1842# the temporary/swap location 1980# the temporary/swap location
1843sub save_path { 1981sub save_path {
1844 my ($self) = @_; 1982 my ($self) = @_;
1845 1983
1846 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1984 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1847 "$TMPDIR/$path.map" 1985 "$TMPDIR/$path.map"
1848} 1986}
1849 1987
1850# the unique path, undef == no special unique path 1988# the unique path, undef == no special unique path
1851sub uniq_path { 1989sub uniq_path {
1852 my ($self) = @_; 1990 my ($self) = @_;
1853 1991
1854 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1992 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1855 "$UNIQUEDIR/$path" 1993 "$UNIQUEDIR/$path"
1856}
1857
1858# and all this just because we cannot iterate over
1859# all maps in C++...
1860sub change_all_map_light {
1861 my ($change) = @_;
1862
1863 $_->change_map_light ($change)
1864 for grep $_->outdoor, values %cf::MAP;
1865} 1994}
1866 1995
1867sub decay_objects { 1996sub decay_objects {
1868 my ($self) = @_; 1997 my ($self) = @_;
1869 1998
1951 2080
1952sub find; 2081sub find;
1953sub find { 2082sub find {
1954 my ($path, $origin) = @_; 2083 my ($path, $origin) = @_;
1955 2084
2085 cf::cede_to_tick;
2086
1956 $path = normalise $path, $origin && $origin->path; 2087 $path = normalise $path, $origin && $origin->path;
1957 2088
1958 cf::lock_wait "map_data:$path";#d#remove 2089 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1959 cf::lock_wait "map_find:$path"; 2090 my $guard2 = cf::lock_acquire "map_find:$path";
1960 2091
1961 $cf::MAP{$path} || do { 2092 $cf::MAP{$path} || do {
1962 my $guard1 = cf::lock_acquire "map_find:$path";
1963 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1964
1965 my $map = new_from_path cf::map $path 2093 my $map = new_from_path cf::map $path
1966 or return; 2094 or return;
1967 2095
1968 $map->{last_save} = $cf::RUNTIME; 2096 $map->{last_save} = $cf::RUNTIME;
1969 2097
1971 or return; 2099 or return;
1972 2100
1973 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2101 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1974 # doing this can freeze the server in a sync job, obviously 2102 # doing this can freeze the server in a sync job, obviously
1975 #$cf::WAIT_FOR_TICK->wait; 2103 #$cf::WAIT_FOR_TICK->wait;
2104 undef $guard2;
1976 undef $guard1; 2105 undef $guard1;
1977 undef $guard2;
1978 $map->reset; 2106 $map->reset;
1979 return find $path; 2107 return find $path;
1980 } 2108 }
1981 2109
1982 $cf::MAP{$path} = $map 2110 $cf::MAP{$path} = $map
1983 } 2111 }
1984} 2112}
1985 2113
1986sub pre_load { } 2114sub pre_load { }
1987sub post_load { } 2115#sub post_load { } # XS
1988 2116
1989sub load { 2117sub load {
1990 my ($self) = @_; 2118 my ($self) = @_;
1991 2119
1992 local $self->{deny_reset} = 1; # loading can take a long time 2120 local $self->{deny_reset} = 1; # loading can take a long time
2009 my $f = new_from_file cf::object::thawer $self->{load_path}; 2137 my $f = new_from_file cf::object::thawer $self->{load_path};
2010 $f->skip_block; 2138 $f->skip_block;
2011 $self->_load_objects ($f) 2139 $self->_load_objects ($f)
2012 or return; 2140 or return;
2013 2141
2014 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2142 $self->post_load_original
2015 if delete $self->{load_original}; 2143 if delete $self->{load_original};
2016 2144
2017 if (my $uniq = $self->uniq_path) { 2145 if (my $uniq = $self->uniq_path) {
2018 utf8::encode $uniq; 2146 utf8::encode $uniq;
2019 unless (aio_stat $uniq) { 2147 unless (aio_stat $uniq) {
2037 unless ($self->{deny_activate}) { 2165 unless ($self->{deny_activate}) {
2038 $self->decay_objects; 2166 $self->decay_objects;
2039 $self->fix_auto_apply; 2167 $self->fix_auto_apply;
2040 $self->update_buttons; 2168 $self->update_buttons;
2041 cf::cede_to_tick; 2169 cf::cede_to_tick;
2042 $self->set_darkness_map;
2043 cf::cede_to_tick;
2044 $self->activate; 2170 $self->activate;
2045 } 2171 }
2046 2172
2047 $self->{last_save} = $cf::RUNTIME; 2173 $self->{last_save} = $cf::RUNTIME;
2048 $self->last_access ($cf::RUNTIME); 2174 $self->last_access ($cf::RUNTIME);
2049 2175
2050 $self->in_memory (cf::MAP_IN_MEMORY); 2176 $self->in_memory (cf::MAP_ACTIVE);
2051 } 2177 }
2052 2178
2053 $self->post_load; 2179 $self->post_load;
2054}
2055 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
2056sub customise_for { 2187sub customise_for {
2057 my ($self, $ob) = @_; 2188 my ($self, $ob) = @_;
2058 2189
2059 return find "~" . $ob->name . "/" . $self->{path} 2190 return find "~" . $ob->name . "/" . $self->{path}
2060 if $self->per_player; 2191 if $self->per_player;
2076 or next; 2207 or next;
2077 $neigh = find $neigh, $map 2208 $neigh = find $neigh, $map
2078 or next; 2209 or next;
2079 $neigh->load; 2210 $neigh->load;
2080 2211
2212 # now find the diagonal neighbours
2081 push @neigh, 2213 push @neigh,
2082 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2214 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2083 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2215 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2084 } 2216 }
2085 2217
2092} 2224}
2093 2225
2094sub find_sync { 2226sub find_sync {
2095 my ($path, $origin) = @_; 2227 my ($path, $origin) = @_;
2096 2228
2097 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
2098} 2233}
2099 2234
2100sub do_load_sync { 2235sub do_load_sync {
2101 my ($map) = @_; 2236 my ($map) = @_;
2102 2237
2103 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2238 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2104 if $Coro::current == $Coro::main; 2239 if $Coro::current == $Coro::main;
2105 2240
2106 cf::sync_job { $map->load }; 2241 $map->load;
2107} 2242}
2108 2243
2109our %MAP_PREFETCH; 2244our %MAP_PREFETCH;
2110our $MAP_PREFETCHER = undef; 2245our $MAP_PREFETCHER = undef;
2111 2246
2113 my ($path, $origin, $load) = @_; 2248 my ($path, $origin, $load) = @_;
2114 2249
2115 $path = normalise $path, $origin && $origin->{path}; 2250 $path = normalise $path, $origin && $origin->{path};
2116 2251
2117 if (my $map = $cf::MAP{$path}) { 2252 if (my $map = $cf::MAP{$path}) {
2118 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2253 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2119 } 2254 }
2120 2255
2121 $MAP_PREFETCH{$path} |= $load; 2256 $MAP_PREFETCH{$path} |= $load;
2122 2257
2123 $MAP_PREFETCHER ||= cf::async { 2258 $MAP_PREFETCHER ||= cf::async {
2137 $MAP_PREFETCHER->prio (6); 2272 $MAP_PREFETCHER->prio (6);
2138 2273
2139 () 2274 ()
2140} 2275}
2141 2276
2277# common code, used by both ->save and ->swapout
2142sub save { 2278sub _save {
2143 my ($self) = @_; 2279 my ($self) = @_;
2144
2145 my $lock = cf::lock_acquire "map_data:$self->{path}";
2146 2280
2147 $self->{last_save} = $cf::RUNTIME; 2281 $self->{last_save} = $cf::RUNTIME;
2148 2282
2149 return unless $self->dirty; 2283 return unless $self->dirty;
2150 2284
2159 2293
2160 cf::async { 2294 cf::async {
2161 $Coro::current->{desc} = "map player save"; 2295 $Coro::current->{desc} = "map player save";
2162 $_->contr->save for $self->players; 2296 $_->contr->save for $self->players;
2163 }; 2297 };
2298
2299 cf::get_slot 0.02;
2164 2300
2165 if ($uniq) { 2301 if ($uniq) {
2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2302 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2167 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2303 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2168 } else { 2304 } else {
2169 $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);
2170 } 2306 }
2171} 2307}
2172 2308
2309sub save {
2310 my ($self) = @_;
2311
2312 my $lock = cf::lock_acquire "map_data:$self->{path}";
2313
2314 $self->_save;
2315}
2316
2173sub swap_out { 2317sub swap_out {
2174 my ($self) = @_; 2318 my ($self) = @_;
2175 2319
2176 # save first because save cedes
2177 $self->save;
2178
2179 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2320 my $lock = cf::lock_acquire "map_data:$self->{path}";
2180 2321
2322 return if $self->in_memory != cf::MAP_ACTIVE;
2323 return if $self->{deny_save};
2181 return if $self->players; 2324 return if $self->players;
2182 return if $self->in_memory != cf::MAP_IN_MEMORY;
2183 return if $self->{deny_save};
2184 2325
2326 # first deactivate the map and "unlink" it from the core
2327 $self->deactivate;
2328 $_->clear_links_to ($self) for values %cf::MAP;
2185 $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};
2186 2376
2187 $self->deactivate; 2377 $self->deactivate;
2188 $_->clear_links_to ($self) for values %cf::MAP; 2378 $_->clear_links_to ($self) for values %cf::MAP;
2189 $self->clear; 2379 $self->clear;
2190}
2191
2192sub reset_at {
2193 my ($self) = @_;
2194
2195 # TODO: safety, remove and allow resettable per-player maps
2196 return 1e99 if $self->{deny_reset};
2197
2198 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2199 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2200
2201 $time + $to
2202}
2203
2204sub should_reset {
2205 my ($self) = @_;
2206
2207 $self->reset_at <= $cf::RUNTIME
2208}
2209
2210sub reset {
2211 my ($self) = @_;
2212
2213 my $lock = cf::lock_acquire "map_data:$self->{path}";
2214
2215 return if $self->players;
2216
2217 warn "resetting map ", $self->path;
2218
2219 $self->in_memory (cf::MAP_SWAPPED);
2220
2221 # need to save uniques path
2222 unless ($self->{deny_save}) {
2223 my $uniq = $self->uniq_path; utf8::encode $uniq;
2224
2225 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2226 if $uniq;
2227 }
2228
2229 delete $cf::MAP{$self->path};
2230
2231 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP;
2233 $self->clear;
2234 2380
2235 $self->unlink_save; 2381 $self->unlink_save;
2236 $self->destroy; 2382 $self->destroy;
2237} 2383}
2238 2384
2246 2392
2247 delete $cf::MAP{$self->path}; 2393 delete $cf::MAP{$self->path};
2248 2394
2249 $self->unlink_save; 2395 $self->unlink_save;
2250 2396
2251 bless $self, "cf::map"; 2397 bless $self, "cf::map::wrap";
2252 delete $self->{deny_reset}; 2398 delete $self->{deny_reset};
2253 $self->{deny_save} = 1; 2399 $self->{deny_save} = 1;
2254 $self->reset_timeout (1); 2400 $self->reset_timeout (1);
2255 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2401 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2256 2402
2305 2451
2306sub unique_maps() { 2452sub unique_maps() {
2307 [ 2453 [
2308 map { 2454 map {
2309 utf8::decode $_; 2455 utf8::decode $_;
2310 /\.map$/ 2456 s/\.map$//; # TODO future compatibility hack
2457 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2458 ? ()
2311 ? normalise $_ 2459 : normalise $_
2312 : ()
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2460 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2461 ]
2315} 2462}
2316 2463
2317package 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}
2318 2495
2319=back 2496=back
2320 2497
2321=head3 cf::object 2498=head3 cf::object
2322 2499
2326 2503
2327=over 4 2504=over 4
2328 2505
2329=item $ob->inv_recursive 2506=item $ob->inv_recursive
2330 2507
2331Returns 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.
2332 2510
2333=cut 2511=cut
2334 2512
2335sub inv_recursive_; 2513sub inv_recursive_;
2336sub inv_recursive_ { 2514sub inv_recursive_ {
2341 inv_recursive_ inv $_[0] 2519 inv_recursive_ inv $_[0]
2342} 2520}
2343 2521
2344=item $ref = $ob->ref 2522=item $ref = $ob->ref
2345 2523
2346creates 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.
2347 2525
2348=item $ob = cf::object::deref ($refstring) 2526=item $ob = cf::object::deref ($refstring)
2349 2527
2350returns 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,
2351even if the object actually exists. May block. 2529even if the object actually exists. May block.
2383can 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
2384dialogue with the given NPC character. 2562dialogue with the given NPC character.
2385 2563
2386=cut 2564=cut
2387 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
2388# rough implementation of a future "reply" method that works 2580# rough implementation of a future "reply" method that works
2389# with dialog boxes. 2581# with dialog boxes.
2390#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
2391sub cf::object::player::reply($$$;$) { 2583sub cf::object::player::reply($$$;$) {
2392 my ($self, $npc, $msg, $flags) = @_; 2584 my ($self, $npc, $msg, $flags) = @_;
2403 my $dialog = $pl->{npc_dialog}; 2595 my $dialog = $pl->{npc_dialog};
2404 $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));
2405 2597
2406 } else { 2598 } else {
2407 $msg = $npc->name . " says: $msg" if $npc; 2599 $msg = $npc->name . " says: $msg" if $npc;
2408 $self->message ($msg, $flags); 2600 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2409 } 2601 }
2410 } 2602 }
2411} 2603}
2412 2604
2413=item $object->send_msg ($channel, $msg, $color, [extra...]) 2605=item $object->send_msg ($channel, $msg, $color, [extra...])
2438 2630
2439=item $player_object->enter_link 2631=item $player_object->enter_link
2440 2632
2441Freezes 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}>).
2442 2634
2443The 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.
2444I<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.
2445 2639
2446Will never block. 2640Will never block.
2447 2641
2448=item $player_object->leave_link ($map, $x, $y) 2642=item $player_object->leave_link ($map, $x, $y)
2449 2643
2469sub cf::object::player::enter_link { 2663sub cf::object::player::enter_link {
2470 my ($self) = @_; 2664 my ($self) = @_;
2471 2665
2472 $self->deactivate_recursive; 2666 $self->deactivate_recursive;
2473 2667
2668 ++$self->{_link_recursion};
2669
2474 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2670 return if UNIVERSAL::isa $self->map, "ext::map_link";
2475 2671
2476 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2672 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2477 if $self->map && $self->map->{path} ne "{link}"; 2673 if $self->map && $self->map->{path} ne "{link}";
2478 2674
2479 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2675 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2480} 2676}
2481 2677
2482sub cf::object::player::leave_link { 2678sub cf::object::player::leave_link {
2483 my ($self, $map, $x, $y) = @_; 2679 my ($self, $map, $x, $y) = @_;
2484 2680
2501 ($x, $y) = (-1, -1) 2697 ($x, $y) = (-1, -1)
2502 unless (defined $x) && (defined $y); 2698 unless (defined $x) && (defined $y);
2503 2699
2504 # use -1 or undef as default coordinates, not 0, 0 2700 # use -1 or undef as default coordinates, not 0, 0
2505 ($x, $y) = ($map->enter_x, $map->enter_y) 2701 ($x, $y) = ($map->enter_x, $map->enter_y)
2506 if $x <=0 && $y <= 0; 2702 if $x <= 0 && $y <= 0;
2507 2703
2508 $map->load; 2704 $map->load;
2509 $map->load_neighbours; 2705 $map->load_neighbours;
2510 2706
2511 return unless $self->contr->active; 2707 return unless $self->contr->active;
2512 $self->activate_recursive;
2513 2708
2514 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2709 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2515 $self->enter_map ($map, $x, $y); 2710 if ($self->enter_map ($map, $x, $y)) {
2516} 2711 # entering was successful
2712 delete $self->{_link_recursion};
2713 # only activate afterwards, to support waiting in hooks
2714 $self->activate_recursive;
2715 }
2517 2716
2717}
2718
2518=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)]])
2519 2720
2520Moves 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
2521her, loading and preparing them map, calling the provided $check callback 2722her, loading and preparing them map, calling the provided $check callback
2522that 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
2523the 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
2524be called at the end of this process. 2725be called at the end of this process.
2525 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
2526=cut 2730=cut
2527 2731
2528our $GOTOGEN; 2732our $GOTOGEN;
2529 2733
2530sub cf::object::player::goto { 2734sub cf::object::player::goto {
2531 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 }
2532 2742
2533 # 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
2534 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2744 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2535 2745
2536 $self->enter_link; 2746 $self->enter_link;
2560 my $map = eval { 2770 my $map = eval {
2561 my $map = defined $path ? cf::map::find $path : undef; 2771 my $map = defined $path ? cf::map::find $path : undef;
2562 2772
2563 if ($map) { 2773 if ($map) {
2564 $map = $map->customise_for ($self); 2774 $map = $map->customise_for ($self);
2565 $map = $check->($map) if $check && $map; 2775 $map = $check->($map, $x, $y, $self) if $check && $map;
2566 } else { 2776 } else {
2567 $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);
2568 } 2778 }
2569 2779
2570 $map 2780 $map
2578 if ($gen == $self->{_goto_generation}) { 2788 if ($gen == $self->{_goto_generation}) {
2579 delete $self->{_goto_generation}; 2789 delete $self->{_goto_generation};
2580 $self->leave_link ($map, $x, $y); 2790 $self->leave_link ($map, $x, $y);
2581 } 2791 }
2582 2792
2583 $done->() if $done; 2793 $done->($self) if $done;
2584 })->prio (1); 2794 })->prio (1);
2585} 2795}
2586 2796
2587=item $player_object->enter_exit ($exit_object) 2797=item $player_object->enter_exit ($exit_object)
2588 2798
2608} 2818}
2609 2819
2610sub prepare_random_map { 2820sub prepare_random_map {
2611 my ($exit) = @_; 2821 my ($exit) = @_;
2612 2822
2613 my $guard = cf::lock_acquire "exit_prepare:$exit";
2614
2615 # all this does is basically replace the /! path by 2823 # all this does is basically replace the /! path by
2616 # a new random map path (?random/...) with a seed 2824 # a new random map path (?random/...) with a seed
2617 # that depends on the exit object 2825 # that depends on the exit object
2618 2826
2619 my $rmp = parse_random_map_params $exit->msg; 2827 my $rmp = parse_random_map_params $exit->msg;
2621 if ($exit->map) { 2829 if ($exit->map) {
2622 $rmp->{region} = $exit->region->name; 2830 $rmp->{region} = $exit->region->name;
2623 $rmp->{origin_map} = $exit->map->path; 2831 $rmp->{origin_map} = $exit->map->path;
2624 $rmp->{origin_x} = $exit->x; 2832 $rmp->{origin_x} = $exit->x;
2625 $rmp->{origin_y} = $exit->y; 2833 $rmp->{origin_y} = $exit->y;
2834
2835 $exit->map->touch;
2626 } 2836 }
2627 2837
2628 $rmp->{random_seed} ||= $exit->random_seed; 2838 $rmp->{random_seed} ||= $exit->random_seed;
2629 2839
2630 my $data = cf::to_json $rmp; 2840 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2631 my $md5 = Digest::MD5::md5_hex $data; 2841 my $md5 = Digest::MD5::md5_hex $data;
2632 my $meta = "$RANDOMDIR/$md5.meta"; 2842 my $meta = "$RANDOMDIR/$md5.meta";
2633 2843
2634 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2844 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2635 aio_write $fh, 0, (length $data), $data, 0; 2845 aio_write $fh, 0, (length $data), $data, 0;
2636 undef $fh; 2846 undef $fh;
2637 aio_rename "$meta~", $meta; 2847 aio_rename "$meta~", $meta;
2638 2848
2849 my $slaying = "?random/$md5";
2850
2851 if ($exit->valid) {
2639 $exit->slaying ("?random/$md5"); 2852 $exit->slaying ("?random/$md5");
2640 $exit->msg (undef); 2853 $exit->msg (undef);
2854 }
2641 } 2855 }
2642} 2856}
2643 2857
2644sub cf::object::player::enter_exit { 2858sub cf::object::player::enter_exit {
2645 my ($self, $exit) = @_; 2859 my ($self, $exit) = @_;
2646 2860
2647 return unless $self->type == cf::PLAYER; 2861 return unless $self->type == cf::PLAYER;
2648 2862
2649 if ($exit->slaying eq "/!") {
2650 #TODO: this should de-fi-ni-te-ly not be a sync-job
2651 # the problem is that $exit might not survive long enough
2652 # so it needs to be done right now, right here
2653 cf::sync_job { prepare_random_map $exit };
2654 }
2655
2656 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2657 my $hp = $exit->stats->hp;
2658 my $sp = $exit->stats->sp;
2659
2660 $self->enter_link; 2863 $self->enter_link;
2661 2864
2662 # if exit is damned, update players death & WoR home-position
2663 $self->contr->savebed ($slaying, $hp, $sp)
2664 if $exit->flag (FLAG_DAMNED);
2665
2666 (async { 2865 (async {
2667 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2866 $Coro::current->{desc} = "enter_exit";
2668 2867
2669 $self->deactivate_recursive; # just to be sure
2670 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
2671 $self->goto ($slaying, $hp, $sp); 2883 $self->goto ($map, $x, $y);
2672 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
2673 1; 2889 1
2674 }) { 2890 }) {
2675 $self->message ("Something went wrong deep within the crossfire server. " 2891 $self->message ("Something went wrong deep within the deliantra server. "
2676 . "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. "
2677 . "Please report this to the dungeon master!", 2893 . "Please report this to the dungeon master!",
2678 cf::NDI_UNIQUE | cf::NDI_RED); 2894 cf::NDI_UNIQUE | cf::NDI_RED);
2679 2895
2680 warn "ERROR in enter_exit: $@"; 2896 error "ERROR in enter_exit: $@";
2681 $self->leave_link; 2897 $self->leave_link;
2682 } 2898 }
2683 })->prio (1); 2899 })->prio (1);
2684} 2900}
2685 2901
2697sub cf::client::send_drawinfo { 2913sub cf::client::send_drawinfo {
2698 my ($self, $text, $flags) = @_; 2914 my ($self, $text, $flags) = @_;
2699 2915
2700 utf8::encode $text; 2916 utf8::encode $text;
2701 $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);
2702} 2943}
2703 2944
2704=item $client->send_msg ($channel, $msg, $color, [extra...]) 2945=item $client->send_msg ($channel, $msg, $color, [extra...])
2705 2946
2706Send 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
2710 2951
2711=cut 2952=cut
2712 2953
2713# non-persistent channels (usually the info channel) 2954# non-persistent channels (usually the info channel)
2714our %CHANNEL = ( 2955our %CHANNEL = (
2956 "c/motd" => {
2957 id => "infobox",
2958 title => "MOTD",
2959 reply => undef,
2960 tooltip => "The message of the day",
2961 },
2715 "c/identify" => { 2962 "c/identify" => {
2716 id => "infobox", 2963 id => "infobox",
2717 title => "Identify", 2964 title => "Identify",
2718 reply => undef, 2965 reply => undef,
2719 tooltip => "Items recently identified", 2966 tooltip => "Items recently identified",
2721 "c/examine" => { 2968 "c/examine" => {
2722 id => "infobox", 2969 id => "infobox",
2723 title => "Examine", 2970 title => "Examine",
2724 reply => undef, 2971 reply => undef,
2725 tooltip => "Signs and other items you examined", 2972 tooltip => "Signs and other items you examined",
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",
2726 }, 2979 },
2727 "c/book" => { 2980 "c/book" => {
2728 id => "infobox", 2981 id => "infobox",
2729 title => "Book", 2982 title => "Book",
2730 reply => undef, 2983 reply => undef,
2746 id => "infobox", 2999 id => "infobox",
2747 title => "Body Parts", 3000 title => "Body Parts",
2748 reply => undef, 3001 reply => undef,
2749 tooltip => "Shows which body parts you posess and are available", 3002 tooltip => "Shows which body parts you posess and are available",
2750 }, 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 },
2751 "c/uptime" => { 3040 "c/uptime" => {
2752 id => "infobox", 3041 id => "infobox",
2753 title => "Uptime", 3042 title => "Uptime",
2754 reply => undef, 3043 reply => undef,
2755 tooltip => "How long the server has been running since last restart", 3044 tooltip => "How long the server has been running since last restart",
2758 id => "infobox", 3047 id => "infobox",
2759 title => "Map Info", 3048 title => "Map Info",
2760 reply => undef, 3049 reply => undef,
2761 tooltip => "Information related to the maps", 3050 tooltip => "Information related to the maps",
2762 }, 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,
2763); 3066);
2764 3067
2765sub cf::client::send_msg { 3068sub cf::client::send_msg {
2766 my ($self, $channel, $msg, $color, @extra) = @_; 3069 my ($self, $channel, $msg, $color, @extra) = @_;
2767 3070
2768 $msg = $self->pl->expand_cfpod ($msg); 3071 $msg = $self->pl->expand_cfpod ($msg)
3072 unless $color & cf::NDI_VERBATIM;
2769 3073
2770 $color &= cf::NDI_CLIENT_MASK; # just in case... 3074 $color &= cf::NDI_CLIENT_MASK; # just in case...
2771 3075
2772 # check predefined channels, for the benefit of C 3076 # check predefined channels, for the benefit of C
2773 if ($CHANNEL{$channel}) { 3077 if ($CHANNEL{$channel}) {
2774 $channel = $CHANNEL{$channel}; 3078 $channel = $CHANNEL{$channel};
2775 3079
2776 $self->ext_msg (channel_info => $channel) 3080 $self->ext_msg (channel_info => $channel);
2777 if $self->can_msg;
2778
2779 $channel = $channel->{id}; 3081 $channel = $channel->{id};
2780 3082
2781 } elsif (ref $channel) { 3083 } elsif (ref $channel) {
2782 # send meta info to client, if not yet sent 3084 # send meta info to client, if not yet sent
2783 unless (exists $self->{channel}{$channel->{id}}) { 3085 unless (exists $self->{channel}{$channel->{id}}) {
2784 $self->{channel}{$channel->{id}} = $channel; 3086 $self->{channel}{$channel->{id}} = $channel;
2785 $self->ext_msg (channel_info => $channel) 3087 $self->ext_msg (channel_info => $channel);
2786 if $self->can_msg;
2787 } 3088 }
2788 3089
2789 $channel = $channel->{id}; 3090 $channel = $channel->{id};
2790 } 3091 }
2791 3092
2792 return unless @extra || length $msg; 3093 return unless @extra || length $msg;
2793 3094
2794 if ($self->can_msg) {
2795 # default colour, mask it out 3095 # default colour, mask it out
2796 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3096 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2797 if $color & cf::NDI_DEF; 3097 if $color & cf::NDI_DEF;
2798 3098
2799 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3099 my $pkt = "msg "
3100 . $self->{json_coder}->encode (
2800 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3101 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2801 } else { 3102 );
2802 if ($color >= 0) {
2803 # replace some tags by gcfclient-compatible ones
2804 for ($msg) {
2805 1 while
2806 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2807 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2808 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2809 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2810 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2811 }
2812 3103
2813 $color &= cf::NDI_COLOR_MASK; 3104 $self->send_big_packet ($pkt);
2814
2815 utf8::encode $msg;
2816
2817 if (0 && $msg =~ /\[/) {
2818 # COMMAND/INFO
2819 $self->send_packet ("drawextinfo $color 10 8 $msg")
2820 } else {
2821 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2822 $self->send_packet ("drawinfo $color $msg")
2823 }
2824 }
2825 }
2826} 3105}
2827 3106
2828=item $client->ext_msg ($type, @msg) 3107=item $client->ext_msg ($type, @msg)
2829 3108
2830Sends an ext event to the client. 3109Sends an ext event to the client.
2833 3112
2834sub cf::client::ext_msg($$@) { 3113sub cf::client::ext_msg($$@) {
2835 my ($self, $type, @msg) = @_; 3114 my ($self, $type, @msg) = @_;
2836 3115
2837 if ($self->extcmd == 2) { 3116 if ($self->extcmd == 2) {
2838 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3117 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2839 } elsif ($self->extcmd == 1) { # TODO: remove 3118 } elsif ($self->extcmd == 1) { # TODO: remove
2840 push @msg, msgtype => "event_$type"; 3119 push @msg, msgtype => "event_$type";
2841 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3120 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2842 } 3121 }
2843} 3122}
2844 3123
2845=item $client->ext_reply ($msgid, @msg) 3124=item $client->ext_reply ($msgid, @msg)
2846 3125
2850 3129
2851sub cf::client::ext_reply($$@) { 3130sub cf::client::ext_reply($$@) {
2852 my ($self, $id, @msg) = @_; 3131 my ($self, $id, @msg) = @_;
2853 3132
2854 if ($self->extcmd == 2) { 3133 if ($self->extcmd == 2) {
2855 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3134 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2856 } elsif ($self->extcmd == 1) { 3135 } elsif ($self->extcmd == 1) {
2857 #TODO: version 1, remove 3136 #TODO: version 1, remove
2858 unshift @msg, msgtype => "reply", msgid => $id; 3137 unshift @msg, msgtype => "reply", msgid => $id;
2859 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3138 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2860 } 3139 }
2861} 3140}
2862 3141
2863=item $success = $client->query ($flags, "text", \&cb) 3142=item $success = $client->query ($flags, "text", \&cb)
2864 3143
2935 3214
2936 $ns->ext_reply ($reply, @reply) 3215 $ns->ext_reply ($reply, @reply)
2937 if $reply; 3216 if $reply;
2938 3217
2939 } else { 3218 } else {
2940 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";
2941 } 3220 }
2942 3221
2943 cf::override; 3222 cf::override;
2944 }, 3223 },
2945); 3224);
2965 3244
2966 $coro 3245 $coro
2967} 3246}
2968 3247
2969cf::client->attach ( 3248cf::client->attach (
2970 on_destroy => sub { 3249 on_client_destroy => sub {
2971 my ($ns) = @_; 3250 my ($ns) = @_;
2972 3251
2973 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3252 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2974 }, 3253 },
2975); 3254);
2991our $safe_hole = new Safe::Hole; 3270our $safe_hole = new Safe::Hole;
2992 3271
2993$SIG{FPE} = 'IGNORE'; 3272$SIG{FPE} = 'IGNORE';
2994 3273
2995$safe->permit_only (Opcode::opset qw( 3274$safe->permit_only (Opcode::opset qw(
2996 :base_core :base_mem :base_orig :base_math 3275 :base_core :base_mem :base_orig :base_math :base_loop
2997 grepstart grepwhile mapstart mapwhile 3276 grepstart grepwhile mapstart mapwhile
2998 sort time 3277 sort time
2999)); 3278));
3000 3279
3001# here we export the classes and methods available to script code 3280# here we export the classes and methods available to script code
3004 3283
3005The following functions and methods are available within a safe environment: 3284The following functions and methods are available within a safe environment:
3006 3285
3007 cf::object 3286 cf::object
3008 contr pay_amount pay_player map x y force_find force_add destroy 3287 contr pay_amount pay_player map x y force_find force_add destroy
3009 insert remove name archname title slaying race decrease_ob_nr 3288 insert remove name archname title slaying race decrease split
3289 value
3010 3290
3011 cf::object::player 3291 cf::object::player
3012 player 3292 player
3013 3293
3014 cf::player 3294 cf::player
3019 3299
3020=cut 3300=cut
3021 3301
3022for ( 3302for (
3023 ["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
3024 insert remove inv name archname title slaying race 3304 insert remove inv nrof name archname title slaying race
3025 decrease_ob_nr destroy)], 3305 decrease split destroy change_exp value msg lore send_msg)],
3026 ["cf::object::player" => qw(player)], 3306 ["cf::object::player" => qw(player)],
3027 ["cf::player" => qw(peaceful)], 3307 ["cf::player" => qw(peaceful send_msg)],
3028 ["cf::map" => qw(trigger)], 3308 ["cf::map" => qw(trigger)],
3029) { 3309) {
3030 no strict 'refs';
3031 my ($pkg, @funs) = @$_; 3310 my ($pkg, @funs) = @$_;
3032 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3311 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3033 for @funs; 3312 for @funs;
3034} 3313}
3035 3314
3050 3329
3051 my $qcode = $code; 3330 my $qcode = $code;
3052 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3331 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3053 $qcode =~ s/\n/\\n/g; 3332 $qcode =~ s/\n/\\n/g;
3054 3333
3334 %vars = (_dummy => 0) unless %vars;
3335
3336 my @res;
3055 local $_; 3337 local $_;
3056 local @safe::cf::_safe_eval_args = values %vars;
3057 3338
3058 my $eval = 3339 my $eval =
3059 "do {\n" 3340 "do {\n"
3060 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3341 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3061 . "#line 0 \"{$qcode}\"\n" 3342 . "#line 0 \"{$qcode}\"\n"
3062 . $code 3343 . $code
3063 . "\n}" 3344 . "\n}"
3064 ; 3345 ;
3065 3346
3347 if ($CFG{safe_eval}) {
3066 sub_generation_inc; 3348 sub_generation_inc;
3349 local @safe::cf::_safe_eval_args = values %vars;
3067 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3350 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3068 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 }
3069 3356
3070 if ($@) { 3357 if ($@) {
3071 warn "$@"; 3358 warn "$@",
3072 warn "while executing safe code '$code'\n"; 3359 "while executing safe code '$code'\n",
3073 warn "with arguments " . (join " ", %vars) . "\n"; 3360 "with arguments " . (join " ", %vars) . "\n";
3074 } 3361 }
3075 3362
3076 wantarray ? @res : $res[0] 3363 wantarray ? @res : $res[0]
3077} 3364}
3078 3365
3092=cut 3379=cut
3093 3380
3094sub register_script_function { 3381sub register_script_function {
3095 my ($fun, $cb) = @_; 3382 my ($fun, $cb) = @_;
3096 3383
3097 no strict 'refs'; 3384 $fun = "safe::$fun" if $CFG{safe_eval};
3098 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3385 *$fun = $safe_hole->wrap ($cb);
3099} 3386}
3100 3387
3101=back 3388=back
3102 3389
3103=cut 3390=cut
3112 # for this (global event?) 3399 # for this (global event?)
3113 %ext::player_env::MUSIC_FACE_CACHE = (); 3400 %ext::player_env::MUSIC_FACE_CACHE = ();
3114 3401
3115 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3402 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3116 3403
3117 warn "loading facedata from $path\n"; 3404 trace "loading facedata from $path\n";
3118 3405
3119 my $facedata;
3120 0 < aio_load $path, $facedata 3406 0 < aio_load $path, my $facedata
3121 or die "$path: $!"; 3407 or die "$path: $!";
3122 3408
3123 $facedata = Coro::Storable::thaw $facedata; 3409 $facedata = Coro::Storable::thaw $facedata;
3124 3410
3125 $facedata->{version} == 2 3411 $facedata->{version} == 2
3126 or cf::cleanup "$path: version mismatch, cannot proceed."; 3412 or cf::cleanup "$path: version mismatch, cannot proceed.";
3127 3413
3128 # 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]);
3129 $facedata->{resource}{"res/exp_table"} = { 3416 $facedata->{resource}{"res/exp_table"} = {
3130 type => FT_RSRC, 3417 type => FT_RSRC,
3131 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),
3132 }; 3420 };
3133 cf::cede_to_tick; 3421 cf::cede_to_tick;
3134 3422
3135 { 3423 {
3136 my $faces = $facedata->{faceinfo}; 3424 my $faces = $facedata->{faceinfo};
3137 3425
3138 while (my ($face, $info) = each %$faces) { 3426 while (my ($face, $info) = each %$faces) {
3139 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3427 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3428
3140 cf::face::set_visibility $idx, $info->{visibility}; 3429 cf::face::set_visibility $idx, $info->{visibility};
3141 cf::face::set_magicmap $idx, $info->{magicmap}; 3430 cf::face::set_magicmap $idx, $info->{magicmap};
3142 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3431 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3143 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} ;
3144 3434
3145 cf::cede_to_tick; 3435 cf::cede_to_tick;
3146 } 3436 }
3147 3437
3148 while (my ($face, $info) = each %$faces) { 3438 while (my ($face, $info) = each %$faces) {
3149 next unless $info->{smooth}; 3439 next unless $info->{smooth};
3440
3150 my $idx = cf::face::find $face 3441 my $idx = cf::face::find $face
3151 or next; 3442 or next;
3443
3152 if (my $smooth = cf::face::find $info->{smooth}) { 3444 if (my $smooth = cf::face::find $info->{smooth}) {
3153 cf::face::set_smooth $idx, $smooth; 3445 cf::face::set_smooth $idx, $smooth;
3154 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3446 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3155 } else { 3447 } else {
3156 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3448 error "smooth face '$info->{smooth}' not found for face '$face'";
3157 } 3449 }
3158 3450
3159 cf::cede_to_tick; 3451 cf::cede_to_tick;
3160 } 3452 }
3161 } 3453 }
3170 3462
3171 cf::anim::invalidate_all; # d'oh 3463 cf::anim::invalidate_all; # d'oh
3172 } 3464 }
3173 3465
3174 { 3466 {
3175 # TODO: for gcfclient pleasure, we should give resources
3176 # that gcfclient doesn't grok a >10000 face index.
3177 my $res = $facedata->{resource}; 3467 my $res = $facedata->{resource};
3178 3468
3179 my $soundconf = delete $res->{"res/sound.conf"};
3180
3181 while (my ($name, $info) = each %$res) { 3469 while (my ($name, $info) = each %$res) {
3470 if (defined $info->{type}) {
3182 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3471 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3183 my $data;
3184 3472
3185 if ($info->{type} & 1) { 3473 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3186 # prepend meta info 3474 cf::face::set_type $idx, $info->{type};
3187
3188 my $meta = $enc->encode ({
3189 name => $name,
3190 %{ $info->{meta} || {} },
3191 });
3192
3193 $data = pack "(w/a*)*", $meta, $info->{data};
3194 } else { 3475 } else {
3195 $data = $info->{data}; 3476 $RESOURCE{$name} = $info; # unused
3196 } 3477 }
3197 3478
3198 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3199 cf::face::set_type $idx, $info->{type};
3200
3201 cf::cede_to_tick; 3479 cf::cede_to_tick;
3202 } 3480 }
3203
3204 if ($soundconf) {
3205 $soundconf = $enc->decode (delete $soundconf->{data});
3206
3207 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3208 my $sound = $soundconf->{compat}[$_]
3209 or next;
3210
3211 my $face = cf::face::find "sound/$sound->[1]";
3212 cf::sound::set $sound->[0] => $face;
3213 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3214 }
3215
3216 while (my ($k, $v) = each %{$soundconf->{event}}) {
3217 my $face = cf::face::find "sound/$v";
3218 cf::sound::set $k => $face;
3219 }
3220 }
3221 } 3481 }
3482
3483 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3222 3484
3223 1 3485 1
3224} 3486}
3225 3487
3226register_exticmd fx_want => sub { 3488register_exticmd fx_want => sub {
3228 3490
3229 while (my ($k, $v) = each %$want) { 3491 while (my ($k, $v) = each %$want) {
3230 $ns->fx_want ($k, $v); 3492 $ns->fx_want ($k, $v);
3231 } 3493 }
3232}; 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}
3233 3505
3234sub reload_regions { 3506sub reload_regions {
3235 # 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
3236 # for this (global event?) 3508 # for this (global event?)
3237 %ext::player_env::MUSIC_FACE_CACHE = (); 3509 %ext::player_env::MUSIC_FACE_CACHE = ();
3251} 3523}
3252 3524
3253sub reload_archetypes { 3525sub reload_archetypes {
3254 load_resource_file "$DATADIR/archetypes" 3526 load_resource_file "$DATADIR/archetypes"
3255 or die "unable to load archetypes\n"; 3527 or die "unable to load archetypes\n";
3256 #d# NEED to laod twice to resolve forward references
3257 # this really needs to be done in an extra post-pass
3258 # (which needs to be synchronous, so solve it differently)
3259 load_resource_file "$DATADIR/archetypes"
3260 or die "unable to load archetypes\n";
3261} 3528}
3262 3529
3263sub reload_treasures { 3530sub reload_treasures {
3264 load_resource_file "$DATADIR/treasures" 3531 load_resource_file "$DATADIR/treasures"
3265 or die "unable to load treasurelists\n"; 3532 or die "unable to load treasurelists\n";
3266} 3533}
3267 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
3268sub reload_resources { 3558sub reload_resources {
3269 warn "reloading resource files...\n"; 3559 trace "reloading resource files...\n";
3270 3560
3561 reload_exp_table;
3562 reload_materials;
3563 reload_facedata;
3564 reload_sound;
3565 reload_archetypes;
3271 reload_regions; 3566 reload_regions;
3272 reload_facedata;
3273 #reload_archetypes;#d#
3274 reload_archetypes;
3275 reload_treasures; 3567 reload_treasures;
3276 3568
3277 warn "finished reloading resource files\n"; 3569 trace "finished reloading resource files\n";
3278}
3279
3280sub init {
3281 reload_resources;
3282} 3570}
3283 3571
3284sub reload_config { 3572sub reload_config {
3285 open my $fh, "<:utf8", "$CONFDIR/config" 3573 trace "reloading config file...\n";
3286 or return;
3287 3574
3288 local $/; 3575 0 < aio_load "$CONFDIR/config", my $config
3289 *CFG = YAML::Syck::Load <$fh>; 3576 or die "$CONFDIR/config: $!";
3290 3577
3578 utf8::decode $config;
3579 *CFG = yaml_load $config;
3580
3291 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3581 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3292 3582
3293 $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};
3294 $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};
3295 3585
3296 if (exists $CFG{mlockall}) { 3586 if (exists $CFG{mlockall}) {
3300 }; 3590 };
3301 warn $@ if $@; 3591 warn $@ if $@;
3302 } 3592 }
3303} 3593}
3304 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
3305sub 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
3306 # we must not ever block the main coroutine 3633 # we must not ever block the main coroutine
3307 local $Coro::idle = sub { 3634 local $Coro::idle = sub {
3308 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#
3309 (async { 3636 (async {
3310 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3637 $Coro::current->{desc} = "IDLE BUG HANDLER";
3311 Event::one_event; 3638 EV::loop EV::LOOP_ONESHOT;
3312 })->prio (Coro::PRIO_MAX); 3639 })->prio (Coro::PRIO_MAX);
3313 }; 3640 };
3314 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;
3315 reload_config; 3654 reload_config;
3316 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
3317 load_extensions; 3665 load_extensions;
3318 3666
3319 $TICK_WATCHER->start; 3667 utime time, time, $RUNTIMEFILE;
3320 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;
3321} 3685}
3322 3686
3323############################################################################# 3687#############################################################################
3324# initialisation and cleanup 3688# initialisation and cleanup
3325 3689
3326# install some emergency cleanup handlers 3690# install some emergency cleanup handlers
3327BEGIN { 3691BEGIN {
3692 our %SIGWATCHER = ();
3328 for my $signal (qw(INT HUP TERM)) { 3693 for my $signal (qw(INT HUP TERM)) {
3329 Event->signal ( 3694 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3330 reentrant => 0,
3331 data => WF_AUTOCANCEL,
3332 signal => $signal,
3333 prio => 0,
3334 cb => sub {
3335 cf::cleanup "SIG$signal"; 3695 cf::cleanup "SIG$signal";
3336 },
3337 ); 3696 };
3338 } 3697 }
3339} 3698}
3340 3699
3341sub write_runtime { 3700sub write_runtime_sync {
3342 my $runtime = "$LOCALDIR/runtime"; 3701 my $t0 = AE::time;
3343 3702
3344 # first touch the runtime file to show we are still running: 3703 # first touch the runtime file to show we are still running:
3345 # the fsync below can take a very very long time. 3704 # the fsync below can take a very very long time.
3346 3705
3347 IO::AIO::aio_utime $runtime, undef, undef; 3706 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3348 3707
3349 my $guard = cf::lock_acquire "write_runtime"; 3708 my $guard = cf::lock_acquire "write_runtime";
3350 3709
3351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3710 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3352 or return; 3711 or return;
3353 3712
3354 my $value = $cf::RUNTIME + 90 + 10; 3713 my $value = $cf::RUNTIME + 90 + 10;
3355 # 10 is the runtime save interval, for a monotonic clock 3714 # 10 is the runtime save interval, for a monotonic clock
3356 # 60 allows for the watchdog to kill the server. 3715 # 60 allows for the watchdog to kill the server.
3366 aio_utime $fh, undef, undef; 3725 aio_utime $fh, undef, undef;
3367 3726
3368 close $fh 3727 close $fh
3369 or return; 3728 or return;
3370 3729
3371 aio_rename "$runtime~", $runtime 3730 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3372 and return; 3731 and return;
3373 3732
3374 warn "runtime file written.\n"; 3733 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3375 3734
3376 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 };
3377} 3786}
3378 3787
3379sub emergency_save() { 3788sub emergency_save() {
3380 my $freeze_guard = cf::freeze_mainloop; 3789 my $freeze_guard = cf::freeze_mainloop;
3381 3790
3382 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;
3383 3797
3384 cf::sync_job { 3798 cf::sync_job {
3799 cf::write_runtime_sync; # external watchdog should not bark
3800
3385 # use a peculiar iteration method to avoid tripping on perl 3801 # use a peculiar iteration method to avoid tripping on perl
3386 # refcount bugs in for. also avoids problems with players 3802 # refcount bugs in for. also avoids problems with players
3387 # and maps saved/destroyed asynchronously. 3803 # and maps saved/destroyed asynchronously.
3388 warn "begin emergency player save\n"; 3804 info "emergency_perl_save: begin player save\n";
3389 for my $login (keys %cf::PLAYER) { 3805 for my $login (keys %cf::PLAYER) {
3390 my $pl = $cf::PLAYER{$login} or next; 3806 my $pl = $cf::PLAYER{$login} or next;
3391 $pl->valid or next; 3807 $pl->valid or next;
3392 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3808 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3393 $pl->save; 3809 $pl->save;
3394 } 3810 }
3395 warn "end emergency player save\n"; 3811 info "emergency_perl_save: end player save\n";
3396 3812
3397 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";
3398 for my $path (keys %cf::MAP) { 3816 for my $path (keys %cf::MAP) {
3399 my $map = $cf::MAP{$path} or next; 3817 my $map = $cf::MAP{$path} or next;
3400 $map->valid or next; 3818 $map->valid or next;
3401 $map->save; 3819 $map->save;
3402 } 3820 }
3403 warn "end emergency map save\n"; 3821 info "emergency_perl_save: end map save\n";
3404 3822
3405 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";
3406 BDB::db_env_txn_checkpoint $DB_ENV; 3826 BDB::db_env_txn_checkpoint $DB_ENV;
3407 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
3408 }; 3851 };
3409 3852
3410 warn "leave emergency perl save\n"; 3853 info "emergency_perl_save: leave\n";
3411} 3854}
3412 3855
3413sub post_cleanup { 3856sub post_cleanup {
3414 my ($make_core) = @_; 3857 my ($make_core) = @_;
3415 3858
3859 IO::AIO::flush;
3860
3416 warn Carp::longmess "post_cleanup backtrace" 3861 error Carp::longmess "post_cleanup backtrace"
3417 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 }
3418} 3891}
3419 3892
3420sub do_reload_perl() { 3893sub do_reload_perl() {
3421 # can/must only be called in main 3894 # can/must only be called in main
3422 if ($Coro::current != $Coro::main) { 3895 unless (in_main) {
3423 warn "can only reload from main coroutine"; 3896 error "can only reload from main coroutine";
3424 return; 3897 return;
3425 } 3898 }
3426 3899
3427 warn "reloading..."; 3900 return if $RELOAD++;
3428 3901
3429 warn "entering sync_job"; 3902 my $t1 = AE::time;
3430 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
3431 cf::sync_job { 3910 cf::sync_job {
3432 cf::write_runtime; # external watchdog should not bark
3433 cf::emergency_save; 3911 #cf::emergency_save;
3434 cf::write_runtime; # external watchdog should not bark
3435 3912
3436 warn "syncing database to disk";
3437 BDB::db_env_txn_checkpoint $DB_ENV;
3438
3439 # if anything goes wrong in here, we should simply crash as we already saved
3440
3441 warn "cancelling all WF_AUTOCANCEL watchers";
3442 for (Event::all_watchers) {
3443 $_->cancel if $_->data & WF_AUTOCANCEL;
3444 }
3445
3446 warn "flushing outstanding aio requests";
3447 for (;;) {
3448 BDB::flush;
3449 IO::AIO::flush;
3450 Coro::cede_notself;
3451 last unless IO::AIO::nreqs || BDB::nreqs;
3452 warn "iterate...";
3453 }
3454
3455 ++$RELOAD;
3456
3457 warn "cancelling all extension coros"; 3913 trace "perl_reload: cancelling all extension coros";
3458 $_->cancel for values %EXT_CORO; 3914 $_->cancel for values %EXT_CORO;
3459 %EXT_CORO = (); 3915 %EXT_CORO = ();
3460 3916
3461 warn "removing commands"; 3917 trace "perl_reload: removing commands";
3462 %COMMAND = (); 3918 %COMMAND = ();
3463 3919
3464 warn "removing ext/exti commands"; 3920 trace "perl_reload: removing ext/exti commands";
3465 %EXTCMD = (); 3921 %EXTCMD = ();
3466 %EXTICMD = (); 3922 %EXTICMD = ();
3467 3923
3468 warn "unloading/nuking all extensions"; 3924 trace "perl_reload: unloading/nuking all extensions";
3469 for my $pkg (@EXTS) { 3925 for my $pkg (@EXTS) {
3470 warn "... unloading $pkg"; 3926 trace "... unloading $pkg";
3471 3927
3472 if (my $cb = $pkg->can ("unload")) { 3928 if (my $cb = $pkg->can ("unload")) {
3473 eval { 3929 eval {
3474 $cb->($pkg); 3930 $cb->($pkg);
3475 1 3931 1
3476 } 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;
3477 } 3937 }
3478 3938
3479 warn "... nuking $pkg";
3480 Symbol::delete_package $pkg;
3481 }
3482
3483 warn "unloading all perl modules loaded from $LIBDIR"; 3939 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3484 while (my ($k, $v) = each %INC) { 3940 while (my ($k, $v) = each %INC) {
3485 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3941 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3486 3942
3487 warn "... unloading $k"; 3943 trace "... unloading $k";
3488 delete $INC{$k}; 3944 delete $INC{$k};
3489 3945
3490 $k =~ s/\.pm$//; 3946 $k =~ s/\.pm$//;
3491 $k =~ s/\//::/g; 3947 $k =~ s/\//::/g;
3492 3948
3493 if (my $cb = $k->can ("unload_module")) { 3949 if (my $cb = $k->can ("unload_module")) {
3494 $cb->(); 3950 $cb->();
3951 }
3952
3953 clear_package $k;
3495 } 3954 }
3496 3955
3497 Symbol::delete_package $k;
3498 }
3499
3500 warn "getting rid of safe::, as good as possible"; 3956 trace "perl_reload: getting rid of safe::, as good as possible";
3501 Symbol::delete_package "safe::$_" 3957 clear_package "safe::$_"
3502 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);
3503 3959
3504 warn "unloading cf.pm \"a bit\""; 3960 trace "perl_reload: unloading cf.pm \"a bit\"";
3505 delete $INC{"cf.pm"}; 3961 delete $INC{"cf.pm"};
3506 delete $INC{"cf/pod.pm"}; 3962 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3507 3963
3508 # don't, removes xs symbols, too, 3964 # don't, removes xs symbols, too,
3509 # and global variables created in xs 3965 # and global variables created in xs
3510 #Symbol::delete_package __PACKAGE__; 3966 #clear_package __PACKAGE__;
3511 3967
3512 warn "unload completed, starting to reload now"; 3968 info "perl_reload: unload completed, starting to reload now";
3513 3969
3514 warn "reloading cf.pm"; 3970 trace "perl_reload: reloading cf.pm";
3515 require cf; 3971 require cf;
3516 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3972 cf::_connect_to_perl_1;
3517 3973
3518 warn "loading config and database again"; 3974 trace "perl_reload: loading config and database again";
3519 cf::reload_config; 3975 cf::reload_config;
3520 3976
3521 warn "loading extensions"; 3977 trace "perl_reload: loading extensions";
3522 cf::load_extensions; 3978 cf::load_extensions;
3523 3979
3980 if ($REATTACH_ON_RELOAD) {
3524 warn "reattaching attachments to objects/players"; 3981 trace "perl_reload: reattaching attachments to objects/players";
3525 _global_reattach; # objects, sockets 3982 _global_reattach; # objects, sockets
3526 warn "reattaching attachments to maps"; 3983 trace "perl_reload: reattaching attachments to maps";
3527 reattach $_ for values %MAP; 3984 reattach $_ for values %MAP;
3528 warn "reattaching attachments to players"; 3985 trace "perl_reload: reattaching attachments to players";
3529 reattach $_ for values %PLAYER; 3986 reattach $_ for values %PLAYER;
3987 }
3530 3988
3531 warn "leaving sync_job"; 3989 cf::_post_init 1;
3532 3990
3991 trace "perl_reload: leaving sync_job";
3992
3533 1 3993 1
3534 } or do { 3994 } or do {
3535 warn $@; 3995 error $@;
3536 warn "error while reloading, exiting."; 3996 cf::cleanup "perl_reload: error, exiting.";
3537 exit 1; 3997 };
3998
3999 --$RELOAD;
3538 }; 4000 }
3539 4001
3540 warn "reloaded"; 4002 $t1 = AE::time - $t1;
4003 info "perl_reload: completed in ${t1}s\n";
3541}; 4004};
3542 4005
3543our $RELOAD_WATCHER; # used only during reload 4006our $RELOAD_WATCHER; # used only during reload
3544 4007
3545sub reload_perl() { 4008sub reload_perl() {
3546 # doing reload synchronously and two reloads happen back-to-back, 4009 # doing reload synchronously and two reloads happen back-to-back,
3547 # coro crashes during coro_state_free->destroy here. 4010 # coro crashes during coro_state_free->destroy here.
3548 4011
3549 $RELOAD_WATCHER ||= Event->timer ( 4012 $RELOAD_WATCHER ||= cf::async {
3550 reentrant => 0, 4013 Coro::AIO::aio_wait cache_extensions;
3551 after => 0, 4014
3552 data => WF_AUTOCANCEL, 4015 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3553 cb => sub {
3554 do_reload_perl; 4016 do_reload_perl;
3555 undef $RELOAD_WATCHER; 4017 undef $RELOAD_WATCHER;
3556 }, 4018 };
3557 ); 4019 };
3558} 4020}
3559 4021
3560register_command "reload" => sub { 4022register_command "reload" => sub {
3561 my ($who, $arg) = @_; 4023 my ($who, $arg) = @_;
3562 4024
3567 reload_perl; 4029 reload_perl;
3568 }; 4030 };
3569 } 4031 }
3570}; 4032};
3571 4033
3572unshift @INC, $LIBDIR; 4034#############################################################################
3573 4035
3574my $bug_warning = 0; 4036my $bug_warning = 0;
3575 4037
3576our @WAIT_FOR_TICK; 4038our @WAIT_FOR_TICK;
3577our @WAIT_FOR_TICK_BEGIN; 4039our @WAIT_FOR_TICK_BEGIN;
3578 4040
3579sub wait_for_tick { 4041sub wait_for_tick() {
3580 return unless $TICK_WATCHER->is_active;
3581 return if $Coro::current == $Coro::main; 4042 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3582 4043
3583 my $signal = new Coro::Signal; 4044 my $signal = new Coro::Signal;
3584 push @WAIT_FOR_TICK, $signal; 4045 push @WAIT_FOR_TICK, $signal;
3585 $signal->wait; 4046 $signal->wait;
3586} 4047}
3587 4048
3588sub wait_for_tick_begin { 4049sub wait_for_tick_begin() {
3589 return unless $TICK_WATCHER->is_active;
3590 return if $Coro::current == $Coro::main; 4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3591 4051
3592 my $signal = new Coro::Signal; 4052 my $signal = new Coro::Signal;
3593 push @WAIT_FOR_TICK_BEGIN, $signal; 4053 push @WAIT_FOR_TICK_BEGIN, $signal;
3594 $signal->wait; 4054 $signal->wait;
3595} 4055}
3596 4056
3597$TICK_WATCHER = Event->timer ( 4057sub tick {
3598 reentrant => 0,
3599 parked => 1,
3600 prio => 0,
3601 at => $NEXT_TICK || $TICK,
3602 data => WF_AUTOCANCEL,
3603 cb => sub {
3604 if ($Coro::current != $Coro::main) { 4058 if ($Coro::current != $Coro::main) {
3605 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"
3606 unless ++$bug_warning > 10; 4060 unless ++$bug_warning > 10;
3607 return; 4061 return;
3608 } 4062 }
3609 4063
3610 $NOW = $tick_start = Event::time;
3611
3612 cf::server_tick; # one server iteration 4064 cf::server_tick; # one server iteration
3613 4065
3614 $RUNTIME += $TICK; 4066 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3615 $NEXT_TICK += $TICK;
3616 4067
3617 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4068 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3618 $NEXT_RUNTIME_WRITE = $NOW + 10; 4069 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3619 Coro::async_pool { 4070 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver"; 4071 $Coro::current->{desc} = "runtime saver";
3621 write_runtime 4072 write_runtime_sync
3622 or warn "ERROR: unable to write runtime file: $!"; 4073 or error "ERROR: unable to write runtime file: $!";
3623 };
3624 } 4074 };
4075 }
3625 4076
3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4077 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3627 $sig->send; 4078 $sig->send;
3628 } 4079 }
3629 while (my $sig = shift @WAIT_FOR_TICK) { 4080 while (my $sig = shift @WAIT_FOR_TICK) {
3630 $sig->send; 4081 $sig->send;
3631 } 4082 }
3632 4083
3633 $NOW = Event::time; 4084 $LOAD = ($NOW - $TICK_START) / $TICK;
3634
3635 # if we are delayed by four ticks or more, skip them all
3636 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3637
3638 $TICK_WATCHER->at ($NEXT_TICK);
3639 $TICK_WATCHER->start;
3640
3641 $LOAD = ($NOW - $tick_start) / $TICK;
3642 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4085 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3643 4086
3644 _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 }
3645 }, 4093 }
3646); 4094}
3647 4095
3648{ 4096{
4097 # configure BDB
4098
3649 BDB::min_parallel 8; 4099 BDB::min_parallel 16;
3650 BDB::max_poll_time $TICK * 0.1; 4100 BDB::max_poll_reqs $TICK * 0.1;
3651 $BDB_POLL_WATCHER = Event->io ( 4101 $AnyEvent::BDB::WATCHER->priority (1);
3652 reentrant => 0,
3653 fd => BDB::poll_fileno,
3654 poll => 'r',
3655 prio => 0,
3656 data => WF_AUTOCANCEL,
3657 cb => \&BDB::poll_cb,
3658 );
3659
3660 BDB::set_sync_prepare {
3661 my $status;
3662 my $current = $Coro::current;
3663 (
3664 sub {
3665 $status = $!;
3666 $current->ready; undef $current;
3667 },
3668 sub {
3669 Coro::schedule while defined $current;
3670 $! = $status;
3671 },
3672 )
3673 };
3674 4102
3675 unless ($DB_ENV) { 4103 unless ($DB_ENV) {
3676 $DB_ENV = BDB::db_env_create; 4104 $DB_ENV = BDB::db_env_create;
3677 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4105 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3678 | 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;
3679 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4108 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3680 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4109 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3681 4110
3682 cf::sync_job { 4111 cf::sync_job {
3683 eval { 4112 eval {
3693 4122
3694 cf::cleanup "db_env_open(db): $@" if $@; 4123 cf::cleanup "db_env_open(db): $@" if $@;
3695 }; 4124 };
3696 } 4125 }
3697 4126
3698 $BDB_DEADLOCK_WATCHER = Event->timer ( 4127 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3699 after => 3,
3700 interval => 1,
3701 hard => 1,
3702 prio => 0,
3703 data => WF_AUTOCANCEL,
3704 cb => sub {
3705 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 { };
3706 },
3707 ); 4129 };
3708 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4130 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3709 after => 11,
3710 interval => 60,
3711 hard => 1,
3712 prio => 0,
3713 data => WF_AUTOCANCEL,
3714 cb => sub {
3715 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4131 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3716 },
3717 ); 4132 };
3718 $BDB_TRICKLE_WATCHER = Event->timer ( 4133 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3719 after => 5,
3720 interval => 10,
3721 hard => 1,
3722 prio => 0,
3723 data => WF_AUTOCANCEL,
3724 cb => sub {
3725 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4134 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3726 },
3727 ); 4135 };
3728} 4136}
3729 4137
3730{ 4138{
4139 # configure IO::AIO
4140
3731 IO::AIO::min_parallel 8; 4141 IO::AIO::min_parallel 8;
3732
3733 undef $Coro::AIO::WATCHER;
3734 IO::AIO::max_poll_time $TICK * 0.1; 4142 IO::AIO::max_poll_time $TICK * 0.1;
3735 $AIO_POLL_WATCHER = Event->io ( 4143 undef $AnyEvent::AIO::WATCHER;
3736 reentrant => 0,
3737 data => WF_AUTOCANCEL,
3738 fd => IO::AIO::poll_fileno,
3739 poll => 'r',
3740 prio => 0,
3741 cb => \&IO::AIO::poll_cb,
3742 );
3743} 4144}
3744 4145
3745my $_log_backtrace; 4146our $_log_backtrace;
4147our $_log_backtrace_last;
3746 4148
3747sub _log_backtrace { 4149sub _log_backtrace {
3748 my ($msg, @addr) = @_; 4150 my ($msg, @addr) = @_;
3749 4151
3750 $msg =~ s/\n//; 4152 $msg =~ s/\n$//;
3751 4153
4154 if ($_log_backtrace_last eq $msg) {
4155 LOG llevInfo, "[ABT] $msg\n";
4156 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3752 # limit the # of concurrent backtraces 4157 # limit the # of concurrent backtraces
3753 if ($_log_backtrace < 2) { 4158 } elsif ($_log_backtrace < 2) {
4159 $_log_backtrace_last = $msg;
3754 ++$_log_backtrace; 4160 ++$_log_backtrace;
4161 my $perl_bt = Carp::longmess $msg;
3755 async { 4162 async {
3756 $Coro::current->{desc} = "abt $msg"; 4163 $Coro::current->{desc} = "abt $msg";
3757 4164
3758 my @bt = fork_call { 4165 my @bt = fork_call {
3759 @addr = map { sprintf "%x", $_ } @addr; 4166 @addr = map { sprintf "%x", $_ } @addr;
3770 } 4177 }
3771 4178
3772 @funcs 4179 @funcs
3773 }; 4180 };
3774 4181
3775 LOG llevInfo, "[ABT] $msg\n"; 4182 LOG llevInfo, "[ABT] $perl_bt\n";
4183 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3776 LOG llevInfo, "[ABT] $_\n" for @bt; 4184 LOG llevInfo, "[ABT] $_\n" for @bt;
3777 --$_log_backtrace; 4185 --$_log_backtrace;
3778 }; 4186 };
3779 } else { 4187 } else {
3780 LOG llevInfo, "[ABT] $msg\n"; 4188 LOG llevInfo, "[ABT] $msg\n";
3781 LOG llevInfo, "[ABT] [suppressed]\n"; 4189 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3782 } 4190 }
3783} 4191}
3784 4192
3785# load additional modules 4193# load additional modules
3786use cf::pod; 4194require "cf/$_.pm" for @EXTRA_MODULES;
4195cf::_connect_to_perl_2;
3787 4196
3788END { cf::emergency_save } 4197END { cf::emergency_save }
3789 4198
37901 41991
3791 4200

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines