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.377 by root, Thu Oct 4 11:36:38 2007 UTC vs.
Revision 1.546 by root, Thu May 6 22:57:49 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines