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.379 by root, Thu Oct 4 23:59:07 2007 UTC vs.
Revision 1.556 by root, Sat Jul 3 01:49:18 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines