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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines