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.379 by root, Thu Oct 4 23:59:07 2007 UTC vs.
Revision 1.503 by root, Sat Jan 30 23:46:39 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 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
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use Storable; 32use EV;
10use Event;
11use Opcode; 33use Opcode;
12use Safe; 34use Safe;
13use Safe::Hole; 35use Safe::Hole;
36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 3.64 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
43use Coro::EV;
18use Coro::Event; 44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
51use Coro::BDB 1.6;
23use Coro::Storable; 52use Coro::Storable;
24use Coro::Util (); 53use Coro::Util ();
25 54
26use JSON::XS (); 55use JSON::XS 2.01 ();
27use BDB (); 56use BDB ();
28use Data::Dumper; 57use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 58use Fcntl;
31use YAML::Syck (); 59use YAML::XS ();
32use IO::AIO 2.32 (); 60use IO::AIO ();
33use Time::HiRes; 61use Time::HiRes;
34use Compress::LZF; 62use Compress::LZF;
35use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
36 66
37# configure various modules to our taste 67# configure various modules to our taste
38# 68#
39$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 77
43$Event::Eval = 1; # no idea why this is required, but it is 78# strictly for debugging
44 79$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 80
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
56our %EXTCMD = (); 87our %EXTCMD = ();
57our %EXTICMD = (); 88our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
60 91
61our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
63 96
64our $CONFDIR = confdir; 97our $CONFDIR = confdir;
65our $DATADIR = datadir; 98our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE;
75 112
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $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 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 115our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
83 117
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 121our $DB_ENV;
89 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
90our %CFG; 125our %CFG;
91 126
92our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 128our $RUNTIME;
129our $NOW;
94 130
95our (%PLAYER, %PLAYER_LOADING); # all users 131our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 132our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 133our $LINK_MAP; # the special {link} map, which is always available
98 134
99# used to convert map paths into valid unix filenames by replacing / by ∕ 135# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 136our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 137
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
140our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
142
143our @POST_INIT;
144
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
105 147
106binmode STDOUT; 148binmode STDOUT;
107binmode STDERR; 149binmode STDERR;
108 150
109# read virtual server time, if available 151# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
114} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
115 159
116mkdir $_ 160mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 162
119our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
120 164
121sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
122 177
123############################################################################# 178#############################################################################
124 179
125=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
126 181
… …
162 217
163The raw value load value from the last tick. 218The raw value load value from the last tick.
164 219
165=item %cf::CFG 220=item %cf::CFG
166 221
167Configuration for the server, loaded from C</etc/crossfire/config>, or 222Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 223from wherever your confdir points to.
169 224
170=item cf::wait_for_tick, cf::wait_for_tick_begin 225=item cf::wait_for_tick, cf::wait_for_tick_begin
171 226
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 227These 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 228returns 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. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
175 230
176=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
177 232
178This array contains the results of the last C<invoke ()> call. When 233This 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 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call. 235that call.
181 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
182=back 243=back
183 244
184=cut 245=cut
185 246
186BEGIN { 247$Coro::State::WARNHOOK = sub {
187 *CORE::GLOBAL::warn = sub {
188 my $msg = join "", @_; 248 my $msg = join "", @_;
189 249
190 $msg .= "\n" 250 $msg .= "\n"
191 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
192 252
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 254
195 LOG llevError, $msg; 255 LOG llevError, $msg;
196 }; 256};
197} 257
258$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
262
263 if ($Coro::current == $Coro::main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d#
266 }#d#
267
268 # kill coroutine otherwise
269 Coro::terminate
270};
198 271
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
209for my $pkg (qw( 282for my $pkg (qw(
210 cf::global cf::attachable 283 cf::global cf::attachable
211 cf::object cf::object::player 284 cf::object cf::object::player
212 cf::client cf::player 285 cf::client cf::player
213 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
214 cf::map cf::party cf::region 288 cf::party cf::region
215)) { 289)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 291}
219 292
220$Event::DIED = sub { 293$EV::DIED = sub {
221 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
222}; 295};
223 296
224############################################################################# 297#############################################################################
225 298
226=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 321 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 322 $d
250 } || "[unable to dump $_[0]: '$@']"; 323 } || "[unable to dump $_[0]: '$@']";
251} 324}
252 325
253=item $ref = cf::from_json $json 326=item $ref = cf::decode_json $json
254 327
255Converts a JSON string into the corresponding perl data structure. 328Converts a JSON string into the corresponding perl data structure.
256 329
257=item $json = cf::to_json $ref 330=item $json = cf::encode_json $ref
258 331
259Converts a perl data structure into its JSON representation. 332Converts a perl data structure into its JSON representation.
260 333
261=cut 334=cut
262 335
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 337
265sub to_json ($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
340
341=item cf::post_init { BLOCK }
342
343Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again.
345
346The cdoeblock will have a single boolean argument to indicate whether this
347is a reload or not.
348
349=cut
350
351sub post_init(&) {
352 push @POST_INIT, shift;
353}
267 354
268=item cf::lock_wait $string 355=item cf::lock_wait $string
269 356
270Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
271 358
272=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
273 360
274Wait until the given lock is available and then acquires it and returns 361Wait 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, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
276for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
277returned. 364returned.
278 365
279Locks are *not* recursive, locking from the same coro twice results in a 366Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro. 367deadlocked coro.
… …
286 373
287Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
288 375
289=cut 376=cut
290 377
291our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 379
294sub lock_wait($) { 380sub lock_wait($) {
295 my ($key) = @_; 381 $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} 382}
308 383
309sub lock_acquire($) { 384sub lock_acquire($) {
310 my ($key) = @_; 385 $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} 386}
324 387
325sub lock_active($) { 388sub lock_active($) {
326 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 390}
330 391
331sub freeze_mainloop { 392sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
333 394
334 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start; 396}
336 }; 397
337 $TICK_WATCHER->stop; 398=item cf::periodic $interval, $cb
338 $guard 399
400Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer.
402
403=cut
404
405sub periodic($$) {
406 my ($interval, $cb) = @_;
407
408 my $start = rand List::Util::min 180, $interval;
409
410 EV::periodic $start, $interval, 0, $cb
339} 411}
340 412
341=item cf::get_slot $time[, $priority[, $name]] 413=item cf::get_slot $time[, $priority[, $name]]
342 414
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 415Allocate $time seconds of blocking CPU time at priority C<$priority>:
… …
351 423
352=cut 424=cut
353 425
354our @SLOT_QUEUE; 426our @SLOT_QUEUE;
355our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
356 429
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
360 433
361 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
362 436
363 while () { 437 while () {
364 next_job: 438 next_job:
439
365 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
366 if ($avail > 0.01) { 441
367 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
369 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send; 446 $job->[2]->send;
371 Coro::cede; 447 Coro::cede;
372 goto next_job; 448 goto next_job;
373 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
374 } 451 }
375 } 452 }
376 453
377 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
378 # we do not use wait_For_tick() as it returns immediately when tick is inactive 455 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 457 $signal->wait;
381 } else { 458 } else {
459 $busy = 0;
382 Coro::schedule; 460 Coro::schedule;
383 } 461 }
384 } 462 }
385}; 463};
386 464
387sub get_slot($;$$) { 465sub get_slot($;$$) {
466 return if tick_inhibit || $Coro::current == $Coro::main;
467
388 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
389 469
390 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
391 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
392 473
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
… …
406 487
407BEGIN { *async = \&Coro::async_pool } 488BEGIN { *async = \&Coro::async_pool }
408 489
409=item cf::sync_job { BLOCK } 490=item cf::sync_job { BLOCK }
410 491
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 492The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 493is 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 494partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 495acceptable.
415 496
416If it must be done, put the blocking parts into C<sync_job>. This will run 497If 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 498the given BLOCK in another coroutine while waiting for the result. The
… …
422 503
423sub sync_job(&) { 504sub sync_job(&) {
424 my ($job) = @_; 505 my ($job) = @_;
425 506
426 if ($Coro::current == $Coro::main) { 507 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 508 my $time = EV::time;
428 509
429 # this is the main coro, too bad, we have to block 510 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 511 # till the operation succeeds, freezing the server :/
431 512
432 LOG llevError | logBacktrace, Carp::longmess "sync job";#d# 513 LOG llevError, Carp::longmess "sync job";#d#
433 514
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 515 my $freeze_guard = freeze_mainloop;
437 516
438 my $busy = 1; 517 my $busy = 1;
439 my @res; 518 my @res;
440 519
… …
444 warn $@ if $@; 523 warn $@ if $@;
445 undef $busy; 524 undef $busy;
446 })->prio (Coro::PRIO_MAX); 525 })->prio (Coro::PRIO_MAX);
447 526
448 while ($busy) { 527 while ($busy) {
449 Coro::cede or Event::one_event; 528 if (Coro::nready) {
529 Coro::cede_notself;
530 } else {
531 EV::loop EV::LOOP_ONESHOT;
450 } 532 }
533 }
451 534
452 $time = Event::time - $time; 535 my $time = EV::time - $time;
453 536
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 537 $TICK_START += $time; # do not account sync jobs to server load
458 538
459 wantarray ? @res : $res[0] 539 wantarray ? @res : $res[0]
460 } else { 540 } else {
461 # we are in another coroutine, how wonderful, everything just works 541 # we are in another coroutine, how wonderful, everything just works
462 542
… …
487=item fork_call { }, $args 567=item fork_call { }, $args
488 568
489Executes the given code block with the given arguments in a seperate 569Executes the given code block with the given arguments in a seperate
490process, returning the results. Everything must be serialisable with 570process, returning the results. Everything must be serialisable with
491Coro::Storable. May, of course, block. Note that the executed sub may 571Coro::Storable. May, of course, block. Note that the executed sub may
492never block itself or use any form of Event handling. 572never block itself or use any form of event handling.
493 573
494=cut 574=cut
495 575
496sub fork_call(&@) { 576sub fork_call(&@) {
497 my ($cb, @args) = @_; 577 my ($cb, @args) = @_;
… …
504 reset_signals; 584 reset_signals;
505 &$cb 585 &$cb
506 }, @args; 586 }, @args;
507 587
508 wantarray ? @res : $res[-1] 588 wantarray ? @res : $res[-1]
589}
590
591=item $coin = coin_from_name $name
592
593=cut
594
595our %coin_alias = (
596 "silver" => "silvercoin",
597 "silvercoin" => "silvercoin",
598 "silvercoins" => "silvercoin",
599 "gold" => "goldcoin",
600 "goldcoin" => "goldcoin",
601 "goldcoins" => "goldcoin",
602 "platinum" => "platinacoin",
603 "platinumcoin" => "platinacoin",
604 "platinumcoins" => "platinacoin",
605 "platina" => "platinacoin",
606 "platinacoin" => "platinacoin",
607 "platinacoins" => "platinacoin",
608 "royalty" => "royalty",
609 "royalties" => "royalty",
610);
611
612sub coin_from_name($) {
613 $coin_alias{$_[0]}
614 ? cf::arch::find $coin_alias{$_[0]}
615 : undef
509} 616}
510 617
511=item $value = cf::db_get $family => $key 618=item $value = cf::db_get $family => $key
512 619
513Returns a single value from the environment database. 620Returns a single value from the environment database.
… …
652 759
653############################################################################# 760#############################################################################
654 761
655=head2 ATTACHABLE OBJECTS 762=head2 ATTACHABLE OBJECTS
656 763
657Many objects in crossfire are so-called attachable objects. That means you can 764Many objects in deliantra are so-called attachable objects. That means you can
658attach callbacks/event handlers (a collection of which is called an "attachment") 765attach callbacks/event handlers (a collection of which is called an "attachment")
659to it. All such attachable objects support the following methods. 766to it. All such attachable objects support the following methods.
660 767
661In the following description, CLASS can be any of C<global>, C<object> 768In 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 769C<player>, C<client> or C<map> (i.e. the attachable objects in
663Crossfire TRT). 770Deliantra).
664 771
665=over 4 772=over 4
666 773
667=item $attachable->attach ($attachment, key => $value...) 774=item $attachable->attach ($attachment, key => $value...)
668 775
… …
712=item cf::CLASS::attachment $name, ... 819=item cf::CLASS::attachment $name, ...
713 820
714Register an attachment by C<$name> through which attachable objects of the 821Register an attachment by C<$name> through which attachable objects of the
715given CLASS can refer to this attachment. 822given CLASS can refer to this attachment.
716 823
717Some classes such as crossfire maps and objects can specify attachments 824Some classes such as deliantra maps and objects can specify attachments
718that are attached at load/instantiate time, thus the need for a name. 825that are attached at load/instantiate time, thus the need for a name.
719 826
720These calls expect any number of the following handler/hook descriptions: 827These calls expect any number of the following handler/hook descriptions:
721 828
722=over 4 829=over 4
… …
950 } 1057 }
951 1058
952 0 1059 0
953} 1060}
954 1061
955=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1062=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
956 1063
957=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1064=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
958 1065
959Generate an object-specific event with the given arguments. 1066Generate an object-specific event with the given arguments.
960 1067
… …
966 1073
967=cut 1074=cut
968 1075
969############################################################################# 1076#############################################################################
970# object support 1077# object support
971#
972 1078
1079sub _object_equal($$);
1080sub _object_equal($$) {
1081 my ($a, $b) = @_;
1082
1083 return 0 unless (ref $a) eq (ref $b);
1084
1085 if ("HASH" eq ref $a) {
1086 my @ka = keys %$a;
1087 my @kb = keys %$b;
1088
1089 return 0 if @ka != @kb;
1090
1091 for (0 .. $#ka) {
1092 return 0 unless $ka[$_] eq $kb[$_];
1093 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1094 }
1095
1096 } elsif ("ARRAY" eq ref $a) {
1097
1098 return 0 if @$a != @$b;
1099
1100 for (0 .. $#$a) {
1101 return 0 unless _object_equal $a->[$_], $b->[$_];
1102 }
1103
1104 } elsif ($a ne $b) {
1105 return 0;
1106 }
1107
1108 1
1109}
1110
1111our $SLOW_MERGES;#d#
973sub _can_merge { 1112sub _can_merge {
974 my ($ob1, $ob2) = @_; 1113 my ($ob1, $ob2) = @_;
975 1114
976 local $Storable::canonical = 1; 1115 ++$SLOW_MERGES;#d#
977 my $fob1 = Storable::freeze $ob1;
978 my $fob2 = Storable::freeze $ob2;
979 1116
980 $fob1 eq $fob2 1117 # we do the slow way here
1118 return _object_equal $ob1, $ob2
981} 1119}
982 1120
983sub reattach { 1121sub reattach {
984 # basically do the same as instantiate, without calling instantiate 1122 # basically do the same as instantiate, without calling instantiate
985 my ($obj) = @_; 1123 my ($obj) = @_;
986 1124
1125 # no longer needed after getting rid of delete_package?
987 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1126 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
988 1127
989 my $registry = $obj->registry; 1128 my $registry = $obj->registry;
990 1129
991 @$registry = (); 1130 @$registry = ();
992 1131
… …
1007cf::attachable->attach ( 1146cf::attachable->attach (
1008 prio => -1000000, 1147 prio => -1000000,
1009 on_instantiate => sub { 1148 on_instantiate => sub {
1010 my ($obj, $data) = @_; 1149 my ($obj, $data) = @_;
1011 1150
1012 $data = from_json $data; 1151 $data = decode_json $data;
1013 1152
1014 for (@$data) { 1153 for (@$data) {
1015 my ($name, $args) = @$_; 1154 my ($name, $args) = @$_;
1016 1155
1017 $obj->attach ($name, %{$args || {} }); 1156 $obj->attach ($name, %{$args || {} });
… …
1038 utf8::decode (my $decname = $filename); 1177 utf8::decode (my $decname = $filename);
1039 warn sprintf "saving %s (%d,%d)\n", 1178 warn sprintf "saving %s (%d,%d)\n",
1040 $decname, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1041 1180
1042 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1043 chmod SAVE_MODE, $fh; 1182 aio_chmod $fh, SAVE_MODE;
1044 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1045 aio_fsync $fh if $cf::USE_FSYNC; 1184 if ($cf::USE_FSYNC) {
1185 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;
1186 aio_fsync $fh;
1187 }
1046 close $fh; 1188 aio_close $fh;
1047 1189
1048 if (@$objs) { 1190 if (@$objs) {
1049 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1191 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1192 aio_chmod $fh, SAVE_MODE;
1051 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1052 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1053 aio_fsync $fh if $cf::USE_FSYNC; 1195 if ($cf::USE_FSYNC) {
1196 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;
1197 aio_fsync $fh;
1198 }
1054 close $fh; 1199 aio_close $fh;
1055 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1056 } 1201 }
1057 } else { 1202 } else {
1058 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
1059 } 1204 }
1060 1205
1061 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
1062 } else { 1210 } else {
1063 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1064 } 1212 }
1065 } else { 1213 } else {
1066 aio_unlink $filename; 1214 aio_unlink $filename;
1067 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1068 } 1216 }
… …
1087 1235
1088 unless (aio_stat "$filename.pst") { 1236 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1237 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1238 or return;
1091 1239
1092 $av = eval { (Storable::thaw $av)->{objs} }; 1240 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs};
1093 } 1242 }
1094 1243
1095 utf8::decode (my $decname = $filename); 1244 utf8::decode (my $decname = $filename);
1096 warn sprintf "loading %s (%d,%d)\n", 1245 warn sprintf "loading %s (%d,%d)\n",
1097 $decname, length $data, scalar @{$av || []}; 1246 $decname, length $data, scalar @{$av || []};
… …
1158 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1159 1308
1160 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1161} 1310}
1162 1311
1312use File::Glob ();
1313
1163cf::player->attach ( 1314cf::player->attach (
1164 on_command => sub { 1315 on_command => sub {
1165 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1166 1317
1167 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
… …
1199 1350
1200 cf::override; 1351 cf::override;
1201 }, 1352 },
1202); 1353);
1203 1354
1355# "readahead" all extensions
1356sub cache_extensions {
1357 my $grp = IO::AIO::aio_group;
1358
1359 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1360 for (grep /\.ext$/, @{$_[0]}) {
1361 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1362 }
1363 };
1364
1365 $grp
1366}
1367
1204sub load_extensions { 1368sub load_extensions {
1205 cf::sync_job { 1369 cf::sync_job {
1206 my %todo; 1370 my %todo;
1207 1371
1208 for my $path (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
… …
1227 1391
1228 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1229 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1230 1394
1231 $ext{source} = 1395 $ext{source} =
1232 "package $pkg; use strict; use utf8;\n" 1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1233 . "#line 1 \"$path\"\n{\n" 1397 . "#line 1 \"$path\"\n{\n"
1234 . $source 1398 . $source
1235 . "\n};\n1"; 1399 . "\n};\n1";
1236 1400
1237 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
… …
1253 my $msg = $@ ? "$v->{path}: $@\n" 1417 my $msg = $@ ? "$v->{path}: $@\n"
1254 : "$v->{base}: extension inactive.\n"; 1418 : "$v->{base}: extension inactive.\n";
1255 1419
1256 if (exists $v->{meta}{mandatory}) { 1420 if (exists $v->{meta}{mandatory}) {
1257 warn $msg; 1421 warn $msg;
1258 warn "mandatory extension failed to load, exiting.\n"; 1422 cf::cleanup "mandatory extension failed to load, exiting.";
1259 exit 1;
1260 } 1423 }
1261 1424
1262 warn $msg; 1425 warn $msg;
1263 } 1426 }
1264 1427
… …
1278 1441
1279=back 1442=back
1280 1443
1281=head2 CORE EXTENSIONS 1444=head2 CORE EXTENSIONS
1282 1445
1283Functions and methods that extend core crossfire objects. 1446Functions and methods that extend core deliantra objects.
1284 1447
1285=cut 1448=cut
1286 1449
1287package cf::player; 1450package cf::player;
1288 1451
… …
1331 1494
1332sub exists($) { 1495sub exists($) {
1333 my ($login) = @_; 1496 my ($login) = @_;
1334 1497
1335 $cf::PLAYER{$login} 1498 $cf::PLAYER{$login}
1336 or cf::sync_job { !aio_stat path $login } 1499 or !aio_stat path $login
1337} 1500}
1338 1501
1339sub find($) { 1502sub find($) {
1340 return $cf::PLAYER{$_[0]} || do { 1503 return $cf::PLAYER{$_[0]} || do {
1341 my $login = $_[0]; 1504 my $login = $_[0];
… …
1353 my $f = new_from_file cf::object::thawer path $login 1516 my $f = new_from_file cf::object::thawer path $login
1354 or return; 1517 or return;
1355 1518
1356 my $pl = cf::player::load_pl $f 1519 my $pl = cf::player::load_pl $f
1357 or return; 1520 or return;
1521
1358 local $cf::PLAYER_LOADING{$login} = $pl; 1522 local $cf::PLAYER_LOADING{$login} = $pl;
1359 $f->resolve_delayed_derefs; 1523 $f->resolve_delayed_derefs;
1360 $cf::PLAYER{$login} = $pl 1524 $cf::PLAYER{$login} = $pl
1361 } 1525 }
1362 } 1526 }
… …
1372 1536
1373 return if $pl->{deny_save}; 1537 return if $pl->{deny_save};
1374 1538
1375 aio_mkdir playerdir $pl, 0770; 1539 aio_mkdir playerdir $pl, 0770;
1376 $pl->{last_save} = $cf::RUNTIME; 1540 $pl->{last_save} = $cf::RUNTIME;
1541
1542 cf::get_slot 0.01;
1377 1543
1378 $pl->save_pl ($path); 1544 $pl->save_pl ($path);
1379 cf::cede_to_tick; 1545 cf::cede_to_tick;
1380} 1546}
1381 1547
… …
1413 my ($pl) = @_; 1579 my ($pl) = @_;
1414 1580
1415 my $name = $pl->ob->name; 1581 my $name = $pl->ob->name;
1416 1582
1417 $pl->{deny_save} = 1; 1583 $pl->{deny_save} = 1;
1418 $pl->password ("*"); # this should lock out the player until we nuked the dir 1584 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1419 1585
1420 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1586 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1421 $pl->deactivate; 1587 $pl->deactivate;
1588 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1589 $pl->ob->check_score;
1422 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1590 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1423 $pl->ns->destroy if $pl->ns; 1591 $pl->ns->destroy if $pl->ns;
1424 1592
1425 my $path = playerdir $pl; 1593 my $path = playerdir $pl;
1426 my $temp = "$path~$cf::RUNTIME~deleting~"; 1594 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1465 1633
1466 for my $login (@$dirs) { 1634 for my $login (@$dirs) {
1467 my $path = path $login; 1635 my $path = path $login;
1468 1636
1469 # a .pst is a dead give-away for a valid player 1637 # a .pst is a dead give-away for a valid player
1470 unless (-e "$path.pst") { 1638 # if no pst file found, open and chekc for blocked users
1639 if (aio_stat "$path.pst") {
1471 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1640 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1472 aio_read $fh, 0, 512, my $buf, 0 or next; 1641 aio_read $fh, 0, 512, my $buf, 0 or next;
1473 $buf !~ /^password -------------$/m or next; # official not-valid tag 1642 $buf !~ /^password -------------$/m or next; # official not-valid tag
1474 } 1643 }
1475 1644
… …
1506 } 1675 }
1507 1676
1508 \@paths 1677 \@paths
1509} 1678}
1510 1679
1511=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1680=item $protocol_xml = $player->expand_cfpod ($cfpod)
1512 1681
1513Expand crossfire pod fragments into protocol xml. 1682Expand deliantra pod fragments into protocol xml.
1514
1515=cut
1516
1517sub expand_cfpod {
1518 ((my $self), (local $_)) = @_;
1519
1520 # escape & and <
1521 s/&/&amp;/g;
1522 s/(?<![BIUGHT])</&lt;/g;
1523
1524 # this is buggy, it needs to properly take care of nested <'s
1525
1526 1 while
1527 # replace B<>, I<>, U<> etc.
1528 s/B<([^\>]*)>/<b>$1<\/b>/
1529 || s/I<([^\>]*)>/<i>$1<\/i>/
1530 || s/U<([^\>]*)>/<u>$1<\/u>/
1531 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1532 # replace G<male|female> tags
1533 || s{G<([^>|]*)\|([^>]*)>}{
1534 $self->gender ? $2 : $1
1535 }ge
1536 # replace H<hint text>
1537 || s{H<([^\>]*)>}
1538 {
1539 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1540 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1541 "")
1542 [$self->{hintmode}]
1543 }ge;
1544
1545 # create single paragraphs (very hackish)
1546 s/(?<=\S)\n(?=\w)/ /g;
1547
1548 # compress some whitespace
1549 s/\s+\n/\n/g; # ws line-ends
1550 s/\n\n+/\n/g; # double lines
1551 s/^\n+//; # beginning lines
1552 s/\n+$//; # ending lines
1553
1554 $_
1555}
1556
1557sub hintmode {
1558 $_[0]{hintmode} = $_[1] if @_ > 1;
1559 $_[0]{hintmode}
1560}
1561 1683
1562=item $player->ext_reply ($msgid, @msg) 1684=item $player->ext_reply ($msgid, @msg)
1563 1685
1564Sends an ext reply to the player. 1686Sends an ext reply to the player.
1565 1687
… …
1632our $MAX_RESET = 3600; 1754our $MAX_RESET = 3600;
1633our $DEFAULT_RESET = 3000; 1755our $DEFAULT_RESET = 3000;
1634 1756
1635sub generate_random_map { 1757sub generate_random_map {
1636 my ($self, $rmp) = @_; 1758 my ($self, $rmp) = @_;
1759
1760 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1761
1637 # mit "rum" bekleckern, nicht 1762 # mit "rum" bekleckern, nicht
1638 $self->_create_random_map ( 1763 $self->_create_random_map (
1639 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1764 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1640 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1765 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1641 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1766 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1763 1888
1764# the temporary/swap location 1889# the temporary/swap location
1765sub save_path { 1890sub save_path {
1766 my ($self) = @_; 1891 my ($self) = @_;
1767 1892
1768 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1893 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1769 "$TMPDIR/$path.map" 1894 "$TMPDIR/$path.map"
1770} 1895}
1771 1896
1772# the unique path, undef == no special unique path 1897# the unique path, undef == no special unique path
1773sub uniq_path { 1898sub uniq_path {
1774 my ($self) = @_; 1899 my ($self) = @_;
1775 1900
1776 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1901 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1777 "$UNIQUEDIR/$path" 1902 "$UNIQUEDIR/$path"
1778}
1779
1780# and all this just because we cannot iterate over
1781# all maps in C++...
1782sub change_all_map_light {
1783 my ($change) = @_;
1784
1785 $_->change_map_light ($change)
1786 for grep $_->outdoor, values %cf::MAP;
1787} 1903}
1788 1904
1789sub decay_objects { 1905sub decay_objects {
1790 my ($self) = @_; 1906 my ($self) = @_;
1791 1907
… …
1875sub find { 1991sub find {
1876 my ($path, $origin) = @_; 1992 my ($path, $origin) = @_;
1877 1993
1878 $path = normalise $path, $origin && $origin->path; 1994 $path = normalise $path, $origin && $origin->path;
1879 1995
1880 cf::lock_wait "map_data:$path";#d#remove 1996 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1881 cf::lock_wait "map_find:$path"; 1997 my $guard2 = cf::lock_acquire "map_find:$path";
1882 1998
1883 $cf::MAP{$path} || do { 1999 $cf::MAP{$path} || do {
1884 my $guard1 = cf::lock_acquire "map_find:$path";
1885 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1886
1887 my $map = new_from_path cf::map $path 2000 my $map = new_from_path cf::map $path
1888 or return; 2001 or return;
1889 2002
1890 $map->{last_save} = $cf::RUNTIME; 2003 $map->{last_save} = $cf::RUNTIME;
1891 2004
… …
1893 or return; 2006 or return;
1894 2007
1895 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2008 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1896 # doing this can freeze the server in a sync job, obviously 2009 # doing this can freeze the server in a sync job, obviously
1897 #$cf::WAIT_FOR_TICK->wait; 2010 #$cf::WAIT_FOR_TICK->wait;
2011 undef $guard2;
1898 undef $guard1; 2012 undef $guard1;
1899 undef $guard2;
1900 $map->reset; 2013 $map->reset;
1901 return find $path; 2014 return find $path;
1902 } 2015 }
1903 2016
1904 $cf::MAP{$path} = $map 2017 $cf::MAP{$path} = $map
1905 } 2018 }
1906} 2019}
1907 2020
1908sub pre_load { } 2021sub pre_load { }
1909sub post_load { } 2022#sub post_load { } # XS
1910 2023
1911sub load { 2024sub load {
1912 my ($self) = @_; 2025 my ($self) = @_;
1913 2026
1914 local $self->{deny_reset} = 1; # loading can take a long time 2027 local $self->{deny_reset} = 1; # loading can take a long time
… …
1931 my $f = new_from_file cf::object::thawer $self->{load_path}; 2044 my $f = new_from_file cf::object::thawer $self->{load_path};
1932 $f->skip_block; 2045 $f->skip_block;
1933 $self->_load_objects ($f) 2046 $self->_load_objects ($f)
1934 or return; 2047 or return;
1935 2048
1936 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2049 $self->post_load_original
1937 if delete $self->{load_original}; 2050 if delete $self->{load_original};
1938 2051
1939 if (my $uniq = $self->uniq_path) { 2052 if (my $uniq = $self->uniq_path) {
1940 utf8::encode $uniq; 2053 utf8::encode $uniq;
1941 unless (aio_stat $uniq) { 2054 unless (aio_stat $uniq) {
… …
1959 unless ($self->{deny_activate}) { 2072 unless ($self->{deny_activate}) {
1960 $self->decay_objects; 2073 $self->decay_objects;
1961 $self->fix_auto_apply; 2074 $self->fix_auto_apply;
1962 $self->update_buttons; 2075 $self->update_buttons;
1963 cf::cede_to_tick; 2076 cf::cede_to_tick;
1964 $self->set_darkness_map;
1965 cf::cede_to_tick;
1966 $self->activate; 2077 $self->activate;
1967 } 2078 }
1968 2079
1969 $self->{last_save} = $cf::RUNTIME; 2080 $self->{last_save} = $cf::RUNTIME;
1970 $self->last_access ($cf::RUNTIME); 2081 $self->last_access ($cf::RUNTIME);
1971 2082
1972 $self->in_memory (cf::MAP_IN_MEMORY); 2083 $self->in_memory (cf::MAP_ACTIVE);
1973 } 2084 }
1974 2085
1975 $self->post_load; 2086 $self->post_load;
1976} 2087}
1977 2088
… …
2035 my ($path, $origin, $load) = @_; 2146 my ($path, $origin, $load) = @_;
2036 2147
2037 $path = normalise $path, $origin && $origin->{path}; 2148 $path = normalise $path, $origin && $origin->{path};
2038 2149
2039 if (my $map = $cf::MAP{$path}) { 2150 if (my $map = $cf::MAP{$path}) {
2040 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2151 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2041 } 2152 }
2042 2153
2043 $MAP_PREFETCH{$path} |= $load; 2154 $MAP_PREFETCH{$path} |= $load;
2044 2155
2045 $MAP_PREFETCHER ||= cf::async { 2156 $MAP_PREFETCHER ||= cf::async {
… …
2082 cf::async { 2193 cf::async {
2083 $Coro::current->{desc} = "map player save"; 2194 $Coro::current->{desc} = "map player save";
2084 $_->contr->save for $self->players; 2195 $_->contr->save for $self->players;
2085 }; 2196 };
2086 2197
2198 cf::get_slot 0.02;
2199
2087 if ($uniq) { 2200 if ($uniq) {
2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2201 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2089 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2202 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2090 } else { 2203 } else {
2091 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2099 $self->save; 2212 $self->save;
2100 2213
2101 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2214 my $lock = cf::lock_acquire "map_data:$self->{path}";
2102 2215
2103 return if $self->players; 2216 return if $self->players;
2104 return if $self->in_memory != cf::MAP_IN_MEMORY; 2217 return if $self->in_memory != cf::MAP_ACTIVE;
2105 return if $self->{deny_save}; 2218 return if $self->{deny_save};
2106 2219
2107 $self->in_memory (cf::MAP_SWAPPED); 2220 $self->in_memory (cf::MAP_SWAPPED);
2108 2221
2109 $self->deactivate; 2222 $self->deactivate;
… …
2134 2247
2135 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2248 my $lock = cf::lock_acquire "map_data:$self->{path}";
2136 2249
2137 return if $self->players; 2250 return if $self->players;
2138 2251
2139 warn "resetting map ", $self->path; 2252 warn "resetting map ", $self->path, "\n";
2140 2253
2141 $self->in_memory (cf::MAP_SWAPPED); 2254 $self->in_memory (cf::MAP_SWAPPED);
2142 2255
2143 # need to save uniques path 2256 # need to save uniques path
2144 unless ($self->{deny_save}) { 2257 unless ($self->{deny_save}) {
… …
2227 2340
2228sub unique_maps() { 2341sub unique_maps() {
2229 [ 2342 [
2230 map { 2343 map {
2231 utf8::decode $_; 2344 utf8::decode $_;
2232 /\.map$/ 2345 s/\.map$//; # TODO future compatibility hack
2346 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2347 ? ()
2233 ? normalise $_ 2348 : normalise $_
2234 : ()
2235 } @{ aio_readdir $UNIQUEDIR or [] } 2349 } @{ aio_readdir $UNIQUEDIR or [] }
2236 ] 2350 ]
2237} 2351}
2238 2352
2239package cf; 2353=item cf::map::static_maps
2354
2355Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2356file in the shared directory excluding F</styles> and F</editor>). May
2357block.
2358
2359=cut
2360
2361sub static_maps() {
2362 my @dirs = "";
2363 my @maps;
2364
2365 while (@dirs) {
2366 my $dir = shift @dirs;
2367
2368 next if $dir eq "/styles" || $dir eq "/editor";
2369
2370 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2371 or return;
2372
2373 for (@$files) {
2374 s/\.map$// or next;
2375 utf8::decode $_;
2376 push @maps, "$dir/$_";
2377 }
2378
2379 push @dirs, map "$dir/$_", @$dirs;
2380 }
2381
2382 \@maps
2383}
2240 2384
2241=back 2385=back
2242 2386
2243=head3 cf::object 2387=head3 cf::object
2244 2388
… …
2248 2392
2249=over 4 2393=over 4
2250 2394
2251=item $ob->inv_recursive 2395=item $ob->inv_recursive
2252 2396
2253Returns the inventory of the object _and_ their inventories, recursively. 2397Returns the inventory of the object I<and> their inventories, recursively,
2398but I<not> the object itself.
2254 2399
2255=cut 2400=cut
2256 2401
2257sub inv_recursive_; 2402sub inv_recursive_;
2258sub inv_recursive_ { 2403sub inv_recursive_ {
… …
2263 inv_recursive_ inv $_[0] 2408 inv_recursive_ inv $_[0]
2264} 2409}
2265 2410
2266=item $ref = $ob->ref 2411=item $ref = $ob->ref
2267 2412
2268creates and returns a persistent reference to an objetc that can be stored as a string. 2413Creates and returns a persistent reference to an object that can be stored as a string.
2269 2414
2270=item $ob = cf::object::deref ($refstring) 2415=item $ob = cf::object::deref ($refstring)
2271 2416
2272returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2417returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2273even if the object actually exists. May block. 2418even if the object actually exists. May block.
… …
2305can be C<undef>. Does the right thing when the player is currently in a 2450can be C<undef>. Does the right thing when the player is currently in a
2306dialogue with the given NPC character. 2451dialogue with the given NPC character.
2307 2452
2308=cut 2453=cut
2309 2454
2455our $SAY_CHANNEL = {
2456 id => "say",
2457 title => "Map",
2458 reply => "say ",
2459 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2460};
2461
2462our $CHAT_CHANNEL = {
2463 id => "chat",
2464 title => "Chat",
2465 reply => "chat ",
2466 tooltip => "Player chat and shouts, global to the server.",
2467};
2468
2310# rough implementation of a future "reply" method that works 2469# rough implementation of a future "reply" method that works
2311# with dialog boxes. 2470# with dialog boxes.
2312#TODO: the first argument must go, split into a $npc->reply_to ( method 2471#TODO: the first argument must go, split into a $npc->reply_to ( method
2313sub cf::object::player::reply($$$;$) { 2472sub cf::object::player::reply($$$;$) {
2314 my ($self, $npc, $msg, $flags) = @_; 2473 my ($self, $npc, $msg, $flags) = @_;
… …
2325 my $dialog = $pl->{npc_dialog}; 2484 my $dialog = $pl->{npc_dialog};
2326 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2485 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2327 2486
2328 } else { 2487 } else {
2329 $msg = $npc->name . " says: $msg" if $npc; 2488 $msg = $npc->name . " says: $msg" if $npc;
2330 $self->message ($msg, $flags); 2489 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2331 } 2490 }
2332 } 2491 }
2333} 2492}
2334 2493
2335=item $object->send_msg ($channel, $msg, $color, [extra...]) 2494=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2360 2519
2361=item $player_object->enter_link 2520=item $player_object->enter_link
2362 2521
2363Freezes the player and moves him/her to a special map (C<{link}>). 2522Freezes the player and moves him/her to a special map (C<{link}>).
2364 2523
2365The player should be reasonably safe there for short amounts of time. You 2524The player should be reasonably safe there for short amounts of time (e.g.
2366I<MUST> call C<leave_link> as soon as possible, though. 2525for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2526though, as the palyer cannot control the character while it is on the link
2527map.
2367 2528
2368Will never block. 2529Will never block.
2369 2530
2370=item $player_object->leave_link ($map, $x, $y) 2531=item $player_object->leave_link ($map, $x, $y)
2371 2532
… …
2423 ($x, $y) = (-1, -1) 2584 ($x, $y) = (-1, -1)
2424 unless (defined $x) && (defined $y); 2585 unless (defined $x) && (defined $y);
2425 2586
2426 # use -1 or undef as default coordinates, not 0, 0 2587 # use -1 or undef as default coordinates, not 0, 0
2427 ($x, $y) = ($map->enter_x, $map->enter_y) 2588 ($x, $y) = ($map->enter_x, $map->enter_y)
2428 if $x <=0 && $y <= 0; 2589 if $x <= 0 && $y <= 0;
2429 2590
2430 $map->load; 2591 $map->load;
2431 $map->load_neighbours; 2592 $map->load_neighbours;
2432 2593
2433 return unless $self->contr->active; 2594 return unless $self->contr->active;
2434 $self->activate_recursive;
2435 2595
2436 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2596 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2437 $self->enter_map ($map, $x, $y); 2597 $self->enter_map ($map, $x, $y);
2598
2599 # only activate afterwards, to support waiting in hooks
2600 $self->activate_recursive;
2438} 2601}
2439 2602
2440=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2603=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2441 2604
2442Moves the player to the given map-path and coordinates by first freezing 2605Moves the player to the given map-path and coordinates by first freezing
2443her, loading and preparing them map, calling the provided $check callback 2606her, loading and preparing them map, calling the provided $check callback
2444that has to return the map if sucecssful, and then unfreezes the player on 2607that has to return the map if sucecssful, and then unfreezes the player on
2445the new (success) or old (failed) map position. In either case, $done will 2608the new (success) or old (failed) map position. In either case, $done will
2446be called at the end of this process. 2609be called at the end of this process.
2610
2611Note that $check will be called with a potentially non-loaded map, so if
2612it needs a loaded map it has to call C<< ->load >>.
2447 2613
2448=cut 2614=cut
2449 2615
2450our $GOTOGEN; 2616our $GOTOGEN;
2451 2617
… …
2530} 2696}
2531 2697
2532sub prepare_random_map { 2698sub prepare_random_map {
2533 my ($exit) = @_; 2699 my ($exit) = @_;
2534 2700
2535 my $guard = cf::lock_acquire "exit_prepare:$exit";
2536
2537 # all this does is basically replace the /! path by 2701 # all this does is basically replace the /! path by
2538 # a new random map path (?random/...) with a seed 2702 # a new random map path (?random/...) with a seed
2539 # that depends on the exit object 2703 # that depends on the exit object
2540 2704
2541 my $rmp = parse_random_map_params $exit->msg; 2705 my $rmp = parse_random_map_params $exit->msg;
… …
2543 if ($exit->map) { 2707 if ($exit->map) {
2544 $rmp->{region} = $exit->region->name; 2708 $rmp->{region} = $exit->region->name;
2545 $rmp->{origin_map} = $exit->map->path; 2709 $rmp->{origin_map} = $exit->map->path;
2546 $rmp->{origin_x} = $exit->x; 2710 $rmp->{origin_x} = $exit->x;
2547 $rmp->{origin_y} = $exit->y; 2711 $rmp->{origin_y} = $exit->y;
2712
2713 $exit->map->touch;
2548 } 2714 }
2549 2715
2550 $rmp->{random_seed} ||= $exit->random_seed; 2716 $rmp->{random_seed} ||= $exit->random_seed;
2551 2717
2552 my $data = cf::to_json $rmp; 2718 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2553 my $md5 = Digest::MD5::md5_hex $data; 2719 my $md5 = Digest::MD5::md5_hex $data;
2554 my $meta = "$RANDOMDIR/$md5.meta"; 2720 my $meta = "$RANDOMDIR/$md5.meta";
2555 2721
2556 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2722 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2557 aio_write $fh, 0, (length $data), $data, 0; 2723 aio_write $fh, 0, (length $data), $data, 0;
2558 undef $fh; 2724 undef $fh;
2559 aio_rename "$meta~", $meta; 2725 aio_rename "$meta~", $meta;
2560 2726
2727 my $slaying = "?random/$md5";
2728
2729 if ($exit->valid) {
2561 $exit->slaying ("?random/$md5"); 2730 $exit->slaying ("?random/$md5");
2562 $exit->msg (undef); 2731 $exit->msg (undef);
2732 }
2563 } 2733 }
2564} 2734}
2565 2735
2566sub cf::object::player::enter_exit { 2736sub cf::object::player::enter_exit {
2567 my ($self, $exit) = @_; 2737 my ($self, $exit) = @_;
2568 2738
2569 return unless $self->type == cf::PLAYER; 2739 return unless $self->type == cf::PLAYER;
2570 2740
2571 if ($exit->slaying eq "/!") {
2572 #TODO: this should de-fi-ni-te-ly not be a sync-job
2573 # the problem is that $exit might not survive long enough
2574 # so it needs to be done right now, right here
2575 cf::sync_job { prepare_random_map $exit };
2576 }
2577
2578 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2579 my $hp = $exit->stats->hp;
2580 my $sp = $exit->stats->sp;
2581
2582 $self->enter_link; 2741 $self->enter_link;
2583 2742
2584 # if exit is damned, update players death & WoR home-position
2585 $self->contr->savebed ($slaying, $hp, $sp)
2586 if $exit->flag (FLAG_DAMNED);
2587
2588 (async { 2743 (async {
2589 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2744 $Coro::current->{desc} = "enter_exit";
2590 2745
2591 $self->deactivate_recursive; # just to be sure
2592 unless (eval { 2746 unless (eval {
2747 $self->deactivate_recursive; # just to be sure
2748
2749 # random map handling
2750 {
2751 my $guard = cf::lock_acquire "exit_prepare:$exit";
2752
2753 prepare_random_map $exit
2754 if $exit->slaying eq "/!";
2755 }
2756
2757 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2758 my $x = $exit->stats->hp;
2759 my $y = $exit->stats->sp;
2760
2593 $self->goto ($slaying, $hp, $sp); 2761 $self->goto ($map, $x, $y);
2594 2762
2763 # if exit is damned, update players death & WoR home-position
2764 $self->contr->savebed ($map, $x, $y)
2765 if $exit->flag (cf::FLAG_DAMNED);
2766
2595 1; 2767 1
2596 }) { 2768 }) {
2597 $self->message ("Something went wrong deep within the crossfire server. " 2769 $self->message ("Something went wrong deep within the deliantra server. "
2598 . "I'll try to bring you back to the map you were before. " 2770 . "I'll try to bring you back to the map you were before. "
2599 . "Please report this to the dungeon master!", 2771 . "Please report this to the dungeon master!",
2600 cf::NDI_UNIQUE | cf::NDI_RED); 2772 cf::NDI_UNIQUE | cf::NDI_RED);
2601 2773
2602 warn "ERROR in enter_exit: $@"; 2774 warn "ERROR in enter_exit: $@";
… …
2619sub cf::client::send_drawinfo { 2791sub cf::client::send_drawinfo {
2620 my ($self, $text, $flags) = @_; 2792 my ($self, $text, $flags) = @_;
2621 2793
2622 utf8::encode $text; 2794 utf8::encode $text;
2623 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2795 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2796}
2797
2798=item $client->send_big_packet ($pkt)
2799
2800Like C<send_packet>, but tries to compress large packets, and fragments
2801them as required.
2802
2803=cut
2804
2805our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2806
2807sub cf::client::send_big_packet {
2808 my ($self, $pkt) = @_;
2809
2810 # try lzf for large packets
2811 $pkt = "lzf " . Compress::LZF::compress $pkt
2812 if 1024 <= length $pkt and $self->{can_lzf};
2813
2814 # split very large packets
2815 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2816 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2817 $pkt = "frag";
2818 }
2819
2820 $self->send_packet ($pkt);
2624} 2821}
2625 2822
2626=item $client->send_msg ($channel, $msg, $color, [extra...]) 2823=item $client->send_msg ($channel, $msg, $color, [extra...])
2627 2824
2628Send a drawinfo or msg packet to the client, formatting the msg for the 2825Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2630the message, with C<log> being the default. If C<$color> is negative, suppress 2827the message, with C<log> being the default. If C<$color> is negative, suppress
2631the message unless the client supports the msg packet. 2828the message unless the client supports the msg packet.
2632 2829
2633=cut 2830=cut
2634 2831
2832# non-persistent channels (usually the info channel)
2635our %CHANNEL = ( 2833our %CHANNEL = (
2834 "c/motd" => {
2835 id => "infobox",
2836 title => "MOTD",
2837 reply => undef,
2838 tooltip => "The message of the day",
2839 },
2636 "c/identify" => { 2840 "c/identify" => {
2637 id => "infobox", 2841 id => "infobox",
2638 title => "Identify", 2842 title => "Identify",
2639 reply => undef, 2843 reply => undef,
2640 tooltip => "Items recently identified", 2844 tooltip => "Items recently identified",
… …
2643 id => "infobox", 2847 id => "infobox",
2644 title => "Examine", 2848 title => "Examine",
2645 reply => undef, 2849 reply => undef,
2646 tooltip => "Signs and other items you examined", 2850 tooltip => "Signs and other items you examined",
2647 }, 2851 },
2852 "c/shopinfo" => {
2853 id => "infobox",
2854 title => "Shop Info",
2855 reply => undef,
2856 tooltip => "What your bargaining skill tells you about the shop",
2857 },
2858 "c/book" => {
2859 id => "infobox",
2860 title => "Book",
2861 reply => undef,
2862 tooltip => "The contents of a note or book",
2863 },
2648 "c/lookat" => { 2864 "c/lookat" => {
2649 id => "infobox", 2865 id => "infobox",
2650 title => "Look", 2866 title => "Look",
2651 reply => undef, 2867 reply => undef,
2652 tooltip => "What you saw there", 2868 tooltip => "What you saw there",
2653 }, 2869 },
2870 "c/who" => {
2871 id => "infobox",
2872 title => "Players",
2873 reply => undef,
2874 tooltip => "Shows players who are currently online",
2875 },
2876 "c/body" => {
2877 id => "infobox",
2878 title => "Body Parts",
2879 reply => undef,
2880 tooltip => "Shows which body parts you posess and are available",
2881 },
2882 "c/statistics" => {
2883 id => "infobox",
2884 title => "Statistics",
2885 reply => undef,
2886 tooltip => "Shows your primary statistics",
2887 },
2888 "c/skills" => {
2889 id => "infobox",
2890 title => "Skills",
2891 reply => undef,
2892 tooltip => "Shows your experience per skill and item power",
2893 },
2894 "c/shopitems" => {
2895 id => "infobox",
2896 title => "Shop Items",
2897 reply => undef,
2898 tooltip => "Shows the items currently for sale in this shop",
2899 },
2900 "c/resistances" => {
2901 id => "infobox",
2902 title => "Resistances",
2903 reply => undef,
2904 tooltip => "Shows your resistances",
2905 },
2906 "c/pets" => {
2907 id => "infobox",
2908 title => "Pets",
2909 reply => undef,
2910 tooltip => "Shows information abotu your pets/a specific pet",
2911 },
2912 "c/perceiveself" => {
2913 id => "infobox",
2914 title => "Perceive Self",
2915 reply => undef,
2916 tooltip => "You gained detailed knowledge about yourself",
2917 },
2918 "c/uptime" => {
2919 id => "infobox",
2920 title => "Uptime",
2921 reply => undef,
2922 tooltip => "How long the server has been running since last restart",
2923 },
2924 "c/mapinfo" => {
2925 id => "infobox",
2926 title => "Map Info",
2927 reply => undef,
2928 tooltip => "Information related to the maps",
2929 },
2930 "c/party" => {
2931 id => "party",
2932 title => "Party",
2933 reply => "gsay ",
2934 tooltip => "Messages and chat related to your party",
2935 },
2936 "c/death" => {
2937 id => "death",
2938 title => "Death",
2939 reply => undef,
2940 tooltip => "Reason for and more info about your most recent death",
2941 },
2942 "c/say" => $SAY_CHANNEL,
2943 "c/chat" => $CHAT_CHANNEL,
2654); 2944);
2655 2945
2656sub cf::client::send_msg { 2946sub cf::client::send_msg {
2657 my ($self, $channel, $msg, $color, @extra) = @_; 2947 my ($self, $channel, $msg, $color, @extra) = @_;
2658 2948
2659 $msg = $self->pl->expand_cfpod ($msg); 2949 $msg = $self->pl->expand_cfpod ($msg)
2950 unless $color & cf::NDI_VERBATIM;
2660 2951
2661 $color &= cf::NDI_CLIENT_MASK; # just in case... 2952 $color &= cf::NDI_CLIENT_MASK; # just in case...
2662 2953
2663 # check predefined channels, for the benefit of C 2954 # check predefined channels, for the benefit of C
2664 if ($CHANNEL{$channel}) { 2955 if ($CHANNEL{$channel}) {
2665 $channel = $CHANNEL{$channel}; 2956 $channel = $CHANNEL{$channel};
2666 2957
2667 $self->ext_msg (channel_info => $channel) 2958 $self->ext_msg (channel_info => $channel);
2668 if $self->can_msg;
2669
2670 $channel = $channel->{id}; 2959 $channel = $channel->{id};
2671 2960
2672 } elsif (ref $channel) { 2961 } elsif (ref $channel) {
2673 # send meta info to client, if not yet sent 2962 # send meta info to client, if not yet sent
2674 unless (exists $self->{channel}{$channel->{id}}) { 2963 unless (exists $self->{channel}{$channel->{id}}) {
2675 $self->{channel}{$channel->{id}} = $channel; 2964 $self->{channel}{$channel->{id}} = $channel;
2676 $self->ext_msg (channel_info => $channel) 2965 $self->ext_msg (channel_info => $channel);
2677 if $self->can_msg;
2678 } 2966 }
2679 2967
2680 $channel = $channel->{id}; 2968 $channel = $channel->{id};
2681 } 2969 }
2682 2970
2683 return unless @extra || length $msg; 2971 return unless @extra || length $msg;
2684 2972
2685 if ($self->can_msg) {
2686 # default colour, mask it out 2973 # default colour, mask it out
2687 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2974 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2688 if $color & cf::NDI_DEF; 2975 if $color & cf::NDI_DEF;
2689 2976
2690 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2977 my $pkt = "msg "
2978 . $self->{json_coder}->encode (
2691 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2979 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2692 } else { 2980 );
2693 if ($color >= 0) {
2694 # replace some tags by gcfclient-compatible ones
2695 for ($msg) {
2696 1 while
2697 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2698 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2699 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2700 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2701 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2702 }
2703 2981
2704 $color &= cf::NDI_COLOR_MASK; 2982 $self->send_big_packet ($pkt);
2705
2706 utf8::encode $msg;
2707
2708 if (0 && $msg =~ /\[/) {
2709 # COMMAND/INFO
2710 $self->send_packet ("drawextinfo $color 10 8 $msg")
2711 } else {
2712 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2713 $self->send_packet ("drawinfo $color $msg")
2714 }
2715 }
2716 }
2717} 2983}
2718 2984
2719=item $client->ext_msg ($type, @msg) 2985=item $client->ext_msg ($type, @msg)
2720 2986
2721Sends an ext event to the client. 2987Sends an ext event to the client.
… …
2724 2990
2725sub cf::client::ext_msg($$@) { 2991sub cf::client::ext_msg($$@) {
2726 my ($self, $type, @msg) = @_; 2992 my ($self, $type, @msg) = @_;
2727 2993
2728 if ($self->extcmd == 2) { 2994 if ($self->extcmd == 2) {
2729 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2995 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2730 } elsif ($self->extcmd == 1) { # TODO: remove 2996 } elsif ($self->extcmd == 1) { # TODO: remove
2731 push @msg, msgtype => "event_$type"; 2997 push @msg, msgtype => "event_$type";
2732 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2998 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2733 } 2999 }
2734} 3000}
2735 3001
2736=item $client->ext_reply ($msgid, @msg) 3002=item $client->ext_reply ($msgid, @msg)
2737 3003
… …
2741 3007
2742sub cf::client::ext_reply($$@) { 3008sub cf::client::ext_reply($$@) {
2743 my ($self, $id, @msg) = @_; 3009 my ($self, $id, @msg) = @_;
2744 3010
2745 if ($self->extcmd == 2) { 3011 if ($self->extcmd == 2) {
2746 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3012 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2747 } elsif ($self->extcmd == 1) { 3013 } elsif ($self->extcmd == 1) {
2748 #TODO: version 1, remove 3014 #TODO: version 1, remove
2749 unshift @msg, msgtype => "reply", msgid => $id; 3015 unshift @msg, msgtype => "reply", msgid => $id;
2750 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3016 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2751 } 3017 }
2752} 3018}
2753 3019
2754=item $success = $client->query ($flags, "text", \&cb) 3020=item $success = $client->query ($flags, "text", \&cb)
2755 3021
… …
2882our $safe_hole = new Safe::Hole; 3148our $safe_hole = new Safe::Hole;
2883 3149
2884$SIG{FPE} = 'IGNORE'; 3150$SIG{FPE} = 'IGNORE';
2885 3151
2886$safe->permit_only (Opcode::opset qw( 3152$safe->permit_only (Opcode::opset qw(
2887 :base_core :base_mem :base_orig :base_math 3153 :base_core :base_mem :base_orig :base_math :base_loop
2888 grepstart grepwhile mapstart mapwhile 3154 grepstart grepwhile mapstart mapwhile
2889 sort time 3155 sort time
2890)); 3156));
2891 3157
2892# here we export the classes and methods available to script code 3158# here we export the classes and methods available to script code
… …
2894=pod 3160=pod
2895 3161
2896The following functions and methods are available within a safe environment: 3162The following functions and methods are available within a safe environment:
2897 3163
2898 cf::object 3164 cf::object
2899 contr pay_amount pay_player map x y force_find force_add 3165 contr pay_amount pay_player map x y force_find force_add destroy
2900 insert remove name archname title slaying race decrease_ob_nr 3166 insert remove name archname title slaying race decrease split
3167 value
2901 3168
2902 cf::object::player 3169 cf::object::player
2903 player 3170 player
2904 3171
2905 cf::player 3172 cf::player
… …
2910 3177
2911=cut 3178=cut
2912 3179
2913for ( 3180for (
2914 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3181 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2915 insert remove inv name archname title slaying race 3182 insert remove inv nrof name archname title slaying race
2916 decrease_ob_nr)], 3183 decrease split destroy change_exp value msg lore send_msg)],
2917 ["cf::object::player" => qw(player)], 3184 ["cf::object::player" => qw(player)],
2918 ["cf::player" => qw(peaceful)], 3185 ["cf::player" => qw(peaceful send_msg)],
2919 ["cf::map" => qw(trigger)], 3186 ["cf::map" => qw(trigger)],
2920) { 3187) {
2921 no strict 'refs'; 3188 no strict 'refs';
2922 my ($pkg, @funs) = @$_; 3189 my ($pkg, @funs) = @$_;
2923 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3190 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2941 3208
2942 my $qcode = $code; 3209 my $qcode = $code;
2943 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3210 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2944 $qcode =~ s/\n/\\n/g; 3211 $qcode =~ s/\n/\\n/g;
2945 3212
3213 %vars = (_dummy => 0) unless %vars;
3214
3215 my @res;
2946 local $_; 3216 local $_;
2947 local @safe::cf::_safe_eval_args = values %vars;
2948 3217
2949 my $eval = 3218 my $eval =
2950 "do {\n" 3219 "do {\n"
2951 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3220 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2952 . "#line 0 \"{$qcode}\"\n" 3221 . "#line 0 \"{$qcode}\"\n"
2953 . $code 3222 . $code
2954 . "\n}" 3223 . "\n}"
2955 ; 3224 ;
2956 3225
3226 if ($CFG{safe_eval}) {
2957 sub_generation_inc; 3227 sub_generation_inc;
3228 local @safe::cf::_safe_eval_args = values %vars;
2958 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3229 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2959 sub_generation_inc; 3230 sub_generation_inc;
3231 } else {
3232 local @cf::_safe_eval_args = values %vars;
3233 @res = wantarray ? eval eval : scalar eval $eval;
3234 }
2960 3235
2961 if ($@) { 3236 if ($@) {
2962 warn "$@"; 3237 warn "$@";
2963 warn "while executing safe code '$code'\n"; 3238 warn "while executing safe code '$code'\n";
2964 warn "with arguments " . (join " ", %vars) . "\n"; 3239 warn "with arguments " . (join " ", %vars) . "\n";
… …
2983=cut 3258=cut
2984 3259
2985sub register_script_function { 3260sub register_script_function {
2986 my ($fun, $cb) = @_; 3261 my ($fun, $cb) = @_;
2987 3262
2988 no strict 'refs'; 3263 $fun = "safe::$fun" if $CFG{safe_eval};
2989 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3264 *$fun = $safe_hole->wrap ($cb);
2990} 3265}
2991 3266
2992=back 3267=back
2993 3268
2994=cut 3269=cut
… …
3015 3290
3016 $facedata->{version} == 2 3291 $facedata->{version} == 2
3017 or cf::cleanup "$path: version mismatch, cannot proceed."; 3292 or cf::cleanup "$path: version mismatch, cannot proceed.";
3018 3293
3019 # patch in the exptable 3294 # patch in the exptable
3295 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3020 $facedata->{resource}{"res/exp_table"} = { 3296 $facedata->{resource}{"res/exp_table"} = {
3021 type => FT_RSRC, 3297 type => FT_RSRC,
3022 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3298 data => $exp_table,
3299 hash => (Digest::MD5::md5 $exp_table),
3023 }; 3300 };
3024 cf::cede_to_tick; 3301 cf::cede_to_tick;
3025 3302
3026 { 3303 {
3027 my $faces = $facedata->{faceinfo}; 3304 my $faces = $facedata->{faceinfo};
3028 3305
3029 while (my ($face, $info) = each %$faces) { 3306 while (my ($face, $info) = each %$faces) {
3030 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3307 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3308
3031 cf::face::set_visibility $idx, $info->{visibility}; 3309 cf::face::set_visibility $idx, $info->{visibility};
3032 cf::face::set_magicmap $idx, $info->{magicmap}; 3310 cf::face::set_magicmap $idx, $info->{magicmap};
3033 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3311 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3034 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3312 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3035 3313
3036 cf::cede_to_tick; 3314 cf::cede_to_tick;
3037 } 3315 }
3038 3316
3039 while (my ($face, $info) = each %$faces) { 3317 while (my ($face, $info) = each %$faces) {
3040 next unless $info->{smooth}; 3318 next unless $info->{smooth};
3319
3041 my $idx = cf::face::find $face 3320 my $idx = cf::face::find $face
3042 or next; 3321 or next;
3322
3043 if (my $smooth = cf::face::find $info->{smooth}) { 3323 if (my $smooth = cf::face::find $info->{smooth}) {
3044 cf::face::set_smooth $idx, $smooth; 3324 cf::face::set_smooth $idx, $smooth;
3045 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3325 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3046 } else { 3326 } else {
3047 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3327 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3061 3341
3062 cf::anim::invalidate_all; # d'oh 3342 cf::anim::invalidate_all; # d'oh
3063 } 3343 }
3064 3344
3065 { 3345 {
3066 # TODO: for gcfclient pleasure, we should give resources
3067 # that gcfclient doesn't grok a >10000 face index.
3068 my $res = $facedata->{resource}; 3346 my $res = $facedata->{resource};
3069 3347
3070 my $soundconf = delete $res->{"res/sound.conf"};
3071
3072 while (my ($name, $info) = each %$res) { 3348 while (my ($name, $info) = each %$res) {
3349 if (defined $info->{type}) {
3073 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3350 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3074 my $data;
3075 3351
3076 if ($info->{type} & 1) { 3352 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3077 # prepend meta info 3353 cf::face::set_type $idx, $info->{type};
3078
3079 my $meta = $enc->encode ({
3080 name => $name,
3081 %{ $info->{meta} || {} },
3082 });
3083
3084 $data = pack "(w/a*)*", $meta, $info->{data};
3085 } else { 3354 } else {
3086 $data = $info->{data}; 3355 $RESOURCE{$name} = $info;
3087 } 3356 }
3088 3357
3089 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3090 cf::face::set_type $idx, $info->{type};
3091
3092 cf::cede_to_tick; 3358 cf::cede_to_tick;
3093 } 3359 }
3094
3095 if ($soundconf) {
3096 $soundconf = $enc->decode (delete $soundconf->{data});
3097
3098 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3099 my $sound = $soundconf->{compat}[$_]
3100 or next;
3101
3102 my $face = cf::face::find "sound/$sound->[1]";
3103 cf::sound::set $sound->[0] => $face;
3104 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3105 }
3106
3107 while (my ($k, $v) = each %{$soundconf->{event}}) {
3108 my $face = cf::face::find "sound/$v";
3109 cf::sound::set $k => $face;
3110 }
3111 }
3112 } 3360 }
3361
3362 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3113 3363
3114 1 3364 1
3115} 3365}
3366
3367cf::global->attach (on_resource_update => sub {
3368 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3369 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3370
3371 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3372 my $sound = $soundconf->{compat}[$_]
3373 or next;
3374
3375 my $face = cf::face::find "sound/$sound->[1]";
3376 cf::sound::set $sound->[0] => $face;
3377 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3378 }
3379
3380 while (my ($k, $v) = each %{$soundconf->{event}}) {
3381 my $face = cf::face::find "sound/$v";
3382 cf::sound::set $k => $face;
3383 }
3384 }
3385});
3116 3386
3117register_exticmd fx_want => sub { 3387register_exticmd fx_want => sub {
3118 my ($ns, $want) = @_; 3388 my ($ns, $want) = @_;
3119 3389
3120 while (my ($k, $v) = each %$want) { 3390 while (my ($k, $v) = each %$want) {
3121 $ns->fx_want ($k, $v); 3391 $ns->fx_want ($k, $v);
3122 } 3392 }
3123}; 3393};
3394
3395sub load_resource_file($) {
3396 my $guard = lock_acquire "load_resource_file";
3397
3398 my $status = load_resource_file_ $_[0];
3399 get_slot 0.1, 100;
3400 cf::arch::commit_load;
3401
3402 $status
3403}
3124 3404
3125sub reload_regions { 3405sub reload_regions {
3126 # HACK to clear player env face cache, we need some signal framework 3406 # HACK to clear player env face cache, we need some signal framework
3127 # for this (global event?) 3407 # for this (global event?)
3128 %ext::player_env::MUSIC_FACE_CACHE = (); 3408 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3142} 3422}
3143 3423
3144sub reload_archetypes { 3424sub reload_archetypes {
3145 load_resource_file "$DATADIR/archetypes" 3425 load_resource_file "$DATADIR/archetypes"
3146 or die "unable to load archetypes\n"; 3426 or die "unable to load archetypes\n";
3147 #d# NEED to laod twice to resolve forward references
3148 # this really needs to be done in an extra post-pass
3149 # (which needs to be synchronous, so solve it differently)
3150 load_resource_file "$DATADIR/archetypes"
3151 or die "unable to load archetypes\n";
3152} 3427}
3153 3428
3154sub reload_treasures { 3429sub reload_treasures {
3155 load_resource_file "$DATADIR/treasures" 3430 load_resource_file "$DATADIR/treasures"
3156 or die "unable to load treasurelists\n"; 3431 or die "unable to load treasurelists\n";
3157} 3432}
3158 3433
3159sub reload_resources { 3434sub reload_resources {
3160 warn "reloading resource files...\n"; 3435 warn "reloading resource files...\n";
3161 3436
3437 reload_facedata;
3438 reload_archetypes;
3162 reload_regions; 3439 reload_regions;
3163 reload_facedata;
3164 #reload_archetypes;#d#
3165 reload_archetypes;
3166 reload_treasures; 3440 reload_treasures;
3167 3441
3168 warn "finished reloading resource files\n"; 3442 warn "finished reloading resource files\n";
3169} 3443}
3170 3444
3171sub init {
3172 reload_resources;
3173}
3174
3175sub reload_config { 3445sub reload_config {
3446 warn "reloading config file...\n";
3447
3176 open my $fh, "<:utf8", "$CONFDIR/config" 3448 open my $fh, "<:utf8", "$CONFDIR/config"
3177 or return; 3449 or return;
3178 3450
3179 local $/; 3451 local $/;
3180 *CFG = YAML::Syck::Load <$fh>; 3452 *CFG = YAML::XS::Load scalar <$fh>;
3181 3453
3182 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3454 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3183 3455
3184 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3456 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3185 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3457 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3189 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3461 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3190 and die "WARNING: m(un)lockall failed: $!\n"; 3462 and die "WARNING: m(un)lockall failed: $!\n";
3191 }; 3463 };
3192 warn $@ if $@; 3464 warn $@ if $@;
3193 } 3465 }
3466
3467 warn "finished reloading resource files\n";
3468}
3469
3470sub pidfile() {
3471 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3472 or die "$PIDFILE: $!";
3473 flock $fh, &Fcntl::LOCK_EX
3474 or die "$PIDFILE: flock: $!";
3475 $fh
3476}
3477
3478# make sure only one server instance is running at any one time
3479sub atomic {
3480 my $fh = pidfile;
3481
3482 my $pid = <$fh>;
3483 kill 9, $pid if $pid > 0;
3484
3485 seek $fh, 0, 0;
3486 print $fh $$;
3487}
3488
3489sub main_loop {
3490 warn "EV::loop starting\n";
3491 if (1) {
3492 EV::loop;
3493 }
3494 warn "EV::loop returned\n";
3495 goto &main_loop unless $REALLY_UNLOOP;
3194} 3496}
3195 3497
3196sub main { 3498sub main {
3499 cf::init_globals; # initialise logging
3500
3501 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3502 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3503 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3504 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3505
3506 cf::init_experience;
3507 cf::init_anim;
3508 cf::init_attackmess;
3509 cf::init_dynamic;
3510
3511 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3512
3197 # we must not ever block the main coroutine 3513 # we must not ever block the main coroutine
3198 local $Coro::idle = sub { 3514 local $Coro::idle = sub {
3199 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3515 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3200 (async { 3516 (async {
3201 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3517 $Coro::current->{desc} = "IDLE BUG HANDLER";
3202 Event::one_event; 3518 EV::loop EV::LOOP_ONESHOT;
3203 })->prio (Coro::PRIO_MAX); 3519 })->prio (Coro::PRIO_MAX);
3204 }; 3520 };
3205 3521
3522 evthread_start IO::AIO::poll_fileno;
3523
3524 cf::sync_job {
3525 cf::load_settings;
3526 cf::load_materials;
3527
3528 reload_resources;
3206 reload_config; 3529 reload_config;
3207 db_init; 3530 db_init;
3531
3532 cf::init_uuid;
3533 cf::init_signals;
3534 cf::init_commands;
3535 cf::init_skills;
3536
3537 cf::init_beforeplay;
3538
3539 atomic;
3540
3208 load_extensions; 3541 load_extensions;
3209 3542
3210 $TICK_WATCHER->start; 3543 utime time, time, $RUNTIMEFILE;
3211 Event::loop; 3544
3545 # no (long-running) fork's whatsoever before this point(!)
3546 use POSIX ();
3547 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3548
3549 (pop @POST_INIT)->(0) while @POST_INIT;
3550 };
3551
3552 main_loop;
3212} 3553}
3213 3554
3214############################################################################# 3555#############################################################################
3215# initialisation and cleanup 3556# initialisation and cleanup
3216 3557
3217# install some emergency cleanup handlers 3558# install some emergency cleanup handlers
3218BEGIN { 3559BEGIN {
3560 our %SIGWATCHER = ();
3219 for my $signal (qw(INT HUP TERM)) { 3561 for my $signal (qw(INT HUP TERM)) {
3220 Event->signal ( 3562 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3221 reentrant => 0,
3222 data => WF_AUTOCANCEL,
3223 signal => $signal,
3224 prio => 0,
3225 cb => sub {
3226 cf::cleanup "SIG$signal"; 3563 cf::cleanup "SIG$signal";
3227 },
3228 ); 3564 };
3229 } 3565 }
3230} 3566}
3231 3567
3232sub write_runtime { 3568sub write_runtime_sync {
3233 my $runtime = "$LOCALDIR/runtime";
3234
3235 # first touch the runtime file to show we are still running: 3569 # first touch the runtime file to show we are still running:
3236 # the fsync below can take a very very long time. 3570 # the fsync below can take a very very long time.
3237 3571
3238 IO::AIO::aio_utime $runtime, undef, undef; 3572 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3239 3573
3240 my $guard = cf::lock_acquire "write_runtime"; 3574 my $guard = cf::lock_acquire "write_runtime";
3241 3575
3242 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3576 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3243 or return; 3577 or return;
3244 3578
3245 my $value = $cf::RUNTIME + 90 + 10; 3579 my $value = $cf::RUNTIME + 90 + 10;
3246 # 10 is the runtime save interval, for a monotonic clock 3580 # 10 is the runtime save interval, for a monotonic clock
3247 # 60 allows for the watchdog to kill the server. 3581 # 60 allows for the watchdog to kill the server.
… …
3257 aio_utime $fh, undef, undef; 3591 aio_utime $fh, undef, undef;
3258 3592
3259 close $fh 3593 close $fh
3260 or return; 3594 or return;
3261 3595
3262 aio_rename "$runtime~", $runtime 3596 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3263 and return; 3597 and return;
3264 3598
3265 warn "runtime file written.\n"; 3599 warn "runtime file written.\n";
3266 3600
3267 1 3601 1
3602}
3603
3604our $uuid_lock;
3605our $uuid_skip;
3606
3607sub write_uuid_sync($) {
3608 $uuid_skip ||= $_[0];
3609
3610 return if $uuid_lock;
3611 local $uuid_lock = 1;
3612
3613 my $uuid = "$LOCALDIR/uuid";
3614
3615 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3616 or return;
3617
3618 my $value = uuid_seq uuid_cur;
3619
3620 unless ($value) {
3621 warn "cowardly refusing to write zero uuid value!\n";
3622 return;
3623 }
3624
3625 my $value = uuid_str $value + $uuid_skip;
3626 $uuid_skip = 0;
3627
3628 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3629 and return;
3630
3631 # always fsync - this file is important
3632 aio_fsync $fh
3633 and return;
3634
3635 close $fh
3636 or return;
3637
3638 aio_rename "$uuid~", $uuid
3639 and return;
3640
3641 warn "uuid file written ($value).\n";
3642
3643 1
3644
3645}
3646
3647sub write_uuid($$) {
3648 my ($skip, $sync) = @_;
3649
3650 $sync ? write_uuid_sync $skip
3651 : async { write_uuid_sync $skip };
3268} 3652}
3269 3653
3270sub emergency_save() { 3654sub emergency_save() {
3271 my $freeze_guard = cf::freeze_mainloop; 3655 my $freeze_guard = cf::freeze_mainloop;
3272 3656
3273 warn "enter emergency perl save\n"; 3657 warn "emergency_perl_save: enter\n";
3274 3658
3275 cf::sync_job { 3659 cf::sync_job {
3660 # this is a trade-off: we want to be very quick here, so
3661 # save all maps without fsync, and later call a global sync
3662 # (which in turn might be very very slow)
3663 local $USE_FSYNC = 0;
3664
3276 # use a peculiar iteration method to avoid tripping on perl 3665 # use a peculiar iteration method to avoid tripping on perl
3277 # refcount bugs in for. also avoids problems with players 3666 # refcount bugs in for. also avoids problems with players
3278 # and maps saved/destroyed asynchronously. 3667 # and maps saved/destroyed asynchronously.
3279 warn "begin emergency player save\n"; 3668 warn "emergency_perl_save: begin player save\n";
3280 for my $login (keys %cf::PLAYER) { 3669 for my $login (keys %cf::PLAYER) {
3281 my $pl = $cf::PLAYER{$login} or next; 3670 my $pl = $cf::PLAYER{$login} or next;
3282 $pl->valid or next; 3671 $pl->valid or next;
3672 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3283 $pl->save; 3673 $pl->save;
3284 } 3674 }
3285 warn "end emergency player save\n"; 3675 warn "emergency_perl_save: end player save\n";
3286 3676
3287 warn "begin emergency map save\n"; 3677 warn "emergency_perl_save: begin map save\n";
3288 for my $path (keys %cf::MAP) { 3678 for my $path (keys %cf::MAP) {
3289 my $map = $cf::MAP{$path} or next; 3679 my $map = $cf::MAP{$path} or next;
3290 $map->valid or next; 3680 $map->valid or next;
3291 $map->save; 3681 $map->save;
3292 } 3682 }
3293 warn "end emergency map save\n"; 3683 warn "emergency_perl_save: end map save\n";
3294 3684
3295 warn "begin emergency database checkpoint\n"; 3685 warn "emergency_perl_save: begin database checkpoint\n";
3296 BDB::db_env_txn_checkpoint $DB_ENV; 3686 BDB::db_env_txn_checkpoint $DB_ENV;
3297 warn "end emergency database checkpoint\n"; 3687 warn "emergency_perl_save: end database checkpoint\n";
3688
3689 warn "emergency_perl_save: begin write uuid\n";
3690 write_uuid_sync 1;
3691 warn "emergency_perl_save: end write uuid\n";
3298 }; 3692 };
3299 3693
3694 warn "emergency_perl_save: starting sync()\n";
3695 IO::AIO::aio_sync sub {
3696 warn "emergency_perl_save: finished sync()\n";
3697 };
3698
3300 warn "leave emergency perl save\n"; 3699 warn "emergency_perl_save: leave\n";
3301} 3700}
3302 3701
3303sub post_cleanup { 3702sub post_cleanup {
3304 my ($make_core) = @_; 3703 my ($make_core) = @_;
3305 3704
3306 warn Carp::longmess "post_cleanup backtrace" 3705 warn Carp::longmess "post_cleanup backtrace"
3307 if $make_core; 3706 if $make_core;
3707
3708 my $fh = pidfile;
3709 unlink $PIDFILE if <$fh> == $$;
3710}
3711
3712# a safer delete_package, copied from Symbol
3713sub clear_package($) {
3714 my $pkg = shift;
3715
3716 # expand to full symbol table name if needed
3717 unless ($pkg =~ /^main::.*::$/) {
3718 $pkg = "main$pkg" if $pkg =~ /^::/;
3719 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3720 $pkg .= '::' unless $pkg =~ /::$/;
3721 }
3722
3723 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3724 my $stem_symtab = *{$stem}{HASH};
3725
3726 defined $stem_symtab and exists $stem_symtab->{$leaf}
3727 or return;
3728
3729 # clear all symbols
3730 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3731 for my $name (keys %$leaf_symtab) {
3732 _gv_clear *{"$pkg$name"};
3733# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3734 }
3735 warn "cleared package $pkg\n";#d#
3308} 3736}
3309 3737
3310sub do_reload_perl() { 3738sub do_reload_perl() {
3311 # can/must only be called in main 3739 # can/must only be called in main
3312 if ($Coro::current != $Coro::main) { 3740 if ($Coro::current != $Coro::main) {
3313 warn "can only reload from main coroutine"; 3741 warn "can only reload from main coroutine";
3314 return; 3742 return;
3315 } 3743 }
3316 3744
3745 return if $RELOAD++;
3746
3747 my $t1 = EV::time;
3748
3749 while ($RELOAD) {
3317 warn "reloading..."; 3750 warn "reloading...";
3318 3751
3319 warn "entering sync_job"; 3752 warn "entering sync_job";
3320 3753
3321 cf::sync_job { 3754 cf::sync_job {
3322 cf::write_runtime; # external watchdog should not bark 3755 cf::write_runtime_sync; # external watchdog should not bark
3323 cf::emergency_save; 3756 cf::emergency_save;
3324 cf::write_runtime; # external watchdog should not bark 3757 cf::write_runtime_sync; # external watchdog should not bark
3325 3758
3326 warn "syncing database to disk"; 3759 warn "syncing database to disk";
3327 BDB::db_env_txn_checkpoint $DB_ENV; 3760 BDB::db_env_txn_checkpoint $DB_ENV;
3328 3761
3329 # if anything goes wrong in here, we should simply crash as we already saved 3762 # if anything goes wrong in here, we should simply crash as we already saved
3330 3763
3331 warn "cancelling all WF_AUTOCANCEL watchers";
3332 for (Event::all_watchers) {
3333 $_->cancel if $_->data & WF_AUTOCANCEL;
3334 }
3335
3336 warn "flushing outstanding aio requests"; 3764 warn "flushing outstanding aio requests";
3337 for (;;) {
3338 BDB::flush;
3339 IO::AIO::flush;
3340 Coro::cede;
3341 last unless IO::AIO::nreqs || BDB::nreqs; 3765 while (IO::AIO::nreqs || BDB::nreqs) {
3342 warn "iterate..."; 3766 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3343 }
3344
3345 ++$RELOAD;
3346
3347 warn "cancelling all extension coros";
3348 $_->cancel for values %EXT_CORO;
3349 %EXT_CORO = ();
3350
3351 warn "removing commands";
3352 %COMMAND = ();
3353
3354 warn "removing ext/exti commands";
3355 %EXTCMD = ();
3356 %EXTICMD = ();
3357
3358 warn "unloading/nuking all extensions";
3359 for my $pkg (@EXTS) {
3360 warn "... unloading $pkg";
3361
3362 if (my $cb = $pkg->can ("unload")) {
3363 eval {
3364 $cb->($pkg);
3365 1
3366 } or warn "$pkg unloaded, but with errors: $@";
3367 } 3767 }
3368 3768
3369 warn "... nuking $pkg"; 3769 warn "cancelling all extension coros";
3370 Symbol::delete_package $pkg; 3770 $_->cancel for values %EXT_CORO;
3371 } 3771 %EXT_CORO = ();
3372 3772
3373 warn "unloading all perl modules loaded from $LIBDIR"; 3773 warn "removing commands";
3374 while (my ($k, $v) = each %INC) { 3774 %COMMAND = ();
3375 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3376 3775
3776 warn "removing ext/exti commands";
3777 %EXTCMD = ();
3778 %EXTICMD = ();
3779
3780 warn "unloading/nuking all extensions";
3781 for my $pkg (@EXTS) {
3377 warn "... unloading $k"; 3782 warn "... unloading $pkg";
3378 delete $INC{$k};
3379 3783
3380 $k =~ s/\.pm$//;
3381 $k =~ s/\//::/g;
3382
3383 if (my $cb = $k->can ("unload_module")) { 3784 if (my $cb = $pkg->can ("unload")) {
3785 eval {
3384 $cb->(); 3786 $cb->($pkg);
3787 1
3788 } or warn "$pkg unloaded, but with errors: $@";
3789 }
3790
3791 warn "... clearing $pkg";
3792 clear_package $pkg;
3385 } 3793 }
3386 3794
3387 Symbol::delete_package $k; 3795 warn "unloading all perl modules loaded from $LIBDIR";
3796 while (my ($k, $v) = each %INC) {
3797 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3798
3799 warn "... unloading $k";
3800 delete $INC{$k};
3801
3802 $k =~ s/\.pm$//;
3803 $k =~ s/\//::/g;
3804
3805 if (my $cb = $k->can ("unload_module")) {
3806 $cb->();
3807 }
3808
3809 clear_package $k;
3388 } 3810 }
3389 3811
3390 warn "getting rid of safe::, as good as possible"; 3812 warn "getting rid of safe::, as good as possible";
3391 Symbol::delete_package "safe::$_" 3813 clear_package "safe::$_"
3392 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3814 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3393 3815
3394 warn "unloading cf.pm \"a bit\""; 3816 warn "unloading cf.pm \"a bit\"";
3395 delete $INC{"cf.pm"}; 3817 delete $INC{"cf.pm"};
3396 delete $INC{"cf/pod.pm"}; 3818 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3397 3819
3398 # don't, removes xs symbols, too, 3820 # don't, removes xs symbols, too,
3399 # and global variables created in xs 3821 # and global variables created in xs
3400 #Symbol::delete_package __PACKAGE__; 3822 #clear_package __PACKAGE__;
3401 3823
3402 warn "unload completed, starting to reload now"; 3824 warn "unload completed, starting to reload now";
3403 3825
3404 warn "reloading cf.pm"; 3826 warn "reloading cf.pm";
3405 require cf; 3827 require cf;
3406 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3828 cf::_connect_to_perl_1;
3407 3829
3408 warn "loading config and database again"; 3830 warn "loading config and database again";
3409 cf::reload_config; 3831 cf::reload_config;
3410 3832
3411 warn "loading extensions"; 3833 warn "loading extensions";
3412 cf::load_extensions; 3834 cf::load_extensions;
3413 3835
3836 if ($REATTACH_ON_RELOAD) {
3414 warn "reattaching attachments to objects/players"; 3837 warn "reattaching attachments to objects/players";
3415 _global_reattach; # objects, sockets 3838 _global_reattach; # objects, sockets
3416 warn "reattaching attachments to maps"; 3839 warn "reattaching attachments to maps";
3417 reattach $_ for values %MAP; 3840 reattach $_ for values %MAP;
3418 warn "reattaching attachments to players"; 3841 warn "reattaching attachments to players";
3419 reattach $_ for values %PLAYER; 3842 reattach $_ for values %PLAYER;
3843 }
3420 3844
3845 warn "running post_init jobs";
3846 (pop @POST_INIT)->(1) while @POST_INIT;
3847
3421 warn "leaving sync_job"; 3848 warn "leaving sync_job";
3422 3849
3423 1 3850 1
3424 } or do { 3851 } or do {
3425 warn $@; 3852 warn $@;
3426 warn "error while reloading, exiting."; 3853 cf::cleanup "error while reloading, exiting.";
3427 exit 1;
3428 }; 3854 };
3429 3855
3430 warn "reloaded"; 3856 warn "reloaded";
3857 --$RELOAD;
3858 }
3859
3860 $t1 = EV::time - $t1;
3861 warn "reload completed in ${t1}s\n";
3431}; 3862};
3432 3863
3433our $RELOAD_WATCHER; # used only during reload 3864our $RELOAD_WATCHER; # used only during reload
3434 3865
3435sub reload_perl() { 3866sub reload_perl() {
3436 # doing reload synchronously and two reloads happen back-to-back, 3867 # doing reload synchronously and two reloads happen back-to-back,
3437 # coro crashes during coro_state_free->destroy here. 3868 # coro crashes during coro_state_free->destroy here.
3438 3869
3439 $RELOAD_WATCHER ||= Event->timer ( 3870 $RELOAD_WATCHER ||= cf::async {
3440 reentrant => 0, 3871 Coro::AIO::aio_wait cache_extensions;
3441 after => 0, 3872
3442 data => WF_AUTOCANCEL, 3873 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3443 cb => sub {
3444 do_reload_perl; 3874 do_reload_perl;
3445 undef $RELOAD_WATCHER; 3875 undef $RELOAD_WATCHER;
3446 }, 3876 };
3447 ); 3877 };
3448} 3878}
3449 3879
3450register_command "reload" => sub { 3880register_command "reload" => sub {
3451 my ($who, $arg) = @_; 3881 my ($who, $arg) = @_;
3452 3882
… …
3465 3895
3466our @WAIT_FOR_TICK; 3896our @WAIT_FOR_TICK;
3467our @WAIT_FOR_TICK_BEGIN; 3897our @WAIT_FOR_TICK_BEGIN;
3468 3898
3469sub wait_for_tick { 3899sub wait_for_tick {
3470 return unless $TICK_WATCHER->is_active;
3471 return if $Coro::current == $Coro::main; 3900 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3472 3901
3473 my $signal = new Coro::Signal; 3902 my $signal = new Coro::Signal;
3474 push @WAIT_FOR_TICK, $signal; 3903 push @WAIT_FOR_TICK, $signal;
3475 $signal->wait; 3904 $signal->wait;
3476} 3905}
3477 3906
3478sub wait_for_tick_begin { 3907sub wait_for_tick_begin {
3479 return unless $TICK_WATCHER->is_active;
3480 return if $Coro::current == $Coro::main; 3908 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3481 3909
3482 my $signal = new Coro::Signal; 3910 my $signal = new Coro::Signal;
3483 push @WAIT_FOR_TICK_BEGIN, $signal; 3911 push @WAIT_FOR_TICK_BEGIN, $signal;
3484 $signal->wait; 3912 $signal->wait;
3485} 3913}
3486 3914
3487$TICK_WATCHER = Event->timer ( 3915sub tick {
3488 reentrant => 0,
3489 parked => 1,
3490 prio => 0,
3491 at => $NEXT_TICK || $TICK,
3492 data => WF_AUTOCANCEL,
3493 cb => sub {
3494 if ($Coro::current != $Coro::main) { 3916 if ($Coro::current != $Coro::main) {
3495 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3917 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3496 unless ++$bug_warning > 10; 3918 unless ++$bug_warning > 10;
3497 return; 3919 return;
3498 } 3920 }
3499 3921
3500 $NOW = $tick_start = Event::time;
3501
3502 cf::server_tick; # one server iteration 3922 cf::server_tick; # one server iteration
3503 3923
3504 $RUNTIME += $TICK; 3924 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3505 $NEXT_TICK += $TICK;
3506 3925
3507 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3926 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3508 $NEXT_RUNTIME_WRITE = $NOW + 10; 3927 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3509 Coro::async_pool { 3928 Coro::async_pool {
3510 $Coro::current->{desc} = "runtime saver"; 3929 $Coro::current->{desc} = "runtime saver";
3511 write_runtime 3930 write_runtime_sync
3512 or warn "ERROR: unable to write runtime file: $!"; 3931 or warn "ERROR: unable to write runtime file: $!";
3513 };
3514 } 3932 };
3933 }
3515 3934
3516 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3935 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3517 $sig->send; 3936 $sig->send;
3518 } 3937 }
3519 while (my $sig = shift @WAIT_FOR_TICK) { 3938 while (my $sig = shift @WAIT_FOR_TICK) {
3520 $sig->send; 3939 $sig->send;
3521 } 3940 }
3522 3941
3523 $NOW = Event::time; 3942 $LOAD = ($NOW - $TICK_START) / $TICK;
3524
3525 # if we are delayed by four ticks or more, skip them all
3526 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3527
3528 $TICK_WATCHER->at ($NEXT_TICK);
3529 $TICK_WATCHER->start;
3530
3531 $LOAD = ($NOW - $tick_start) / $TICK;
3532 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3943 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3533 3944
3534 _post_tick; 3945 if (0) {
3946 if ($NEXT_TICK) {
3947 my $jitter = $TICK_START - $NEXT_TICK;
3948 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3949 warn "jitter $JITTER\n";#d#
3950 }
3535 }, 3951 }
3536); 3952}
3537 3953
3538{ 3954{
3955 # configure BDB
3956
3539 BDB::min_parallel 8; 3957 BDB::min_parallel 16;
3540 BDB::max_poll_time $TICK * 0.1; 3958 BDB::max_poll_reqs $TICK * 0.1;
3541 $BDB_POLL_WATCHER = Event->io ( 3959 $AnyEvent::BDB::WATCHER->priority (1);
3542 reentrant => 0,
3543 fd => BDB::poll_fileno,
3544 poll => 'r',
3545 prio => 0,
3546 data => WF_AUTOCANCEL,
3547 cb => \&BDB::poll_cb,
3548 );
3549
3550 BDB::set_sync_prepare {
3551 my $status;
3552 my $current = $Coro::current;
3553 (
3554 sub {
3555 $status = $!;
3556 $current->ready; undef $current;
3557 },
3558 sub {
3559 Coro::schedule while defined $current;
3560 $! = $status;
3561 },
3562 )
3563 };
3564 3960
3565 unless ($DB_ENV) { 3961 unless ($DB_ENV) {
3566 $DB_ENV = BDB::db_env_create; 3962 $DB_ENV = BDB::db_env_create;
3567 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3963 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3568 | BDB::LOG_AUTOREMOVE, 1); 3964 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3965 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3569 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3966 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3570 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3967 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3571 3968
3572 cf::sync_job { 3969 cf::sync_job {
3573 eval { 3970 eval {
… …
3583 3980
3584 cf::cleanup "db_env_open(db): $@" if $@; 3981 cf::cleanup "db_env_open(db): $@" if $@;
3585 }; 3982 };
3586 } 3983 }
3587 3984
3588 $BDB_DEADLOCK_WATCHER = Event->timer ( 3985 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3589 after => 3,
3590 interval => 1,
3591 hard => 1,
3592 prio => 0,
3593 data => WF_AUTOCANCEL,
3594 cb => sub {
3595 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3986 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3596 },
3597 ); 3987 };
3598 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3988 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3599 after => 11,
3600 interval => 60,
3601 hard => 1,
3602 prio => 0,
3603 data => WF_AUTOCANCEL,
3604 cb => sub {
3605 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3989 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3606 },
3607 ); 3990 };
3608 $BDB_TRICKLE_WATCHER = Event->timer ( 3991 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3609 after => 5,
3610 interval => 10,
3611 hard => 1,
3612 prio => 0,
3613 data => WF_AUTOCANCEL,
3614 cb => sub {
3615 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3992 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3616 },
3617 ); 3993 };
3618} 3994}
3619 3995
3620{ 3996{
3997 # configure IO::AIO
3998
3621 IO::AIO::min_parallel 8; 3999 IO::AIO::min_parallel 8;
3622
3623 undef $Coro::AIO::WATCHER;
3624 IO::AIO::max_poll_time $TICK * 0.1; 4000 IO::AIO::max_poll_time $TICK * 0.1;
3625 $AIO_POLL_WATCHER = Event->io ( 4001 undef $AnyEvent::AIO::WATCHER;
3626 reentrant => 0,
3627 data => WF_AUTOCANCEL,
3628 fd => IO::AIO::poll_fileno,
3629 poll => 'r',
3630 prio => 0,
3631 cb => \&IO::AIO::poll_cb,
3632 );
3633} 4002}
3634 4003
3635my $_log_backtrace; 4004my $_log_backtrace;
3636 4005
3637sub _log_backtrace { 4006sub _log_backtrace {
… …
3640 $msg =~ s/\n//; 4009 $msg =~ s/\n//;
3641 4010
3642 # limit the # of concurrent backtraces 4011 # limit the # of concurrent backtraces
3643 if ($_log_backtrace < 2) { 4012 if ($_log_backtrace < 2) {
3644 ++$_log_backtrace; 4013 ++$_log_backtrace;
4014 my $perl_bt = Carp::longmess $msg;
3645 async { 4015 async {
3646 $Coro::current->{desc} = "abt $msg"; 4016 $Coro::current->{desc} = "abt $msg";
3647 4017
3648 my @bt = fork_call { 4018 my @bt = fork_call {
3649 @addr = map { sprintf "%x", $_ } @addr; 4019 @addr = map { sprintf "%x", $_ } @addr;
… …
3660 } 4030 }
3661 4031
3662 @funcs 4032 @funcs
3663 }; 4033 };
3664 4034
3665 LOG llevInfo, "[ABT] $msg\n"; 4035 LOG llevInfo, "[ABT] $perl_bt\n";
4036 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3666 LOG llevInfo, "[ABT] $_\n" for @bt; 4037 LOG llevInfo, "[ABT] $_\n" for @bt;
3667 --$_log_backtrace; 4038 --$_log_backtrace;
3668 }; 4039 };
3669 } else { 4040 } else {
3670 LOG llevInfo, "[ABT] $msg\n"; 4041 LOG llevInfo, "[ABT] $msg\n";
3671 LOG llevInfo, "[ABT] [suppressed]\n"; 4042 LOG llevInfo, "[ABT] [suppressed]\n";
3672 } 4043 }
3673} 4044}
3674 4045
3675# load additional modules 4046# load additional modules
3676use cf::pod; 4047require "cf/$_.pm" for @EXTRA_MODULES;
4048cf::_connect_to_perl_2;
3677 4049
3678END { cf::emergency_save } 4050END { cf::emergency_save }
3679 4051
36801 40521
3681 4053

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines