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.381 by root, Mon Oct 8 18:19:39 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 Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 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 | logBacktrace, 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 local $Storable::canonical = 1; 1141 ++$SLOW_MERGES;#d#
977 my $fob1 = Storable::freeze $ob1;
978 my $fob2 = Storable::freeze $ob2;
979 1142
980 $fob1 eq $fob2 1143 # we do the slow way here
1144 return _object_equal $ob1, $ob2
981} 1145}
982 1146
983sub reattach { 1147sub reattach {
984 # basically do the same as instantiate, without calling instantiate 1148 # basically do the same as instantiate, without calling instantiate
985 my ($obj) = @_; 1149 my ($obj) = @_;
986 1150
1151 # no longer needed after getting rid of delete_package?
987 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
988 1153
989 my $registry = $obj->registry; 1154 my $registry = $obj->registry;
990 1155
991 @$registry = (); 1156 @$registry = ();
992 1157
997 for (@$attach) { 1162 for (@$attach) {
998 my ($klass, @attach) = @$_; 1163 my ($klass, @attach) = @$_;
999 _attach $registry, $klass, @attach; 1164 _attach $registry, $klass, @attach;
1000 } 1165 }
1001 } else { 1166 } else {
1002 warn "object uses attachment '$name' that is not available, postponing.\n"; 1167 info "object uses attachment '$name' that is not available, postponing.\n";
1003 } 1168 }
1004 } 1169 }
1005} 1170}
1006 1171
1007cf::attachable->attach ( 1172cf::attachable->attach (
1008 prio => -1000000, 1173 prio => -1000000,
1009 on_instantiate => sub { 1174 on_instantiate => sub {
1010 my ($obj, $data) = @_; 1175 my ($obj, $data) = @_;
1011 1176
1012 $data = from_json $data; 1177 $data = decode_json $data;
1013 1178
1014 for (@$data) { 1179 for (@$data) {
1015 my ($name, $args) = @$_; 1180 my ($name, $args) = @$_;
1016 1181
1017 $obj->attach ($name, %{$args || {} }); 1182 $obj->attach ($name, %{$args || {} });
1034 my ($filename, $rdata, $objs) = @_; 1199 my ($filename, $rdata, $objs) = @_;
1035 1200
1036 sync_job { 1201 sync_job {
1037 if (length $$rdata) { 1202 if (length $$rdata) {
1038 utf8::decode (my $decname = $filename); 1203 utf8::decode (my $decname = $filename);
1039 warn sprintf "saving %s (%d,%d)\n", 1204 trace sprintf "saving %s (%d,%d)\n",
1040 $decname, length $$rdata, scalar @$objs; 1205 $decname, length $$rdata, scalar @$objs
1206 if $VERBOSE_IO;
1041 1207
1042 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1208 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1043 chmod SAVE_MODE, $fh; 1209 aio_chmod $fh, SAVE_MODE;
1044 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1210 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1045 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 }
1046 close $fh; 1215 aio_close $fh;
1047 1216
1048 if (@$objs) { 1217 if (@$objs) {
1049 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) {
1050 chmod SAVE_MODE, $fh; 1219 aio_chmod $fh, SAVE_MODE;
1051 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1220 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1052 aio_write $fh, 0, (length $data), $data, 0; 1221 aio_write $fh, 0, (length $data), $data, 0;
1053 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 }
1054 close $fh; 1226 aio_close $fh;
1055 aio_rename "$filename.pst~", "$filename.pst"; 1227 aio_rename "$filename.pst~", "$filename.pst";
1056 } 1228 }
1057 } else { 1229 } else {
1058 aio_unlink "$filename.pst"; 1230 aio_unlink "$filename.pst";
1059 } 1231 }
1060 1232
1061 aio_rename "$filename~", $filename; 1233 aio_rename "$filename~", $filename;
1234
1235 $filename =~ s%/[^/]+$%%;
1236 aio_pathsync $filename if $cf::USE_FSYNC;
1062 } else { 1237 } else {
1063 warn "FATAL: $filename~: $!\n"; 1238 error "unable to save objects: $filename~: $!\n";
1064 } 1239 }
1065 } else { 1240 } else {
1066 aio_unlink $filename; 1241 aio_unlink $filename;
1067 aio_unlink "$filename.pst"; 1242 aio_unlink "$filename.pst";
1068 } 1243 }
1087 1262
1088 unless (aio_stat "$filename.pst") { 1263 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1264 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1265 or return;
1091 1266
1092 my $st = eval { Coro::Storable::thaw $av } 1267 my $st = eval { Coro::Storable::thaw $av };
1093 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1094 $av = $st->{objs}; 1268 $av = $st->{objs};
1095 } 1269 }
1096 1270
1097 utf8::decode (my $decname = $filename); 1271 utf8::decode (my $decname = $filename);
1098 warn sprintf "loading %s (%d,%d)\n", 1272 trace sprintf "loading %s (%d,%d)\n",
1099 $decname, length $data, scalar @{$av || []}; 1273 $decname, length $data, scalar @{$av || []}
1274 if $VERBOSE_IO;
1100 1275
1101 ($data, $av) 1276 ($data, $av)
1102} 1277}
1103 1278
1104=head2 COMMAND CALLBACKS 1279=head2 COMMAND CALLBACKS
1160 my ($name, $cb) = @_; 1335 my ($name, $cb) = @_;
1161 1336
1162 $EXTICMD{$name} = $cb; 1337 $EXTICMD{$name} = $cb;
1163} 1338}
1164 1339
1340use File::Glob ();
1341
1165cf::player->attach ( 1342cf::player->attach (
1166 on_command => sub { 1343 on_unknown_command => sub {
1167 my ($pl, $name, $params) = @_; 1344 my ($pl, $name, $params) = @_;
1168 1345
1169 my $cb = $COMMAND{$name} 1346 my $cb = $COMMAND{$name}
1170 or return; 1347 or return;
1171 1348
1194 1371
1195 $pl->ext_reply ($reply, @reply) 1372 $pl->ext_reply ($reply, @reply)
1196 if $reply; 1373 if $reply;
1197 1374
1198 } else { 1375 } else {
1199 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1376 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1200 } 1377 }
1201 1378
1202 cf::override; 1379 cf::override;
1203 }, 1380 },
1204); 1381);
1205 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
1206sub load_extensions { 1396sub load_extensions {
1397 info "loading extensions...";
1398
1207 cf::sync_job { 1399 cf::sync_job {
1208 my %todo; 1400 my %todo;
1209 1401
1210 for my $path (<$LIBDIR/*.ext>) { 1402 for my $path (<$LIBDIR/*.ext>) {
1211 next unless -r $path; 1403 next unless -r $path;
1229 1421
1230 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1422 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1231 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1423 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1232 1424
1233 $ext{source} = 1425 $ext{source} =
1234 "package $pkg; use strict; use utf8;\n" 1426 "package $pkg; use common::sense;\n"
1235 . "#line 1 \"$path\"\n{\n" 1427 . "#line 1 \"$path\"\n{\n"
1236 . $source 1428 . $source
1237 . "\n};\n1"; 1429 . "\n};\n1";
1238 1430
1239 $todo{$base} = \%ext; 1431 $todo{$base} = \%ext;
1240 } 1432 }
1241 1433
1434 my $pass = 0;
1242 my %done; 1435 my %done;
1243 while (%todo) { 1436 while (%todo) {
1244 my $progress; 1437 my $progress;
1245 1438
1439 ++$pass;
1440
1441 ext:
1246 while (my ($k, $v) = each %todo) { 1442 while (my ($k, $v) = each %todo) {
1247 for (split /,\s*/, $v->{meta}{depends}) { 1443 for (split /,\s*/, $v->{meta}{depends}) {
1248 goto skip 1444 next ext
1249 unless exists $done{$_}; 1445 unless exists $done{$_};
1250 } 1446 }
1251 1447
1252 warn "... loading '$k' into '$v->{pkg}'\n"; 1448 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1253 1449
1254 unless (eval $v->{source}) { 1450 my $active = eval $v->{source};
1451
1452 if (length $@) {
1255 my $msg = $@ ? "$v->{path}: $@\n" 1453 error "$v->{path}: $@\n";
1256 : "$v->{base}: extension inactive.\n"; 1454 undef $@; # work around perl 5.10.0 utf-8 caching bug
1257 1455
1456 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1258 if (exists $v->{meta}{mandatory}) { 1457 if exists $v->{meta}{mandatory};
1259 warn $msg; 1458
1260 warn "mandatory extension failed to load, exiting.\n"; 1459 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1261 exit 1; 1460 delete $todo{$k};
1262 } 1461 } else {
1263 1462 $done{$k} = delete $todo{$k};
1264 warn $msg; 1463 push @EXTS, $v->{pkg};
1464 $progress = 1;
1465
1466 info "$v->{base}: extension inactive.\n"
1467 unless $active;
1265 } 1468 }
1266
1267 $done{$k} = delete $todo{$k};
1268 push @EXTS, $v->{pkg};
1269 $progress = 1;
1270 } 1469 }
1271 1470
1272 skip: 1471 unless ($progress) {
1273 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1472 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1274 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 }
1275 } 1479 }
1276 }; 1480 };
1277} 1481}
1278 1482
1279############################################################################# 1483#############################################################################
1280 1484
1281=back 1485=back
1282 1486
1283=head2 CORE EXTENSIONS 1487=head2 CORE EXTENSIONS
1284 1488
1285Functions and methods that extend core crossfire objects. 1489Functions and methods that extend core deliantra objects.
1286 1490
1287=cut 1491=cut
1288 1492
1289package cf::player; 1493package cf::player;
1290 1494
1333 1537
1334sub exists($) { 1538sub exists($) {
1335 my ($login) = @_; 1539 my ($login) = @_;
1336 1540
1337 $cf::PLAYER{$login} 1541 $cf::PLAYER{$login}
1338 or cf::sync_job { !aio_stat path $login } 1542 or !aio_stat path $login
1339} 1543}
1340 1544
1341sub find($) { 1545sub find($) {
1342 return $cf::PLAYER{$_[0]} || do { 1546 return $cf::PLAYER{$_[0]} || do {
1343 my $login = $_[0]; 1547 my $login = $_[0];
1355 my $f = new_from_file cf::object::thawer path $login 1559 my $f = new_from_file cf::object::thawer path $login
1356 or return; 1560 or return;
1357 1561
1358 my $pl = cf::player::load_pl $f 1562 my $pl = cf::player::load_pl $f
1359 or return; 1563 or return;
1564
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1565 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1566 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1567 $cf::PLAYER{$login} = $pl
1363 } 1568 }
1364 } 1569 }
1365} 1570}
1366 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
1367sub save($) { 1585sub save($) {
1368 my ($pl) = @_; 1586 my ($pl) = @_;
1369 1587
1370 return if $pl->{deny_save}; 1588 return if $pl->{deny_save};
1371 1589
1374 1592
1375 return if $pl->{deny_save}; 1593 return if $pl->{deny_save};
1376 1594
1377 aio_mkdir playerdir $pl, 0770; 1595 aio_mkdir playerdir $pl, 0770;
1378 $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];
1379 1602
1380 $pl->save_pl ($path); 1603 $pl->save_pl ($path);
1381 cf::cede_to_tick; 1604 cf::cede_to_tick;
1382} 1605}
1383 1606
1415 my ($pl) = @_; 1638 my ($pl) = @_;
1416 1639
1417 my $name = $pl->ob->name; 1640 my $name = $pl->ob->name;
1418 1641
1419 $pl->{deny_save} = 1; 1642 $pl->{deny_save} = 1;
1420 $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
1421 1644
1422 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1645 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1423 $pl->deactivate; 1646 $pl->deactivate;
1647 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1424 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1648 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1425 $pl->ns->destroy if $pl->ns; 1649 $pl->ns->destroy if $pl->ns;
1426 1650
1427 my $path = playerdir $pl; 1651 my $path = playerdir $pl;
1428 my $temp = "$path~$cf::RUNTIME~deleting~"; 1652 my $temp = "$path~$cf::RUNTIME~deleting~";
1467 1691
1468 for my $login (@$dirs) { 1692 for my $login (@$dirs) {
1469 my $path = path $login; 1693 my $path = path $login;
1470 1694
1471 # a .pst is a dead give-away for a valid player 1695 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") { 1696 # if no pst file found, open and chekc for blocked users
1697 if (aio_stat "$path.pst") {
1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1698 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1474 aio_read $fh, 0, 512, my $buf, 0 or next; 1699 aio_read $fh, 0, 512, my $buf, 0 or next;
1475 $buf !~ /^password -------------$/m or next; # official not-valid tag 1700 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 } 1701 }
1477 1702
1481 1706
1482 \@logins 1707 \@logins
1483} 1708}
1484 1709
1485=item $player->maps 1710=item $player->maps
1711
1712=item cf::player::maps $login
1486 1713
1487Returns an arrayref of map paths that are private for this 1714Returns an arrayref of map paths that are private for this
1488player. May block. 1715player. May block.
1489 1716
1490=cut 1717=cut
1508 } 1735 }
1509 1736
1510 \@paths 1737 \@paths
1511} 1738}
1512 1739
1513=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1740=item $protocol_xml = $player->expand_cfpod ($cfpod)
1514 1741
1515Expand crossfire pod fragments into protocol xml. 1742Expand deliantra pod fragments into protocol xml.
1516
1517=cut
1518
1519sub expand_cfpod {
1520 ((my $self), (local $_)) = @_;
1521
1522 # escape & and <
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525
1526 # this is buggy, it needs to properly take care of nested <'s
1527
1528 1 while
1529 # replace B<>, I<>, U<> etc.
1530 s/B<([^\>]*)>/<b>$1<\/b>/
1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1534 # replace G<male|female> tags
1535 || s{G<([^>|]*)\|([^>]*)>}{
1536 $self->gender ? $2 : $1
1537 }ge
1538 # replace H<hint text>
1539 || s{H<([^\>]*)>}
1540 {
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "")
1544 [$self->{hintmode}]
1545 }ge;
1546
1547 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g;
1549
1550 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines
1555
1556 $_
1557}
1558
1559sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode}
1562}
1563 1743
1564=item $player->ext_reply ($msgid, @msg) 1744=item $player->ext_reply ($msgid, @msg)
1565 1745
1566Sends an ext reply to the player. 1746Sends an ext reply to the player.
1567 1747
1599 1779
1600=cut 1780=cut
1601 1781
1602sub find_by_path($) { 1782sub find_by_path($) {
1603 my ($path) = @_; 1783 my ($path) = @_;
1784
1785 $path =~ s/^~[^\/]*//; # skip ~login
1604 1786
1605 my ($match, $specificity); 1787 my ($match, $specificity);
1606 1788
1607 for my $region (list) { 1789 for my $region (list) {
1608 if ($region->{match} && $path =~ $region->{match}) { 1790 if ($region->{match} && $path =~ $region->{match}) {
1634our $MAX_RESET = 3600; 1816our $MAX_RESET = 3600;
1635our $DEFAULT_RESET = 3000; 1817our $DEFAULT_RESET = 3000;
1636 1818
1637sub generate_random_map { 1819sub generate_random_map {
1638 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
1639 # mit "rum" bekleckern, nicht 1824 # mit "rum" bekleckern, nicht
1640 $self->_create_random_map ( 1825 $self->_create_random_map (
1641 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1826 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1827 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1643 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1828 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1644 $rmp->{exit_on_final_map}, 1829 $rmp->{exit_on_final_map},
1645 $rmp->{xsize}, $rmp->{ysize}, 1830 $rmp->{xsize}, $rmp->{ysize},
1646 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1831 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1647 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1832 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1662 1847
1663sub register { 1848sub register {
1664 my (undef, $regex, $prio) = @_; 1849 my (undef, $regex, $prio) = @_;
1665 my $pkg = caller; 1850 my $pkg = caller;
1666 1851
1667 no strict;
1668 push @{"$pkg\::ISA"}, __PACKAGE__; 1852 push @{"$pkg\::ISA"}, __PACKAGE__;
1669 1853
1670 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1854 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1671} 1855}
1672 1856
1673# also paths starting with '/' 1857# also paths starting with '/'
1674$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1858$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1675 1859
1676sub thawer_merge { 1860sub thawer_merge {
1677 my ($self, $merge) = @_; 1861 my ($self, $merge) = @_;
1678 1862
1679 # we have to keep some variables in memory intact 1863 # we have to keep some variables in memory intact
1765 1949
1766# the temporary/swap location 1950# the temporary/swap location
1767sub save_path { 1951sub save_path {
1768 my ($self) = @_; 1952 my ($self) = @_;
1769 1953
1770 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1954 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771 "$TMPDIR/$path.map" 1955 "$TMPDIR/$path.map"
1772} 1956}
1773 1957
1774# the unique path, undef == no special unique path 1958# the unique path, undef == no special unique path
1775sub uniq_path { 1959sub uniq_path {
1776 my ($self) = @_; 1960 my ($self) = @_;
1777 1961
1778 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1962 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779 "$UNIQUEDIR/$path" 1963 "$UNIQUEDIR/$path"
1780}
1781
1782# and all this just because we cannot iterate over
1783# all maps in C++...
1784sub change_all_map_light {
1785 my ($change) = @_;
1786
1787 $_->change_map_light ($change)
1788 for grep $_->outdoor, values %cf::MAP;
1789} 1964}
1790 1965
1791sub decay_objects { 1966sub decay_objects {
1792 my ($self) = @_; 1967 my ($self) = @_;
1793 1968
1877sub find { 2052sub find {
1878 my ($path, $origin) = @_; 2053 my ($path, $origin) = @_;
1879 2054
1880 $path = normalise $path, $origin && $origin->path; 2055 $path = normalise $path, $origin && $origin->path;
1881 2056
1882 cf::lock_wait "map_data:$path";#d#remove 2057 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1883 cf::lock_wait "map_find:$path"; 2058 my $guard2 = cf::lock_acquire "map_find:$path";
1884 2059
1885 $cf::MAP{$path} || do { 2060 $cf::MAP{$path} || do {
1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1889 my $map = new_from_path cf::map $path 2061 my $map = new_from_path cf::map $path
1890 or return; 2062 or return;
1891 2063
1892 $map->{last_save} = $cf::RUNTIME; 2064 $map->{last_save} = $cf::RUNTIME;
1893 2065
1895 or return; 2067 or return;
1896 2068
1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2069 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898 # doing this can freeze the server in a sync job, obviously 2070 # doing this can freeze the server in a sync job, obviously
1899 #$cf::WAIT_FOR_TICK->wait; 2071 #$cf::WAIT_FOR_TICK->wait;
2072 undef $guard2;
1900 undef $guard1; 2073 undef $guard1;
1901 undef $guard2;
1902 $map->reset; 2074 $map->reset;
1903 return find $path; 2075 return find $path;
1904 } 2076 }
1905 2077
1906 $cf::MAP{$path} = $map 2078 $cf::MAP{$path} = $map
1907 } 2079 }
1908} 2080}
1909 2081
1910sub pre_load { } 2082sub pre_load { }
1911sub post_load { } 2083#sub post_load { } # XS
1912 2084
1913sub load { 2085sub load {
1914 my ($self) = @_; 2086 my ($self) = @_;
1915 2087
1916 local $self->{deny_reset} = 1; # loading can take a long time 2088 local $self->{deny_reset} = 1; # loading can take a long time
1933 my $f = new_from_file cf::object::thawer $self->{load_path}; 2105 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block; 2106 $f->skip_block;
1935 $self->_load_objects ($f) 2107 $self->_load_objects ($f)
1936 or return; 2108 or return;
1937 2109
1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2110 $self->post_load_original
1939 if delete $self->{load_original}; 2111 if delete $self->{load_original};
1940 2112
1941 if (my $uniq = $self->uniq_path) { 2113 if (my $uniq = $self->uniq_path) {
1942 utf8::encode $uniq; 2114 utf8::encode $uniq;
1943 unless (aio_stat $uniq) { 2115 unless (aio_stat $uniq) {
1961 unless ($self->{deny_activate}) { 2133 unless ($self->{deny_activate}) {
1962 $self->decay_objects; 2134 $self->decay_objects;
1963 $self->fix_auto_apply; 2135 $self->fix_auto_apply;
1964 $self->update_buttons; 2136 $self->update_buttons;
1965 cf::cede_to_tick; 2137 cf::cede_to_tick;
1966 $self->set_darkness_map;
1967 cf::cede_to_tick;
1968 $self->activate; 2138 $self->activate;
1969 } 2139 }
1970 2140
1971 $self->{last_save} = $cf::RUNTIME; 2141 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME); 2142 $self->last_access ($cf::RUNTIME);
1973 2143
1974 $self->in_memory (cf::MAP_IN_MEMORY); 2144 $self->in_memory (cf::MAP_ACTIVE);
1975 } 2145 }
1976 2146
1977 $self->post_load; 2147 $self->post_load;
1978} 2148}
1979 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
1980sub customise_for { 2153sub customise_for {
1981 my ($self, $ob) = @_; 2154 my ($self, $ob) = @_;
1982 2155
1983 return find "~" . $ob->name . "/" . $self->{path} 2156 return find "~" . $ob->name . "/" . $self->{path}
1984 if $self->per_player; 2157 if $self->per_player;
2000 or next; 2173 or next;
2001 $neigh = find $neigh, $map 2174 $neigh = find $neigh, $map
2002 or next; 2175 or next;
2003 $neigh->load; 2176 $neigh->load;
2004 2177
2178 # now find the diagonal neighbours
2005 push @neigh, 2179 push @neigh,
2006 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2180 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2007 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2181 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2008 } 2182 }
2009 2183
2016} 2190}
2017 2191
2018sub find_sync { 2192sub find_sync {
2019 my ($path, $origin) = @_; 2193 my ($path, $origin) = @_;
2020 2194
2021 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
2022} 2199}
2023 2200
2024sub do_load_sync { 2201sub do_load_sync {
2025 my ($map) = @_; 2202 my ($map) = @_;
2026 2203
2027 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2204 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2028 if $Coro::current == $Coro::main; 2205 if $Coro::current == $Coro::main;
2029 2206
2030 cf::sync_job { $map->load }; 2207 $map->load;
2031} 2208}
2032 2209
2033our %MAP_PREFETCH; 2210our %MAP_PREFETCH;
2034our $MAP_PREFETCHER = undef; 2211our $MAP_PREFETCHER = undef;
2035 2212
2037 my ($path, $origin, $load) = @_; 2214 my ($path, $origin, $load) = @_;
2038 2215
2039 $path = normalise $path, $origin && $origin->{path}; 2216 $path = normalise $path, $origin && $origin->{path};
2040 2217
2041 if (my $map = $cf::MAP{$path}) { 2218 if (my $map = $cf::MAP{$path}) {
2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2219 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043 } 2220 }
2044 2221
2045 $MAP_PREFETCH{$path} |= $load; 2222 $MAP_PREFETCH{$path} |= $load;
2046 2223
2047 $MAP_PREFETCHER ||= cf::async { 2224 $MAP_PREFETCHER ||= cf::async {
2061 $MAP_PREFETCHER->prio (6); 2238 $MAP_PREFETCHER->prio (6);
2062 2239
2063 () 2240 ()
2064} 2241}
2065 2242
2243# common code, used by both ->save and ->swapout
2066sub save { 2244sub _save {
2067 my ($self) = @_; 2245 my ($self) = @_;
2068
2069 my $lock = cf::lock_acquire "map_data:$self->{path}";
2070 2246
2071 $self->{last_save} = $cf::RUNTIME; 2247 $self->{last_save} = $cf::RUNTIME;
2072 2248
2073 return unless $self->dirty; 2249 return unless $self->dirty;
2074 2250
2083 2259
2084 cf::async { 2260 cf::async {
2085 $Coro::current->{desc} = "map player save"; 2261 $Coro::current->{desc} = "map player save";
2086 $_->contr->save for $self->players; 2262 $_->contr->save for $self->players;
2087 }; 2263 };
2264
2265 cf::get_slot 0.02;
2088 2266
2089 if ($uniq) { 2267 if ($uniq) {
2090 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2268 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2091 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2269 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2092 } else { 2270 } else {
2093 $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);
2094 } 2272 }
2095} 2273}
2096 2274
2275sub save {
2276 my ($self) = @_;
2277
2278 my $lock = cf::lock_acquire "map_data:$self->{path}";
2279
2280 $self->_save;
2281}
2282
2097sub swap_out { 2283sub swap_out {
2098 my ($self) = @_; 2284 my ($self) = @_;
2099 2285
2100 # save first because save cedes
2101 $self->save;
2102
2103 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2286 my $lock = cf::lock_acquire "map_data:$self->{path}";
2104 2287
2288 return if $self->in_memory != cf::MAP_ACTIVE;
2289 return if $self->{deny_save};
2105 return if $self->players; 2290 return if $self->players;
2106 return if $self->in_memory != cf::MAP_IN_MEMORY;
2107 return if $self->{deny_save};
2108 2291
2292 # first deactivate the map and "unlink" it from the core
2293 $self->deactivate;
2294 $_->clear_links_to ($self) for values %cf::MAP;
2109 $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};
2110 2342
2111 $self->deactivate; 2343 $self->deactivate;
2112 $_->clear_links_to ($self) for values %cf::MAP; 2344 $_->clear_links_to ($self) for values %cf::MAP;
2113 $self->clear; 2345 $self->clear;
2114}
2115
2116sub reset_at {
2117 my ($self) = @_;
2118
2119 # TODO: safety, remove and allow resettable per-player maps
2120 return 1e99 if $self->{deny_reset};
2121
2122 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2123 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2124
2125 $time + $to
2126}
2127
2128sub should_reset {
2129 my ($self) = @_;
2130
2131 $self->reset_at <= $cf::RUNTIME
2132}
2133
2134sub reset {
2135 my ($self) = @_;
2136
2137 my $lock = cf::lock_acquire "map_data:$self->{path}";
2138
2139 return if $self->players;
2140
2141 warn "resetting map ", $self->path;
2142
2143 $self->in_memory (cf::MAP_SWAPPED);
2144
2145 # need to save uniques path
2146 unless ($self->{deny_save}) {
2147 my $uniq = $self->uniq_path; utf8::encode $uniq;
2148
2149 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2150 if $uniq;
2151 }
2152
2153 delete $cf::MAP{$self->path};
2154
2155 $self->deactivate;
2156 $_->clear_links_to ($self) for values %cf::MAP;
2157 $self->clear;
2158 2346
2159 $self->unlink_save; 2347 $self->unlink_save;
2160 $self->destroy; 2348 $self->destroy;
2161} 2349}
2162 2350
2170 2358
2171 delete $cf::MAP{$self->path}; 2359 delete $cf::MAP{$self->path};
2172 2360
2173 $self->unlink_save; 2361 $self->unlink_save;
2174 2362
2175 bless $self, "cf::map"; 2363 bless $self, "cf::map::wrap";
2176 delete $self->{deny_reset}; 2364 delete $self->{deny_reset};
2177 $self->{deny_save} = 1; 2365 $self->{deny_save} = 1;
2178 $self->reset_timeout (1); 2366 $self->reset_timeout (1);
2179 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2367 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2180 2368
2229 2417
2230sub unique_maps() { 2418sub unique_maps() {
2231 [ 2419 [
2232 map { 2420 map {
2233 utf8::decode $_; 2421 utf8::decode $_;
2234 /\.map$/ 2422 s/\.map$//; # TODO future compatibility hack
2423 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2424 ? ()
2235 ? normalise $_ 2425 : normalise $_
2236 : ()
2237 } @{ aio_readdir $UNIQUEDIR or [] } 2426 } @{ aio_readdir $UNIQUEDIR or [] }
2238 ] 2427 ]
2239} 2428}
2240 2429
2241package 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}
2242 2461
2243=back 2462=back
2244 2463
2245=head3 cf::object 2464=head3 cf::object
2246 2465
2250 2469
2251=over 4 2470=over 4
2252 2471
2253=item $ob->inv_recursive 2472=item $ob->inv_recursive
2254 2473
2255Returns 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.
2256 2476
2257=cut 2477=cut
2258 2478
2259sub inv_recursive_; 2479sub inv_recursive_;
2260sub inv_recursive_ { 2480sub inv_recursive_ {
2265 inv_recursive_ inv $_[0] 2485 inv_recursive_ inv $_[0]
2266} 2486}
2267 2487
2268=item $ref = $ob->ref 2488=item $ref = $ob->ref
2269 2489
2270creates 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.
2271 2491
2272=item $ob = cf::object::deref ($refstring) 2492=item $ob = cf::object::deref ($refstring)
2273 2493
2274returns 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,
2275even if the object actually exists. May block. 2495even if the object actually exists. May block.
2307can 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
2308dialogue with the given NPC character. 2528dialogue with the given NPC character.
2309 2529
2310=cut 2530=cut
2311 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
2312# rough implementation of a future "reply" method that works 2546# rough implementation of a future "reply" method that works
2313# with dialog boxes. 2547# with dialog boxes.
2314#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
2315sub cf::object::player::reply($$$;$) { 2549sub cf::object::player::reply($$$;$) {
2316 my ($self, $npc, $msg, $flags) = @_; 2550 my ($self, $npc, $msg, $flags) = @_;
2327 my $dialog = $pl->{npc_dialog}; 2561 my $dialog = $pl->{npc_dialog};
2328 $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));
2329 2563
2330 } else { 2564 } else {
2331 $msg = $npc->name . " says: $msg" if $npc; 2565 $msg = $npc->name . " says: $msg" if $npc;
2332 $self->message ($msg, $flags); 2566 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333 } 2567 }
2334 } 2568 }
2335} 2569}
2336 2570
2337=item $object->send_msg ($channel, $msg, $color, [extra...]) 2571=item $object->send_msg ($channel, $msg, $color, [extra...])
2362 2596
2363=item $player_object->enter_link 2597=item $player_object->enter_link
2364 2598
2365Freezes 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}>).
2366 2600
2367The 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.
2368I<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.
2369 2605
2370Will never block. 2606Will never block.
2371 2607
2372=item $player_object->leave_link ($map, $x, $y) 2608=item $player_object->leave_link ($map, $x, $y)
2373 2609
2393sub cf::object::player::enter_link { 2629sub cf::object::player::enter_link {
2394 my ($self) = @_; 2630 my ($self) = @_;
2395 2631
2396 $self->deactivate_recursive; 2632 $self->deactivate_recursive;
2397 2633
2634 ++$self->{_link_recursion};
2635
2398 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2636 return if UNIVERSAL::isa $self->map, "ext::map_link";
2399 2637
2400 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2638 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2401 if $self->map && $self->map->{path} ne "{link}"; 2639 if $self->map && $self->map->{path} ne "{link}";
2402 2640
2403 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2641 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2404} 2642}
2405 2643
2406sub cf::object::player::leave_link { 2644sub cf::object::player::leave_link {
2407 my ($self, $map, $x, $y) = @_; 2645 my ($self, $map, $x, $y) = @_;
2408 2646
2425 ($x, $y) = (-1, -1) 2663 ($x, $y) = (-1, -1)
2426 unless (defined $x) && (defined $y); 2664 unless (defined $x) && (defined $y);
2427 2665
2428 # use -1 or undef as default coordinates, not 0, 0 2666 # use -1 or undef as default coordinates, not 0, 0
2429 ($x, $y) = ($map->enter_x, $map->enter_y) 2667 ($x, $y) = ($map->enter_x, $map->enter_y)
2430 if $x <=0 && $y <= 0; 2668 if $x <= 0 && $y <= 0;
2431 2669
2432 $map->load; 2670 $map->load;
2433 $map->load_neighbours; 2671 $map->load_neighbours;
2434 2672
2435 return unless $self->contr->active; 2673 return unless $self->contr->active;
2436 $self->activate_recursive;
2437 2674
2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2675 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2439 $self->enter_map ($map, $x, $y); 2676 if ($self->enter_map ($map, $x, $y)) {
2440} 2677 # entering was successful
2678 delete $self->{_link_recursion};
2679 # only activate afterwards, to support waiting in hooks
2680 $self->activate_recursive;
2681 }
2441 2682
2683}
2684
2442=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)]])
2443 2686
2444Moves 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
2445her, loading and preparing them map, calling the provided $check callback 2688her, loading and preparing them map, calling the provided $check callback
2446that 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
2447the 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
2448be called at the end of this process. 2691be called at the end of this process.
2449 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
2450=cut 2696=cut
2451 2697
2452our $GOTOGEN; 2698our $GOTOGEN;
2453 2699
2454sub cf::object::player::goto { 2700sub cf::object::player::goto {
2455 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 }
2456 2708
2457 # 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
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2710 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2711
2460 $self->enter_link; 2712 $self->enter_link;
2484 my $map = eval { 2736 my $map = eval {
2485 my $map = defined $path ? cf::map::find $path : undef; 2737 my $map = defined $path ? cf::map::find $path : undef;
2486 2738
2487 if ($map) { 2739 if ($map) {
2488 $map = $map->customise_for ($self); 2740 $map = $map->customise_for ($self);
2489 $map = $check->($map) if $check && $map; 2741 $map = $check->($map, $x, $y, $self) if $check && $map;
2490 } else { 2742 } else {
2491 $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);
2492 } 2744 }
2493 2745
2494 $map 2746 $map
2502 if ($gen == $self->{_goto_generation}) { 2754 if ($gen == $self->{_goto_generation}) {
2503 delete $self->{_goto_generation}; 2755 delete $self->{_goto_generation};
2504 $self->leave_link ($map, $x, $y); 2756 $self->leave_link ($map, $x, $y);
2505 } 2757 }
2506 2758
2507 $done->() if $done; 2759 $done->($self) if $done;
2508 })->prio (1); 2760 })->prio (1);
2509} 2761}
2510 2762
2511=item $player_object->enter_exit ($exit_object) 2763=item $player_object->enter_exit ($exit_object)
2512 2764
2532} 2784}
2533 2785
2534sub prepare_random_map { 2786sub prepare_random_map {
2535 my ($exit) = @_; 2787 my ($exit) = @_;
2536 2788
2537 my $guard = cf::lock_acquire "exit_prepare:$exit";
2538
2539 # all this does is basically replace the /! path by 2789 # all this does is basically replace the /! path by
2540 # a new random map path (?random/...) with a seed 2790 # a new random map path (?random/...) with a seed
2541 # that depends on the exit object 2791 # that depends on the exit object
2542 2792
2543 my $rmp = parse_random_map_params $exit->msg; 2793 my $rmp = parse_random_map_params $exit->msg;
2545 if ($exit->map) { 2795 if ($exit->map) {
2546 $rmp->{region} = $exit->region->name; 2796 $rmp->{region} = $exit->region->name;
2547 $rmp->{origin_map} = $exit->map->path; 2797 $rmp->{origin_map} = $exit->map->path;
2548 $rmp->{origin_x} = $exit->x; 2798 $rmp->{origin_x} = $exit->x;
2549 $rmp->{origin_y} = $exit->y; 2799 $rmp->{origin_y} = $exit->y;
2800
2801 $exit->map->touch;
2550 } 2802 }
2551 2803
2552 $rmp->{random_seed} ||= $exit->random_seed; 2804 $rmp->{random_seed} ||= $exit->random_seed;
2553 2805
2554 my $data = cf::to_json $rmp; 2806 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2555 my $md5 = Digest::MD5::md5_hex $data; 2807 my $md5 = Digest::MD5::md5_hex $data;
2556 my $meta = "$RANDOMDIR/$md5.meta"; 2808 my $meta = "$RANDOMDIR/$md5.meta";
2557 2809
2558 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2810 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2559 aio_write $fh, 0, (length $data), $data, 0; 2811 aio_write $fh, 0, (length $data), $data, 0;
2560 undef $fh; 2812 undef $fh;
2561 aio_rename "$meta~", $meta; 2813 aio_rename "$meta~", $meta;
2562 2814
2815 my $slaying = "?random/$md5";
2816
2817 if ($exit->valid) {
2563 $exit->slaying ("?random/$md5"); 2818 $exit->slaying ("?random/$md5");
2564 $exit->msg (undef); 2819 $exit->msg (undef);
2820 }
2565 } 2821 }
2566} 2822}
2567 2823
2568sub cf::object::player::enter_exit { 2824sub cf::object::player::enter_exit {
2569 my ($self, $exit) = @_; 2825 my ($self, $exit) = @_;
2570 2826
2571 return unless $self->type == cf::PLAYER; 2827 return unless $self->type == cf::PLAYER;
2572 2828
2573 if ($exit->slaying eq "/!") {
2574 #TODO: this should de-fi-ni-te-ly not be a sync-job
2575 # the problem is that $exit might not survive long enough
2576 # so it needs to be done right now, right here
2577 cf::sync_job { prepare_random_map $exit };
2578 }
2579
2580 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2581 my $hp = $exit->stats->hp;
2582 my $sp = $exit->stats->sp;
2583
2584 $self->enter_link; 2829 $self->enter_link;
2585 2830
2586 # if exit is damned, update players death & WoR home-position
2587 $self->contr->savebed ($slaying, $hp, $sp)
2588 if $exit->flag (FLAG_DAMNED);
2589
2590 (async { 2831 (async {
2591 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2832 $Coro::current->{desc} = "enter_exit";
2592 2833
2593 $self->deactivate_recursive; # just to be sure
2594 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
2595 $self->goto ($slaying, $hp, $sp); 2849 $self->goto ($map, $x, $y);
2596 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
2597 1; 2855 1
2598 }) { 2856 }) {
2599 $self->message ("Something went wrong deep within the crossfire server. " 2857 $self->message ("Something went wrong deep within the deliantra server. "
2600 . "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. "
2601 . "Please report this to the dungeon master!", 2859 . "Please report this to the dungeon master!",
2602 cf::NDI_UNIQUE | cf::NDI_RED); 2860 cf::NDI_UNIQUE | cf::NDI_RED);
2603 2861
2604 warn "ERROR in enter_exit: $@"; 2862 error "ERROR in enter_exit: $@";
2605 $self->leave_link; 2863 $self->leave_link;
2606 } 2864 }
2607 })->prio (1); 2865 })->prio (1);
2608} 2866}
2609 2867
2621sub cf::client::send_drawinfo { 2879sub cf::client::send_drawinfo {
2622 my ($self, $text, $flags) = @_; 2880 my ($self, $text, $flags) = @_;
2623 2881
2624 utf8::encode $text; 2882 utf8::encode $text;
2625 $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);
2626} 2909}
2627 2910
2628=item $client->send_msg ($channel, $msg, $color, [extra...]) 2911=item $client->send_msg ($channel, $msg, $color, [extra...])
2629 2912
2630Send 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
2632the 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
2633the message unless the client supports the msg packet. 2916the message unless the client supports the msg packet.
2634 2917
2635=cut 2918=cut
2636 2919
2920# non-persistent channels (usually the info channel)
2637our %CHANNEL = ( 2921our %CHANNEL = (
2922 "c/motd" => {
2923 id => "infobox",
2924 title => "MOTD",
2925 reply => undef,
2926 tooltip => "The message of the day",
2927 },
2638 "c/identify" => { 2928 "c/identify" => {
2639 id => "infobox", 2929 id => "infobox",
2640 title => "Identify", 2930 title => "Identify",
2641 reply => undef, 2931 reply => undef,
2642 tooltip => "Items recently identified", 2932 tooltip => "Items recently identified",
2645 id => "infobox", 2935 id => "infobox",
2646 title => "Examine", 2936 title => "Examine",
2647 reply => undef, 2937 reply => undef,
2648 tooltip => "Signs and other items you examined", 2938 tooltip => "Signs and other items you examined",
2649 }, 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 },
2650 "c/lookat" => { 2952 "c/lookat" => {
2651 id => "infobox", 2953 id => "infobox",
2652 title => "Look", 2954 title => "Look",
2653 reply => undef, 2955 reply => undef,
2654 tooltip => "What you saw there", 2956 tooltip => "What you saw there",
2655 }, 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,
2656); 3032);
2657 3033
2658sub cf::client::send_msg { 3034sub cf::client::send_msg {
2659 my ($self, $channel, $msg, $color, @extra) = @_; 3035 my ($self, $channel, $msg, $color, @extra) = @_;
2660 3036
2661 $msg = $self->pl->expand_cfpod ($msg); 3037 $msg = $self->pl->expand_cfpod ($msg)
3038 unless $color & cf::NDI_VERBATIM;
2662 3039
2663 $color &= cf::NDI_CLIENT_MASK; # just in case... 3040 $color &= cf::NDI_CLIENT_MASK; # just in case...
2664 3041
2665 # check predefined channels, for the benefit of C 3042 # check predefined channels, for the benefit of C
2666 if ($CHANNEL{$channel}) { 3043 if ($CHANNEL{$channel}) {
2667 $channel = $CHANNEL{$channel}; 3044 $channel = $CHANNEL{$channel};
2668 3045
2669 $self->ext_msg (channel_info => $channel) 3046 $self->ext_msg (channel_info => $channel);
2670 if $self->can_msg;
2671
2672 $channel = $channel->{id}; 3047 $channel = $channel->{id};
2673 3048
2674 } elsif (ref $channel) { 3049 } elsif (ref $channel) {
2675 # send meta info to client, if not yet sent 3050 # send meta info to client, if not yet sent
2676 unless (exists $self->{channel}{$channel->{id}}) { 3051 unless (exists $self->{channel}{$channel->{id}}) {
2677 $self->{channel}{$channel->{id}} = $channel; 3052 $self->{channel}{$channel->{id}} = $channel;
2678 $self->ext_msg (channel_info => $channel) 3053 $self->ext_msg (channel_info => $channel);
2679 if $self->can_msg;
2680 } 3054 }
2681 3055
2682 $channel = $channel->{id}; 3056 $channel = $channel->{id};
2683 } 3057 }
2684 3058
2685 return unless @extra || length $msg; 3059 return unless @extra || length $msg;
2686 3060
2687 if ($self->can_msg) {
2688 # default colour, mask it out 3061 # default colour, mask it out
2689 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3062 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2690 if $color & cf::NDI_DEF; 3063 if $color & cf::NDI_DEF;
2691 3064
2692 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3065 my $pkt = "msg "
3066 . $self->{json_coder}->encode (
2693 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3067 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2694 } else { 3068 );
2695 if ($color >= 0) {
2696 # replace some tags by gcfclient-compatible ones
2697 for ($msg) {
2698 1 while
2699 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2700 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2701 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2702 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2703 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2704 }
2705 3069
2706 $color &= cf::NDI_COLOR_MASK; 3070 $self->send_big_packet ($pkt);
2707
2708 utf8::encode $msg;
2709
2710 if (0 && $msg =~ /\[/) {
2711 # COMMAND/INFO
2712 $self->send_packet ("drawextinfo $color 10 8 $msg")
2713 } else {
2714 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2715 $self->send_packet ("drawinfo $color $msg")
2716 }
2717 }
2718 }
2719} 3071}
2720 3072
2721=item $client->ext_msg ($type, @msg) 3073=item $client->ext_msg ($type, @msg)
2722 3074
2723Sends an ext event to the client. 3075Sends an ext event to the client.
2726 3078
2727sub cf::client::ext_msg($$@) { 3079sub cf::client::ext_msg($$@) {
2728 my ($self, $type, @msg) = @_; 3080 my ($self, $type, @msg) = @_;
2729 3081
2730 if ($self->extcmd == 2) { 3082 if ($self->extcmd == 2) {
2731 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3083 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2732 } elsif ($self->extcmd == 1) { # TODO: remove 3084 } elsif ($self->extcmd == 1) { # TODO: remove
2733 push @msg, msgtype => "event_$type"; 3085 push @msg, msgtype => "event_$type";
2734 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3086 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2735 } 3087 }
2736} 3088}
2737 3089
2738=item $client->ext_reply ($msgid, @msg) 3090=item $client->ext_reply ($msgid, @msg)
2739 3091
2743 3095
2744sub cf::client::ext_reply($$@) { 3096sub cf::client::ext_reply($$@) {
2745 my ($self, $id, @msg) = @_; 3097 my ($self, $id, @msg) = @_;
2746 3098
2747 if ($self->extcmd == 2) { 3099 if ($self->extcmd == 2) {
2748 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3100 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2749 } elsif ($self->extcmd == 1) { 3101 } elsif ($self->extcmd == 1) {
2750 #TODO: version 1, remove 3102 #TODO: version 1, remove
2751 unshift @msg, msgtype => "reply", msgid => $id; 3103 unshift @msg, msgtype => "reply", msgid => $id;
2752 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3104 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2753 } 3105 }
2754} 3106}
2755 3107
2756=item $success = $client->query ($flags, "text", \&cb) 3108=item $success = $client->query ($flags, "text", \&cb)
2757 3109
2828 3180
2829 $ns->ext_reply ($reply, @reply) 3181 $ns->ext_reply ($reply, @reply)
2830 if $reply; 3182 if $reply;
2831 3183
2832 } else { 3184 } else {
2833 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";
2834 } 3186 }
2835 3187
2836 cf::override; 3188 cf::override;
2837 }, 3189 },
2838); 3190);
2858 3210
2859 $coro 3211 $coro
2860} 3212}
2861 3213
2862cf::client->attach ( 3214cf::client->attach (
2863 on_destroy => sub { 3215 on_client_destroy => sub {
2864 my ($ns) = @_; 3216 my ($ns) = @_;
2865 3217
2866 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3218 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2867 }, 3219 },
2868); 3220);
2884our $safe_hole = new Safe::Hole; 3236our $safe_hole = new Safe::Hole;
2885 3237
2886$SIG{FPE} = 'IGNORE'; 3238$SIG{FPE} = 'IGNORE';
2887 3239
2888$safe->permit_only (Opcode::opset qw( 3240$safe->permit_only (Opcode::opset qw(
2889 :base_core :base_mem :base_orig :base_math 3241 :base_core :base_mem :base_orig :base_math :base_loop
2890 grepstart grepwhile mapstart mapwhile 3242 grepstart grepwhile mapstart mapwhile
2891 sort time 3243 sort time
2892)); 3244));
2893 3245
2894# here we export the classes and methods available to script code 3246# here we export the classes and methods available to script code
2896=pod 3248=pod
2897 3249
2898The following functions and methods are available within a safe environment: 3250The following functions and methods are available within a safe environment:
2899 3251
2900 cf::object 3252 cf::object
2901 contr pay_amount pay_player map x y force_find force_add 3253 contr pay_amount pay_player map x y force_find force_add destroy
2902 insert remove name archname title slaying race decrease_ob_nr 3254 insert remove name archname title slaying race decrease split
3255 value
2903 3256
2904 cf::object::player 3257 cf::object::player
2905 player 3258 player
2906 3259
2907 cf::player 3260 cf::player
2912 3265
2913=cut 3266=cut
2914 3267
2915for ( 3268for (
2916 ["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
2917 insert remove inv name archname title slaying race 3270 insert remove inv nrof name archname title slaying race
2918 decrease_ob_nr)], 3271 decrease split destroy change_exp value msg lore send_msg)],
2919 ["cf::object::player" => qw(player)], 3272 ["cf::object::player" => qw(player)],
2920 ["cf::player" => qw(peaceful)], 3273 ["cf::player" => qw(peaceful send_msg)],
2921 ["cf::map" => qw(trigger)], 3274 ["cf::map" => qw(trigger)],
2922) { 3275) {
2923 no strict 'refs';
2924 my ($pkg, @funs) = @$_; 3276 my ($pkg, @funs) = @$_;
2925 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3277 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2926 for @funs; 3278 for @funs;
2927} 3279}
2928 3280
2943 3295
2944 my $qcode = $code; 3296 my $qcode = $code;
2945 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3297 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2946 $qcode =~ s/\n/\\n/g; 3298 $qcode =~ s/\n/\\n/g;
2947 3299
3300 %vars = (_dummy => 0) unless %vars;
3301
3302 my @res;
2948 local $_; 3303 local $_;
2949 local @safe::cf::_safe_eval_args = values %vars;
2950 3304
2951 my $eval = 3305 my $eval =
2952 "do {\n" 3306 "do {\n"
2953 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3307 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2954 . "#line 0 \"{$qcode}\"\n" 3308 . "#line 0 \"{$qcode}\"\n"
2955 . $code 3309 . $code
2956 . "\n}" 3310 . "\n}"
2957 ; 3311 ;
2958 3312
3313 if ($CFG{safe_eval}) {
2959 sub_generation_inc; 3314 sub_generation_inc;
3315 local @safe::cf::_safe_eval_args = values %vars;
2960 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3316 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2961 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 }
2962 3322
2963 if ($@) { 3323 if ($@) {
2964 warn "$@"; 3324 warn "$@",
2965 warn "while executing safe code '$code'\n"; 3325 "while executing safe code '$code'\n",
2966 warn "with arguments " . (join " ", %vars) . "\n"; 3326 "with arguments " . (join " ", %vars) . "\n";
2967 } 3327 }
2968 3328
2969 wantarray ? @res : $res[0] 3329 wantarray ? @res : $res[0]
2970} 3330}
2971 3331
2985=cut 3345=cut
2986 3346
2987sub register_script_function { 3347sub register_script_function {
2988 my ($fun, $cb) = @_; 3348 my ($fun, $cb) = @_;
2989 3349
2990 no strict 'refs'; 3350 $fun = "safe::$fun" if $CFG{safe_eval};
2991 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3351 *$fun = $safe_hole->wrap ($cb);
2992} 3352}
2993 3353
2994=back 3354=back
2995 3355
2996=cut 3356=cut
3005 # for this (global event?) 3365 # for this (global event?)
3006 %ext::player_env::MUSIC_FACE_CACHE = (); 3366 %ext::player_env::MUSIC_FACE_CACHE = ();
3007 3367
3008 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3368 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3009 3369
3010 warn "loading facedata from $path\n"; 3370 trace "loading facedata from $path\n";
3011 3371
3012 my $facedata; 3372 my $facedata;
3013 0 < aio_load $path, $facedata 3373 0 < aio_load $path, $facedata
3014 or die "$path: $!"; 3374 or die "$path: $!";
3015 3375
3017 3377
3018 $facedata->{version} == 2 3378 $facedata->{version} == 2
3019 or cf::cleanup "$path: version mismatch, cannot proceed."; 3379 or cf::cleanup "$path: version mismatch, cannot proceed.";
3020 3380
3021 # 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]);
3022 $facedata->{resource}{"res/exp_table"} = { 3383 $facedata->{resource}{"res/exp_table"} = {
3023 type => FT_RSRC, 3384 type => FT_RSRC,
3024 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),
3025 }; 3387 };
3026 cf::cede_to_tick; 3388 cf::cede_to_tick;
3027 3389
3028 { 3390 {
3029 my $faces = $facedata->{faceinfo}; 3391 my $faces = $facedata->{faceinfo};
3030 3392
3031 while (my ($face, $info) = each %$faces) { 3393 while (my ($face, $info) = each %$faces) {
3032 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3394 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3395
3033 cf::face::set_visibility $idx, $info->{visibility}; 3396 cf::face::set_visibility $idx, $info->{visibility};
3034 cf::face::set_magicmap $idx, $info->{magicmap}; 3397 cf::face::set_magicmap $idx, $info->{magicmap};
3035 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3398 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3036 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3399 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3037 3400
3038 cf::cede_to_tick; 3401 cf::cede_to_tick;
3039 } 3402 }
3040 3403
3041 while (my ($face, $info) = each %$faces) { 3404 while (my ($face, $info) = each %$faces) {
3042 next unless $info->{smooth}; 3405 next unless $info->{smooth};
3406
3043 my $idx = cf::face::find $face 3407 my $idx = cf::face::find $face
3044 or next; 3408 or next;
3409
3045 if (my $smooth = cf::face::find $info->{smooth}) { 3410 if (my $smooth = cf::face::find $info->{smooth}) {
3046 cf::face::set_smooth $idx, $smooth; 3411 cf::face::set_smooth $idx, $smooth;
3047 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3412 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3048 } else { 3413 } else {
3049 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3414 error "smooth face '$info->{smooth}' not found for face '$face'";
3050 } 3415 }
3051 3416
3052 cf::cede_to_tick; 3417 cf::cede_to_tick;
3053 } 3418 }
3054 } 3419 }
3063 3428
3064 cf::anim::invalidate_all; # d'oh 3429 cf::anim::invalidate_all; # d'oh
3065 } 3430 }
3066 3431
3067 { 3432 {
3068 # TODO: for gcfclient pleasure, we should give resources
3069 # that gcfclient doesn't grok a >10000 face index.
3070 my $res = $facedata->{resource}; 3433 my $res = $facedata->{resource};
3071 3434
3072 my $soundconf = delete $res->{"res/sound.conf"};
3073
3074 while (my ($name, $info) = each %$res) { 3435 while (my ($name, $info) = each %$res) {
3436 if (defined $info->{type}) {
3075 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3437 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3076 my $data;
3077 3438
3078 if ($info->{type} & 1) { 3439 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3079 # prepend meta info 3440 cf::face::set_type $idx, $info->{type};
3080
3081 my $meta = $enc->encode ({
3082 name => $name,
3083 %{ $info->{meta} || {} },
3084 });
3085
3086 $data = pack "(w/a*)*", $meta, $info->{data};
3087 } else { 3441 } else {
3088 $data = $info->{data}; 3442 $RESOURCE{$name} = $info; # unused
3089 } 3443 }
3090 3444
3091 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3092 cf::face::set_type $idx, $info->{type};
3093
3094 cf::cede_to_tick; 3445 cf::cede_to_tick;
3095 } 3446 }
3096
3097 if ($soundconf) {
3098 $soundconf = $enc->decode (delete $soundconf->{data});
3099
3100 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3101 my $sound = $soundconf->{compat}[$_]
3102 or next;
3103
3104 my $face = cf::face::find "sound/$sound->[1]";
3105 cf::sound::set $sound->[0] => $face;
3106 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3107 }
3108
3109 while (my ($k, $v) = each %{$soundconf->{event}}) {
3110 my $face = cf::face::find "sound/$v";
3111 cf::sound::set $k => $face;
3112 }
3113 }
3114 } 3447 }
3448
3449 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3115 3450
3116 1 3451 1
3117} 3452}
3118 3453
3119register_exticmd fx_want => sub { 3454register_exticmd fx_want => sub {
3121 3456
3122 while (my ($k, $v) = each %$want) { 3457 while (my ($k, $v) = each %$want) {
3123 $ns->fx_want ($k, $v); 3458 $ns->fx_want ($k, $v);
3124 } 3459 }
3125}; 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}
3126 3471
3127sub reload_regions { 3472sub reload_regions {
3128 # 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
3129 # for this (global event?) 3474 # for this (global event?)
3130 %ext::player_env::MUSIC_FACE_CACHE = (); 3475 %ext::player_env::MUSIC_FACE_CACHE = ();
3144} 3489}
3145 3490
3146sub reload_archetypes { 3491sub reload_archetypes {
3147 load_resource_file "$DATADIR/archetypes" 3492 load_resource_file "$DATADIR/archetypes"
3148 or die "unable to load archetypes\n"; 3493 or die "unable to load archetypes\n";
3149 #d# NEED to laod twice to resolve forward references
3150 # this really needs to be done in an extra post-pass
3151 # (which needs to be synchronous, so solve it differently)
3152 load_resource_file "$DATADIR/archetypes"
3153 or die "unable to load archetypes\n";
3154} 3494}
3155 3495
3156sub reload_treasures { 3496sub reload_treasures {
3157 load_resource_file "$DATADIR/treasures" 3497 load_resource_file "$DATADIR/treasures"
3158 or die "unable to load treasurelists\n"; 3498 or die "unable to load treasurelists\n";
3159} 3499}
3160 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
3161sub reload_resources { 3524sub reload_resources {
3162 warn "reloading resource files...\n"; 3525 trace "reloading resource files...\n";
3163 3526
3527 reload_facedata;
3528 reload_sound;
3529 reload_archetypes;
3164 reload_regions; 3530 reload_regions;
3165 reload_facedata;
3166 #reload_archetypes;#d#
3167 reload_archetypes;
3168 reload_treasures; 3531 reload_treasures;
3169 3532
3170 warn "finished reloading resource files\n"; 3533 trace "finished reloading resource files\n";
3171}
3172
3173sub init {
3174 reload_resources;
3175} 3534}
3176 3535
3177sub reload_config { 3536sub reload_config {
3537 trace "reloading config file...\n";
3538
3178 open my $fh, "<:utf8", "$CONFDIR/config" 3539 open my $fh, "<:utf8", "$CONFDIR/config"
3179 or return; 3540 or return;
3180 3541
3181 local $/; 3542 local $/;
3182 *CFG = YAML::Syck::Load <$fh>; 3543 *CFG = YAML::XS::Load scalar <$fh>;
3183 3544
3184 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3545 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3185 3546
3186 $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};
3187 $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};
3188 3549
3189 if (exists $CFG{mlockall}) { 3550 if (exists $CFG{mlockall}) {
3191 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3552 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3192 and die "WARNING: m(un)lockall failed: $!\n"; 3553 and die "WARNING: m(un)lockall failed: $!\n";
3193 }; 3554 };
3194 warn $@ if $@; 3555 warn $@ if $@;
3195 } 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;
3196} 3587}
3197 3588
3198sub 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
3199 # we must not ever block the main coroutine 3599 # we must not ever block the main coroutine
3200 local $Coro::idle = sub { 3600 local $Coro::idle = sub {
3201 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#
3202 (async { 3602 (async {
3203 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3603 $Coro::current->{desc} = "IDLE BUG HANDLER";
3204 Event::one_event; 3604 EV::loop EV::LOOP_ONESHOT;
3205 })->prio (Coro::PRIO_MAX); 3605 })->prio (Coro::PRIO_MAX);
3206 }; 3606 };
3207 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;
3208 reload_config; 3620 reload_config;
3209 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
3210 load_extensions; 3631 load_extensions;
3211 3632
3212 $TICK_WATCHER->start; 3633 utime time, time, $RUNTIMEFILE;
3213 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;
3214} 3646}
3215 3647
3216############################################################################# 3648#############################################################################
3217# initialisation and cleanup 3649# initialisation and cleanup
3218 3650
3219# install some emergency cleanup handlers 3651# install some emergency cleanup handlers
3220BEGIN { 3652BEGIN {
3653 our %SIGWATCHER = ();
3221 for my $signal (qw(INT HUP TERM)) { 3654 for my $signal (qw(INT HUP TERM)) {
3222 Event->signal ( 3655 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3223 reentrant => 0,
3224 data => WF_AUTOCANCEL,
3225 signal => $signal,
3226 prio => 0,
3227 cb => sub {
3228 cf::cleanup "SIG$signal"; 3656 cf::cleanup "SIG$signal";
3229 },
3230 ); 3657 };
3231 } 3658 }
3232} 3659}
3233 3660
3234sub write_runtime { 3661sub write_runtime_sync {
3235 my $runtime = "$LOCALDIR/runtime"; 3662 my $t0 = AE::time;
3236 3663
3237 # first touch the runtime file to show we are still running: 3664 # first touch the runtime file to show we are still running:
3238 # the fsync below can take a very very long time. 3665 # the fsync below can take a very very long time.
3239 3666
3240 IO::AIO::aio_utime $runtime, undef, undef; 3667 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3241 3668
3242 my $guard = cf::lock_acquire "write_runtime"; 3669 my $guard = cf::lock_acquire "write_runtime";
3243 3670
3244 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3671 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3245 or return; 3672 or return;
3246 3673
3247 my $value = $cf::RUNTIME + 90 + 10; 3674 my $value = $cf::RUNTIME + 90 + 10;
3248 # 10 is the runtime save interval, for a monotonic clock 3675 # 10 is the runtime save interval, for a monotonic clock
3249 # 60 allows for the watchdog to kill the server. 3676 # 60 allows for the watchdog to kill the server.
3259 aio_utime $fh, undef, undef; 3686 aio_utime $fh, undef, undef;
3260 3687
3261 close $fh 3688 close $fh
3262 or return; 3689 or return;
3263 3690
3264 aio_rename "$runtime~", $runtime 3691 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3265 and return; 3692 and return;
3266 3693
3267 warn "runtime file written.\n"; 3694 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3268 3695
3269 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 };
3270} 3747}
3271 3748
3272sub emergency_save() { 3749sub emergency_save() {
3273 my $freeze_guard = cf::freeze_mainloop; 3750 my $freeze_guard = cf::freeze_mainloop;
3274 3751
3275 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;
3276 3758
3277 cf::sync_job { 3759 cf::sync_job {
3760 cf::write_runtime_sync; # external watchdog should not bark
3761
3278 # use a peculiar iteration method to avoid tripping on perl 3762 # use a peculiar iteration method to avoid tripping on perl
3279 # refcount bugs in for. also avoids problems with players 3763 # refcount bugs in for. also avoids problems with players
3280 # and maps saved/destroyed asynchronously. 3764 # and maps saved/destroyed asynchronously.
3281 warn "begin emergency player save\n"; 3765 info "emergency_perl_save: begin player save\n";
3282 for my $login (keys %cf::PLAYER) { 3766 for my $login (keys %cf::PLAYER) {
3283 my $pl = $cf::PLAYER{$login} or next; 3767 my $pl = $cf::PLAYER{$login} or next;
3284 $pl->valid or next; 3768 $pl->valid or next;
3285 delete $pl->{unclean_save}; 3769 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3286 $pl->save; 3770 $pl->save;
3287 } 3771 }
3288 warn "end emergency player save\n"; 3772 info "emergency_perl_save: end player save\n";
3289 3773
3290 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";
3291 for my $path (keys %cf::MAP) { 3777 for my $path (keys %cf::MAP) {
3292 my $map = $cf::MAP{$path} or next; 3778 my $map = $cf::MAP{$path} or next;
3293 $map->valid or next; 3779 $map->valid or next;
3294 $map->save; 3780 $map->save;
3295 } 3781 }
3296 warn "end emergency map save\n"; 3782 info "emergency_perl_save: end map save\n";
3297 3783
3298 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";
3299 BDB::db_env_txn_checkpoint $DB_ENV; 3787 BDB::db_env_txn_checkpoint $DB_ENV;
3300 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
3301 }; 3812 };
3302 3813
3303 warn "leave emergency perl save\n"; 3814 info "emergency_perl_save: leave\n";
3304} 3815}
3305 3816
3306sub post_cleanup { 3817sub post_cleanup {
3307 my ($make_core) = @_; 3818 my ($make_core) = @_;
3308 3819
3820 IO::AIO::flush;
3821
3309 warn Carp::longmess "post_cleanup backtrace" 3822 error Carp::longmess "post_cleanup backtrace"
3310 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 }
3311} 3852}
3312 3853
3313sub do_reload_perl() { 3854sub do_reload_perl() {
3314 # can/must only be called in main 3855 # can/must only be called in main
3315 if ($Coro::current != $Coro::main) { 3856 if (in_main) {
3316 warn "can only reload from main coroutine"; 3857 error "can only reload from main coroutine";
3317 return; 3858 return;
3318 } 3859 }
3319 3860
3861 return if $RELOAD++;
3862
3863 my $t1 = AE::time;
3864
3865 while ($RELOAD) {
3320 warn "reloading..."; 3866 info "reloading...";
3321 3867
3322 warn "entering sync_job"; 3868 trace "entering sync_job";
3323 3869
3324 cf::sync_job { 3870 cf::sync_job {
3325 cf::write_runtime; # external watchdog should not bark
3326 cf::emergency_save; 3871 cf::emergency_save;
3327 cf::write_runtime; # external watchdog should not bark
3328 3872
3329 warn "syncing database to disk";
3330 BDB::db_env_txn_checkpoint $DB_ENV;
3331
3332 # if anything goes wrong in here, we should simply crash as we already saved
3333
3334 warn "cancelling all WF_AUTOCANCEL watchers";
3335 for (Event::all_watchers) {
3336 $_->cancel if $_->data & WF_AUTOCANCEL;
3337 }
3338
3339 warn "flushing outstanding aio requests";
3340 for (;;) {
3341 BDB::flush;
3342 IO::AIO::flush;
3343 Coro::cede;
3344 last unless IO::AIO::nreqs || BDB::nreqs;
3345 warn "iterate...";
3346 }
3347
3348 ++$RELOAD;
3349
3350 warn "cancelling all extension coros"; 3873 trace "cancelling all extension coros";
3351 $_->cancel for values %EXT_CORO; 3874 $_->cancel for values %EXT_CORO;
3352 %EXT_CORO = (); 3875 %EXT_CORO = ();
3353 3876
3354 warn "removing commands"; 3877 trace "removing commands";
3355 %COMMAND = (); 3878 %COMMAND = ();
3356 3879
3357 warn "removing ext/exti commands"; 3880 trace "removing ext/exti commands";
3358 %EXTCMD = (); 3881 %EXTCMD = ();
3359 %EXTICMD = (); 3882 %EXTICMD = ();
3360 3883
3361 warn "unloading/nuking all extensions"; 3884 trace "unloading/nuking all extensions";
3362 for my $pkg (@EXTS) { 3885 for my $pkg (@EXTS) {
3363 warn "... unloading $pkg"; 3886 trace "... unloading $pkg";
3364 3887
3365 if (my $cb = $pkg->can ("unload")) { 3888 if (my $cb = $pkg->can ("unload")) {
3366 eval { 3889 eval {
3367 $cb->($pkg); 3890 $cb->($pkg);
3368 1 3891 1
3369 } 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;
3370 } 3897 }
3371 3898
3372 warn "... nuking $pkg";
3373 Symbol::delete_package $pkg;
3374 }
3375
3376 warn "unloading all perl modules loaded from $LIBDIR"; 3899 trace "unloading all perl modules loaded from $LIBDIR";
3377 while (my ($k, $v) = each %INC) { 3900 while (my ($k, $v) = each %INC) {
3378 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3901 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3379 3902
3380 warn "... unloading $k"; 3903 trace "... unloading $k";
3381 delete $INC{$k}; 3904 delete $INC{$k};
3382 3905
3383 $k =~ s/\.pm$//; 3906 $k =~ s/\.pm$//;
3384 $k =~ s/\//::/g; 3907 $k =~ s/\//::/g;
3385 3908
3386 if (my $cb = $k->can ("unload_module")) { 3909 if (my $cb = $k->can ("unload_module")) {
3387 $cb->(); 3910 $cb->();
3911 }
3912
3913 clear_package $k;
3388 } 3914 }
3389 3915
3390 Symbol::delete_package $k;
3391 }
3392
3393 warn "getting rid of safe::, as good as possible"; 3916 trace "getting rid of safe::, as good as possible";
3394 Symbol::delete_package "safe::$_" 3917 clear_package "safe::$_"
3395 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);
3396 3919
3397 warn "unloading cf.pm \"a bit\""; 3920 trace "unloading cf.pm \"a bit\"";
3398 delete $INC{"cf.pm"}; 3921 delete $INC{"cf.pm"};
3399 delete $INC{"cf/pod.pm"}; 3922 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3400 3923
3401 # don't, removes xs symbols, too, 3924 # don't, removes xs symbols, too,
3402 # and global variables created in xs 3925 # and global variables created in xs
3403 #Symbol::delete_package __PACKAGE__; 3926 #clear_package __PACKAGE__;
3404 3927
3405 warn "unload completed, starting to reload now"; 3928 info "unload completed, starting to reload now";
3406 3929
3407 warn "reloading cf.pm"; 3930 trace "reloading cf.pm";
3408 require cf; 3931 require cf;
3409 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3932 cf::_connect_to_perl_1;
3410 3933
3411 warn "loading config and database again"; 3934 trace "loading config and database again";
3412 cf::reload_config; 3935 cf::reload_config;
3413 3936
3414 warn "loading extensions"; 3937 trace "loading extensions";
3415 cf::load_extensions; 3938 cf::load_extensions;
3416 3939
3940 if ($REATTACH_ON_RELOAD) {
3417 warn "reattaching attachments to objects/players"; 3941 trace "reattaching attachments to objects/players";
3418 _global_reattach; # objects, sockets 3942 _global_reattach; # objects, sockets
3419 warn "reattaching attachments to maps"; 3943 trace "reattaching attachments to maps";
3420 reattach $_ for values %MAP; 3944 reattach $_ for values %MAP;
3421 warn "reattaching attachments to players"; 3945 trace "reattaching attachments to players";
3422 reattach $_ for values %PLAYER; 3946 reattach $_ for values %PLAYER;
3947 }
3423 3948
3949 trace "running post_init jobs";
3950 (pop @POST_INIT)->(1) while @POST_INIT;
3951
3424 warn "leaving sync_job"; 3952 trace "leaving sync_job";
3425 3953
3426 1 3954 1
3427 } or do { 3955 } or do {
3428 warn $@; 3956 error $@;
3429 warn "error while reloading, exiting."; 3957 cf::cleanup "error while reloading, exiting.";
3430 exit 1; 3958 };
3959
3960 info "reloaded";
3961 --$RELOAD;
3431 }; 3962 }
3432 3963
3433 warn "reloaded"; 3964 $t1 = AE::time - $t1;
3965 info "reload completed in ${t1}s\n";
3434}; 3966};
3435 3967
3436our $RELOAD_WATCHER; # used only during reload 3968our $RELOAD_WATCHER; # used only during reload
3437 3969
3438sub reload_perl() { 3970sub reload_perl() {
3439 # doing reload synchronously and two reloads happen back-to-back, 3971 # doing reload synchronously and two reloads happen back-to-back,
3440 # coro crashes during coro_state_free->destroy here. 3972 # coro crashes during coro_state_free->destroy here.
3441 3973
3442 $RELOAD_WATCHER ||= Event->timer ( 3974 $RELOAD_WATCHER ||= cf::async {
3443 reentrant => 0, 3975 Coro::AIO::aio_wait cache_extensions;
3444 after => 0, 3976
3445 data => WF_AUTOCANCEL, 3977 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3446 cb => sub {
3447 do_reload_perl; 3978 do_reload_perl;
3448 undef $RELOAD_WATCHER; 3979 undef $RELOAD_WATCHER;
3449 }, 3980 };
3450 ); 3981 };
3451} 3982}
3452 3983
3453register_command "reload" => sub { 3984register_command "reload" => sub {
3454 my ($who, $arg) = @_; 3985 my ($who, $arg) = @_;
3455 3986
3468 3999
3469our @WAIT_FOR_TICK; 4000our @WAIT_FOR_TICK;
3470our @WAIT_FOR_TICK_BEGIN; 4001our @WAIT_FOR_TICK_BEGIN;
3471 4002
3472sub wait_for_tick { 4003sub wait_for_tick {
3473 return unless $TICK_WATCHER->is_active;
3474 return if $Coro::current == $Coro::main; 4004 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3475 4005
3476 my $signal = new Coro::Signal; 4006 my $signal = new Coro::Signal;
3477 push @WAIT_FOR_TICK, $signal; 4007 push @WAIT_FOR_TICK, $signal;
3478 $signal->wait; 4008 $signal->wait;
3479} 4009}
3480 4010
3481sub wait_for_tick_begin { 4011sub wait_for_tick_begin {
3482 return unless $TICK_WATCHER->is_active;
3483 return if $Coro::current == $Coro::main; 4012 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3484 4013
3485 my $signal = new Coro::Signal; 4014 my $signal = new Coro::Signal;
3486 push @WAIT_FOR_TICK_BEGIN, $signal; 4015 push @WAIT_FOR_TICK_BEGIN, $signal;
3487 $signal->wait; 4016 $signal->wait;
3488} 4017}
3489 4018
3490$TICK_WATCHER = Event->timer ( 4019sub tick {
3491 reentrant => 0,
3492 parked => 1,
3493 prio => 0,
3494 at => $NEXT_TICK || $TICK,
3495 data => WF_AUTOCANCEL,
3496 cb => sub {
3497 if ($Coro::current != $Coro::main) { 4020 if ($Coro::current != $Coro::main) {
3498 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"
3499 unless ++$bug_warning > 10; 4022 unless ++$bug_warning > 10;
3500 return; 4023 return;
3501 } 4024 }
3502 4025
3503 $NOW = $tick_start = Event::time;
3504
3505 cf::server_tick; # one server iteration 4026 cf::server_tick; # one server iteration
3506 4027
3507 $RUNTIME += $TICK; 4028 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3508 $NEXT_TICK += $TICK;
3509 4029
3510 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4030 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3511 $NEXT_RUNTIME_WRITE = $NOW + 10; 4031 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3512 Coro::async_pool { 4032 Coro::async_pool {
3513 $Coro::current->{desc} = "runtime saver"; 4033 $Coro::current->{desc} = "runtime saver";
3514 write_runtime 4034 write_runtime_sync
3515 or warn "ERROR: unable to write runtime file: $!"; 4035 or error "ERROR: unable to write runtime file: $!";
3516 };
3517 } 4036 };
4037 }
3518 4038
3519 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4039 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3520 $sig->send; 4040 $sig->send;
3521 } 4041 }
3522 while (my $sig = shift @WAIT_FOR_TICK) { 4042 while (my $sig = shift @WAIT_FOR_TICK) {
3523 $sig->send; 4043 $sig->send;
3524 } 4044 }
3525 4045
3526 $NOW = Event::time; 4046 $LOAD = ($NOW - $TICK_START) / $TICK;
3527
3528 # if we are delayed by four ticks or more, skip them all
3529 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3530
3531 $TICK_WATCHER->at ($NEXT_TICK);
3532 $TICK_WATCHER->start;
3533
3534 $LOAD = ($NOW - $tick_start) / $TICK;
3535 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4047 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3536 4048
3537 _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 }
3538 }, 4055 }
3539); 4056}
3540 4057
3541{ 4058{
4059 # configure BDB
4060
3542 BDB::min_parallel 8; 4061 BDB::min_parallel 16;
3543 BDB::max_poll_time $TICK * 0.1; 4062 BDB::max_poll_reqs $TICK * 0.1;
3544 $BDB_POLL_WATCHER = Event->io ( 4063 $AnyEvent::BDB::WATCHER->priority (1);
3545 reentrant => 0,
3546 fd => BDB::poll_fileno,
3547 poll => 'r',
3548 prio => 0,
3549 data => WF_AUTOCANCEL,
3550 cb => \&BDB::poll_cb,
3551 );
3552
3553 BDB::set_sync_prepare {
3554 my $status;
3555 my $current = $Coro::current;
3556 (
3557 sub {
3558 $status = $!;
3559 $current->ready; undef $current;
3560 },
3561 sub {
3562 Coro::schedule while defined $current;
3563 $! = $status;
3564 },
3565 )
3566 };
3567 4064
3568 unless ($DB_ENV) { 4065 unless ($DB_ENV) {
3569 $DB_ENV = BDB::db_env_create; 4066 $DB_ENV = BDB::db_env_create;
3570 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4067 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3571 | 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;
3572 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4070 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3573 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4071 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3574 4072
3575 cf::sync_job { 4073 cf::sync_job {
3576 eval { 4074 eval {
3586 4084
3587 cf::cleanup "db_env_open(db): $@" if $@; 4085 cf::cleanup "db_env_open(db): $@" if $@;
3588 }; 4086 };
3589 } 4087 }
3590 4088
3591 $BDB_DEADLOCK_WATCHER = Event->timer ( 4089 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3592 after => 3,
3593 interval => 1,
3594 hard => 1,
3595 prio => 0,
3596 data => WF_AUTOCANCEL,
3597 cb => sub {
3598 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 { };
3599 },
3600 ); 4091 };
3601 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4092 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3602 after => 11,
3603 interval => 60,
3604 hard => 1,
3605 prio => 0,
3606 data => WF_AUTOCANCEL,
3607 cb => sub {
3608 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4093 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3609 },
3610 ); 4094 };
3611 $BDB_TRICKLE_WATCHER = Event->timer ( 4095 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3612 after => 5,
3613 interval => 10,
3614 hard => 1,
3615 prio => 0,
3616 data => WF_AUTOCANCEL,
3617 cb => sub {
3618 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4096 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3619 },
3620 ); 4097 };
3621} 4098}
3622 4099
3623{ 4100{
4101 # configure IO::AIO
4102
3624 IO::AIO::min_parallel 8; 4103 IO::AIO::min_parallel 8;
3625
3626 undef $Coro::AIO::WATCHER;
3627 IO::AIO::max_poll_time $TICK * 0.1; 4104 IO::AIO::max_poll_time $TICK * 0.1;
3628 $AIO_POLL_WATCHER = Event->io ( 4105 undef $AnyEvent::AIO::WATCHER;
3629 reentrant => 0,
3630 data => WF_AUTOCANCEL,
3631 fd => IO::AIO::poll_fileno,
3632 poll => 'r',
3633 prio => 0,
3634 cb => \&IO::AIO::poll_cb,
3635 );
3636} 4106}
3637 4107
3638my $_log_backtrace; 4108my $_log_backtrace;
3639 4109
3640sub _log_backtrace { 4110sub _log_backtrace {
3643 $msg =~ s/\n//; 4113 $msg =~ s/\n//;
3644 4114
3645 # limit the # of concurrent backtraces 4115 # limit the # of concurrent backtraces
3646 if ($_log_backtrace < 2) { 4116 if ($_log_backtrace < 2) {
3647 ++$_log_backtrace; 4117 ++$_log_backtrace;
4118 my $perl_bt = Carp::longmess $msg;
3648 async { 4119 async {
3649 $Coro::current->{desc} = "abt $msg"; 4120 $Coro::current->{desc} = "abt $msg";
3650 4121
3651 my @bt = fork_call { 4122 my @bt = fork_call {
3652 @addr = map { sprintf "%x", $_ } @addr; 4123 @addr = map { sprintf "%x", $_ } @addr;
3663 } 4134 }
3664 4135
3665 @funcs 4136 @funcs
3666 }; 4137 };
3667 4138
3668 LOG llevInfo, "[ABT] $msg\n"; 4139 LOG llevInfo, "[ABT] $perl_bt\n";
4140 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3669 LOG llevInfo, "[ABT] $_\n" for @bt; 4141 LOG llevInfo, "[ABT] $_\n" for @bt;
3670 --$_log_backtrace; 4142 --$_log_backtrace;
3671 }; 4143 };
3672 } else { 4144 } else {
3673 LOG llevInfo, "[ABT] $msg\n"; 4145 LOG llevInfo, "[ABT] $msg\n";
3674 LOG llevInfo, "[ABT] [suppressed]\n"; 4146 LOG llevInfo, "[ABT] [suppressed]\n";
3675 } 4147 }
3676} 4148}
3677 4149
3678# load additional modules 4150# load additional modules
3679use cf::pod; 4151require "cf/$_.pm" for @EXTRA_MODULES;
4152cf::_connect_to_perl_2;
3680 4153
3681END { cf::emergency_save } 4154END { cf::emergency_save }
3682 4155
36831 41561
3684 4157

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines