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.553 by root, Tue May 18 21:30:16 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}
2052 2191
2192 1
2193}
2194
2195# customize the map for a given player, i.e.
2196# return the _real_ map. used by e.g. per-player
2197# maps to change the path to ~playername/mappath
2053sub customise_for { 2198sub customise_for {
2054 my ($self, $ob) = @_; 2199 my ($self, $ob) = @_;
2055 2200
2056 return find "~" . $ob->name . "/" . $self->{path} 2201 return find "~" . $ob->name . "/" . $self->{path}
2057 if $self->per_player; 2202 if $self->per_player;
… …
2073 or next; 2218 or next;
2074 $neigh = find $neigh, $map 2219 $neigh = find $neigh, $map
2075 or next; 2220 or next;
2076 $neigh->load; 2221 $neigh->load;
2077 2222
2223 # now find the diagonal neighbours
2078 push @neigh, 2224 push @neigh,
2079 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2225 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2080 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2226 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2081 } 2227 }
2082 2228
… …
2089} 2235}
2090 2236
2091sub find_sync { 2237sub find_sync {
2092 my ($path, $origin) = @_; 2238 my ($path, $origin) = @_;
2093 2239
2094 cf::sync_job { find $path, $origin } 2240 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2241 if $Coro::current == $Coro::main;
2242
2243 find $path, $origin
2095} 2244}
2096 2245
2097sub do_load_sync { 2246sub do_load_sync {
2098 my ($map) = @_; 2247 my ($map) = @_;
2099 2248
2100 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2249 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2101 if $Coro::current == $Coro::main; 2250 if $Coro::current == $Coro::main;
2102 2251
2103 cf::sync_job { $map->load }; 2252 $map->load;
2104} 2253}
2105 2254
2106our %MAP_PREFETCH; 2255our %MAP_PREFETCH;
2107our $MAP_PREFETCHER = undef; 2256our $MAP_PREFETCHER = undef;
2108 2257
… …
2110 my ($path, $origin, $load) = @_; 2259 my ($path, $origin, $load) = @_;
2111 2260
2112 $path = normalise $path, $origin && $origin->{path}; 2261 $path = normalise $path, $origin && $origin->{path};
2113 2262
2114 if (my $map = $cf::MAP{$path}) { 2263 if (my $map = $cf::MAP{$path}) {
2115 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2264 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2116 } 2265 }
2117 2266
2118 $MAP_PREFETCH{$path} |= $load; 2267 $MAP_PREFETCH{$path} |= $load;
2119 2268
2120 $MAP_PREFETCHER ||= cf::async { 2269 $MAP_PREFETCHER ||= cf::async {
… …
2134 $MAP_PREFETCHER->prio (6); 2283 $MAP_PREFETCHER->prio (6);
2135 2284
2136 () 2285 ()
2137} 2286}
2138 2287
2288# common code, used by both ->save and ->swapout
2139sub save { 2289sub _save {
2140 my ($self) = @_; 2290 my ($self) = @_;
2141
2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
2143 2291
2144 $self->{last_save} = $cf::RUNTIME; 2292 $self->{last_save} = $cf::RUNTIME;
2145 2293
2146 return unless $self->dirty; 2294 return unless $self->dirty;
2147 2295
… …
2156 2304
2157 cf::async { 2305 cf::async {
2158 $Coro::current->{desc} = "map player save"; 2306 $Coro::current->{desc} = "map player save";
2159 $_->contr->save for $self->players; 2307 $_->contr->save for $self->players;
2160 }; 2308 };
2309
2310 cf::get_slot 0.02;
2161 2311
2162 if ($uniq) { 2312 if ($uniq) {
2163 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2313 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2164 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2314 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2165 } else { 2315 } else {
2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2316 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2167 } 2317 }
2168} 2318}
2169 2319
2320sub save {
2321 my ($self) = @_;
2322
2323 my $lock = cf::lock_acquire "map_data:$self->{path}";
2324
2325 $self->_save;
2326}
2327
2170sub swap_out { 2328sub swap_out {
2171 my ($self) = @_; 2329 my ($self) = @_;
2172 2330
2173 # save first because save cedes
2174 $self->save;
2175
2176 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2331 my $lock = cf::lock_acquire "map_data:$self->{path}";
2177 2332
2333 return if $self->in_memory != cf::MAP_ACTIVE;
2334 return if $self->{deny_save};
2178 return if $self->players; 2335 return if $self->players;
2179 return if $self->in_memory != cf::MAP_IN_MEMORY;
2180 return if $self->{deny_save};
2181 2336
2337 # first deactivate the map and "unlink" it from the core
2338 $self->deactivate;
2339 $_->clear_links_to ($self) for values %cf::MAP;
2182 $self->in_memory (cf::MAP_SWAPPED); 2340 $self->in_memory (cf::MAP_SWAPPED);
2341
2342 # then atomically save
2343 $self->_save;
2344
2345 # then free the map
2346 $self->clear;
2347}
2348
2349sub reset_at {
2350 my ($self) = @_;
2351
2352 # TODO: safety, remove and allow resettable per-player maps
2353 return 1e99 if $self->{deny_reset};
2354
2355 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2356 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2357
2358 $time + $to
2359}
2360
2361sub should_reset {
2362 my ($self) = @_;
2363
2364 $self->reset_at <= $cf::RUNTIME
2365}
2366
2367sub reset {
2368 my ($self) = @_;
2369
2370 my $lock = cf::lock_acquire "map_data:$self->{path}";
2371
2372 return if $self->players;
2373
2374 cf::trace "resetting map ", $self->path, "\n";
2375
2376 $self->in_memory (cf::MAP_SWAPPED);
2377
2378 # need to save uniques path
2379 unless ($self->{deny_save}) {
2380 my $uniq = $self->uniq_path; utf8::encode $uniq;
2381
2382 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2383 if $uniq;
2384 }
2385
2386 delete $cf::MAP{$self->path};
2183 2387
2184 $self->deactivate; 2388 $self->deactivate;
2185 $_->clear_links_to ($self) for values %cf::MAP; 2389 $_->clear_links_to ($self) for values %cf::MAP;
2186 $self->clear; 2390 $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 2391
2232 $self->unlink_save; 2392 $self->unlink_save;
2233 $self->destroy; 2393 $self->destroy;
2234} 2394}
2235 2395
… …
2243 2403
2244 delete $cf::MAP{$self->path}; 2404 delete $cf::MAP{$self->path};
2245 2405
2246 $self->unlink_save; 2406 $self->unlink_save;
2247 2407
2248 bless $self, "cf::map"; 2408 bless $self, "cf::map::wrap";
2249 delete $self->{deny_reset}; 2409 delete $self->{deny_reset};
2250 $self->{deny_save} = 1; 2410 $self->{deny_save} = 1;
2251 $self->reset_timeout (1); 2411 $self->reset_timeout (1);
2252 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2412 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2253 2413
… …
2302 2462
2303sub unique_maps() { 2463sub unique_maps() {
2304 [ 2464 [
2305 map { 2465 map {
2306 utf8::decode $_; 2466 utf8::decode $_;
2307 /\.map$/ 2467 s/\.map$//; # TODO future compatibility hack
2468 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2469 ? ()
2308 ? normalise $_ 2470 : normalise $_
2309 : ()
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2471 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2472 ]
2312} 2473}
2313 2474
2314package cf; 2475=item cf::map::static_maps
2476
2477Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2478file in the shared directory excluding F</styles> and F</editor>). May
2479block.
2480
2481=cut
2482
2483sub static_maps() {
2484 my @dirs = "";
2485 my @maps;
2486
2487 while (@dirs) {
2488 my $dir = shift @dirs;
2489
2490 next if $dir eq "/styles" || $dir eq "/editor";
2491
2492 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2493 or return;
2494
2495 for (@$files) {
2496 s/\.map$// or next;
2497 utf8::decode $_;
2498 push @maps, "$dir/$_";
2499 }
2500
2501 push @dirs, map "$dir/$_", @$dirs;
2502 }
2503
2504 \@maps
2505}
2315 2506
2316=back 2507=back
2317 2508
2318=head3 cf::object 2509=head3 cf::object
2319 2510
… …
2323 2514
2324=over 4 2515=over 4
2325 2516
2326=item $ob->inv_recursive 2517=item $ob->inv_recursive
2327 2518
2328Returns the inventory of the object _and_ their inventories, recursively. 2519Returns the inventory of the object I<and> their inventories, recursively,
2520but I<not> the object itself.
2329 2521
2330=cut 2522=cut
2331 2523
2332sub inv_recursive_; 2524sub inv_recursive_;
2333sub inv_recursive_ { 2525sub inv_recursive_ {
… …
2338 inv_recursive_ inv $_[0] 2530 inv_recursive_ inv $_[0]
2339} 2531}
2340 2532
2341=item $ref = $ob->ref 2533=item $ref = $ob->ref
2342 2534
2343creates and returns a persistent reference to an objetc that can be stored as a string. 2535Creates and returns a persistent reference to an object that can be stored as a string.
2344 2536
2345=item $ob = cf::object::deref ($refstring) 2537=item $ob = cf::object::deref ($refstring)
2346 2538
2347returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2539returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2348even if the object actually exists. May block. 2540even if the object actually exists. May block.
… …
2380can be C<undef>. Does the right thing when the player is currently in a 2572can be C<undef>. Does the right thing when the player is currently in a
2381dialogue with the given NPC character. 2573dialogue with the given NPC character.
2382 2574
2383=cut 2575=cut
2384 2576
2577our $SAY_CHANNEL = {
2578 id => "say",
2579 title => "Map",
2580 reply => "say ",
2581 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2582};
2583
2584our $CHAT_CHANNEL = {
2585 id => "chat",
2586 title => "Chat",
2587 reply => "chat ",
2588 tooltip => "Player chat and shouts, global to the server.",
2589};
2590
2385# rough implementation of a future "reply" method that works 2591# rough implementation of a future "reply" method that works
2386# with dialog boxes. 2592# with dialog boxes.
2387#TODO: the first argument must go, split into a $npc->reply_to ( method 2593#TODO: the first argument must go, split into a $npc->reply_to ( method
2388sub cf::object::player::reply($$$;$) { 2594sub cf::object::player::reply($$$;$) {
2389 my ($self, $npc, $msg, $flags) = @_; 2595 my ($self, $npc, $msg, $flags) = @_;
… …
2400 my $dialog = $pl->{npc_dialog}; 2606 my $dialog = $pl->{npc_dialog};
2401 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2607 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2402 2608
2403 } else { 2609 } else {
2404 $msg = $npc->name . " says: $msg" if $npc; 2610 $msg = $npc->name . " says: $msg" if $npc;
2405 $self->message ($msg, $flags); 2611 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2406 } 2612 }
2407 } 2613 }
2408} 2614}
2409 2615
2410=item $object->send_msg ($channel, $msg, $color, [extra...]) 2616=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2435 2641
2436=item $player_object->enter_link 2642=item $player_object->enter_link
2437 2643
2438Freezes the player and moves him/her to a special map (C<{link}>). 2644Freezes the player and moves him/her to a special map (C<{link}>).
2439 2645
2440The player should be reasonably safe there for short amounts of time. You 2646The player should be reasonably safe there for short amounts of time (e.g.
2441I<MUST> call C<leave_link> as soon as possible, though. 2647for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2648though, as the player cannot control the character while it is on the link
2649map.
2442 2650
2443Will never block. 2651Will never block.
2444 2652
2445=item $player_object->leave_link ($map, $x, $y) 2653=item $player_object->leave_link ($map, $x, $y)
2446 2654
… …
2466sub cf::object::player::enter_link { 2674sub cf::object::player::enter_link {
2467 my ($self) = @_; 2675 my ($self) = @_;
2468 2676
2469 $self->deactivate_recursive; 2677 $self->deactivate_recursive;
2470 2678
2679 ++$self->{_link_recursion};
2680
2471 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2681 return if UNIVERSAL::isa $self->map, "ext::map_link";
2472 2682
2473 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2683 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2474 if $self->map && $self->map->{path} ne "{link}"; 2684 if $self->map && $self->map->{path} ne "{link}";
2475 2685
2476 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2686 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2477} 2687}
2478 2688
2479sub cf::object::player::leave_link { 2689sub cf::object::player::leave_link {
2480 my ($self, $map, $x, $y) = @_; 2690 my ($self, $map, $x, $y) = @_;
2481 2691
… …
2498 ($x, $y) = (-1, -1) 2708 ($x, $y) = (-1, -1)
2499 unless (defined $x) && (defined $y); 2709 unless (defined $x) && (defined $y);
2500 2710
2501 # use -1 or undef as default coordinates, not 0, 0 2711 # use -1 or undef as default coordinates, not 0, 0
2502 ($x, $y) = ($map->enter_x, $map->enter_y) 2712 ($x, $y) = ($map->enter_x, $map->enter_y)
2503 if $x <=0 && $y <= 0; 2713 if $x <= 0 && $y <= 0;
2504 2714
2505 $map->load; 2715 $map->load;
2506 $map->load_neighbours; 2716 $map->load_neighbours;
2507 2717
2508 return unless $self->contr->active; 2718 return unless $self->contr->active;
2509 $self->activate_recursive;
2510 2719
2511 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2720 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2512 $self->enter_map ($map, $x, $y); 2721 if ($self->enter_map ($map, $x, $y)) {
2513} 2722 # entering was successful
2723 delete $self->{_link_recursion};
2724 # only activate afterwards, to support waiting in hooks
2725 $self->activate_recursive;
2726 }
2514 2727
2728}
2729
2515=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2730=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2516 2731
2517Moves the player to the given map-path and coordinates by first freezing 2732Moves the player to the given map-path and coordinates by first freezing
2518her, loading and preparing them map, calling the provided $check callback 2733her, loading and preparing them map, calling the provided $check callback
2519that has to return the map if sucecssful, and then unfreezes the player on 2734that 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 2735the new (success) or old (failed) map position. In either case, $done will
2521be called at the end of this process. 2736be called at the end of this process.
2522 2737
2738Note that $check will be called with a potentially non-loaded map, so if
2739it needs a loaded map it has to call C<< ->load >>.
2740
2523=cut 2741=cut
2524 2742
2525our $GOTOGEN; 2743our $GOTOGEN;
2526 2744
2527sub cf::object::player::goto { 2745sub cf::object::player::goto {
2528 my ($self, $path, $x, $y, $check, $done) = @_; 2746 my ($self, $path, $x, $y, $check, $done) = @_;
2747
2748 if ($self->{_link_recursion} >= $MAX_LINKS) {
2749 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2750 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2751 ($path, $x, $y) = @$EMERGENCY_POSITION;
2752 }
2529 2753
2530 # do generation counting so two concurrent goto's will be executed in-order 2754 # do generation counting so two concurrent goto's will be executed in-order
2531 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2755 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2532 2756
2533 $self->enter_link; 2757 $self->enter_link;
… …
2557 my $map = eval { 2781 my $map = eval {
2558 my $map = defined $path ? cf::map::find $path : undef; 2782 my $map = defined $path ? cf::map::find $path : undef;
2559 2783
2560 if ($map) { 2784 if ($map) {
2561 $map = $map->customise_for ($self); 2785 $map = $map->customise_for ($self);
2562 $map = $check->($map) if $check && $map; 2786 $map = $check->($map, $x, $y, $self) if $check && $map;
2563 } else { 2787 } else {
2564 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2788 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2565 } 2789 }
2566 2790
2567 $map 2791 $map
… …
2575 if ($gen == $self->{_goto_generation}) { 2799 if ($gen == $self->{_goto_generation}) {
2576 delete $self->{_goto_generation}; 2800 delete $self->{_goto_generation};
2577 $self->leave_link ($map, $x, $y); 2801 $self->leave_link ($map, $x, $y);
2578 } 2802 }
2579 2803
2580 $done->() if $done; 2804 $done->($self) if $done;
2581 })->prio (1); 2805 })->prio (1);
2582} 2806}
2583 2807
2584=item $player_object->enter_exit ($exit_object) 2808=item $player_object->enter_exit ($exit_object)
2585 2809
… …
2605} 2829}
2606 2830
2607sub prepare_random_map { 2831sub prepare_random_map {
2608 my ($exit) = @_; 2832 my ($exit) = @_;
2609 2833
2610 my $guard = cf::lock_acquire "exit_prepare:$exit";
2611
2612 # all this does is basically replace the /! path by 2834 # all this does is basically replace the /! path by
2613 # a new random map path (?random/...) with a seed 2835 # a new random map path (?random/...) with a seed
2614 # that depends on the exit object 2836 # that depends on the exit object
2615 2837
2616 my $rmp = parse_random_map_params $exit->msg; 2838 my $rmp = parse_random_map_params $exit->msg;
… …
2618 if ($exit->map) { 2840 if ($exit->map) {
2619 $rmp->{region} = $exit->region->name; 2841 $rmp->{region} = $exit->region->name;
2620 $rmp->{origin_map} = $exit->map->path; 2842 $rmp->{origin_map} = $exit->map->path;
2621 $rmp->{origin_x} = $exit->x; 2843 $rmp->{origin_x} = $exit->x;
2622 $rmp->{origin_y} = $exit->y; 2844 $rmp->{origin_y} = $exit->y;
2845
2846 $exit->map->touch;
2623 } 2847 }
2624 2848
2625 $rmp->{random_seed} ||= $exit->random_seed; 2849 $rmp->{random_seed} ||= $exit->random_seed;
2626 2850
2627 my $data = cf::to_json $rmp; 2851 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2628 my $md5 = Digest::MD5::md5_hex $data; 2852 my $md5 = Digest::MD5::md5_hex $data;
2629 my $meta = "$RANDOMDIR/$md5.meta"; 2853 my $meta = "$RANDOMDIR/$md5.meta";
2630 2854
2631 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2855 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2632 aio_write $fh, 0, (length $data), $data, 0; 2856 aio_write $fh, 0, (length $data), $data, 0;
2633 undef $fh; 2857 undef $fh;
2634 aio_rename "$meta~", $meta; 2858 aio_rename "$meta~", $meta;
2635 2859
2860 my $slaying = "?random/$md5";
2861
2862 if ($exit->valid) {
2636 $exit->slaying ("?random/$md5"); 2863 $exit->slaying ("?random/$md5");
2637 $exit->msg (undef); 2864 $exit->msg (undef);
2865 }
2638 } 2866 }
2639} 2867}
2640 2868
2641sub cf::object::player::enter_exit { 2869sub cf::object::player::enter_exit {
2642 my ($self, $exit) = @_; 2870 my ($self, $exit) = @_;
2643 2871
2644 return unless $self->type == cf::PLAYER; 2872 return unless $self->type == cf::PLAYER;
2645 2873
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; 2874 $self->enter_link;
2658 2875
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 { 2876 (async {
2664 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2877 $Coro::current->{desc} = "enter_exit";
2665 2878
2666 $self->deactivate_recursive; # just to be sure
2667 unless (eval { 2879 unless (eval {
2880 $self->deactivate_recursive; # just to be sure
2881
2882 # random map handling
2883 {
2884 my $guard = cf::lock_acquire "exit_prepare:$exit";
2885
2886 prepare_random_map $exit
2887 if $exit->slaying eq "/!";
2888 }
2889
2890 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2891 my $x = $exit->stats->hp;
2892 my $y = $exit->stats->sp;
2893
2668 $self->goto ($slaying, $hp, $sp); 2894 $self->goto ($map, $x, $y);
2669 2895
2896 # if exit is damned, update players death & WoR home-position
2897 $self->contr->savebed ($map, $x, $y)
2898 if $exit->flag (cf::FLAG_DAMNED);
2899
2670 1; 2900 1
2671 }) { 2901 }) {
2672 $self->message ("Something went wrong deep within the crossfire server. " 2902 $self->message ("Something went wrong deep within the deliantra server. "
2673 . "I'll try to bring you back to the map you were before. " 2903 . "I'll try to bring you back to the map you were before. "
2674 . "Please report this to the dungeon master!", 2904 . "Please report this to the dungeon master!",
2675 cf::NDI_UNIQUE | cf::NDI_RED); 2905 cf::NDI_UNIQUE | cf::NDI_RED);
2676 2906
2677 warn "ERROR in enter_exit: $@"; 2907 error "ERROR in enter_exit: $@";
2678 $self->leave_link; 2908 $self->leave_link;
2679 } 2909 }
2680 })->prio (1); 2910 })->prio (1);
2681} 2911}
2682 2912
… …
2694sub cf::client::send_drawinfo { 2924sub cf::client::send_drawinfo {
2695 my ($self, $text, $flags) = @_; 2925 my ($self, $text, $flags) = @_;
2696 2926
2697 utf8::encode $text; 2927 utf8::encode $text;
2698 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2928 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2929}
2930
2931=item $client->send_big_packet ($pkt)
2932
2933Like C<send_packet>, but tries to compress large packets, and fragments
2934them as required.
2935
2936=cut
2937
2938our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2939
2940sub cf::client::send_big_packet {
2941 my ($self, $pkt) = @_;
2942
2943 # try lzf for large packets
2944 $pkt = "lzf " . Compress::LZF::compress $pkt
2945 if 1024 <= length $pkt and $self->{can_lzf};
2946
2947 # split very large packets
2948 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2949 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2950 $pkt = "frag";
2951 }
2952
2953 $self->send_packet ($pkt);
2699} 2954}
2700 2955
2701=item $client->send_msg ($channel, $msg, $color, [extra...]) 2956=item $client->send_msg ($channel, $msg, $color, [extra...])
2702 2957
2703Send a drawinfo or msg packet to the client, formatting the msg for the 2958Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2707 2962
2708=cut 2963=cut
2709 2964
2710# non-persistent channels (usually the info channel) 2965# non-persistent channels (usually the info channel)
2711our %CHANNEL = ( 2966our %CHANNEL = (
2967 "c/motd" => {
2968 id => "infobox",
2969 title => "MOTD",
2970 reply => undef,
2971 tooltip => "The message of the day",
2972 },
2712 "c/identify" => { 2973 "c/identify" => {
2713 id => "infobox", 2974 id => "infobox",
2714 title => "Identify", 2975 title => "Identify",
2715 reply => undef, 2976 reply => undef,
2716 tooltip => "Items recently identified", 2977 tooltip => "Items recently identified",
… …
2718 "c/examine" => { 2979 "c/examine" => {
2719 id => "infobox", 2980 id => "infobox",
2720 title => "Examine", 2981 title => "Examine",
2721 reply => undef, 2982 reply => undef,
2722 tooltip => "Signs and other items you examined", 2983 tooltip => "Signs and other items you examined",
2984 },
2985 "c/shopinfo" => {
2986 id => "infobox",
2987 title => "Shop Info",
2988 reply => undef,
2989 tooltip => "What your bargaining skill tells you about the shop",
2723 }, 2990 },
2724 "c/book" => { 2991 "c/book" => {
2725 id => "infobox", 2992 id => "infobox",
2726 title => "Book", 2993 title => "Book",
2727 reply => undef, 2994 reply => undef,
… …
2743 id => "infobox", 3010 id => "infobox",
2744 title => "Body Parts", 3011 title => "Body Parts",
2745 reply => undef, 3012 reply => undef,
2746 tooltip => "Shows which body parts you posess and are available", 3013 tooltip => "Shows which body parts you posess and are available",
2747 }, 3014 },
3015 "c/statistics" => {
3016 id => "infobox",
3017 title => "Statistics",
3018 reply => undef,
3019 tooltip => "Shows your primary statistics",
3020 },
3021 "c/skills" => {
3022 id => "infobox",
3023 title => "Skills",
3024 reply => undef,
3025 tooltip => "Shows your experience per skill and item power",
3026 },
3027 "c/shopitems" => {
3028 id => "infobox",
3029 title => "Shop Items",
3030 reply => undef,
3031 tooltip => "Shows the items currently for sale in this shop",
3032 },
3033 "c/resistances" => {
3034 id => "infobox",
3035 title => "Resistances",
3036 reply => undef,
3037 tooltip => "Shows your resistances",
3038 },
3039 "c/pets" => {
3040 id => "infobox",
3041 title => "Pets",
3042 reply => undef,
3043 tooltip => "Shows information abotu your pets/a specific pet",
3044 },
3045 "c/perceiveself" => {
3046 id => "infobox",
3047 title => "Perceive Self",
3048 reply => undef,
3049 tooltip => "You gained detailed knowledge about yourself",
3050 },
2748 "c/uptime" => { 3051 "c/uptime" => {
2749 id => "infobox", 3052 id => "infobox",
2750 title => "Uptime", 3053 title => "Uptime",
2751 reply => undef, 3054 reply => undef,
2752 tooltip => "How long the server has been running since last restart", 3055 tooltip => "How long the server has been running since last restart",
… …
2755 id => "infobox", 3058 id => "infobox",
2756 title => "Map Info", 3059 title => "Map Info",
2757 reply => undef, 3060 reply => undef,
2758 tooltip => "Information related to the maps", 3061 tooltip => "Information related to the maps",
2759 }, 3062 },
3063 "c/party" => {
3064 id => "party",
3065 title => "Party",
3066 reply => "gsay ",
3067 tooltip => "Messages and chat related to your party",
3068 },
3069 "c/death" => {
3070 id => "death",
3071 title => "Death",
3072 reply => undef,
3073 tooltip => "Reason for and more info about your most recent death",
3074 },
3075 "c/say" => $SAY_CHANNEL,
3076 "c/chat" => $CHAT_CHANNEL,
2760); 3077);
2761 3078
2762sub cf::client::send_msg { 3079sub cf::client::send_msg {
2763 my ($self, $channel, $msg, $color, @extra) = @_; 3080 my ($self, $channel, $msg, $color, @extra) = @_;
2764 3081
2765 $msg = $self->pl->expand_cfpod ($msg); 3082 $msg = $self->pl->expand_cfpod ($msg)
3083 unless $color & cf::NDI_VERBATIM;
2766 3084
2767 $color &= cf::NDI_CLIENT_MASK; # just in case... 3085 $color &= cf::NDI_CLIENT_MASK; # just in case...
2768 3086
2769 # check predefined channels, for the benefit of C 3087 # check predefined channels, for the benefit of C
2770 if ($CHANNEL{$channel}) { 3088 if ($CHANNEL{$channel}) {
2771 $channel = $CHANNEL{$channel}; 3089 $channel = $CHANNEL{$channel};
2772 3090
2773 $self->ext_msg (channel_info => $channel) 3091 $self->ext_msg (channel_info => $channel);
2774 if $self->can_msg;
2775
2776 $channel = $channel->{id}; 3092 $channel = $channel->{id};
2777 3093
2778 } elsif (ref $channel) { 3094 } elsif (ref $channel) {
2779 # send meta info to client, if not yet sent 3095 # send meta info to client, if not yet sent
2780 unless (exists $self->{channel}{$channel->{id}}) { 3096 unless (exists $self->{channel}{$channel->{id}}) {
2781 $self->{channel}{$channel->{id}} = $channel; 3097 $self->{channel}{$channel->{id}} = $channel;
2782 $self->ext_msg (channel_info => $channel) 3098 $self->ext_msg (channel_info => $channel);
2783 if $self->can_msg;
2784 } 3099 }
2785 3100
2786 $channel = $channel->{id}; 3101 $channel = $channel->{id};
2787 } 3102 }
2788 3103
2789 return unless @extra || length $msg; 3104 return unless @extra || length $msg;
2790 3105
2791 if ($self->can_msg) {
2792 # default colour, mask it out 3106 # default colour, mask it out
2793 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3107 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2794 if $color & cf::NDI_DEF; 3108 if $color & cf::NDI_DEF;
2795 3109
2796 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3110 my $pkt = "msg "
3111 . $self->{json_coder}->encode (
2797 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3112 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2798 } else { 3113 );
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 3114
2810 $color &= cf::NDI_COLOR_MASK; 3115 $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} 3116}
2824 3117
2825=item $client->ext_msg ($type, @msg) 3118=item $client->ext_msg ($type, @msg)
2826 3119
2827Sends an ext event to the client. 3120Sends an ext event to the client.
… …
2830 3123
2831sub cf::client::ext_msg($$@) { 3124sub cf::client::ext_msg($$@) {
2832 my ($self, $type, @msg) = @_; 3125 my ($self, $type, @msg) = @_;
2833 3126
2834 if ($self->extcmd == 2) { 3127 if ($self->extcmd == 2) {
2835 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3128 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2836 } elsif ($self->extcmd == 1) { # TODO: remove 3129 } elsif ($self->extcmd == 1) { # TODO: remove
2837 push @msg, msgtype => "event_$type"; 3130 push @msg, msgtype => "event_$type";
2838 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3131 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2839 } 3132 }
2840} 3133}
2841 3134
2842=item $client->ext_reply ($msgid, @msg) 3135=item $client->ext_reply ($msgid, @msg)
2843 3136
… …
2847 3140
2848sub cf::client::ext_reply($$@) { 3141sub cf::client::ext_reply($$@) {
2849 my ($self, $id, @msg) = @_; 3142 my ($self, $id, @msg) = @_;
2850 3143
2851 if ($self->extcmd == 2) { 3144 if ($self->extcmd == 2) {
2852 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3145 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2853 } elsif ($self->extcmd == 1) { 3146 } elsif ($self->extcmd == 1) {
2854 #TODO: version 1, remove 3147 #TODO: version 1, remove
2855 unshift @msg, msgtype => "reply", msgid => $id; 3148 unshift @msg, msgtype => "reply", msgid => $id;
2856 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3149 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2857 } 3150 }
2858} 3151}
2859 3152
2860=item $success = $client->query ($flags, "text", \&cb) 3153=item $success = $client->query ($flags, "text", \&cb)
2861 3154
… …
2932 3225
2933 $ns->ext_reply ($reply, @reply) 3226 $ns->ext_reply ($reply, @reply)
2934 if $reply; 3227 if $reply;
2935 3228
2936 } else { 3229 } else {
2937 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3230 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2938 } 3231 }
2939 3232
2940 cf::override; 3233 cf::override;
2941 }, 3234 },
2942); 3235);
… …
2962 3255
2963 $coro 3256 $coro
2964} 3257}
2965 3258
2966cf::client->attach ( 3259cf::client->attach (
2967 on_destroy => sub { 3260 on_client_destroy => sub {
2968 my ($ns) = @_; 3261 my ($ns) = @_;
2969 3262
2970 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3263 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2971 }, 3264 },
2972); 3265);
… …
2988our $safe_hole = new Safe::Hole; 3281our $safe_hole = new Safe::Hole;
2989 3282
2990$SIG{FPE} = 'IGNORE'; 3283$SIG{FPE} = 'IGNORE';
2991 3284
2992$safe->permit_only (Opcode::opset qw( 3285$safe->permit_only (Opcode::opset qw(
2993 :base_core :base_mem :base_orig :base_math 3286 :base_core :base_mem :base_orig :base_math :base_loop
2994 grepstart grepwhile mapstart mapwhile 3287 grepstart grepwhile mapstart mapwhile
2995 sort time 3288 sort time
2996)); 3289));
2997 3290
2998# here we export the classes and methods available to script code 3291# here we export the classes and methods available to script code
… …
3001 3294
3002The following functions and methods are available within a safe environment: 3295The following functions and methods are available within a safe environment:
3003 3296
3004 cf::object 3297 cf::object
3005 contr pay_amount pay_player map x y force_find force_add destroy 3298 contr pay_amount pay_player map x y force_find force_add destroy
3006 insert remove name archname title slaying race decrease_ob_nr 3299 insert remove name archname title slaying race decrease split
3300 value
3007 3301
3008 cf::object::player 3302 cf::object::player
3009 player 3303 player
3010 3304
3011 cf::player 3305 cf::player
… …
3016 3310
3017=cut 3311=cut
3018 3312
3019for ( 3313for (
3020 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3314 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3021 insert remove inv name archname title slaying race 3315 insert remove inv nrof name archname title slaying race
3022 decrease_ob_nr destroy)], 3316 decrease split destroy change_exp value msg lore send_msg)],
3023 ["cf::object::player" => qw(player)], 3317 ["cf::object::player" => qw(player)],
3024 ["cf::player" => qw(peaceful)], 3318 ["cf::player" => qw(peaceful send_msg)],
3025 ["cf::map" => qw(trigger)], 3319 ["cf::map" => qw(trigger)],
3026) { 3320) {
3027 no strict 'refs';
3028 my ($pkg, @funs) = @$_; 3321 my ($pkg, @funs) = @$_;
3029 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3322 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3030 for @funs; 3323 for @funs;
3031} 3324}
3032 3325
… …
3047 3340
3048 my $qcode = $code; 3341 my $qcode = $code;
3049 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3342 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3050 $qcode =~ s/\n/\\n/g; 3343 $qcode =~ s/\n/\\n/g;
3051 3344
3345 %vars = (_dummy => 0) unless %vars;
3346
3347 my @res;
3052 local $_; 3348 local $_;
3053 local @safe::cf::_safe_eval_args = values %vars;
3054 3349
3055 my $eval = 3350 my $eval =
3056 "do {\n" 3351 "do {\n"
3057 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3352 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3058 . "#line 0 \"{$qcode}\"\n" 3353 . "#line 0 \"{$qcode}\"\n"
3059 . $code 3354 . $code
3060 . "\n}" 3355 . "\n}"
3061 ; 3356 ;
3062 3357
3358 if ($CFG{safe_eval}) {
3063 sub_generation_inc; 3359 sub_generation_inc;
3360 local @safe::cf::_safe_eval_args = values %vars;
3064 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3361 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3065 sub_generation_inc; 3362 sub_generation_inc;
3363 } else {
3364 local @cf::_safe_eval_args = values %vars;
3365 @res = wantarray ? eval eval : scalar eval $eval;
3366 }
3066 3367
3067 if ($@) { 3368 if ($@) {
3068 warn "$@"; 3369 warn "$@",
3069 warn "while executing safe code '$code'\n"; 3370 "while executing safe code '$code'\n",
3070 warn "with arguments " . (join " ", %vars) . "\n"; 3371 "with arguments " . (join " ", %vars) . "\n";
3071 } 3372 }
3072 3373
3073 wantarray ? @res : $res[0] 3374 wantarray ? @res : $res[0]
3074} 3375}
3075 3376
… …
3089=cut 3390=cut
3090 3391
3091sub register_script_function { 3392sub register_script_function {
3092 my ($fun, $cb) = @_; 3393 my ($fun, $cb) = @_;
3093 3394
3094 no strict 'refs'; 3395 $fun = "safe::$fun" if $CFG{safe_eval};
3095 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3396 *$fun = $safe_hole->wrap ($cb);
3096} 3397}
3097 3398
3098=back 3399=back
3099 3400
3100=cut 3401=cut
… …
3109 # for this (global event?) 3410 # for this (global event?)
3110 %ext::player_env::MUSIC_FACE_CACHE = (); 3411 %ext::player_env::MUSIC_FACE_CACHE = ();
3111 3412
3112 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3413 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3113 3414
3114 warn "loading facedata from $path\n"; 3415 trace "loading facedata from $path\n";
3115 3416
3116 my $facedata;
3117 0 < aio_load $path, $facedata 3417 0 < aio_load $path, my $facedata
3118 or die "$path: $!"; 3418 or die "$path: $!";
3119 3419
3120 $facedata = Coro::Storable::thaw $facedata; 3420 $facedata = Coro::Storable::thaw $facedata;
3121 3421
3122 $facedata->{version} == 2 3422 $facedata->{version} == 2
3123 or cf::cleanup "$path: version mismatch, cannot proceed."; 3423 or cf::cleanup "$path: version mismatch, cannot proceed.";
3124 3424
3125 # patch in the exptable 3425 # patch in the exptable
3426 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3126 $facedata->{resource}{"res/exp_table"} = { 3427 $facedata->{resource}{"res/exp_table"} = {
3127 type => FT_RSRC, 3428 type => FT_RSRC,
3128 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3429 data => $exp_table,
3430 hash => (Digest::MD5::md5 $exp_table),
3129 }; 3431 };
3130 cf::cede_to_tick; 3432 cf::cede_to_tick;
3131 3433
3132 { 3434 {
3133 my $faces = $facedata->{faceinfo}; 3435 my $faces = $facedata->{faceinfo};
3134 3436
3135 while (my ($face, $info) = each %$faces) { 3437 while (my ($face, $info) = each %$faces) {
3136 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3438 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3439
3137 cf::face::set_visibility $idx, $info->{visibility}; 3440 cf::face::set_visibility $idx, $info->{visibility};
3138 cf::face::set_magicmap $idx, $info->{magicmap}; 3441 cf::face::set_magicmap $idx, $info->{magicmap};
3139 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3442 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3140 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3443 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3141 3444
3142 cf::cede_to_tick; 3445 cf::cede_to_tick;
3143 } 3446 }
3144 3447
3145 while (my ($face, $info) = each %$faces) { 3448 while (my ($face, $info) = each %$faces) {
3146 next unless $info->{smooth}; 3449 next unless $info->{smooth};
3450
3147 my $idx = cf::face::find $face 3451 my $idx = cf::face::find $face
3148 or next; 3452 or next;
3453
3149 if (my $smooth = cf::face::find $info->{smooth}) { 3454 if (my $smooth = cf::face::find $info->{smooth}) {
3150 cf::face::set_smooth $idx, $smooth; 3455 cf::face::set_smooth $idx, $smooth;
3151 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3456 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3152 } else { 3457 } else {
3153 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3458 error "smooth face '$info->{smooth}' not found for face '$face'";
3154 } 3459 }
3155 3460
3156 cf::cede_to_tick; 3461 cf::cede_to_tick;
3157 } 3462 }
3158 } 3463 }
… …
3167 3472
3168 cf::anim::invalidate_all; # d'oh 3473 cf::anim::invalidate_all; # d'oh
3169 } 3474 }
3170 3475
3171 { 3476 {
3172 # TODO: for gcfclient pleasure, we should give resources
3173 # that gcfclient doesn't grok a >10000 face index.
3174 my $res = $facedata->{resource}; 3477 my $res = $facedata->{resource};
3175 3478
3176 my $soundconf = delete $res->{"res/sound.conf"};
3177
3178 while (my ($name, $info) = each %$res) { 3479 while (my ($name, $info) = each %$res) {
3480 if (defined $info->{type}) {
3179 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3481 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3180 my $data;
3181 3482
3182 if ($info->{type} & 1) { 3483 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3183 # prepend meta info 3484 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 { 3485 } else {
3192 $data = $info->{data}; 3486 $RESOURCE{$name} = $info; # unused
3193 } 3487 }
3194 3488
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; 3489 cf::cede_to_tick;
3199 } 3490 }
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 } 3491 }
3492
3493 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3219 3494
3220 1 3495 1
3221} 3496}
3222 3497
3223register_exticmd fx_want => sub { 3498register_exticmd fx_want => sub {
… …
3225 3500
3226 while (my ($k, $v) = each %$want) { 3501 while (my ($k, $v) = each %$want) {
3227 $ns->fx_want ($k, $v); 3502 $ns->fx_want ($k, $v);
3228 } 3503 }
3229}; 3504};
3505
3506sub load_resource_file($) {
3507 my $guard = lock_acquire "load_resource_file";
3508
3509 my $status = load_resource_file_ $_[0];
3510 get_slot 0.1, 100;
3511 cf::arch::commit_load;
3512
3513 $status
3514}
3230 3515
3231sub reload_regions { 3516sub reload_regions {
3232 # HACK to clear player env face cache, we need some signal framework 3517 # HACK to clear player env face cache, we need some signal framework
3233 # for this (global event?) 3518 # for this (global event?)
3234 %ext::player_env::MUSIC_FACE_CACHE = (); 3519 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3248} 3533}
3249 3534
3250sub reload_archetypes { 3535sub reload_archetypes {
3251 load_resource_file "$DATADIR/archetypes" 3536 load_resource_file "$DATADIR/archetypes"
3252 or die "unable to load archetypes\n"; 3537 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} 3538}
3259 3539
3260sub reload_treasures { 3540sub reload_treasures {
3261 load_resource_file "$DATADIR/treasures" 3541 load_resource_file "$DATADIR/treasures"
3262 or die "unable to load treasurelists\n"; 3542 or die "unable to load treasurelists\n";
3263} 3543}
3264 3544
3545sub reload_sound {
3546 trace "loading sound config from $DATADIR/sound\n";
3547
3548 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3549 or die "$DATADIR/sound $!";
3550
3551 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3552
3553 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3554 my $sound = $soundconf->{compat}[$_]
3555 or next;
3556
3557 my $face = cf::face::find "sound/$sound->[1]";
3558 cf::sound::set $sound->[0] => $face;
3559 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3560 }
3561
3562 while (my ($k, $v) = each %{$soundconf->{event}}) {
3563 my $face = cf::face::find "sound/$v";
3564 cf::sound::set $k => $face;
3565 }
3566}
3567
3265sub reload_resources { 3568sub reload_resources {
3266 warn "reloading resource files...\n"; 3569 trace "reloading resource files...\n";
3267 3570
3571 reload_exp_table;
3572 reload_materials;
3573 reload_facedata;
3574 reload_sound;
3575 reload_archetypes;
3268 reload_regions; 3576 reload_regions;
3269 reload_facedata;
3270 #reload_archetypes;#d#
3271 reload_archetypes;
3272 reload_treasures; 3577 reload_treasures;
3273 3578
3274 warn "finished reloading resource files\n"; 3579 trace "finished reloading resource files\n";
3275}
3276
3277sub init {
3278 reload_resources;
3279} 3580}
3280 3581
3281sub reload_config { 3582sub reload_config {
3282 open my $fh, "<:utf8", "$CONFDIR/config" 3583 trace "reloading config file...\n";
3283 or return;
3284 3584
3285 local $/; 3585 0 < aio_load "$CONFDIR/config", my $config
3286 *CFG = YAML::Syck::Load <$fh>; 3586 or die "$CONFDIR/config: $!";
3287 3587
3588 utf8::decode $config;
3589 *CFG = yaml_load $config;
3590
3288 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3591 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3289 3592
3290 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3593 $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}; 3594 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3292 3595
3293 if (exists $CFG{mlockall}) { 3596 if (exists $CFG{mlockall}) {
… …
3297 }; 3600 };
3298 warn $@ if $@; 3601 warn $@ if $@;
3299 } 3602 }
3300} 3603}
3301 3604
3605sub pidfile() {
3606 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3607 or die "$PIDFILE: $!";
3608 flock $fh, &Fcntl::LOCK_EX
3609 or die "$PIDFILE: flock: $!";
3610 $fh
3611}
3612
3613# make sure only one server instance is running at any one time
3614sub atomic {
3615 my $fh = pidfile;
3616
3617 my $pid = <$fh>;
3618 kill 9, $pid if $pid > 0;
3619
3620 seek $fh, 0, 0;
3621 print $fh $$;
3622}
3623
3624sub main_loop {
3625 trace "EV::loop starting\n";
3626 if (1) {
3627 EV::loop;
3628 }
3629 trace "EV::loop returned\n";
3630 goto &main_loop unless $REALLY_UNLOOP;
3631}
3632
3302sub main { 3633sub main {
3634 cf::init_globals; # initialise logging
3635
3636 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3637 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3638 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3639 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3640
3641 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3642
3303 # we must not ever block the main coroutine 3643 # we must not ever block the main coroutine
3304 local $Coro::idle = sub { 3644 local $Coro::idle = sub {
3305 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3645 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3306 (async { 3646 (async {
3307 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3647 $Coro::current->{desc} = "IDLE BUG HANDLER";
3308 Event::one_event; 3648 EV::loop EV::LOOP_ONESHOT;
3309 })->prio (Coro::PRIO_MAX); 3649 })->prio (Coro::PRIO_MAX);
3310 }; 3650 };
3311 3651
3652 evthread_start IO::AIO::poll_fileno;
3653
3654 cf::sync_job {
3655 cf::incloader::init ();
3656
3657 cf::init_anim;
3658 cf::init_attackmess;
3659 cf::init_dynamic;
3660
3661 cf::load_settings;
3662
3663 reload_resources;
3312 reload_config; 3664 reload_config;
3313 db_init; 3665 db_init;
3666
3667 cf::init_uuid;
3668 cf::init_signals;
3669 cf::init_skills;
3670
3671 cf::init_beforeplay;
3672
3673 atomic;
3674
3314 load_extensions; 3675 load_extensions;
3315 3676
3316 $TICK_WATCHER->start; 3677 utime time, time, $RUNTIMEFILE;
3317 Event::loop; 3678
3679 # no (long-running) fork's whatsoever before this point(!)
3680 use POSIX ();
3681 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3682
3683 cf::_post_init 0;
3684 };
3685
3686 cf::object::thawer::errors_are_fatal 0;
3687 info "parse errors in files are no longer fatal from this point on.\n";
3688
3689 my $free_main; $free_main = EV::idle sub {
3690 undef $free_main;
3691 undef &main; # free gobs of memory :)
3692 };
3693
3694 goto &main_loop;
3318} 3695}
3319 3696
3320############################################################################# 3697#############################################################################
3321# initialisation and cleanup 3698# initialisation and cleanup
3322 3699
3323# install some emergency cleanup handlers 3700# install some emergency cleanup handlers
3324BEGIN { 3701BEGIN {
3702 our %SIGWATCHER = ();
3325 for my $signal (qw(INT HUP TERM)) { 3703 for my $signal (qw(INT HUP TERM)) {
3326 Event->signal ( 3704 $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"; 3705 cf::cleanup "SIG$signal";
3333 },
3334 ); 3706 };
3335 } 3707 }
3336} 3708}
3337 3709
3338sub write_runtime { 3710sub write_runtime_sync {
3339 my $runtime = "$LOCALDIR/runtime"; 3711 my $t0 = AE::time;
3340 3712
3341 # first touch the runtime file to show we are still running: 3713 # first touch the runtime file to show we are still running:
3342 # the fsync below can take a very very long time. 3714 # the fsync below can take a very very long time.
3343 3715
3344 IO::AIO::aio_utime $runtime, undef, undef; 3716 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3345 3717
3346 my $guard = cf::lock_acquire "write_runtime"; 3718 my $guard = cf::lock_acquire "write_runtime";
3347 3719
3348 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3720 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3349 or return; 3721 or return;
3350 3722
3351 my $value = $cf::RUNTIME + 90 + 10; 3723 my $value = $cf::RUNTIME + 90 + 10;
3352 # 10 is the runtime save interval, for a monotonic clock 3724 # 10 is the runtime save interval, for a monotonic clock
3353 # 60 allows for the watchdog to kill the server. 3725 # 60 allows for the watchdog to kill the server.
… …
3363 aio_utime $fh, undef, undef; 3735 aio_utime $fh, undef, undef;
3364 3736
3365 close $fh 3737 close $fh
3366 or return; 3738 or return;
3367 3739
3368 aio_rename "$runtime~", $runtime 3740 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3369 and return; 3741 and return;
3370 3742
3371 warn "runtime file written.\n"; 3743 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3372 3744
3373 1 3745 1
3746}
3747
3748our $uuid_lock;
3749our $uuid_skip;
3750
3751sub write_uuid_sync($) {
3752 $uuid_skip ||= $_[0];
3753
3754 return if $uuid_lock;
3755 local $uuid_lock = 1;
3756
3757 my $uuid = "$LOCALDIR/uuid";
3758
3759 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3760 or return;
3761
3762 my $value = uuid_seq uuid_cur;
3763
3764 unless ($value) {
3765 info "cowardly refusing to write zero uuid value!\n";
3766 return;
3767 }
3768
3769 my $value = uuid_str $value + $uuid_skip;
3770 $uuid_skip = 0;
3771
3772 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3773 and return;
3774
3775 # always fsync - this file is important
3776 aio_fsync $fh
3777 and return;
3778
3779 close $fh
3780 or return;
3781
3782 aio_rename "$uuid~", $uuid
3783 and return;
3784
3785 trace "uuid file written ($value).\n";
3786
3787 1
3788
3789}
3790
3791sub write_uuid($$) {
3792 my ($skip, $sync) = @_;
3793
3794 $sync ? write_uuid_sync $skip
3795 : async { write_uuid_sync $skip };
3374} 3796}
3375 3797
3376sub emergency_save() { 3798sub emergency_save() {
3377 my $freeze_guard = cf::freeze_mainloop; 3799 my $freeze_guard = cf::freeze_mainloop;
3378 3800
3379 warn "enter emergency perl save\n"; 3801 info "emergency_perl_save: enter\n";
3802
3803 # this is a trade-off: we want to be very quick here, so
3804 # save all maps without fsync, and later call a global sync
3805 # (which in turn might be very very slow)
3806 local $USE_FSYNC = 0;
3380 3807
3381 cf::sync_job { 3808 cf::sync_job {
3809 cf::write_runtime_sync; # external watchdog should not bark
3810
3382 # use a peculiar iteration method to avoid tripping on perl 3811 # use a peculiar iteration method to avoid tripping on perl
3383 # refcount bugs in for. also avoids problems with players 3812 # refcount bugs in for. also avoids problems with players
3384 # and maps saved/destroyed asynchronously. 3813 # and maps saved/destroyed asynchronously.
3385 warn "begin emergency player save\n"; 3814 info "emergency_perl_save: begin player save\n";
3386 for my $login (keys %cf::PLAYER) { 3815 for my $login (keys %cf::PLAYER) {
3387 my $pl = $cf::PLAYER{$login} or next; 3816 my $pl = $cf::PLAYER{$login} or next;
3388 $pl->valid or next; 3817 $pl->valid or next;
3389 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3818 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3390 $pl->save; 3819 $pl->save;
3391 } 3820 }
3392 warn "end emergency player save\n"; 3821 info "emergency_perl_save: end player save\n";
3393 3822
3394 warn "begin emergency map save\n"; 3823 cf::write_runtime_sync; # external watchdog should not bark
3824
3825 info "emergency_perl_save: begin map save\n";
3395 for my $path (keys %cf::MAP) { 3826 for my $path (keys %cf::MAP) {
3396 my $map = $cf::MAP{$path} or next; 3827 my $map = $cf::MAP{$path} or next;
3397 $map->valid or next; 3828 $map->valid or next;
3398 $map->save; 3829 $map->save;
3399 } 3830 }
3400 warn "end emergency map save\n"; 3831 info "emergency_perl_save: end map save\n";
3401 3832
3402 warn "begin emergency database checkpoint\n"; 3833 cf::write_runtime_sync; # external watchdog should not bark
3834
3835 info "emergency_perl_save: begin database checkpoint\n";
3403 BDB::db_env_txn_checkpoint $DB_ENV; 3836 BDB::db_env_txn_checkpoint $DB_ENV;
3404 warn "end emergency database checkpoint\n"; 3837 info "emergency_perl_save: end database checkpoint\n";
3838
3839 info "emergency_perl_save: begin write uuid\n";
3840 write_uuid_sync 1;
3841 info "emergency_perl_save: end write uuid\n";
3842
3843 cf::write_runtime_sync; # external watchdog should not bark
3844
3845 trace "emergency_perl_save: syncing database to disk";
3846 BDB::db_env_txn_checkpoint $DB_ENV;
3847
3848 info "emergency_perl_save: starting sync\n";
3849 IO::AIO::aio_sync sub {
3850 info "emergency_perl_save: finished sync\n";
3851 };
3852
3853 cf::write_runtime_sync; # external watchdog should not bark
3854
3855 trace "emergency_perl_save: flushing outstanding aio requests";
3856 while (IO::AIO::nreqs || BDB::nreqs) {
3857 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3858 }
3859
3860 cf::write_runtime_sync; # external watchdog should not bark
3405 }; 3861 };
3406 3862
3407 warn "leave emergency perl save\n"; 3863 info "emergency_perl_save: leave\n";
3408} 3864}
3409 3865
3410sub post_cleanup { 3866sub post_cleanup {
3411 my ($make_core) = @_; 3867 my ($make_core) = @_;
3412 3868
3869 IO::AIO::flush;
3870
3413 warn Carp::longmess "post_cleanup backtrace" 3871 error Carp::longmess "post_cleanup backtrace"
3414 if $make_core; 3872 if $make_core;
3873
3874 my $fh = pidfile;
3875 unlink $PIDFILE if <$fh> == $$;
3876}
3877
3878# a safer delete_package, copied from Symbol
3879sub clear_package($) {
3880 my $pkg = shift;
3881
3882 # expand to full symbol table name if needed
3883 unless ($pkg =~ /^main::.*::$/) {
3884 $pkg = "main$pkg" if $pkg =~ /^::/;
3885 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3886 $pkg .= '::' unless $pkg =~ /::$/;
3887 }
3888
3889 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3890 my $stem_symtab = *{$stem}{HASH};
3891
3892 defined $stem_symtab and exists $stem_symtab->{$leaf}
3893 or return;
3894
3895 # clear all symbols
3896 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3897 for my $name (keys %$leaf_symtab) {
3898 _gv_clear *{"$pkg$name"};
3899# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3900 }
3415} 3901}
3416 3902
3417sub do_reload_perl() { 3903sub do_reload_perl() {
3418 # can/must only be called in main 3904 # can/must only be called in main
3419 if ($Coro::current != $Coro::main) { 3905 unless (in_main) {
3420 warn "can only reload from main coroutine"; 3906 error "can only reload from main coroutine";
3421 return; 3907 return;
3422 } 3908 }
3423 3909
3424 warn "reloading..."; 3910 return if $RELOAD++;
3425 3911
3426 warn "entering sync_job"; 3912 my $t1 = AE::time;
3427 3913
3914 while ($RELOAD) {
3915 cf::get_slot 0.1, -1, "reload_perl";
3916 info "perl_reload: reloading...";
3917
3918 trace "perl_reload: entering sync_job";
3919
3428 cf::sync_job { 3920 cf::sync_job {
3429 cf::write_runtime; # external watchdog should not bark
3430 cf::emergency_save; 3921 #cf::emergency_save;
3431 cf::write_runtime; # external watchdog should not bark
3432 3922
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"; 3923 trace "perl_reload: cancelling all extension coros";
3455 $_->cancel for values %EXT_CORO; 3924 $_->cancel for values %EXT_CORO;
3456 %EXT_CORO = (); 3925 %EXT_CORO = ();
3457 3926
3458 warn "removing commands"; 3927 trace "perl_reload: removing commands";
3459 %COMMAND = (); 3928 %COMMAND = ();
3460 3929
3461 warn "removing ext/exti commands"; 3930 trace "perl_reload: removing ext/exti commands";
3462 %EXTCMD = (); 3931 %EXTCMD = ();
3463 %EXTICMD = (); 3932 %EXTICMD = ();
3464 3933
3465 warn "unloading/nuking all extensions"; 3934 trace "perl_reload: unloading/nuking all extensions";
3466 for my $pkg (@EXTS) { 3935 for my $pkg (@EXTS) {
3467 warn "... unloading $pkg"; 3936 trace "... unloading $pkg";
3468 3937
3469 if (my $cb = $pkg->can ("unload")) { 3938 if (my $cb = $pkg->can ("unload")) {
3470 eval { 3939 eval {
3471 $cb->($pkg); 3940 $cb->($pkg);
3472 1 3941 1
3473 } or warn "$pkg unloaded, but with errors: $@"; 3942 } or error "$pkg unloaded, but with errors: $@";
3943 }
3944
3945 trace "... clearing $pkg";
3946 clear_package $pkg;
3474 } 3947 }
3475 3948
3476 warn "... nuking $pkg";
3477 Symbol::delete_package $pkg;
3478 }
3479
3480 warn "unloading all perl modules loaded from $LIBDIR"; 3949 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3481 while (my ($k, $v) = each %INC) { 3950 while (my ($k, $v) = each %INC) {
3482 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3951 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3483 3952
3484 warn "... unloading $k"; 3953 trace "... unloading $k";
3485 delete $INC{$k}; 3954 delete $INC{$k};
3486 3955
3487 $k =~ s/\.pm$//; 3956 $k =~ s/\.pm$//;
3488 $k =~ s/\//::/g; 3957 $k =~ s/\//::/g;
3489 3958
3490 if (my $cb = $k->can ("unload_module")) { 3959 if (my $cb = $k->can ("unload_module")) {
3491 $cb->(); 3960 $cb->();
3961 }
3962
3963 clear_package $k;
3492 } 3964 }
3493 3965
3494 Symbol::delete_package $k;
3495 }
3496
3497 warn "getting rid of safe::, as good as possible"; 3966 trace "perl_reload: getting rid of safe::, as good as possible";
3498 Symbol::delete_package "safe::$_" 3967 clear_package "safe::$_"
3499 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3968 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3500 3969
3501 warn "unloading cf.pm \"a bit\""; 3970 trace "perl_reload: unloading cf.pm \"a bit\"";
3502 delete $INC{"cf.pm"}; 3971 delete $INC{"cf.pm"};
3503 delete $INC{"cf/pod.pm"}; 3972 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3504 3973
3505 # don't, removes xs symbols, too, 3974 # don't, removes xs symbols, too,
3506 # and global variables created in xs 3975 # and global variables created in xs
3507 #Symbol::delete_package __PACKAGE__; 3976 #clear_package __PACKAGE__;
3508 3977
3509 warn "unload completed, starting to reload now"; 3978 info "perl_reload: unload completed, starting to reload now";
3510 3979
3511 warn "reloading cf.pm"; 3980 trace "perl_reload: reloading cf.pm";
3512 require cf; 3981 require cf;
3513 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3982 cf::_connect_to_perl_1;
3514 3983
3515 warn "loading config and database again"; 3984 trace "perl_reload: loading config and database again";
3516 cf::reload_config; 3985 cf::reload_config;
3517 3986
3518 warn "loading extensions"; 3987 trace "perl_reload: loading extensions";
3519 cf::load_extensions; 3988 cf::load_extensions;
3520 3989
3990 if ($REATTACH_ON_RELOAD) {
3521 warn "reattaching attachments to objects/players"; 3991 trace "perl_reload: reattaching attachments to objects/players";
3522 _global_reattach; # objects, sockets 3992 _global_reattach; # objects, sockets
3523 warn "reattaching attachments to maps"; 3993 trace "perl_reload: reattaching attachments to maps";
3524 reattach $_ for values %MAP; 3994 reattach $_ for values %MAP;
3525 warn "reattaching attachments to players"; 3995 trace "perl_reload: reattaching attachments to players";
3526 reattach $_ for values %PLAYER; 3996 reattach $_ for values %PLAYER;
3997 }
3527 3998
3528 warn "leaving sync_job"; 3999 cf::_post_init 1;
3529 4000
4001 trace "perl_reload: leaving sync_job";
4002
3530 1 4003 1
3531 } or do { 4004 } or do {
3532 warn $@; 4005 error $@;
3533 warn "error while reloading, exiting."; 4006 cf::cleanup "perl_reload: error, exiting.";
3534 exit 1; 4007 };
4008
4009 --$RELOAD;
3535 }; 4010 }
3536 4011
3537 warn "reloaded"; 4012 $t1 = AE::time - $t1;
4013 info "perl_reload: completed in ${t1}s\n";
3538}; 4014};
3539 4015
3540our $RELOAD_WATCHER; # used only during reload 4016our $RELOAD_WATCHER; # used only during reload
3541 4017
3542sub reload_perl() { 4018sub reload_perl() {
3543 # doing reload synchronously and two reloads happen back-to-back, 4019 # doing reload synchronously and two reloads happen back-to-back,
3544 # coro crashes during coro_state_free->destroy here. 4020 # coro crashes during coro_state_free->destroy here.
3545 4021
3546 $RELOAD_WATCHER ||= Event->timer ( 4022 $RELOAD_WATCHER ||= cf::async {
3547 reentrant => 0, 4023 Coro::AIO::aio_wait cache_extensions;
3548 after => 0, 4024
3549 data => WF_AUTOCANCEL, 4025 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3550 cb => sub {
3551 do_reload_perl; 4026 do_reload_perl;
3552 undef $RELOAD_WATCHER; 4027 undef $RELOAD_WATCHER;
3553 }, 4028 };
3554 ); 4029 };
3555} 4030}
3556 4031
3557register_command "reload" => sub { 4032register_command "reload" => sub {
3558 my ($who, $arg) = @_; 4033 my ($who, $arg) = @_;
3559 4034
… …
3564 reload_perl; 4039 reload_perl;
3565 }; 4040 };
3566 } 4041 }
3567}; 4042};
3568 4043
3569unshift @INC, $LIBDIR; 4044#############################################################################
3570 4045
3571my $bug_warning = 0; 4046my $bug_warning = 0;
3572 4047
3573our @WAIT_FOR_TICK; 4048our @WAIT_FOR_TICK;
3574our @WAIT_FOR_TICK_BEGIN; 4049our @WAIT_FOR_TICK_BEGIN;
3575 4050
3576sub wait_for_tick { 4051sub wait_for_tick() {
3577 return unless $TICK_WATCHER->is_active;
3578 return if $Coro::current == $Coro::main; 4052 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3579 4053
3580 my $signal = new Coro::Signal; 4054 my $signal = new Coro::Signal;
3581 push @WAIT_FOR_TICK, $signal; 4055 push @WAIT_FOR_TICK, $signal;
3582 $signal->wait; 4056 $signal->wait;
3583} 4057}
3584 4058
3585sub wait_for_tick_begin { 4059sub wait_for_tick_begin() {
3586 return unless $TICK_WATCHER->is_active;
3587 return if $Coro::current == $Coro::main; 4060 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3588 4061
3589 my $signal = new Coro::Signal; 4062 my $signal = new Coro::Signal;
3590 push @WAIT_FOR_TICK_BEGIN, $signal; 4063 push @WAIT_FOR_TICK_BEGIN, $signal;
3591 $signal->wait; 4064 $signal->wait;
3592} 4065}
3593 4066
3594$TICK_WATCHER = Event->timer ( 4067sub 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) { 4068 if ($Coro::current != $Coro::main) {
3602 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4069 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3603 unless ++$bug_warning > 10; 4070 unless ++$bug_warning > 10;
3604 return; 4071 return;
3605 } 4072 }
3606 4073
3607 $NOW = $tick_start = Event::time;
3608
3609 cf::server_tick; # one server iteration 4074 cf::server_tick; # one server iteration
3610 4075
3611 $RUNTIME += $TICK; 4076 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3612 $NEXT_TICK += $TICK;
3613 4077
3614 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4078 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3615 $NEXT_RUNTIME_WRITE = $NOW + 10; 4079 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3616 Coro::async_pool { 4080 Coro::async_pool {
3617 $Coro::current->{desc} = "runtime saver"; 4081 $Coro::current->{desc} = "runtime saver";
3618 write_runtime 4082 write_runtime_sync
3619 or warn "ERROR: unable to write runtime file: $!"; 4083 or error "ERROR: unable to write runtime file: $!";
3620 };
3621 } 4084 };
4085 }
3622 4086
3623 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4087 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3624 $sig->send; 4088 $sig->send;
3625 } 4089 }
3626 while (my $sig = shift @WAIT_FOR_TICK) { 4090 while (my $sig = shift @WAIT_FOR_TICK) {
3627 $sig->send; 4091 $sig->send;
3628 } 4092 }
3629 4093
3630 $NOW = Event::time; 4094 $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; 4095 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3640 4096
3641 _post_tick; 4097 if (0) {
4098 if ($NEXT_TICK) {
4099 my $jitter = $TICK_START - $NEXT_TICK;
4100 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4101 debug "jitter $JITTER\n";#d#
4102 }
3642 }, 4103 }
3643); 4104}
3644 4105
3645{ 4106{
4107 # configure BDB
4108
3646 BDB::min_parallel 8; 4109 BDB::min_parallel 16;
3647 BDB::max_poll_time $TICK * 0.1; 4110 BDB::max_poll_reqs $TICK * 0.1;
3648 $BDB_POLL_WATCHER = Event->io ( 4111 $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 4112
3672 unless ($DB_ENV) { 4113 unless ($DB_ENV) {
3673 $DB_ENV = BDB::db_env_create; 4114 $DB_ENV = BDB::db_env_create;
3674 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4115 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3675 | BDB::LOG_AUTOREMOVE, 1); 4116 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4117 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3676 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4118 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3677 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4119 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3678 4120
3679 cf::sync_job { 4121 cf::sync_job {
3680 eval { 4122 eval {
… …
3690 4132
3691 cf::cleanup "db_env_open(db): $@" if $@; 4133 cf::cleanup "db_env_open(db): $@" if $@;
3692 }; 4134 };
3693 } 4135 }
3694 4136
3695 $BDB_DEADLOCK_WATCHER = Event->timer ( 4137 $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 { }; 4138 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3703 },
3704 ); 4139 };
3705 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4140 $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 { }; 4141 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3713 },
3714 ); 4142 };
3715 $BDB_TRICKLE_WATCHER = Event->timer ( 4143 $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 { }; 4144 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3723 },
3724 ); 4145 };
3725} 4146}
3726 4147
3727{ 4148{
4149 # configure IO::AIO
4150
3728 IO::AIO::min_parallel 8; 4151 IO::AIO::min_parallel 8;
3729
3730 undef $Coro::AIO::WATCHER;
3731 IO::AIO::max_poll_time $TICK * 0.1; 4152 IO::AIO::max_poll_time $TICK * 0.1;
3732 $AIO_POLL_WATCHER = Event->io ( 4153 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} 4154}
3741 4155
3742my $_log_backtrace; 4156our $_log_backtrace;
4157our $_log_backtrace_last;
3743 4158
3744sub _log_backtrace { 4159sub _log_backtrace {
3745 my ($msg, @addr) = @_; 4160 my ($msg, @addr) = @_;
3746 4161
3747 $msg =~ s/\n//; 4162 $msg =~ s/\n$//;
3748 4163
4164 if ($_log_backtrace_last eq $msg) {
4165 LOG llevInfo, "[ABT] $msg\n";
4166 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3749 # limit the # of concurrent backtraces 4167 # limit the # of concurrent backtraces
3750 if ($_log_backtrace < 2) { 4168 } elsif ($_log_backtrace < 2) {
4169 $_log_backtrace_last = $msg;
3751 ++$_log_backtrace; 4170 ++$_log_backtrace;
4171 my $perl_bt = Carp::longmess $msg;
3752 async { 4172 async {
3753 $Coro::current->{desc} = "abt $msg"; 4173 $Coro::current->{desc} = "abt $msg";
3754 4174
3755 my @bt = fork_call { 4175 my @bt = fork_call {
3756 @addr = map { sprintf "%x", $_ } @addr; 4176 @addr = map { sprintf "%x", $_ } @addr;
… …
3767 } 4187 }
3768 4188
3769 @funcs 4189 @funcs
3770 }; 4190 };
3771 4191
3772 LOG llevInfo, "[ABT] $msg\n"; 4192 LOG llevInfo, "[ABT] $perl_bt\n";
4193 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3773 LOG llevInfo, "[ABT] $_\n" for @bt; 4194 LOG llevInfo, "[ABT] $_\n" for @bt;
3774 --$_log_backtrace; 4195 --$_log_backtrace;
3775 }; 4196 };
3776 } else { 4197 } else {
3777 LOG llevInfo, "[ABT] $msg\n"; 4198 LOG llevInfo, "[ABT] $msg\n";
3778 LOG llevInfo, "[ABT] [suppressed]\n"; 4199 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3779 } 4200 }
3780} 4201}
3781 4202
3782# load additional modules 4203# load additional modules
3783use cf::pod; 4204require "cf/$_.pm" for @EXTRA_MODULES;
4205cf::_connect_to_perl_2;
3784 4206
3785END { cf::emergency_save } 4207END { cf::emergency_save }
3786 4208
37871 42091
3788 4210

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines