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.385 by root, Fri Oct 12 19:13:26 2007 UTC vs.
Revision 1.539 by root, Tue May 4 22:49:21 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines