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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines