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.392 by root, Fri Oct 26 04:44:54 2007 UTC vs.
Revision 1.551 by root, Sun May 16 13:48:07 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines