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.373 by root, Sat Sep 15 15:58:06 2007 UTC vs.
Revision 1.547 by root, Sun May 9 22:51:13 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 {
453 $Coro::current->desc ("timeslot manager");
454
359 my $signal = new Coro::Signal; 455 my $signal = new Coro::Signal;
456 my $busy;
360 457
361 while () { 458 while () {
362 next_job: 459 next_job:
460
363 my $avail = cf::till_tick; 461 my $avail = cf::till_tick;
364 if ($avail > 0.01) { 462
365 for (0 .. $#SLOT_QUEUE) { 463 for (0 .. $#SLOT_QUEUE) {
366 if ($SLOT_QUEUE[$_][0] < $avail) { 464 if ($SLOT_QUEUE[$_][0] <= $avail) {
465 $busy = 0;
367 my $job = splice @SLOT_QUEUE, $_, 1, (); 466 my $job = splice @SLOT_QUEUE, $_, 1, ();
368 $job->[2]->send; 467 $job->[2]->send;
369 Coro::cede; 468 Coro::cede;
370 goto next_job; 469 goto next_job;
371 } 470 } else {
471 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
372 } 472 }
373 } 473 }
374 474
375 if (@SLOT_QUEUE) { 475 if (@SLOT_QUEUE) {
376 # 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
377 push @cf::WAIT_FOR_TICK, $signal; 477 push @cf::WAIT_FOR_TICK, $signal;
378 $signal->wait; 478 $signal->wait;
379 } else { 479 } else {
480 $busy = 0;
380 Coro::schedule; 481 Coro::schedule;
381 } 482 }
382 } 483 }
383}; 484};
384 485
385sub get_slot($;$$) { 486sub get_slot($;$$) {
487 return if tick_inhibit || $Coro::current == $Coro::main;
488
386 my ($time, $pri, $name) = @_; 489 my ($time, $pri, $name) = @_;
387 490
388 $time = $TICK * .6 if $time > $TICK * .6; 491 $time = clamp $time, 0.01, $TICK * .6;
492
389 my $sig = new Coro::Signal; 493 my $sig = new Coro::Signal;
390 494
391 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 495 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
392 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 496 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
393 $SLOT_QUEUE->ready; 497 $SLOT_QUEUE->ready;
404 508
405BEGIN { *async = \&Coro::async_pool } 509BEGIN { *async = \&Coro::async_pool }
406 510
407=item cf::sync_job { BLOCK } 511=item cf::sync_job { BLOCK }
408 512
409The design of Crossfire TRT requires that the main coroutine ($Coro::main) 513The design of Deliantra requires that the main coroutine ($Coro::main)
410is always able to handle events or runnable, as Crossfire TRT is only 514is always able to handle events or runnable, as Deliantra is only
411partly 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
412acceptable. 516acceptable.
413 517
414If 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
415the given BLOCK in another coroutine while waiting for the result. The 519the given BLOCK in another coroutine while waiting for the result. The
419=cut 523=cut
420 524
421sub sync_job(&) { 525sub sync_job(&) {
422 my ($job) = @_; 526 my ($job) = @_;
423 527
424 if ($Coro::current == $Coro::main) { 528 if (in_main) {
425 my $time = Event::time; 529 my $time = AE::time;
426 530
427 # this is the main coro, too bad, we have to block 531 # this is the main coro, too bad, we have to block
428 # till the operation succeeds, freezing the server :/ 532 # till the operation succeeds, freezing the server :/
429 533
430 # TODO: use suspend/resume instead 534 #LOG llevError, Carp::longmess "sync job";#d#
431 # (but this is cancel-safe) 535
432 my $freeze_guard = freeze_mainloop; 536 my $freeze_guard = freeze_mainloop;
433 537
434 my $busy = 1; 538 my $busy = 1;
435 my @res; 539 my @res;
436 540
437 (async { 541 (async {
542 $Coro::current->desc ("sync job coro");
438 @res = eval { $job->() }; 543 @res = eval { $job->() };
439 warn $@ if $@; 544 error $@ if $@;
440 undef $busy; 545 undef $busy;
441 })->prio (Coro::PRIO_MAX); 546 })->prio (Coro::PRIO_MAX);
442 547
443 while ($busy) { 548 while ($busy) {
444 Coro::cede or Event::one_event; 549 if (Coro::nready) {
550 Coro::cede_notself;
551 } else {
552 EV::loop EV::LOOP_ONESHOT;
445 } 553 }
554 }
446 555
447 $time = Event::time - $time; 556 my $time = AE::time - $time;
448 557
449 LOG llevError | logBacktrace, Carp::longmess "long sync job"
450 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
451
452 $tick_start += $time; # do not account sync jobs to server load 558 $TICK_START += $time; # do not account sync jobs to server load
453 559
454 wantarray ? @res : $res[0] 560 wantarray ? @res : $res[0]
455 } else { 561 } else {
456 # we are in another coroutine, how wonderful, everything just works 562 # we are in another coroutine, how wonderful, everything just works
457 563
482=item fork_call { }, $args 588=item fork_call { }, $args
483 589
484Executes the given code block with the given arguments in a seperate 590Executes the given code block with the given arguments in a seperate
485process, returning the results. Everything must be serialisable with 591process, returning the results. Everything must be serialisable with
486Coro::Storable. May, of course, block. Note that the executed sub may 592Coro::Storable. May, of course, block. Note that the executed sub may
487never block itself or use any form of Event handling. 593never block itself or use any form of event handling.
488 594
489=cut 595=cut
596
597sub post_fork {
598 reset_signals;
599}
490 600
491sub fork_call(&@) { 601sub fork_call(&@) {
492 my ($cb, @args) = @_; 602 my ($cb, @args) = @_;
493 603
494 # we seemingly have to make a local copy of the whole thing, 604 # we seemingly have to make a local copy of the whole thing,
495 # otherwise perl prematurely frees the stuff :/ 605 # otherwise perl prematurely frees the stuff :/
496 # TODO: investigate and fix (likely this will be rather laborious) 606 # TODO: investigate and fix (likely this will be rather laborious)
497 607
498 my @res = Coro::Util::fork_eval { 608 my @res = Coro::Util::fork_eval {
499 reset_signals; 609 cf::post_fork;
500 &$cb 610 &$cb
501 }, @args; 611 }, @args;
502 612
503 wantarray ? @res : $res[-1] 613 wantarray ? @res : $res[-1]
504} 614}
505 615
616sub objinfo {
617 (
618 "counter value" => cf::object::object_count,
619 "objects created" => cf::object::create_count,
620 "objects destroyed" => cf::object::destroy_count,
621 "freelist size" => cf::object::free_count,
622 "allocated objects" => cf::object::objects_size,
623 "active objects" => cf::object::actives_size,
624 )
625}
626
627=item $coin = coin_from_name $name
628
629=cut
630
631our %coin_alias = (
632 "silver" => "silvercoin",
633 "silvercoin" => "silvercoin",
634 "silvercoins" => "silvercoin",
635 "gold" => "goldcoin",
636 "goldcoin" => "goldcoin",
637 "goldcoins" => "goldcoin",
638 "platinum" => "platinacoin",
639 "platinumcoin" => "platinacoin",
640 "platinumcoins" => "platinacoin",
641 "platina" => "platinacoin",
642 "platinacoin" => "platinacoin",
643 "platinacoins" => "platinacoin",
644 "royalty" => "royalty",
645 "royalties" => "royalty",
646);
647
648sub coin_from_name($) {
649 $coin_alias{$_[0]}
650 ? cf::arch::find $coin_alias{$_[0]}
651 : undef
652}
653
506=item $value = cf::db_get $family => $key 654=item $value = cf::db_get $family => $key
507 655
508Returns a single value from the environment database. 656Returns a single value from the environment database.
509 657
510=item cf::db_put $family => $key => $value 658=item cf::db_put $family => $key => $value
518within each server. 666within each server.
519 667
520=cut 668=cut
521 669
522sub db_table($) { 670sub db_table($) {
671 cf::error "db_get called from main context"
672 if $Coro::current == $Coro::main;
673
523 my ($name) = @_; 674 my ($name) = @_;
524 my $db = BDB::db_create $DB_ENV; 675 my $db = BDB::db_create $DB_ENV;
525 676
526 eval { 677 eval {
527 $db->set_flags (BDB::CHKSUM); 678 $db->set_flags (BDB::CHKSUM);
537} 688}
538 689
539our $DB; 690our $DB;
540 691
541sub db_init { 692sub db_init {
542 cf::sync_job {
543 $DB ||= db_table "db"; 693 $DB ||= db_table "db";
544 };
545} 694}
546 695
547sub db_get($$) { 696sub db_get($$) {
548 my $key = "$_[0]/$_[1]"; 697 my $key = "$_[0]/$_[1]";
549 698
550 cf::sync_job { 699 cf::error "db_get called from main context"
700 if $Coro::current == $Coro::main;
701
551 BDB::db_get $DB, undef, $key, my $data; 702 BDB::db_get $DB, undef, $key, my $data;
552 703
553 $! ? () 704 $! ? ()
554 : $data 705 : $data
555 }
556} 706}
557 707
558sub db_put($$$) { 708sub db_put($$$) {
559 BDB::dbreq_pri 4; 709 BDB::dbreq_pri 4;
560 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 710 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
616 766
617 my $t1 = Time::HiRes::time; 767 my $t1 = Time::HiRes::time;
618 my $data = $process->(\@data); 768 my $data = $process->(\@data);
619 my $t2 = Time::HiRes::time; 769 my $t2 = Time::HiRes::time;
620 770
621 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 771 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
622 772
623 db_put cache => "$id/data", $data; 773 db_put cache => "$id/data", $data;
624 db_put cache => "$id/md5" , $md5; 774 db_put cache => "$id/md5" , $md5;
625 db_put cache => "$id/meta", $meta; 775 db_put cache => "$id/meta", $meta;
626 776
636 786
637=cut 787=cut
638 788
639sub datalog($@) { 789sub datalog($@) {
640 my ($type, %kv) = @_; 790 my ($type, %kv) = @_;
641 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 791 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
642} 792}
643 793
644=back 794=back
645 795
646=cut 796=cut
647 797
648############################################################################# 798#############################################################################
649 799
650=head2 ATTACHABLE OBJECTS 800=head2 ATTACHABLE OBJECTS
651 801
652Many objects in crossfire are so-called attachable objects. That means you can 802Many objects in deliantra are so-called attachable objects. That means you can
653attach callbacks/event handlers (a collection of which is called an "attachment") 803attach callbacks/event handlers (a collection of which is called an "attachment")
654to it. All such attachable objects support the following methods. 804to it. All such attachable objects support the following methods.
655 805
656In the following description, CLASS can be any of C<global>, C<object> 806In the following description, CLASS can be any of C<global>, C<object>
657C<player>, C<client> or C<map> (i.e. the attachable objects in 807C<player>, C<client> or C<map> (i.e. the attachable objects in
658Crossfire TRT). 808Deliantra).
659 809
660=over 4 810=over 4
661 811
662=item $attachable->attach ($attachment, key => $value...) 812=item $attachable->attach ($attachment, key => $value...)
663 813
707=item cf::CLASS::attachment $name, ... 857=item cf::CLASS::attachment $name, ...
708 858
709Register an attachment by C<$name> through which attachable objects of the 859Register an attachment by C<$name> through which attachable objects of the
710given CLASS can refer to this attachment. 860given CLASS can refer to this attachment.
711 861
712Some classes such as crossfire maps and objects can specify attachments 862Some classes such as deliantra maps and objects can specify attachments
713that are attached at load/instantiate time, thus the need for a name. 863that are attached at load/instantiate time, thus the need for a name.
714 864
715These calls expect any number of the following handler/hook descriptions: 865These calls expect any number of the following handler/hook descriptions:
716 866
717=over 4 867=over 4
841 991
842 } elsif (exists $cb_id{$type}) { 992 } elsif (exists $cb_id{$type}) {
843 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 993 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
844 994
845 } elsif (ref $type) { 995 } elsif (ref $type) {
846 warn "attaching objects not supported, ignoring.\n"; 996 error "attaching objects not supported, ignoring.\n";
847 997
848 } else { 998 } else {
849 shift @arg; 999 shift @arg;
850 warn "attach argument '$type' not supported, ignoring.\n"; 1000 error "attach argument '$type' not supported, ignoring.\n";
851 } 1001 }
852 } 1002 }
853} 1003}
854 1004
855sub _object_attach { 1005sub _object_attach {
865 _attach $registry, $klass, @attach; 1015 _attach $registry, $klass, @attach;
866 } 1016 }
867 1017
868 $obj->{$name} = \%arg; 1018 $obj->{$name} = \%arg;
869 } else { 1019 } else {
870 warn "object uses attachment '$name' which is not available, postponing.\n"; 1020 info "object uses attachment '$name' which is not available, postponing.\n";
871 } 1021 }
872 1022
873 $obj->{_attachment}{$name} = undef; 1023 $obj->{_attachment}{$name} = undef;
874} 1024}
875 1025
934 1084
935 for (@$callbacks) { 1085 for (@$callbacks) {
936 eval { &{$_->[1]} }; 1086 eval { &{$_->[1]} };
937 1087
938 if ($@) { 1088 if ($@) {
939 warn "$@";
940 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1089 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
941 override; 1090 override;
942 } 1091 }
943 1092
944 return 1 if $override; 1093 return 1 if $override;
945 } 1094 }
946 1095
947 0 1096 0
948} 1097}
949 1098
950=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1099=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
951 1100
952=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1101=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
953 1102
954Generate an object-specific event with the given arguments. 1103Generate an object-specific event with the given arguments.
955 1104
961 1110
962=cut 1111=cut
963 1112
964############################################################################# 1113#############################################################################
965# object support 1114# object support
966#
967 1115
1116sub _object_equal($$);
1117sub _object_equal($$) {
1118 my ($a, $b) = @_;
1119
1120 return 0 unless (ref $a) eq (ref $b);
1121
1122 if ("HASH" eq ref $a) {
1123 my @ka = keys %$a;
1124 my @kb = keys %$b;
1125
1126 return 0 if @ka != @kb;
1127
1128 for (0 .. $#ka) {
1129 return 0 unless $ka[$_] eq $kb[$_];
1130 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1131 }
1132
1133 } elsif ("ARRAY" eq ref $a) {
1134
1135 return 0 if @$a != @$b;
1136
1137 for (0 .. $#$a) {
1138 return 0 unless _object_equal $a->[$_], $b->[$_];
1139 }
1140
1141 } elsif ($a ne $b) {
1142 return 0;
1143 }
1144
1145 1
1146}
1147
1148our $SLOW_MERGES;#d#
968sub _can_merge { 1149sub _can_merge {
969 my ($ob1, $ob2) = @_; 1150 my ($ob1, $ob2) = @_;
970 1151
971 local $Storable::canonical = 1; 1152 ++$SLOW_MERGES;#d#
972 my $fob1 = Storable::freeze $ob1;
973 my $fob2 = Storable::freeze $ob2;
974 1153
975 $fob1 eq $fob2 1154 # we do the slow way here
1155 return _object_equal $ob1, $ob2
976} 1156}
977 1157
978sub reattach { 1158sub reattach {
979 # basically do the same as instantiate, without calling instantiate 1159 # basically do the same as instantiate, without calling instantiate
980 my ($obj) = @_; 1160 my ($obj) = @_;
981 1161
1162 # no longer needed after getting rid of delete_package?
982 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1163 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
983 1164
984 my $registry = $obj->registry; 1165 my $registry = $obj->registry;
985 1166
986 @$registry = (); 1167 @$registry = ();
987 1168
992 for (@$attach) { 1173 for (@$attach) {
993 my ($klass, @attach) = @$_; 1174 my ($klass, @attach) = @$_;
994 _attach $registry, $klass, @attach; 1175 _attach $registry, $klass, @attach;
995 } 1176 }
996 } else { 1177 } else {
997 warn "object uses attachment '$name' that is not available, postponing.\n"; 1178 info "object uses attachment '$name' that is not available, postponing.\n";
998 } 1179 }
999 } 1180 }
1000} 1181}
1001 1182
1002cf::attachable->attach ( 1183cf::attachable->attach (
1003 prio => -1000000, 1184 prio => -1000000,
1004 on_instantiate => sub { 1185 on_instantiate => sub {
1005 my ($obj, $data) = @_; 1186 my ($obj, $data) = @_;
1006 1187
1007 $data = from_json $data; 1188 $data = decode_json $data;
1008 1189
1009 for (@$data) { 1190 for (@$data) {
1010 my ($name, $args) = @$_; 1191 my ($name, $args) = @$_;
1011 1192
1012 $obj->attach ($name, %{$args || {} }); 1193 $obj->attach ($name, %{$args || {} });
1029 my ($filename, $rdata, $objs) = @_; 1210 my ($filename, $rdata, $objs) = @_;
1030 1211
1031 sync_job { 1212 sync_job {
1032 if (length $$rdata) { 1213 if (length $$rdata) {
1033 utf8::decode (my $decname = $filename); 1214 utf8::decode (my $decname = $filename);
1034 warn sprintf "saving %s (%d,%d)\n", 1215 trace sprintf "saving %s (%d,%d)\n",
1035 $decname, length $$rdata, scalar @$objs; 1216 $decname, length $$rdata, scalar @$objs
1217 if $VERBOSE_IO;
1036 1218
1037 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1219 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1038 chmod SAVE_MODE, $fh; 1220 aio_chmod $fh, SAVE_MODE;
1039 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1221 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1040 aio_fsync $fh if $cf::USE_FSYNC; 1222 if ($cf::USE_FSYNC) {
1223 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;
1224 aio_fsync $fh;
1225 }
1041 close $fh; 1226 aio_close $fh;
1042 1227
1043 if (@$objs) { 1228 if (@$objs) {
1044 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1229 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1045 chmod SAVE_MODE, $fh; 1230 aio_chmod $fh, SAVE_MODE;
1046 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1231 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1047 aio_write $fh, 0, (length $data), $data, 0; 1232 aio_write $fh, 0, (length $data), $data, 0;
1048 aio_fsync $fh if $cf::USE_FSYNC; 1233 if ($cf::USE_FSYNC) {
1234 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;
1235 aio_fsync $fh;
1236 }
1049 close $fh; 1237 aio_close $fh;
1050 aio_rename "$filename.pst~", "$filename.pst"; 1238 aio_rename "$filename.pst~", "$filename.pst";
1051 } 1239 }
1052 } else { 1240 } else {
1053 aio_unlink "$filename.pst"; 1241 aio_unlink "$filename.pst";
1054 } 1242 }
1055 1243
1056 aio_rename "$filename~", $filename; 1244 aio_rename "$filename~", $filename;
1245
1246 $filename =~ s%/[^/]+$%%;
1247 aio_pathsync $filename if $cf::USE_FSYNC;
1057 } else { 1248 } else {
1058 warn "FATAL: $filename~: $!\n"; 1249 error "unable to save objects: $filename~: $!\n";
1059 } 1250 }
1060 } else { 1251 } else {
1061 aio_unlink $filename; 1252 aio_unlink $filename;
1062 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1063 } 1254 }
1082 1273
1083 unless (aio_stat "$filename.pst") { 1274 unless (aio_stat "$filename.pst") {
1084 (aio_load "$filename.pst", $av) >= 0 1275 (aio_load "$filename.pst", $av) >= 0
1085 or return; 1276 or return;
1086 1277
1087 $av = eval { (Storable::thaw $av)->{objs} }; 1278 my $st = eval { Coro::Storable::thaw $av };
1279 $av = $st->{objs};
1088 } 1280 }
1089 1281
1090 utf8::decode (my $decname = $filename); 1282 utf8::decode (my $decname = $filename);
1091 warn sprintf "loading %s (%d,%d)\n", 1283 trace sprintf "loading %s (%d,%d)\n",
1092 $decname, length $data, scalar @{$av || []}; 1284 $decname, length $data, scalar @{$av || []}
1285 if $VERBOSE_IO;
1093 1286
1094 ($data, $av) 1287 ($data, $av)
1095} 1288}
1096 1289
1097=head2 COMMAND CALLBACKS 1290=head2 COMMAND CALLBACKS
1153 my ($name, $cb) = @_; 1346 my ($name, $cb) = @_;
1154 1347
1155 $EXTICMD{$name} = $cb; 1348 $EXTICMD{$name} = $cb;
1156} 1349}
1157 1350
1351use File::Glob ();
1352
1158cf::player->attach ( 1353cf::player->attach (
1159 on_command => sub { 1354 on_unknown_command => sub {
1160 my ($pl, $name, $params) = @_; 1355 my ($pl, $name, $params) = @_;
1161 1356
1162 my $cb = $COMMAND{$name} 1357 my $cb = $COMMAND{$name}
1163 or return; 1358 or return;
1164 1359
1187 1382
1188 $pl->ext_reply ($reply, @reply) 1383 $pl->ext_reply ($reply, @reply)
1189 if $reply; 1384 if $reply;
1190 1385
1191 } else { 1386 } else {
1192 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1387 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1193 } 1388 }
1194 1389
1195 cf::override; 1390 cf::override;
1196 }, 1391 },
1197); 1392);
1198 1393
1394# "readahead" all extensions
1395sub cache_extensions {
1396 my $grp = IO::AIO::aio_group;
1397
1398 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1399 for (grep /\.ext$/, @{$_[0]}) {
1400 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1401 }
1402 };
1403
1404 $grp
1405}
1406
1199sub load_extensions { 1407sub load_extensions {
1408 info "loading extensions...";
1409
1200 cf::sync_job { 1410 cf::sync_job {
1201 my %todo; 1411 my %todo;
1202 1412
1203 for my $path (<$LIBDIR/*.ext>) { 1413 for my $path (<$LIBDIR/*.ext>) {
1204 next unless -r $path; 1414 next unless -r $path;
1222 1432
1223 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1433 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1224 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1434 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1225 1435
1226 $ext{source} = 1436 $ext{source} =
1227 "package $pkg; use strict; use utf8;\n" 1437 "package $pkg; use common::sense;\n"
1228 . "#line 1 \"$path\"\n{\n" 1438 . "#line 1 \"$path\"\n{\n"
1229 . $source 1439 . $source
1230 . "\n};\n1"; 1440 . "\n};\n1";
1231 1441
1232 $todo{$base} = \%ext; 1442 $todo{$base} = \%ext;
1233 } 1443 }
1234 1444
1445 my $pass = 0;
1235 my %done; 1446 my %done;
1236 while (%todo) { 1447 while (%todo) {
1237 my $progress; 1448 my $progress;
1238 1449
1450 ++$pass;
1451
1452 ext:
1239 while (my ($k, $v) = each %todo) { 1453 while (my ($k, $v) = each %todo) {
1240 for (split /,\s*/, $v->{meta}{depends}) { 1454 for (split /,\s*/, $v->{meta}{depends}) {
1241 goto skip 1455 next ext
1242 unless exists $done{$_}; 1456 unless exists $done{$_};
1243 } 1457 }
1244 1458
1245 warn "... loading '$k' into '$v->{pkg}'\n"; 1459 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1246 1460
1247 unless (eval $v->{source}) { 1461 my $active = eval $v->{source};
1462
1463 if (length $@) {
1248 my $msg = $@ ? "$v->{path}: $@\n" 1464 error "$v->{path}: $@\n";
1249 : "$v->{base}: extension inactive.\n";
1250 1465
1466 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1251 if (exists $v->{meta}{mandatory}) { 1467 if exists $v->{meta}{mandatory};
1252 warn $msg; 1468
1253 warn "mandatory extension failed to load, exiting.\n"; 1469 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1254 exit 1; 1470 delete $todo{$k};
1255 } 1471 } else {
1256 1472 $done{$k} = delete $todo{$k};
1257 warn $msg; 1473 push @EXTS, $v->{pkg};
1474 $progress = 1;
1475
1476 info "$v->{base}: extension inactive.\n"
1477 unless $active;
1258 } 1478 }
1259
1260 $done{$k} = delete $todo{$k};
1261 push @EXTS, $v->{pkg};
1262 $progress = 1;
1263 } 1479 }
1264 1480
1265 skip: 1481 unless ($progress) {
1266 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1482 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1267 unless $progress; 1483
1484 while (my ($k, $v) = each %todo) {
1485 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1486 if exists $v->{meta}{mandatory};
1487 }
1488 }
1268 } 1489 }
1269 }; 1490 };
1270} 1491}
1271 1492
1272############################################################################# 1493#############################################################################
1273 1494
1274=back 1495=back
1275 1496
1276=head2 CORE EXTENSIONS 1497=head2 CORE EXTENSIONS
1277 1498
1278Functions and methods that extend core crossfire objects. 1499Functions and methods that extend core deliantra objects.
1279 1500
1280=cut 1501=cut
1281 1502
1282package cf::player; 1503package cf::player;
1283 1504
1326 1547
1327sub exists($) { 1548sub exists($) {
1328 my ($login) = @_; 1549 my ($login) = @_;
1329 1550
1330 $cf::PLAYER{$login} 1551 $cf::PLAYER{$login}
1331 or cf::sync_job { !aio_stat path $login } 1552 or !aio_stat path $login
1332} 1553}
1333 1554
1334sub find($) { 1555sub find($) {
1335 return $cf::PLAYER{$_[0]} || do { 1556 return $cf::PLAYER{$_[0]} || do {
1336 my $login = $_[0]; 1557 my $login = $_[0];
1348 my $f = new_from_file cf::object::thawer path $login 1569 my $f = new_from_file cf::object::thawer path $login
1349 or return; 1570 or return;
1350 1571
1351 my $pl = cf::player::load_pl $f 1572 my $pl = cf::player::load_pl $f
1352 or return; 1573 or return;
1574
1353 local $cf::PLAYER_LOADING{$login} = $pl; 1575 local $cf::PLAYER_LOADING{$login} = $pl;
1354 $f->resolve_delayed_derefs; 1576 $f->resolve_delayed_derefs;
1355 $cf::PLAYER{$login} = $pl 1577 $cf::PLAYER{$login} = $pl
1356 } 1578 }
1357 } 1579 }
1358} 1580}
1359 1581
1582cf::player->attach (
1583 on_load => sub {
1584 my ($pl, $path) = @_;
1585
1586 # restore slots saved in save, below
1587 my $slots = delete $pl->{_slots};
1588
1589 $pl->ob->current_weapon ($slots->[0]);
1590 $pl->combat_ob ($slots->[1]);
1591 $pl->ranged_ob ($slots->[2]);
1592 },
1593);
1594
1360sub save($) { 1595sub save($) {
1361 my ($pl) = @_; 1596 my ($pl) = @_;
1362 1597
1363 return if $pl->{deny_save}; 1598 return if $pl->{deny_save};
1364 1599
1367 1602
1368 return if $pl->{deny_save}; 1603 return if $pl->{deny_save};
1369 1604
1370 aio_mkdir playerdir $pl, 0770; 1605 aio_mkdir playerdir $pl, 0770;
1371 $pl->{last_save} = $cf::RUNTIME; 1606 $pl->{last_save} = $cf::RUNTIME;
1607
1608 cf::get_slot 0.01;
1609
1610 # save slots, to be restored later
1611 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1372 1612
1373 $pl->save_pl ($path); 1613 $pl->save_pl ($path);
1374 cf::cede_to_tick; 1614 cf::cede_to_tick;
1375} 1615}
1376 1616
1408 my ($pl) = @_; 1648 my ($pl) = @_;
1409 1649
1410 my $name = $pl->ob->name; 1650 my $name = $pl->ob->name;
1411 1651
1412 $pl->{deny_save} = 1; 1652 $pl->{deny_save} = 1;
1413 $pl->password ("*"); # this should lock out the player until we nuked the dir 1653 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1414 1654
1415 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1655 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1416 $pl->deactivate; 1656 $pl->deactivate;
1657
1658 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1659 ext::highscore::check ($pl->ob);
1660
1417 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1661 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1418 $pl->ns->destroy if $pl->ns; 1662 $pl->ns->destroy if $pl->ns;
1419 1663
1420 my $path = playerdir $pl; 1664 my $path = playerdir $pl;
1421 my $temp = "$path~$cf::RUNTIME~deleting~"; 1665 my $temp = "$path~$cf::RUNTIME~deleting~";
1460 1704
1461 for my $login (@$dirs) { 1705 for my $login (@$dirs) {
1462 my $path = path $login; 1706 my $path = path $login;
1463 1707
1464 # a .pst is a dead give-away for a valid player 1708 # a .pst is a dead give-away for a valid player
1465 unless (-e "$path.pst") { 1709 # if no pst file found, open and chekc for blocked users
1710 if (aio_stat "$path.pst") {
1466 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1711 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1467 aio_read $fh, 0, 512, my $buf, 0 or next; 1712 aio_read $fh, 0, 512, my $buf, 0 or next;
1468 $buf !~ /^password -------------$/m or next; # official not-valid tag 1713 $buf !~ /^password -------------$/m or next; # official not-valid tag
1469 } 1714 }
1470 1715
1474 1719
1475 \@logins 1720 \@logins
1476} 1721}
1477 1722
1478=item $player->maps 1723=item $player->maps
1724
1725=item cf::player::maps $login
1479 1726
1480Returns an arrayref of map paths that are private for this 1727Returns an arrayref of map paths that are private for this
1481player. May block. 1728player. May block.
1482 1729
1483=cut 1730=cut
1501 } 1748 }
1502 1749
1503 \@paths 1750 \@paths
1504} 1751}
1505 1752
1506=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1753=item $protocol_xml = $player->expand_cfpod ($cfpod)
1507 1754
1508Expand crossfire pod fragments into protocol xml. 1755Expand deliantra pod fragments into protocol xml.
1509
1510=cut
1511
1512sub expand_cfpod {
1513 ((my $self), (local $_)) = @_;
1514
1515 # escape & and <
1516 s/&/&amp;/g;
1517 s/(?<![BIUGHT])</&lt;/g;
1518
1519 # this is buggy, it needs to properly take care of nested <'s
1520
1521 1 while
1522 # replace B<>, I<>, U<> etc.
1523 s/B<([^\>]*)>/<b>$1<\/b>/
1524 || s/I<([^\>]*)>/<i>$1<\/i>/
1525 || s/U<([^\>]*)>/<u>$1<\/u>/
1526 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1527 # replace G<male|female> tags
1528 || s{G<([^>|]*)\|([^>]*)>}{
1529 $self->gender ? $2 : $1
1530 }ge
1531 # replace H<hint text>
1532 || s{H<([^\>]*)>}
1533 {
1534 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1535 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1536 "")
1537 [$self->{hintmode}]
1538 }ge;
1539
1540 # create single paragraphs (very hackish)
1541 s/(?<=\S)\n(?=\w)/ /g;
1542
1543 # compress some whitespace
1544 s/\s+\n/\n/g; # ws line-ends
1545 s/\n\n+/\n/g; # double lines
1546 s/^\n+//; # beginning lines
1547 s/\n+$//; # ending lines
1548
1549 $_
1550}
1551
1552sub hintmode {
1553 $_[0]{hintmode} = $_[1] if @_ > 1;
1554 $_[0]{hintmode}
1555}
1556 1756
1557=item $player->ext_reply ($msgid, @msg) 1757=item $player->ext_reply ($msgid, @msg)
1558 1758
1559Sends an ext reply to the player. 1759Sends an ext reply to the player.
1560 1760
1592 1792
1593=cut 1793=cut
1594 1794
1595sub find_by_path($) { 1795sub find_by_path($) {
1596 my ($path) = @_; 1796 my ($path) = @_;
1797
1798 $path =~ s/^~[^\/]*//; # skip ~login
1597 1799
1598 my ($match, $specificity); 1800 my ($match, $specificity);
1599 1801
1600 for my $region (list) { 1802 for my $region (list) {
1601 if ($region->{match} && $path =~ $region->{match}) { 1803 if ($region->{match} && $path =~ $region->{match}) {
1627our $MAX_RESET = 3600; 1829our $MAX_RESET = 3600;
1628our $DEFAULT_RESET = 3000; 1830our $DEFAULT_RESET = 3000;
1629 1831
1630sub generate_random_map { 1832sub generate_random_map {
1631 my ($self, $rmp) = @_; 1833 my ($self, $rmp) = @_;
1834
1835 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1836
1632 # mit "rum" bekleckern, nicht 1837 # mit "rum" bekleckern, nicht
1633 $self->_create_random_map ( 1838 $self->_create_random_map (
1634 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1839 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1635 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1840 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1636 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1841 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1637 $rmp->{exit_on_final_map}, 1842 $rmp->{exit_on_final_map},
1638 $rmp->{xsize}, $rmp->{ysize}, 1843 $rmp->{xsize}, $rmp->{ysize},
1639 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1844 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1640 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1845 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1655 1860
1656sub register { 1861sub register {
1657 my (undef, $regex, $prio) = @_; 1862 my (undef, $regex, $prio) = @_;
1658 my $pkg = caller; 1863 my $pkg = caller;
1659 1864
1660 no strict;
1661 push @{"$pkg\::ISA"}, __PACKAGE__; 1865 push @{"$pkg\::ISA"}, __PACKAGE__;
1662 1866
1663 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1867 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1664} 1868}
1665 1869
1666# also paths starting with '/' 1870# also paths starting with '/'
1667$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1871$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1668 1872
1669sub thawer_merge { 1873sub thawer_merge {
1670 my ($self, $merge) = @_; 1874 my ($self, $merge) = @_;
1671 1875
1672 # we have to keep some variables in memory intact 1876 # we have to keep some variables in memory intact
1677} 1881}
1678 1882
1679sub normalise { 1883sub normalise {
1680 my ($path, $base) = @_; 1884 my ($path, $base) = @_;
1681 1885
1682 $path = "$path"; # make sure its a string 1886 $path = "$path"; # make sure it's a string
1683 1887
1684 $path =~ s/\.map$//; 1888 $path =~ s/\.map$//;
1685 1889
1686 # map plan: 1890 # map plan:
1687 # 1891 #
1726 $self->init; # pass $1 etc. 1930 $self->init; # pass $1 etc.
1727 return $self; 1931 return $self;
1728 } 1932 }
1729 } 1933 }
1730 1934
1731 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1935 Carp::cluck "unable to resolve path '$path' (base '$base')";
1732 () 1936 ()
1733} 1937}
1734 1938
1735sub init { 1939sub init {
1736 my ($self) = @_; 1940 my ($self) = @_;
1758 1962
1759# the temporary/swap location 1963# the temporary/swap location
1760sub save_path { 1964sub save_path {
1761 my ($self) = @_; 1965 my ($self) = @_;
1762 1966
1763 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1967 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1764 "$TMPDIR/$path.map" 1968 "$TMPDIR/$path.map"
1765} 1969}
1766 1970
1767# the unique path, undef == no special unique path 1971# the unique path, undef == no special unique path
1768sub uniq_path { 1972sub uniq_path {
1769 my ($self) = @_; 1973 my ($self) = @_;
1770 1974
1771 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1975 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1772 "$UNIQUEDIR/$path" 1976 "$UNIQUEDIR/$path"
1773}
1774
1775# and all this just because we cannot iterate over
1776# all maps in C++...
1777sub change_all_map_light {
1778 my ($change) = @_;
1779
1780 $_->change_map_light ($change)
1781 for grep $_->outdoor, values %cf::MAP;
1782} 1977}
1783 1978
1784sub decay_objects { 1979sub decay_objects {
1785 my ($self) = @_; 1980 my ($self) = @_;
1786 1981
1868 2063
1869sub find; 2064sub find;
1870sub find { 2065sub find {
1871 my ($path, $origin) = @_; 2066 my ($path, $origin) = @_;
1872 2067
2068 cf::cede_to_tick;
2069
1873 $path = normalise $path, $origin && $origin->path; 2070 $path = normalise $path, $origin && $origin->path;
1874 2071
1875 cf::lock_wait "map_data:$path";#d#remove 2072 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1876 cf::lock_wait "map_find:$path"; 2073 my $guard2 = cf::lock_acquire "map_find:$path";
1877 2074
1878 $cf::MAP{$path} || do { 2075 $cf::MAP{$path} || do {
1879 my $guard1 = cf::lock_acquire "map_find:$path";
1880 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1881
1882 my $map = new_from_path cf::map $path 2076 my $map = new_from_path cf::map $path
1883 or return; 2077 or return;
1884 2078
1885 $map->{last_save} = $cf::RUNTIME; 2079 $map->{last_save} = $cf::RUNTIME;
1886 2080
1888 or return; 2082 or return;
1889 2083
1890 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2084 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1891 # doing this can freeze the server in a sync job, obviously 2085 # doing this can freeze the server in a sync job, obviously
1892 #$cf::WAIT_FOR_TICK->wait; 2086 #$cf::WAIT_FOR_TICK->wait;
2087 undef $guard2;
1893 undef $guard1; 2088 undef $guard1;
1894 undef $guard2;
1895 $map->reset; 2089 $map->reset;
1896 return find $path; 2090 return find $path;
1897 } 2091 }
1898 2092
1899 $cf::MAP{$path} = $map 2093 $cf::MAP{$path} = $map
1900 } 2094 }
1901} 2095}
1902 2096
1903sub pre_load { } 2097sub pre_load { }
1904sub post_load { } 2098#sub post_load { } # XS
1905 2099
1906sub load { 2100sub load {
1907 my ($self) = @_; 2101 my ($self) = @_;
1908 2102
1909 local $self->{deny_reset} = 1; # loading can take a long time 2103 local $self->{deny_reset} = 1; # loading can take a long time
1926 my $f = new_from_file cf::object::thawer $self->{load_path}; 2120 my $f = new_from_file cf::object::thawer $self->{load_path};
1927 $f->skip_block; 2121 $f->skip_block;
1928 $self->_load_objects ($f) 2122 $self->_load_objects ($f)
1929 or return; 2123 or return;
1930 2124
1931 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2125 $self->post_load_original
1932 if delete $self->{load_original}; 2126 if delete $self->{load_original};
1933 2127
1934 if (my $uniq = $self->uniq_path) { 2128 if (my $uniq = $self->uniq_path) {
1935 utf8::encode $uniq; 2129 utf8::encode $uniq;
1936 unless (aio_stat $uniq) { 2130 unless (aio_stat $uniq) {
1954 unless ($self->{deny_activate}) { 2148 unless ($self->{deny_activate}) {
1955 $self->decay_objects; 2149 $self->decay_objects;
1956 $self->fix_auto_apply; 2150 $self->fix_auto_apply;
1957 $self->update_buttons; 2151 $self->update_buttons;
1958 cf::cede_to_tick; 2152 cf::cede_to_tick;
1959 $self->set_darkness_map;
1960 cf::cede_to_tick;
1961 $self->activate; 2153 $self->activate;
1962 } 2154 }
1963 2155
1964 $self->{last_save} = $cf::RUNTIME; 2156 $self->{last_save} = $cf::RUNTIME;
1965 $self->last_access ($cf::RUNTIME); 2157 $self->last_access ($cf::RUNTIME);
1966 2158
1967 $self->in_memory (cf::MAP_IN_MEMORY); 2159 $self->in_memory (cf::MAP_ACTIVE);
1968 } 2160 }
1969 2161
1970 $self->post_load; 2162 $self->post_load;
1971} 2163}
1972 2164
2165# customize the map for a given player, i.e.
2166# return the _real_ map. used by e.g. per-player
2167# maps to change the path to ~playername/mappath
1973sub customise_for { 2168sub customise_for {
1974 my ($self, $ob) = @_; 2169 my ($self, $ob) = @_;
1975 2170
1976 return find "~" . $ob->name . "/" . $self->{path} 2171 return find "~" . $ob->name . "/" . $self->{path}
1977 if $self->per_player; 2172 if $self->per_player;
1993 or next; 2188 or next;
1994 $neigh = find $neigh, $map 2189 $neigh = find $neigh, $map
1995 or next; 2190 or next;
1996 $neigh->load; 2191 $neigh->load;
1997 2192
2193 # now find the diagonal neighbours
1998 push @neigh, 2194 push @neigh,
1999 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2195 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2000 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2196 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2001 } 2197 }
2002 2198
2009} 2205}
2010 2206
2011sub find_sync { 2207sub find_sync {
2012 my ($path, $origin) = @_; 2208 my ($path, $origin) = @_;
2013 2209
2014 cf::sync_job { find $path, $origin } 2210 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2211 if $Coro::current == $Coro::main;
2212
2213 find $path, $origin
2015} 2214}
2016 2215
2017sub do_load_sync { 2216sub do_load_sync {
2018 my ($map) = @_; 2217 my ($map) = @_;
2019 2218
2020 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2219 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2021 if $Coro::current == $Coro::main; 2220 if $Coro::current == $Coro::main;
2022 2221
2023 cf::sync_job { $map->load }; 2222 $map->load;
2024} 2223}
2025 2224
2026our %MAP_PREFETCH; 2225our %MAP_PREFETCH;
2027our $MAP_PREFETCHER = undef; 2226our $MAP_PREFETCHER = undef;
2028 2227
2030 my ($path, $origin, $load) = @_; 2229 my ($path, $origin, $load) = @_;
2031 2230
2032 $path = normalise $path, $origin && $origin->{path}; 2231 $path = normalise $path, $origin && $origin->{path};
2033 2232
2034 if (my $map = $cf::MAP{$path}) { 2233 if (my $map = $cf::MAP{$path}) {
2035 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2234 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2036 } 2235 }
2037 2236
2038 $MAP_PREFETCH{$path} |= $load; 2237 $MAP_PREFETCH{$path} |= $load;
2039 2238
2040 $MAP_PREFETCHER ||= cf::async { 2239 $MAP_PREFETCHER ||= cf::async {
2240 $Coro::current->{desc} = "map prefetcher";
2241
2041 while (%MAP_PREFETCH) { 2242 while (%MAP_PREFETCH) {
2042 while (my ($k, $v) = each %MAP_PREFETCH) { 2243 while (my ($k, $v) = each %MAP_PREFETCH) {
2043 if (my $map = find $k) { 2244 if (my $map = find $k) {
2044 $map->load if $v; 2245 $map->load if $v;
2045 } 2246 }
2052 $MAP_PREFETCHER->prio (6); 2253 $MAP_PREFETCHER->prio (6);
2053 2254
2054 () 2255 ()
2055} 2256}
2056 2257
2258# common code, used by both ->save and ->swapout
2057sub save { 2259sub _save {
2058 my ($self) = @_; 2260 my ($self) = @_;
2059
2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
2061 2261
2062 $self->{last_save} = $cf::RUNTIME; 2262 $self->{last_save} = $cf::RUNTIME;
2063 2263
2064 return unless $self->dirty; 2264 return unless $self->dirty;
2065 2265
2071 return if $self->{deny_save}; 2271 return if $self->{deny_save};
2072 2272
2073 local $self->{last_access} = $self->last_access;#d# 2273 local $self->{last_access} = $self->last_access;#d#
2074 2274
2075 cf::async { 2275 cf::async {
2276 $Coro::current->{desc} = "map player save";
2076 $_->contr->save for $self->players; 2277 $_->contr->save for $self->players;
2077 }; 2278 };
2279
2280 cf::get_slot 0.02;
2078 2281
2079 if ($uniq) { 2282 if ($uniq) {
2080 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2283 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2081 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2284 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2082 } else { 2285 } else {
2083 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2286 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2084 } 2287 }
2085} 2288}
2086 2289
2290sub save {
2291 my ($self) = @_;
2292
2293 my $lock = cf::lock_acquire "map_data:$self->{path}";
2294
2295 $self->_save;
2296}
2297
2087sub swap_out { 2298sub swap_out {
2088 my ($self) = @_; 2299 my ($self) = @_;
2089 2300
2090 # save first because save cedes
2091 $self->save;
2092
2093 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2301 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094 2302
2303 return if $self->in_memory != cf::MAP_ACTIVE;
2304 return if $self->{deny_save};
2095 return if $self->players; 2305 return if $self->players;
2096 return if $self->in_memory != cf::MAP_IN_MEMORY;
2097 return if $self->{deny_save};
2098 2306
2307 # first deactivate the map and "unlink" it from the core
2308 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP;
2099 $self->in_memory (cf::MAP_SWAPPED); 2310 $self->in_memory (cf::MAP_SWAPPED);
2311
2312 # then atomically save
2313 $self->_save;
2314
2315 # then free the map
2316 $self->clear;
2317}
2318
2319sub reset_at {
2320 my ($self) = @_;
2321
2322 # TODO: safety, remove and allow resettable per-player maps
2323 return 1e99 if $self->{deny_reset};
2324
2325 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2326 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2327
2328 $time + $to
2329}
2330
2331sub should_reset {
2332 my ($self) = @_;
2333
2334 $self->reset_at <= $cf::RUNTIME
2335}
2336
2337sub reset {
2338 my ($self) = @_;
2339
2340 my $lock = cf::lock_acquire "map_data:$self->{path}";
2341
2342 return if $self->players;
2343
2344 cf::trace "resetting map ", $self->path, "\n";
2345
2346 $self->in_memory (cf::MAP_SWAPPED);
2347
2348 # need to save uniques path
2349 unless ($self->{deny_save}) {
2350 my $uniq = $self->uniq_path; utf8::encode $uniq;
2351
2352 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2353 if $uniq;
2354 }
2355
2356 delete $cf::MAP{$self->path};
2100 2357
2101 $self->deactivate; 2358 $self->deactivate;
2102 $_->clear_links_to ($self) for values %cf::MAP; 2359 $_->clear_links_to ($self) for values %cf::MAP;
2103 $self->clear; 2360 $self->clear;
2104}
2105
2106sub reset_at {
2107 my ($self) = @_;
2108
2109 # TODO: safety, remove and allow resettable per-player maps
2110 return 1e99 if $self->{deny_reset};
2111
2112 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2113 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2114
2115 $time + $to
2116}
2117
2118sub should_reset {
2119 my ($self) = @_;
2120
2121 $self->reset_at <= $cf::RUNTIME
2122}
2123
2124sub reset {
2125 my ($self) = @_;
2126
2127 my $lock = cf::lock_acquire "map_data:$self->{path}";
2128
2129 return if $self->players;
2130
2131 warn "resetting map ", $self->path;
2132
2133 $self->in_memory (cf::MAP_SWAPPED);
2134
2135 # need to save uniques path
2136 unless ($self->{deny_save}) {
2137 my $uniq = $self->uniq_path; utf8::encode $uniq;
2138
2139 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2140 if $uniq;
2141 }
2142
2143 delete $cf::MAP{$self->path};
2144
2145 $self->deactivate;
2146 $_->clear_links_to ($self) for values %cf::MAP;
2147 $self->clear;
2148 2361
2149 $self->unlink_save; 2362 $self->unlink_save;
2150 $self->destroy; 2363 $self->destroy;
2151} 2364}
2152 2365
2160 2373
2161 delete $cf::MAP{$self->path}; 2374 delete $cf::MAP{$self->path};
2162 2375
2163 $self->unlink_save; 2376 $self->unlink_save;
2164 2377
2165 bless $self, "cf::map"; 2378 bless $self, "cf::map::wrap";
2166 delete $self->{deny_reset}; 2379 delete $self->{deny_reset};
2167 $self->{deny_save} = 1; 2380 $self->{deny_save} = 1;
2168 $self->reset_timeout (1); 2381 $self->reset_timeout (1);
2169 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2382 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2170 2383
2219 2432
2220sub unique_maps() { 2433sub unique_maps() {
2221 [ 2434 [
2222 map { 2435 map {
2223 utf8::decode $_; 2436 utf8::decode $_;
2224 /\.map$/ 2437 s/\.map$//; # TODO future compatibility hack
2438 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2439 ? ()
2225 ? normalise $_ 2440 : normalise $_
2226 : ()
2227 } @{ aio_readdir $UNIQUEDIR or [] } 2441 } @{ aio_readdir $UNIQUEDIR or [] }
2228 ] 2442 ]
2229} 2443}
2230 2444
2231package cf; 2445=item cf::map::static_maps
2446
2447Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2448file in the shared directory excluding F</styles> and F</editor>). May
2449block.
2450
2451=cut
2452
2453sub static_maps() {
2454 my @dirs = "";
2455 my @maps;
2456
2457 while (@dirs) {
2458 my $dir = shift @dirs;
2459
2460 next if $dir eq "/styles" || $dir eq "/editor";
2461
2462 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2463 or return;
2464
2465 for (@$files) {
2466 s/\.map$// or next;
2467 utf8::decode $_;
2468 push @maps, "$dir/$_";
2469 }
2470
2471 push @dirs, map "$dir/$_", @$dirs;
2472 }
2473
2474 \@maps
2475}
2232 2476
2233=back 2477=back
2234 2478
2235=head3 cf::object 2479=head3 cf::object
2236 2480
2240 2484
2241=over 4 2485=over 4
2242 2486
2243=item $ob->inv_recursive 2487=item $ob->inv_recursive
2244 2488
2245Returns the inventory of the object _and_ their inventories, recursively. 2489Returns the inventory of the object I<and> their inventories, recursively,
2490but I<not> the object itself.
2246 2491
2247=cut 2492=cut
2248 2493
2249sub inv_recursive_; 2494sub inv_recursive_;
2250sub inv_recursive_ { 2495sub inv_recursive_ {
2255 inv_recursive_ inv $_[0] 2500 inv_recursive_ inv $_[0]
2256} 2501}
2257 2502
2258=item $ref = $ob->ref 2503=item $ref = $ob->ref
2259 2504
2260creates and returns a persistent reference to an objetc that can be stored as a string. 2505Creates and returns a persistent reference to an object that can be stored as a string.
2261 2506
2262=item $ob = cf::object::deref ($refstring) 2507=item $ob = cf::object::deref ($refstring)
2263 2508
2264returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2509returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2265even if the object actually exists. May block. 2510even if the object actually exists. May block.
2267=cut 2512=cut
2268 2513
2269sub deref { 2514sub deref {
2270 my ($ref) = @_; 2515 my ($ref) = @_;
2271 2516
2272 # temporary compatibility#TODO#remove
2273 $ref =~ s{^<}{player/<};
2274
2275 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2517 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2276 my ($uuid, $name) = ($1, $2); 2518 my ($uuid, $name) = ($1, $2);
2277 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2519 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2278 or return; 2520 or return;
2279 $pl->ob->uuid eq $uuid 2521 $pl->ob->uuid eq $uuid
2280 or return; 2522 or return;
2300can be C<undef>. Does the right thing when the player is currently in a 2542can be C<undef>. Does the right thing when the player is currently in a
2301dialogue with the given NPC character. 2543dialogue with the given NPC character.
2302 2544
2303=cut 2545=cut
2304 2546
2547our $SAY_CHANNEL = {
2548 id => "say",
2549 title => "Map",
2550 reply => "say ",
2551 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2552};
2553
2554our $CHAT_CHANNEL = {
2555 id => "chat",
2556 title => "Chat",
2557 reply => "chat ",
2558 tooltip => "Player chat and shouts, global to the server.",
2559};
2560
2305# rough implementation of a future "reply" method that works 2561# rough implementation of a future "reply" method that works
2306# with dialog boxes. 2562# with dialog boxes.
2307#TODO: the first argument must go, split into a $npc->reply_to ( method 2563#TODO: the first argument must go, split into a $npc->reply_to ( method
2308sub cf::object::player::reply($$$;$) { 2564sub cf::object::player::reply($$$;$) {
2309 my ($self, $npc, $msg, $flags) = @_; 2565 my ($self, $npc, $msg, $flags) = @_;
2320 my $dialog = $pl->{npc_dialog}; 2576 my $dialog = $pl->{npc_dialog};
2321 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2577 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2322 2578
2323 } else { 2579 } else {
2324 $msg = $npc->name . " says: $msg" if $npc; 2580 $msg = $npc->name . " says: $msg" if $npc;
2325 $self->message ($msg, $flags); 2581 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2326 } 2582 }
2327 } 2583 }
2328} 2584}
2329 2585
2330=item $object->send_msg ($channel, $msg, $color, [extra...]) 2586=item $object->send_msg ($channel, $msg, $color, [extra...])
2355 2611
2356=item $player_object->enter_link 2612=item $player_object->enter_link
2357 2613
2358Freezes the player and moves him/her to a special map (C<{link}>). 2614Freezes the player and moves him/her to a special map (C<{link}>).
2359 2615
2360The player should be reasonably safe there for short amounts of time. You 2616The player should be reasonably safe there for short amounts of time (e.g.
2361I<MUST> call C<leave_link> as soon as possible, though. 2617for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2618though, as the player cannot control the character while it is on the link
2619map.
2362 2620
2363Will never block. 2621Will never block.
2364 2622
2365=item $player_object->leave_link ($map, $x, $y) 2623=item $player_object->leave_link ($map, $x, $y)
2366 2624
2386sub cf::object::player::enter_link { 2644sub cf::object::player::enter_link {
2387 my ($self) = @_; 2645 my ($self) = @_;
2388 2646
2389 $self->deactivate_recursive; 2647 $self->deactivate_recursive;
2390 2648
2649 ++$self->{_link_recursion};
2650
2391 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2651 return if UNIVERSAL::isa $self->map, "ext::map_link";
2392 2652
2393 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2653 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2394 if $self->map && $self->map->{path} ne "{link}"; 2654 if $self->map && $self->map->{path} ne "{link}";
2395 2655
2396 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2656 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2397} 2657}
2398 2658
2399sub cf::object::player::leave_link { 2659sub cf::object::player::leave_link {
2400 my ($self, $map, $x, $y) = @_; 2660 my ($self, $map, $x, $y) = @_;
2401 2661
2418 ($x, $y) = (-1, -1) 2678 ($x, $y) = (-1, -1)
2419 unless (defined $x) && (defined $y); 2679 unless (defined $x) && (defined $y);
2420 2680
2421 # use -1 or undef as default coordinates, not 0, 0 2681 # use -1 or undef as default coordinates, not 0, 0
2422 ($x, $y) = ($map->enter_x, $map->enter_y) 2682 ($x, $y) = ($map->enter_x, $map->enter_y)
2423 if $x <=0 && $y <= 0; 2683 if $x <= 0 && $y <= 0;
2424 2684
2425 $map->load; 2685 $map->load;
2426 $map->load_neighbours; 2686 $map->load_neighbours;
2427 2687
2428 return unless $self->contr->active; 2688 return unless $self->contr->active;
2429 $self->activate_recursive;
2430 2689
2431 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2690 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2432 $self->enter_map ($map, $x, $y); 2691 if ($self->enter_map ($map, $x, $y)) {
2433} 2692 # entering was successful
2693 delete $self->{_link_recursion};
2694 # only activate afterwards, to support waiting in hooks
2695 $self->activate_recursive;
2696 }
2434 2697
2698}
2699
2435=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2700=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2436 2701
2437Moves the player to the given map-path and coordinates by first freezing 2702Moves the player to the given map-path and coordinates by first freezing
2438her, loading and preparing them map, calling the provided $check callback 2703her, loading and preparing them map, calling the provided $check callback
2439that has to return the map if sucecssful, and then unfreezes the player on 2704that has to return the map if sucecssful, and then unfreezes the player on
2440the new (success) or old (failed) map position. In either case, $done will 2705the new (success) or old (failed) map position. In either case, $done will
2441be called at the end of this process. 2706be called at the end of this process.
2442 2707
2708Note that $check will be called with a potentially non-loaded map, so if
2709it needs a loaded map it has to call C<< ->load >>.
2710
2443=cut 2711=cut
2444 2712
2445our $GOTOGEN; 2713our $GOTOGEN;
2446 2714
2447sub cf::object::player::goto { 2715sub cf::object::player::goto {
2448 my ($self, $path, $x, $y, $check, $done) = @_; 2716 my ($self, $path, $x, $y, $check, $done) = @_;
2449 2717
2718 if ($self->{_link_recursion} >= $MAX_LINKS) {
2719 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2720 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2721 ($path, $x, $y) = @$EMERGENCY_POSITION;
2722 }
2723
2450 # do generation counting so two concurrent goto's will be executed in-order 2724 # do generation counting so two concurrent goto's will be executed in-order
2451 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2725 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2452 2726
2453 $self->enter_link; 2727 $self->enter_link;
2454 2728
2455 (async { 2729 (async {
2730 $Coro::current->{desc} = "player::goto $path $x $y";
2731
2456 # *tag paths override both path and x|y 2732 # *tag paths override both path and x|y
2457 if ($path =~ /^\*(.*)$/) { 2733 if ($path =~ /^\*(.*)$/) {
2458 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2734 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2459 my $ob = $obs[rand @obs]; 2735 my $ob = $obs[rand @obs];
2460 2736
2475 my $map = eval { 2751 my $map = eval {
2476 my $map = defined $path ? cf::map::find $path : undef; 2752 my $map = defined $path ? cf::map::find $path : undef;
2477 2753
2478 if ($map) { 2754 if ($map) {
2479 $map = $map->customise_for ($self); 2755 $map = $map->customise_for ($self);
2480 $map = $check->($map) if $check && $map; 2756 $map = $check->($map, $x, $y, $self) if $check && $map;
2481 } else { 2757 } else {
2482 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2758 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2483 } 2759 }
2484 2760
2485 $map 2761 $map
2493 if ($gen == $self->{_goto_generation}) { 2769 if ($gen == $self->{_goto_generation}) {
2494 delete $self->{_goto_generation}; 2770 delete $self->{_goto_generation};
2495 $self->leave_link ($map, $x, $y); 2771 $self->leave_link ($map, $x, $y);
2496 } 2772 }
2497 2773
2498 $done->() if $done; 2774 $done->($self) if $done;
2499 })->prio (1); 2775 })->prio (1);
2500} 2776}
2501 2777
2502=item $player_object->enter_exit ($exit_object) 2778=item $player_object->enter_exit ($exit_object)
2503 2779
2523} 2799}
2524 2800
2525sub prepare_random_map { 2801sub prepare_random_map {
2526 my ($exit) = @_; 2802 my ($exit) = @_;
2527 2803
2528 my $guard = cf::lock_acquire "exit_prepare:$exit";
2529
2530 # all this does is basically replace the /! path by 2804 # all this does is basically replace the /! path by
2531 # a new random map path (?random/...) with a seed 2805 # a new random map path (?random/...) with a seed
2532 # that depends on the exit object 2806 # that depends on the exit object
2533 2807
2534 my $rmp = parse_random_map_params $exit->msg; 2808 my $rmp = parse_random_map_params $exit->msg;
2536 if ($exit->map) { 2810 if ($exit->map) {
2537 $rmp->{region} = $exit->region->name; 2811 $rmp->{region} = $exit->region->name;
2538 $rmp->{origin_map} = $exit->map->path; 2812 $rmp->{origin_map} = $exit->map->path;
2539 $rmp->{origin_x} = $exit->x; 2813 $rmp->{origin_x} = $exit->x;
2540 $rmp->{origin_y} = $exit->y; 2814 $rmp->{origin_y} = $exit->y;
2815
2816 $exit->map->touch;
2541 } 2817 }
2542 2818
2543 $rmp->{random_seed} ||= $exit->random_seed; 2819 $rmp->{random_seed} ||= $exit->random_seed;
2544 2820
2545 my $data = cf::to_json $rmp; 2821 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2546 my $md5 = Digest::MD5::md5_hex $data; 2822 my $md5 = Digest::MD5::md5_hex $data;
2547 my $meta = "$RANDOMDIR/$md5.meta"; 2823 my $meta = "$RANDOMDIR/$md5.meta";
2548 2824
2549 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2825 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2550 aio_write $fh, 0, (length $data), $data, 0; 2826 aio_write $fh, 0, (length $data), $data, 0;
2551 undef $fh; 2827 undef $fh;
2552 aio_rename "$meta~", $meta; 2828 aio_rename "$meta~", $meta;
2553 2829
2830 my $slaying = "?random/$md5";
2831
2832 if ($exit->valid) {
2554 $exit->slaying ("?random/$md5"); 2833 $exit->slaying ("?random/$md5");
2555 $exit->msg (undef); 2834 $exit->msg (undef);
2835 }
2556 } 2836 }
2557} 2837}
2558 2838
2559sub cf::object::player::enter_exit { 2839sub cf::object::player::enter_exit {
2560 my ($self, $exit) = @_; 2840 my ($self, $exit) = @_;
2561 2841
2562 return unless $self->type == cf::PLAYER; 2842 return unless $self->type == cf::PLAYER;
2563 2843
2564 if ($exit->slaying eq "/!") {
2565 #TODO: this should de-fi-ni-te-ly not be a sync-job
2566 # the problem is that $exit might not survive long enough
2567 # so it needs to be done right now, right here
2568 cf::sync_job { prepare_random_map $exit };
2569 }
2570
2571 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2572 my $hp = $exit->stats->hp;
2573 my $sp = $exit->stats->sp;
2574
2575 $self->enter_link; 2844 $self->enter_link;
2576 2845
2577 # if exit is damned, update players death & WoR home-position
2578 $self->contr->savebed ($slaying, $hp, $sp)
2579 if $exit->flag (FLAG_DAMNED);
2580
2581 (async { 2846 (async {
2582 $self->deactivate_recursive; # just to be sure 2847 $Coro::current->{desc} = "enter_exit";
2848
2583 unless (eval { 2849 unless (eval {
2850 $self->deactivate_recursive; # just to be sure
2851
2852 # random map handling
2853 {
2854 my $guard = cf::lock_acquire "exit_prepare:$exit";
2855
2856 prepare_random_map $exit
2857 if $exit->slaying eq "/!";
2858 }
2859
2860 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2861 my $x = $exit->stats->hp;
2862 my $y = $exit->stats->sp;
2863
2584 $self->goto ($slaying, $hp, $sp); 2864 $self->goto ($map, $x, $y);
2585 2865
2866 # if exit is damned, update players death & WoR home-position
2867 $self->contr->savebed ($map, $x, $y)
2868 if $exit->flag (cf::FLAG_DAMNED);
2869
2586 1; 2870 1
2587 }) { 2871 }) {
2588 $self->message ("Something went wrong deep within the crossfire server. " 2872 $self->message ("Something went wrong deep within the deliantra server. "
2589 . "I'll try to bring you back to the map you were before. " 2873 . "I'll try to bring you back to the map you were before. "
2590 . "Please report this to the dungeon master!", 2874 . "Please report this to the dungeon master!",
2591 cf::NDI_UNIQUE | cf::NDI_RED); 2875 cf::NDI_UNIQUE | cf::NDI_RED);
2592 2876
2593 warn "ERROR in enter_exit: $@"; 2877 error "ERROR in enter_exit: $@";
2594 $self->leave_link; 2878 $self->leave_link;
2595 } 2879 }
2596 })->prio (1); 2880 })->prio (1);
2597} 2881}
2598 2882
2610sub cf::client::send_drawinfo { 2894sub cf::client::send_drawinfo {
2611 my ($self, $text, $flags) = @_; 2895 my ($self, $text, $flags) = @_;
2612 2896
2613 utf8::encode $text; 2897 utf8::encode $text;
2614 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2898 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2899}
2900
2901=item $client->send_big_packet ($pkt)
2902
2903Like C<send_packet>, but tries to compress large packets, and fragments
2904them as required.
2905
2906=cut
2907
2908our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2909
2910sub cf::client::send_big_packet {
2911 my ($self, $pkt) = @_;
2912
2913 # try lzf for large packets
2914 $pkt = "lzf " . Compress::LZF::compress $pkt
2915 if 1024 <= length $pkt and $self->{can_lzf};
2916
2917 # split very large packets
2918 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2919 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2920 $pkt = "frag";
2921 }
2922
2923 $self->send_packet ($pkt);
2615} 2924}
2616 2925
2617=item $client->send_msg ($channel, $msg, $color, [extra...]) 2926=item $client->send_msg ($channel, $msg, $color, [extra...])
2618 2927
2619Send a drawinfo or msg packet to the client, formatting the msg for the 2928Send a drawinfo or msg packet to the client, formatting the msg for the
2621the message, with C<log> being the default. If C<$color> is negative, suppress 2930the message, with C<log> being the default. If C<$color> is negative, suppress
2622the message unless the client supports the msg packet. 2931the message unless the client supports the msg packet.
2623 2932
2624=cut 2933=cut
2625 2934
2935# non-persistent channels (usually the info channel)
2626our %CHANNEL = ( 2936our %CHANNEL = (
2937 "c/motd" => {
2938 id => "infobox",
2939 title => "MOTD",
2940 reply => undef,
2941 tooltip => "The message of the day",
2942 },
2627 "c/identify" => { 2943 "c/identify" => {
2628 id => "identify", 2944 id => "infobox",
2629 title => "Identify", 2945 title => "Identify",
2630 reply => undef, 2946 reply => undef,
2631 tooltip => "Items recently identified", 2947 tooltip => "Items recently identified",
2632 }, 2948 },
2633 "c/examine" => { 2949 "c/examine" => {
2634 id => "examine", 2950 id => "infobox",
2635 title => "Examine", 2951 title => "Examine",
2636 reply => undef, 2952 reply => undef,
2637 tooltip => "Signs and other items you examined", 2953 tooltip => "Signs and other items you examined",
2638 }, 2954 },
2955 "c/shopinfo" => {
2956 id => "infobox",
2957 title => "Shop Info",
2958 reply => undef,
2959 tooltip => "What your bargaining skill tells you about the shop",
2960 },
2961 "c/book" => {
2962 id => "infobox",
2963 title => "Book",
2964 reply => undef,
2965 tooltip => "The contents of a note or book",
2966 },
2967 "c/lookat" => {
2968 id => "infobox",
2969 title => "Look",
2970 reply => undef,
2971 tooltip => "What you saw there",
2972 },
2973 "c/who" => {
2974 id => "infobox",
2975 title => "Players",
2976 reply => undef,
2977 tooltip => "Shows players who are currently online",
2978 },
2979 "c/body" => {
2980 id => "infobox",
2981 title => "Body Parts",
2982 reply => undef,
2983 tooltip => "Shows which body parts you posess and are available",
2984 },
2985 "c/statistics" => {
2986 id => "infobox",
2987 title => "Statistics",
2988 reply => undef,
2989 tooltip => "Shows your primary statistics",
2990 },
2991 "c/skills" => {
2992 id => "infobox",
2993 title => "Skills",
2994 reply => undef,
2995 tooltip => "Shows your experience per skill and item power",
2996 },
2997 "c/shopitems" => {
2998 id => "infobox",
2999 title => "Shop Items",
3000 reply => undef,
3001 tooltip => "Shows the items currently for sale in this shop",
3002 },
3003 "c/resistances" => {
3004 id => "infobox",
3005 title => "Resistances",
3006 reply => undef,
3007 tooltip => "Shows your resistances",
3008 },
3009 "c/pets" => {
3010 id => "infobox",
3011 title => "Pets",
3012 reply => undef,
3013 tooltip => "Shows information abotu your pets/a specific pet",
3014 },
3015 "c/perceiveself" => {
3016 id => "infobox",
3017 title => "Perceive Self",
3018 reply => undef,
3019 tooltip => "You gained detailed knowledge about yourself",
3020 },
3021 "c/uptime" => {
3022 id => "infobox",
3023 title => "Uptime",
3024 reply => undef,
3025 tooltip => "How long the server has been running since last restart",
3026 },
3027 "c/mapinfo" => {
3028 id => "infobox",
3029 title => "Map Info",
3030 reply => undef,
3031 tooltip => "Information related to the maps",
3032 },
3033 "c/party" => {
3034 id => "party",
3035 title => "Party",
3036 reply => "gsay ",
3037 tooltip => "Messages and chat related to your party",
3038 },
3039 "c/death" => {
3040 id => "death",
3041 title => "Death",
3042 reply => undef,
3043 tooltip => "Reason for and more info about your most recent death",
3044 },
3045 "c/say" => $SAY_CHANNEL,
3046 "c/chat" => $CHAT_CHANNEL,
2639); 3047);
2640 3048
2641sub cf::client::send_msg { 3049sub cf::client::send_msg {
2642 my ($self, $channel, $msg, $color, @extra) = @_; 3050 my ($self, $channel, $msg, $color, @extra) = @_;
2643 3051
2644 $msg = $self->pl->expand_cfpod ($msg); 3052 $msg = $self->pl->expand_cfpod ($msg)
3053 unless $color & cf::NDI_VERBATIM;
2645 3054
2646 $color &= cf::NDI_CLIENT_MASK; # just in case... 3055 $color &= cf::NDI_CLIENT_MASK; # just in case...
2647 3056
2648 # check predefined channels, for the benefit of C 3057 # check predefined channels, for the benefit of C
2649 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 3058 if ($CHANNEL{$channel}) {
3059 $channel = $CHANNEL{$channel};
2650 3060
3061 $self->ext_msg (channel_info => $channel);
3062 $channel = $channel->{id};
3063
2651 if (ref $channel) { 3064 } elsif (ref $channel) {
2652 # send meta info to client, if not yet sent 3065 # send meta info to client, if not yet sent
2653 unless (exists $self->{channel}{$channel->{id}}) { 3066 unless (exists $self->{channel}{$channel->{id}}) {
2654 $self->{channel}{$channel->{id}} = $channel; 3067 $self->{channel}{$channel->{id}} = $channel;
2655 $self->ext_msg (channel_info => $channel) 3068 $self->ext_msg (channel_info => $channel);
2656 if $self->can_msg;
2657 } 3069 }
2658 3070
2659 $channel = $channel->{id}; 3071 $channel = $channel->{id};
2660 } 3072 }
2661 3073
2662 return unless @extra || length $msg; 3074 return unless @extra || length $msg;
2663 3075
2664 if ($self->can_msg) {
2665 # default colour, mask it out 3076 # default colour, mask it out
2666 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3077 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2667 if $color & cf::NDI_DEF; 3078 if $color & cf::NDI_DEF;
2668 3079
2669 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3080 my $pkt = "msg "
3081 . $self->{json_coder}->encode (
2670 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3082 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2671 } else { 3083 );
2672 if ($color >= 0) {
2673 # replace some tags by gcfclient-compatible ones
2674 for ($msg) {
2675 1 while
2676 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2677 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2678 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2679 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2680 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2681 }
2682 3084
2683 $color &= cf::NDI_COLOR_MASK; 3085 $self->send_big_packet ($pkt);
2684
2685 utf8::encode $msg;
2686
2687 if (0 && $msg =~ /\[/) {
2688 # COMMAND/INFO
2689 $self->send_packet ("drawextinfo $color 10 8 $msg")
2690 } else {
2691 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2692 $self->send_packet ("drawinfo $color $msg")
2693 }
2694 }
2695 }
2696} 3086}
2697 3087
2698=item $client->ext_msg ($type, @msg) 3088=item $client->ext_msg ($type, @msg)
2699 3089
2700Sends an ext event to the client. 3090Sends an ext event to the client.
2703 3093
2704sub cf::client::ext_msg($$@) { 3094sub cf::client::ext_msg($$@) {
2705 my ($self, $type, @msg) = @_; 3095 my ($self, $type, @msg) = @_;
2706 3096
2707 if ($self->extcmd == 2) { 3097 if ($self->extcmd == 2) {
2708 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3098 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2709 } elsif ($self->extcmd == 1) { # TODO: remove 3099 } elsif ($self->extcmd == 1) { # TODO: remove
2710 push @msg, msgtype => "event_$type"; 3100 push @msg, msgtype => "event_$type";
2711 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2712 } 3102 }
2713} 3103}
2714 3104
2715=item $client->ext_reply ($msgid, @msg) 3105=item $client->ext_reply ($msgid, @msg)
2716 3106
2720 3110
2721sub cf::client::ext_reply($$@) { 3111sub cf::client::ext_reply($$@) {
2722 my ($self, $id, @msg) = @_; 3112 my ($self, $id, @msg) = @_;
2723 3113
2724 if ($self->extcmd == 2) { 3114 if ($self->extcmd == 2) {
2725 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2726 } elsif ($self->extcmd == 1) { 3116 } elsif ($self->extcmd == 1) {
2727 #TODO: version 1, remove 3117 #TODO: version 1, remove
2728 unshift @msg, msgtype => "reply", msgid => $id; 3118 unshift @msg, msgtype => "reply", msgid => $id;
2729 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3119 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2730 } 3120 }
2731} 3121}
2732 3122
2733=item $success = $client->query ($flags, "text", \&cb) 3123=item $success = $client->query ($flags, "text", \&cb)
2734 3124
2805 3195
2806 $ns->ext_reply ($reply, @reply) 3196 $ns->ext_reply ($reply, @reply)
2807 if $reply; 3197 if $reply;
2808 3198
2809 } else { 3199 } else {
2810 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3200 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2811 } 3201 }
2812 3202
2813 cf::override; 3203 cf::override;
2814 }, 3204 },
2815); 3205);
2835 3225
2836 $coro 3226 $coro
2837} 3227}
2838 3228
2839cf::client->attach ( 3229cf::client->attach (
2840 on_destroy => sub { 3230 on_client_destroy => sub {
2841 my ($ns) = @_; 3231 my ($ns) = @_;
2842 3232
2843 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3233 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2844 }, 3234 },
2845); 3235);
2861our $safe_hole = new Safe::Hole; 3251our $safe_hole = new Safe::Hole;
2862 3252
2863$SIG{FPE} = 'IGNORE'; 3253$SIG{FPE} = 'IGNORE';
2864 3254
2865$safe->permit_only (Opcode::opset qw( 3255$safe->permit_only (Opcode::opset qw(
2866 :base_core :base_mem :base_orig :base_math 3256 :base_core :base_mem :base_orig :base_math :base_loop
2867 grepstart grepwhile mapstart mapwhile 3257 grepstart grepwhile mapstart mapwhile
2868 sort time 3258 sort time
2869)); 3259));
2870 3260
2871# here we export the classes and methods available to script code 3261# here we export the classes and methods available to script code
2873=pod 3263=pod
2874 3264
2875The following functions and methods are available within a safe environment: 3265The following functions and methods are available within a safe environment:
2876 3266
2877 cf::object 3267 cf::object
2878 contr pay_amount pay_player map x y force_find force_add 3268 contr pay_amount pay_player map x y force_find force_add destroy
2879 insert remove name archname title slaying race decrease_ob_nr 3269 insert remove name archname title slaying race decrease split
3270 value
2880 3271
2881 cf::object::player 3272 cf::object::player
2882 player 3273 player
2883 3274
2884 cf::player 3275 cf::player
2889 3280
2890=cut 3281=cut
2891 3282
2892for ( 3283for (
2893 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3284 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2894 insert remove inv name archname title slaying race 3285 insert remove inv nrof name archname title slaying race
2895 decrease_ob_nr)], 3286 decrease split destroy change_exp value msg lore send_msg)],
2896 ["cf::object::player" => qw(player)], 3287 ["cf::object::player" => qw(player)],
2897 ["cf::player" => qw(peaceful)], 3288 ["cf::player" => qw(peaceful send_msg)],
2898 ["cf::map" => qw(trigger)], 3289 ["cf::map" => qw(trigger)],
2899) { 3290) {
2900 no strict 'refs';
2901 my ($pkg, @funs) = @$_; 3291 my ($pkg, @funs) = @$_;
2902 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3292 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2903 for @funs; 3293 for @funs;
2904} 3294}
2905 3295
2920 3310
2921 my $qcode = $code; 3311 my $qcode = $code;
2922 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3312 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2923 $qcode =~ s/\n/\\n/g; 3313 $qcode =~ s/\n/\\n/g;
2924 3314
3315 %vars = (_dummy => 0) unless %vars;
3316
3317 my @res;
2925 local $_; 3318 local $_;
2926 local @safe::cf::_safe_eval_args = values %vars;
2927 3319
2928 my $eval = 3320 my $eval =
2929 "do {\n" 3321 "do {\n"
2930 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3322 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2931 . "#line 0 \"{$qcode}\"\n" 3323 . "#line 0 \"{$qcode}\"\n"
2932 . $code 3324 . $code
2933 . "\n}" 3325 . "\n}"
2934 ; 3326 ;
2935 3327
3328 if ($CFG{safe_eval}) {
2936 sub_generation_inc; 3329 sub_generation_inc;
3330 local @safe::cf::_safe_eval_args = values %vars;
2937 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3331 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2938 sub_generation_inc; 3332 sub_generation_inc;
3333 } else {
3334 local @cf::_safe_eval_args = values %vars;
3335 @res = wantarray ? eval eval : scalar eval $eval;
3336 }
2939 3337
2940 if ($@) { 3338 if ($@) {
2941 warn "$@"; 3339 warn "$@",
2942 warn "while executing safe code '$code'\n"; 3340 "while executing safe code '$code'\n",
2943 warn "with arguments " . (join " ", %vars) . "\n"; 3341 "with arguments " . (join " ", %vars) . "\n";
2944 } 3342 }
2945 3343
2946 wantarray ? @res : $res[0] 3344 wantarray ? @res : $res[0]
2947} 3345}
2948 3346
2962=cut 3360=cut
2963 3361
2964sub register_script_function { 3362sub register_script_function {
2965 my ($fun, $cb) = @_; 3363 my ($fun, $cb) = @_;
2966 3364
2967 no strict 'refs'; 3365 $fun = "safe::$fun" if $CFG{safe_eval};
2968 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3366 *$fun = $safe_hole->wrap ($cb);
2969} 3367}
2970 3368
2971=back 3369=back
2972 3370
2973=cut 3371=cut
2982 # for this (global event?) 3380 # for this (global event?)
2983 %ext::player_env::MUSIC_FACE_CACHE = (); 3381 %ext::player_env::MUSIC_FACE_CACHE = ();
2984 3382
2985 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3383 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2986 3384
2987 warn "loading facedata from $path\n"; 3385 trace "loading facedata from $path\n";
2988 3386
2989 my $facedata;
2990 0 < aio_load $path, $facedata 3387 0 < aio_load $path, my $facedata
2991 or die "$path: $!"; 3388 or die "$path: $!";
2992 3389
2993 $facedata = Coro::Storable::thaw $facedata; 3390 $facedata = Coro::Storable::thaw $facedata;
2994 3391
2995 $facedata->{version} == 2 3392 $facedata->{version} == 2
2996 or cf::cleanup "$path: version mismatch, cannot proceed."; 3393 or cf::cleanup "$path: version mismatch, cannot proceed.";
2997 3394
2998 # patch in the exptable 3395 # patch in the exptable
3396 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
2999 $facedata->{resource}{"res/exp_table"} = { 3397 $facedata->{resource}{"res/exp_table"} = {
3000 type => FT_RSRC, 3398 type => FT_RSRC,
3001 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3399 data => $exp_table,
3400 hash => (Digest::MD5::md5 $exp_table),
3002 }; 3401 };
3003 cf::cede_to_tick; 3402 cf::cede_to_tick;
3004 3403
3005 { 3404 {
3006 my $faces = $facedata->{faceinfo}; 3405 my $faces = $facedata->{faceinfo};
3007 3406
3008 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
3009 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3408 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3409
3010 cf::face::set_visibility $idx, $info->{visibility}; 3410 cf::face::set_visibility $idx, $info->{visibility};
3011 cf::face::set_magicmap $idx, $info->{magicmap}; 3411 cf::face::set_magicmap $idx, $info->{magicmap};
3012 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3412 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3013 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3413 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3014 3414
3015 cf::cede_to_tick; 3415 cf::cede_to_tick;
3016 } 3416 }
3017 3417
3018 while (my ($face, $info) = each %$faces) { 3418 while (my ($face, $info) = each %$faces) {
3019 next unless $info->{smooth}; 3419 next unless $info->{smooth};
3420
3020 my $idx = cf::face::find $face 3421 my $idx = cf::face::find $face
3021 or next; 3422 or next;
3423
3022 if (my $smooth = cf::face::find $info->{smooth}) { 3424 if (my $smooth = cf::face::find $info->{smooth}) {
3023 cf::face::set_smooth $idx, $smooth; 3425 cf::face::set_smooth $idx, $smooth;
3024 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3426 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3025 } else { 3427 } else {
3026 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3428 error "smooth face '$info->{smooth}' not found for face '$face'";
3027 } 3429 }
3028 3430
3029 cf::cede_to_tick; 3431 cf::cede_to_tick;
3030 } 3432 }
3031 } 3433 }
3040 3442
3041 cf::anim::invalidate_all; # d'oh 3443 cf::anim::invalidate_all; # d'oh
3042 } 3444 }
3043 3445
3044 { 3446 {
3045 # TODO: for gcfclient pleasure, we should give resources
3046 # that gcfclient doesn't grok a >10000 face index.
3047 my $res = $facedata->{resource}; 3447 my $res = $facedata->{resource};
3048 3448
3049 my $soundconf = delete $res->{"res/sound.conf"};
3050
3051 while (my ($name, $info) = each %$res) { 3449 while (my ($name, $info) = each %$res) {
3450 if (defined $info->{type}) {
3052 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3451 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3053 my $data;
3054 3452
3055 if ($info->{type} & 1) { 3453 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3056 # prepend meta info 3454 cf::face::set_type $idx, $info->{type};
3057
3058 my $meta = $enc->encode ({
3059 name => $name,
3060 %{ $info->{meta} || {} },
3061 });
3062
3063 $data = pack "(w/a*)*", $meta, $info->{data};
3064 } else { 3455 } else {
3065 $data = $info->{data}; 3456 $RESOURCE{$name} = $info; # unused
3066 } 3457 }
3067 3458
3068 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3069 cf::face::set_type $idx, $info->{type};
3070
3071 cf::cede_to_tick; 3459 cf::cede_to_tick;
3072 } 3460 }
3073
3074 if ($soundconf) {
3075 $soundconf = $enc->decode (delete $soundconf->{data});
3076
3077 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3078 my $sound = $soundconf->{compat}[$_]
3079 or next;
3080
3081 my $face = cf::face::find "sound/$sound->[1]";
3082 cf::sound::set $sound->[0] => $face;
3083 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3084 }
3085
3086 while (my ($k, $v) = each %{$soundconf->{event}}) {
3087 my $face = cf::face::find "sound/$v";
3088 cf::sound::set $k => $face;
3089 }
3090 }
3091 } 3461 }
3462
3463 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3092 3464
3093 1 3465 1
3094} 3466}
3095 3467
3096register_exticmd fx_want => sub { 3468register_exticmd fx_want => sub {
3098 3470
3099 while (my ($k, $v) = each %$want) { 3471 while (my ($k, $v) = each %$want) {
3100 $ns->fx_want ($k, $v); 3472 $ns->fx_want ($k, $v);
3101 } 3473 }
3102}; 3474};
3475
3476sub load_resource_file($) {
3477 my $guard = lock_acquire "load_resource_file";
3478
3479 my $status = load_resource_file_ $_[0];
3480 get_slot 0.1, 100;
3481 cf::arch::commit_load;
3482
3483 $status
3484}
3103 3485
3104sub reload_regions { 3486sub reload_regions {
3105 # HACK to clear player env face cache, we need some signal framework 3487 # HACK to clear player env face cache, we need some signal framework
3106 # for this (global event?) 3488 # for this (global event?)
3107 %ext::player_env::MUSIC_FACE_CACHE = (); 3489 %ext::player_env::MUSIC_FACE_CACHE = ();
3121} 3503}
3122 3504
3123sub reload_archetypes { 3505sub reload_archetypes {
3124 load_resource_file "$DATADIR/archetypes" 3506 load_resource_file "$DATADIR/archetypes"
3125 or die "unable to load archetypes\n"; 3507 or die "unable to load archetypes\n";
3126 #d# NEED to laod twice to resolve forward references
3127 # this really needs to be done in an extra post-pass
3128 # (which needs to be synchronous, so solve it differently)
3129 load_resource_file "$DATADIR/archetypes"
3130 or die "unable to load archetypes\n";
3131} 3508}
3132 3509
3133sub reload_treasures { 3510sub reload_treasures {
3134 load_resource_file "$DATADIR/treasures" 3511 load_resource_file "$DATADIR/treasures"
3135 or die "unable to load treasurelists\n"; 3512 or die "unable to load treasurelists\n";
3136} 3513}
3137 3514
3515sub reload_sound {
3516 trace "loading sound config from $DATADIR/sound\n";
3517
3518 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3519 or die "$DATADIR/sound $!";
3520
3521 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3522
3523 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3524 my $sound = $soundconf->{compat}[$_]
3525 or next;
3526
3527 my $face = cf::face::find "sound/$sound->[1]";
3528 cf::sound::set $sound->[0] => $face;
3529 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3530 }
3531
3532 while (my ($k, $v) = each %{$soundconf->{event}}) {
3533 my $face = cf::face::find "sound/$v";
3534 cf::sound::set $k => $face;
3535 }
3536}
3537
3138sub reload_resources { 3538sub reload_resources {
3139 warn "reloading resource files...\n"; 3539 trace "reloading resource files...\n";
3140 3540
3541 reload_exp_table;
3542 reload_materials;
3543 reload_facedata;
3544 reload_sound;
3545 reload_archetypes;
3141 reload_regions; 3546 reload_regions;
3142 reload_facedata;
3143 #reload_archetypes;#d#
3144 reload_archetypes;
3145 reload_treasures; 3547 reload_treasures;
3146 3548
3147 warn "finished reloading resource files\n"; 3549 trace "finished reloading resource files\n";
3148}
3149
3150sub init {
3151 reload_resources;
3152} 3550}
3153 3551
3154sub reload_config { 3552sub reload_config {
3155 open my $fh, "<:utf8", "$CONFDIR/config" 3553 trace "reloading config file...\n";
3156 or return;
3157 3554
3158 local $/; 3555 0 < aio_load "$CONFDIR/config", my $config
3556 or die "$CONFDIR/config: $!";
3557
3558 utf8::decode $config;
3559
3560 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3159 *CFG = YAML::Syck::Load <$fh>; 3561 *CFG = YAML::XS::Load $config;
3160 3562
3161 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3563 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3162 3564
3163 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3565 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3164 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3566 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3165 3567
3166 if (exists $CFG{mlockall}) { 3568 if (exists $CFG{mlockall}) {
3170 }; 3572 };
3171 warn $@ if $@; 3573 warn $@ if $@;
3172 } 3574 }
3173} 3575}
3174 3576
3577sub pidfile() {
3578 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3579 or die "$PIDFILE: $!";
3580 flock $fh, &Fcntl::LOCK_EX
3581 or die "$PIDFILE: flock: $!";
3582 $fh
3583}
3584
3585# make sure only one server instance is running at any one time
3586sub atomic {
3587 my $fh = pidfile;
3588
3589 my $pid = <$fh>;
3590 kill 9, $pid if $pid > 0;
3591
3592 seek $fh, 0, 0;
3593 print $fh $$;
3594}
3595
3596sub main_loop {
3597 trace "EV::loop starting\n";
3598 if (1) {
3599 EV::loop;
3600 }
3601 trace "EV::loop returned\n";
3602 goto &main_loop unless $REALLY_UNLOOP;
3603}
3604
3175sub main { 3605sub main {
3606 cf::init_globals; # initialise logging
3607
3608 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3609 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3610 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3611 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3612
3613 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3614
3176 # we must not ever block the main coroutine 3615 # we must not ever block the main coroutine
3177 local $Coro::idle = sub { 3616 local $Coro::idle = sub {
3178 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3617 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3179 (async { 3618 (async {
3180 Event::one_event; 3619 $Coro::current->{desc} = "IDLE BUG HANDLER";
3620 EV::loop EV::LOOP_ONESHOT;
3181 })->prio (Coro::PRIO_MAX); 3621 })->prio (Coro::PRIO_MAX);
3182 }; 3622 };
3183 3623
3624 evthread_start IO::AIO::poll_fileno;
3625
3626 cf::sync_job {
3627 cf::incloader::init ();
3628
3629 cf::init_anim;
3630 cf::init_attackmess;
3631 cf::init_dynamic;
3632
3633 cf::load_settings;
3634
3635 reload_resources;
3184 reload_config; 3636 reload_config;
3185 db_init; 3637 db_init;
3638
3639 cf::init_uuid;
3640 cf::init_signals;
3641 cf::init_skills;
3642
3643 cf::init_beforeplay;
3644
3645 atomic;
3646
3186 load_extensions; 3647 load_extensions;
3187 3648
3188 $TICK_WATCHER->start; 3649 utime time, time, $RUNTIMEFILE;
3189 Event::loop; 3650
3651 # no (long-running) fork's whatsoever before this point(!)
3652 use POSIX ();
3653 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3654
3655 (pop @POST_INIT)->(0) while @POST_INIT;
3656 };
3657
3658 cf::object::thawer::errors_are_fatal 0;
3659 info "parse errors in files are no longer fatal from this point on.\n";
3660
3661 my $free_main; $free_main = EV::idle sub {
3662 undef $free_main;
3663 undef &main; # free gobs of memory :)
3664 };
3665
3666 goto &main_loop;
3190} 3667}
3191 3668
3192############################################################################# 3669#############################################################################
3193# initialisation and cleanup 3670# initialisation and cleanup
3194 3671
3195# install some emergency cleanup handlers 3672# install some emergency cleanup handlers
3196BEGIN { 3673BEGIN {
3674 our %SIGWATCHER = ();
3197 for my $signal (qw(INT HUP TERM)) { 3675 for my $signal (qw(INT HUP TERM)) {
3198 Event->signal ( 3676 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3199 reentrant => 0,
3200 data => WF_AUTOCANCEL,
3201 signal => $signal,
3202 prio => 0,
3203 cb => sub {
3204 cf::cleanup "SIG$signal"; 3677 cf::cleanup "SIG$signal";
3205 },
3206 ); 3678 };
3207 } 3679 }
3208} 3680}
3209 3681
3210sub write_runtime { 3682sub write_runtime_sync {
3211 my $runtime = "$LOCALDIR/runtime"; 3683 my $t0 = AE::time;
3212 3684
3213 # first touch the runtime file to show we are still running: 3685 # first touch the runtime file to show we are still running:
3214 # the fsync below can take a very very long time. 3686 # the fsync below can take a very very long time.
3215 3687
3216 IO::AIO::aio_utime $runtime, undef, undef; 3688 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3217 3689
3218 my $guard = cf::lock_acquire "write_runtime"; 3690 my $guard = cf::lock_acquire "write_runtime";
3219 3691
3220 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3692 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3221 or return; 3693 or return;
3222 3694
3223 my $value = $cf::RUNTIME + 90 + 10; 3695 my $value = $cf::RUNTIME + 90 + 10;
3224 # 10 is the runtime save interval, for a monotonic clock 3696 # 10 is the runtime save interval, for a monotonic clock
3225 # 60 allows for the watchdog to kill the server. 3697 # 60 allows for the watchdog to kill the server.
3235 aio_utime $fh, undef, undef; 3707 aio_utime $fh, undef, undef;
3236 3708
3237 close $fh 3709 close $fh
3238 or return; 3710 or return;
3239 3711
3240 aio_rename "$runtime~", $runtime 3712 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3241 and return; 3713 and return;
3242 3714
3243 warn "runtime file written.\n"; 3715 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3244 3716
3245 1 3717 1
3718}
3719
3720our $uuid_lock;
3721our $uuid_skip;
3722
3723sub write_uuid_sync($) {
3724 $uuid_skip ||= $_[0];
3725
3726 return if $uuid_lock;
3727 local $uuid_lock = 1;
3728
3729 my $uuid = "$LOCALDIR/uuid";
3730
3731 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3732 or return;
3733
3734 my $value = uuid_seq uuid_cur;
3735
3736 unless ($value) {
3737 info "cowardly refusing to write zero uuid value!\n";
3738 return;
3739 }
3740
3741 my $value = uuid_str $value + $uuid_skip;
3742 $uuid_skip = 0;
3743
3744 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3745 and return;
3746
3747 # always fsync - this file is important
3748 aio_fsync $fh
3749 and return;
3750
3751 close $fh
3752 or return;
3753
3754 aio_rename "$uuid~", $uuid
3755 and return;
3756
3757 trace "uuid file written ($value).\n";
3758
3759 1
3760
3761}
3762
3763sub write_uuid($$) {
3764 my ($skip, $sync) = @_;
3765
3766 $sync ? write_uuid_sync $skip
3767 : async { write_uuid_sync $skip };
3246} 3768}
3247 3769
3248sub emergency_save() { 3770sub emergency_save() {
3249 my $freeze_guard = cf::freeze_mainloop; 3771 my $freeze_guard = cf::freeze_mainloop;
3250 3772
3251 warn "enter emergency perl save\n"; 3773 info "emergency_perl_save: enter\n";
3774
3775 # this is a trade-off: we want to be very quick here, so
3776 # save all maps without fsync, and later call a global sync
3777 # (which in turn might be very very slow)
3778 local $USE_FSYNC = 0;
3252 3779
3253 cf::sync_job { 3780 cf::sync_job {
3781 cf::write_runtime_sync; # external watchdog should not bark
3782
3254 # use a peculiar iteration method to avoid tripping on perl 3783 # use a peculiar iteration method to avoid tripping on perl
3255 # refcount bugs in for. also avoids problems with players 3784 # refcount bugs in for. also avoids problems with players
3256 # and maps saved/destroyed asynchronously. 3785 # and maps saved/destroyed asynchronously.
3257 warn "begin emergency player save\n"; 3786 info "emergency_perl_save: begin player save\n";
3258 for my $login (keys %cf::PLAYER) { 3787 for my $login (keys %cf::PLAYER) {
3259 my $pl = $cf::PLAYER{$login} or next; 3788 my $pl = $cf::PLAYER{$login} or next;
3260 $pl->valid or next; 3789 $pl->valid or next;
3790 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3261 $pl->save; 3791 $pl->save;
3262 } 3792 }
3263 warn "end emergency player save\n"; 3793 info "emergency_perl_save: end player save\n";
3264 3794
3265 warn "begin emergency map save\n"; 3795 cf::write_runtime_sync; # external watchdog should not bark
3796
3797 info "emergency_perl_save: begin map save\n";
3266 for my $path (keys %cf::MAP) { 3798 for my $path (keys %cf::MAP) {
3267 my $map = $cf::MAP{$path} or next; 3799 my $map = $cf::MAP{$path} or next;
3268 $map->valid or next; 3800 $map->valid or next;
3269 $map->save; 3801 $map->save;
3270 } 3802 }
3271 warn "end emergency map save\n"; 3803 info "emergency_perl_save: end map save\n";
3272 3804
3273 warn "begin emergency database checkpoint\n"; 3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3807 info "emergency_perl_save: begin database checkpoint\n";
3274 BDB::db_env_txn_checkpoint $DB_ENV; 3808 BDB::db_env_txn_checkpoint $DB_ENV;
3275 warn "end emergency database checkpoint\n"; 3809 info "emergency_perl_save: end database checkpoint\n";
3810
3811 info "emergency_perl_save: begin write uuid\n";
3812 write_uuid_sync 1;
3813 info "emergency_perl_save: end write uuid\n";
3814
3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3817 trace "emergency_perl_save: syncing database to disk";
3818 BDB::db_env_txn_checkpoint $DB_ENV;
3819
3820 info "emergency_perl_save: starting sync\n";
3821 IO::AIO::aio_sync sub {
3822 info "emergency_perl_save: finished sync\n";
3823 };
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: flushing outstanding aio requests";
3828 while (IO::AIO::nreqs || BDB::nreqs) {
3829 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3830 }
3831
3832 cf::write_runtime_sync; # external watchdog should not bark
3276 }; 3833 };
3277 3834
3278 warn "leave emergency perl save\n"; 3835 info "emergency_perl_save: leave\n";
3279} 3836}
3280 3837
3281sub post_cleanup { 3838sub post_cleanup {
3282 my ($make_core) = @_; 3839 my ($make_core) = @_;
3283 3840
3841 IO::AIO::flush;
3842
3284 warn Carp::longmess "post_cleanup backtrace" 3843 error Carp::longmess "post_cleanup backtrace"
3285 if $make_core; 3844 if $make_core;
3845
3846 my $fh = pidfile;
3847 unlink $PIDFILE if <$fh> == $$;
3848}
3849
3850# a safer delete_package, copied from Symbol
3851sub clear_package($) {
3852 my $pkg = shift;
3853
3854 # expand to full symbol table name if needed
3855 unless ($pkg =~ /^main::.*::$/) {
3856 $pkg = "main$pkg" if $pkg =~ /^::/;
3857 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3858 $pkg .= '::' unless $pkg =~ /::$/;
3859 }
3860
3861 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3862 my $stem_symtab = *{$stem}{HASH};
3863
3864 defined $stem_symtab and exists $stem_symtab->{$leaf}
3865 or return;
3866
3867 # clear all symbols
3868 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3869 for my $name (keys %$leaf_symtab) {
3870 _gv_clear *{"$pkg$name"};
3871# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3872 }
3286} 3873}
3287 3874
3288sub do_reload_perl() { 3875sub do_reload_perl() {
3289 # can/must only be called in main 3876 # can/must only be called in main
3290 if ($Coro::current != $Coro::main) { 3877 unless (in_main) {
3291 warn "can only reload from main coroutine"; 3878 error "can only reload from main coroutine";
3292 return; 3879 return;
3293 } 3880 }
3294 3881
3882 return if $RELOAD++;
3883
3884 my $t1 = AE::time;
3885
3886 while ($RELOAD) {
3887 cf::get_slot 0.1, -1, "reload_perl";
3295 warn "reloading..."; 3888 info "reloading...";
3296 3889
3297 warn "entering sync_job"; 3890 trace "entering sync_job";
3298 3891
3299 cf::sync_job { 3892 cf::sync_job {
3300 cf::write_runtime; # external watchdog should not bark
3301 cf::emergency_save; 3893 #cf::emergency_save;
3302 cf::write_runtime; # external watchdog should not bark
3303 3894
3304 warn "syncing database to disk";
3305 BDB::db_env_txn_checkpoint $DB_ENV;
3306
3307 # if anything goes wrong in here, we should simply crash as we already saved
3308
3309 warn "cancelling all WF_AUTOCANCEL watchers";
3310 for (Event::all_watchers) {
3311 $_->cancel if $_->data & WF_AUTOCANCEL;
3312 }
3313
3314 warn "flushing outstanding aio requests";
3315 for (;;) {
3316 BDB::flush;
3317 IO::AIO::flush;
3318 Coro::cede;
3319 last unless IO::AIO::nreqs || BDB::nreqs;
3320 warn "iterate...";
3321 }
3322
3323 ++$RELOAD;
3324
3325 warn "cancelling all extension coros"; 3895 trace "cancelling all extension coros";
3326 $_->cancel for values %EXT_CORO; 3896 $_->cancel for values %EXT_CORO;
3327 %EXT_CORO = (); 3897 %EXT_CORO = ();
3328 3898
3329 warn "removing commands"; 3899 trace "removing commands";
3330 %COMMAND = (); 3900 %COMMAND = ();
3331 3901
3332 warn "removing ext/exti commands"; 3902 trace "removing ext/exti commands";
3333 %EXTCMD = (); 3903 %EXTCMD = ();
3334 %EXTICMD = (); 3904 %EXTICMD = ();
3335 3905
3336 warn "unloading/nuking all extensions"; 3906 trace "unloading/nuking all extensions";
3337 for my $pkg (@EXTS) { 3907 for my $pkg (@EXTS) {
3338 warn "... unloading $pkg"; 3908 trace "... unloading $pkg";
3339 3909
3340 if (my $cb = $pkg->can ("unload")) { 3910 if (my $cb = $pkg->can ("unload")) {
3341 eval { 3911 eval {
3342 $cb->($pkg); 3912 $cb->($pkg);
3343 1 3913 1
3344 } or warn "$pkg unloaded, but with errors: $@"; 3914 } or error "$pkg unloaded, but with errors: $@";
3915 }
3916
3917 trace "... clearing $pkg";
3918 clear_package $pkg;
3345 } 3919 }
3346 3920
3347 warn "... nuking $pkg";
3348 Symbol::delete_package $pkg;
3349 }
3350
3351 warn "unloading all perl modules loaded from $LIBDIR"; 3921 trace "unloading all perl modules loaded from $LIBDIR";
3352 while (my ($k, $v) = each %INC) { 3922 while (my ($k, $v) = each %INC) {
3353 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3923 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3354 3924
3355 warn "... unloading $k"; 3925 trace "... unloading $k";
3356 delete $INC{$k}; 3926 delete $INC{$k};
3357 3927
3358 $k =~ s/\.pm$//; 3928 $k =~ s/\.pm$//;
3359 $k =~ s/\//::/g; 3929 $k =~ s/\//::/g;
3360 3930
3361 if (my $cb = $k->can ("unload_module")) { 3931 if (my $cb = $k->can ("unload_module")) {
3362 $cb->(); 3932 $cb->();
3933 }
3934
3935 clear_package $k;
3363 } 3936 }
3364 3937
3365 Symbol::delete_package $k;
3366 }
3367
3368 warn "getting rid of safe::, as good as possible"; 3938 trace "getting rid of safe::, as good as possible";
3369 Symbol::delete_package "safe::$_" 3939 clear_package "safe::$_"
3370 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3940 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3371 3941
3372 warn "unloading cf.pm \"a bit\""; 3942 trace "unloading cf.pm \"a bit\"";
3373 delete $INC{"cf.pm"}; 3943 delete $INC{"cf.pm"};
3374 delete $INC{"cf/pod.pm"}; 3944 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3375 3945
3376 # don't, removes xs symbols, too, 3946 # don't, removes xs symbols, too,
3377 # and global variables created in xs 3947 # and global variables created in xs
3378 #Symbol::delete_package __PACKAGE__; 3948 #clear_package __PACKAGE__;
3379 3949
3380 warn "unload completed, starting to reload now"; 3950 info "unload completed, starting to reload now";
3381 3951
3382 warn "reloading cf.pm"; 3952 trace "reloading cf.pm";
3383 require cf; 3953 require cf;
3384 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3954 cf::_connect_to_perl_1;
3385 3955
3386 warn "loading config and database again"; 3956 trace "loading config and database again";
3387 cf::reload_config; 3957 cf::reload_config;
3388 3958
3389 warn "loading extensions"; 3959 trace "loading extensions";
3390 cf::load_extensions; 3960 cf::load_extensions;
3391 3961
3962 if ($REATTACH_ON_RELOAD) {
3392 warn "reattaching attachments to objects/players"; 3963 trace "reattaching attachments to objects/players";
3393 _global_reattach; # objects, sockets 3964 _global_reattach; # objects, sockets
3394 warn "reattaching attachments to maps"; 3965 trace "reattaching attachments to maps";
3395 reattach $_ for values %MAP; 3966 reattach $_ for values %MAP;
3396 warn "reattaching attachments to players"; 3967 trace "reattaching attachments to players";
3397 reattach $_ for values %PLAYER; 3968 reattach $_ for values %PLAYER;
3969 }
3398 3970
3971 trace "running post_init jobs";
3972 (pop @POST_INIT)->(1) while @POST_INIT;
3973
3399 warn "leaving sync_job"; 3974 trace "leaving sync_job";
3400 3975
3401 1 3976 1
3402 } or do { 3977 } or do {
3403 warn $@; 3978 error $@;
3404 warn "error while reloading, exiting."; 3979 cf::cleanup "error while reloading, exiting.";
3405 exit 1; 3980 };
3981
3982 info "reloaded";
3983 --$RELOAD;
3406 }; 3984 }
3407 3985
3408 warn "reloaded"; 3986 $t1 = AE::time - $t1;
3987 info "reload completed in ${t1}s\n";
3409}; 3988};
3410 3989
3411our $RELOAD_WATCHER; # used only during reload 3990our $RELOAD_WATCHER; # used only during reload
3412 3991
3413sub reload_perl() { 3992sub reload_perl() {
3414 # doing reload synchronously and two reloads happen back-to-back, 3993 # doing reload synchronously and two reloads happen back-to-back,
3415 # coro crashes during coro_state_free->destroy here. 3994 # coro crashes during coro_state_free->destroy here.
3416 3995
3417 $RELOAD_WATCHER ||= Event->timer ( 3996 $RELOAD_WATCHER ||= cf::async {
3418 reentrant => 0, 3997 Coro::AIO::aio_wait cache_extensions;
3419 after => 0, 3998
3420 data => WF_AUTOCANCEL, 3999 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3421 cb => sub {
3422 do_reload_perl; 4000 do_reload_perl;
3423 undef $RELOAD_WATCHER; 4001 undef $RELOAD_WATCHER;
3424 }, 4002 };
3425 ); 4003 };
3426} 4004}
3427 4005
3428register_command "reload" => sub { 4006register_command "reload" => sub {
3429 my ($who, $arg) = @_; 4007 my ($who, $arg) = @_;
3430 4008
3431 if ($who->flag (FLAG_WIZ)) { 4009 if ($who->flag (FLAG_WIZ)) {
3432 $who->message ("reloading server."); 4010 $who->message ("reloading server.");
4011 async {
4012 $Coro::current->{desc} = "perl_reload";
3433 async { reload_perl }; 4013 reload_perl;
4014 };
3434 } 4015 }
3435}; 4016};
3436 4017
3437unshift @INC, $LIBDIR; 4018#############################################################################
3438 4019
3439my $bug_warning = 0; 4020my $bug_warning = 0;
3440 4021
3441our @WAIT_FOR_TICK; 4022our @WAIT_FOR_TICK;
3442our @WAIT_FOR_TICK_BEGIN; 4023our @WAIT_FOR_TICK_BEGIN;
3443 4024
3444sub wait_for_tick { 4025sub wait_for_tick() {
3445 return unless $TICK_WATCHER->is_active;
3446 return if $Coro::current == $Coro::main; 4026 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3447 4027
3448 my $signal = new Coro::Signal; 4028 my $signal = new Coro::Signal;
3449 push @WAIT_FOR_TICK, $signal; 4029 push @WAIT_FOR_TICK, $signal;
3450 $signal->wait; 4030 $signal->wait;
3451} 4031}
3452 4032
3453sub wait_for_tick_begin { 4033sub wait_for_tick_begin() {
3454 return unless $TICK_WATCHER->is_active;
3455 return if $Coro::current == $Coro::main; 4034 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3456 4035
3457 my $signal = new Coro::Signal; 4036 my $signal = new Coro::Signal;
3458 push @WAIT_FOR_TICK_BEGIN, $signal; 4037 push @WAIT_FOR_TICK_BEGIN, $signal;
3459 $signal->wait; 4038 $signal->wait;
3460} 4039}
3461 4040
3462$TICK_WATCHER = Event->timer ( 4041sub tick {
3463 reentrant => 0,
3464 parked => 1,
3465 prio => 0,
3466 at => $NEXT_TICK || $TICK,
3467 data => WF_AUTOCANCEL,
3468 cb => sub {
3469 if ($Coro::current != $Coro::main) { 4042 if ($Coro::current != $Coro::main) {
3470 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4043 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3471 unless ++$bug_warning > 10; 4044 unless ++$bug_warning > 10;
3472 return; 4045 return;
3473 } 4046 }
3474 4047
3475 $NOW = $tick_start = Event::time;
3476
3477 cf::server_tick; # one server iteration 4048 cf::server_tick; # one server iteration
3478 4049
3479 $RUNTIME += $TICK; 4050 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3480 $NEXT_TICK += $TICK;
3481 4051
3482 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4052 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3483 $NEXT_RUNTIME_WRITE = $NOW + 10; 4053 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3484 Coro::async_pool { 4054 Coro::async_pool {
4055 $Coro::current->{desc} = "runtime saver";
3485 write_runtime 4056 write_runtime_sync
3486 or warn "ERROR: unable to write runtime file: $!"; 4057 or error "ERROR: unable to write runtime file: $!";
3487 };
3488 } 4058 };
4059 }
3489 4060
3490 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4061 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3491 $sig->send; 4062 $sig->send;
3492 } 4063 }
3493 while (my $sig = shift @WAIT_FOR_TICK) { 4064 while (my $sig = shift @WAIT_FOR_TICK) {
3494 $sig->send; 4065 $sig->send;
3495 } 4066 }
3496 4067
3497 $NOW = Event::time; 4068 $LOAD = ($NOW - $TICK_START) / $TICK;
3498
3499 # if we are delayed by four ticks or more, skip them all
3500 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3501
3502 $TICK_WATCHER->at ($NEXT_TICK);
3503 $TICK_WATCHER->start;
3504
3505 $LOAD = ($NOW - $tick_start) / $TICK;
3506 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4069 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3507 4070
3508 _post_tick; 4071 if (0) {
4072 if ($NEXT_TICK) {
4073 my $jitter = $TICK_START - $NEXT_TICK;
4074 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4075 debug "jitter $JITTER\n";#d#
4076 }
3509 }, 4077 }
3510); 4078}
3511 4079
3512{ 4080{
4081 # configure BDB
4082
3513 BDB::min_parallel 8; 4083 BDB::min_parallel 16;
3514 BDB::max_poll_time $TICK * 0.1; 4084 BDB::max_poll_reqs $TICK * 0.1;
3515 $BDB_POLL_WATCHER = Event->io ( 4085 $AnyEvent::BDB::WATCHER->priority (1);
3516 reentrant => 0,
3517 fd => BDB::poll_fileno,
3518 poll => 'r',
3519 prio => 0,
3520 data => WF_AUTOCANCEL,
3521 cb => \&BDB::poll_cb,
3522 );
3523
3524 BDB::set_sync_prepare {
3525 my $status;
3526 my $current = $Coro::current;
3527 (
3528 sub {
3529 $status = $!;
3530 $current->ready; undef $current;
3531 },
3532 sub {
3533 Coro::schedule while defined $current;
3534 $! = $status;
3535 },
3536 )
3537 };
3538 4086
3539 unless ($DB_ENV) { 4087 unless ($DB_ENV) {
3540 $DB_ENV = BDB::db_env_create; 4088 $DB_ENV = BDB::db_env_create;
3541 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4089 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3542 | BDB::LOG_AUTOREMOVE, 1); 4090 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4091 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3543 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4092 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3544 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4093 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3545 4094
3546 cf::sync_job { 4095 cf::sync_job {
3547 eval { 4096 eval {
3557 4106
3558 cf::cleanup "db_env_open(db): $@" if $@; 4107 cf::cleanup "db_env_open(db): $@" if $@;
3559 }; 4108 };
3560 } 4109 }
3561 4110
3562 $BDB_DEADLOCK_WATCHER = Event->timer ( 4111 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3563 after => 3,
3564 interval => 1,
3565 hard => 1,
3566 prio => 0,
3567 data => WF_AUTOCANCEL,
3568 cb => sub {
3569 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4112 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3570 },
3571 ); 4113 };
3572 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4114 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3573 after => 11,
3574 interval => 60,
3575 hard => 1,
3576 prio => 0,
3577 data => WF_AUTOCANCEL,
3578 cb => sub {
3579 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4115 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3580 },
3581 ); 4116 };
3582 $BDB_TRICKLE_WATCHER = Event->timer ( 4117 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3583 after => 5,
3584 interval => 10,
3585 hard => 1,
3586 prio => 0,
3587 data => WF_AUTOCANCEL,
3588 cb => sub {
3589 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4118 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3590 },
3591 ); 4119 };
3592} 4120}
3593 4121
3594{ 4122{
4123 # configure IO::AIO
4124
3595 IO::AIO::min_parallel 8; 4125 IO::AIO::min_parallel 8;
3596
3597 undef $Coro::AIO::WATCHER;
3598 IO::AIO::max_poll_time $TICK * 0.1; 4126 IO::AIO::max_poll_time $TICK * 0.1;
3599 $AIO_POLL_WATCHER = Event->io ( 4127 undef $AnyEvent::AIO::WATCHER;
3600 reentrant => 0,
3601 data => WF_AUTOCANCEL,
3602 fd => IO::AIO::poll_fileno,
3603 poll => 'r',
3604 prio => 6,
3605 cb => \&IO::AIO::poll_cb,
3606 );
3607} 4128}
3608 4129
3609my $_log_backtrace; 4130my $_log_backtrace;
3610 4131
3611sub _log_backtrace { 4132sub _log_backtrace {
3614 $msg =~ s/\n//; 4135 $msg =~ s/\n//;
3615 4136
3616 # limit the # of concurrent backtraces 4137 # limit the # of concurrent backtraces
3617 if ($_log_backtrace < 2) { 4138 if ($_log_backtrace < 2) {
3618 ++$_log_backtrace; 4139 ++$_log_backtrace;
4140 my $perl_bt = Carp::longmess $msg;
3619 async { 4141 async {
4142 $Coro::current->{desc} = "abt $msg";
4143
3620 my @bt = fork_call { 4144 my @bt = fork_call {
3621 @addr = map { sprintf "%x", $_ } @addr; 4145 @addr = map { sprintf "%x", $_ } @addr;
3622 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4146 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3623 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4147 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3624 or die "addr2line: $!"; 4148 or die "addr2line: $!";
3632 } 4156 }
3633 4157
3634 @funcs 4158 @funcs
3635 }; 4159 };
3636 4160
3637 LOG llevInfo, "[ABT] $msg\n"; 4161 LOG llevInfo, "[ABT] $perl_bt\n";
4162 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3638 LOG llevInfo, "[ABT] $_\n" for @bt; 4163 LOG llevInfo, "[ABT] $_\n" for @bt;
3639 --$_log_backtrace; 4164 --$_log_backtrace;
3640 }; 4165 };
3641 } else { 4166 } else {
3642 LOG llevInfo, "[ABT] $msg\n"; 4167 LOG llevInfo, "[ABT] $msg\n";
3643 LOG llevInfo, "[ABT] [suppressed]\n"; 4168 LOG llevInfo, "[ABT] [suppressed]\n";
3644 } 4169 }
3645} 4170}
3646 4171
3647# load additional modules 4172# load additional modules
3648use cf::pod; 4173require "cf/$_.pm" for @EXTRA_MODULES;
4174cf::_connect_to_perl_2;
3649 4175
3650END { cf::emergency_save } 4176END { cf::emergency_save }
3651 4177
36521 41781
3653 4179

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines