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.368 by root, Wed Sep 12 11:18:25 2007 UTC vs.
Revision 1.496 by root, Sun Nov 15 18:03:59 2009 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; 118our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 121our $DB_ENV;
88 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
89our %CFG; 125our %CFG;
90 126
91our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
92our $RUNTIME; 128our $RUNTIME;
129our $NOW;
93 130
94our (%PLAYER, %PLAYER_LOADING); # all users 131our (%PLAYER, %PLAYER_LOADING); # all users
95our (%MAP, %MAP_LOADING ); # all maps 132our (%MAP, %MAP_LOADING ); # all maps
96our $LINK_MAP; # the special {link} map, which is always available 133our $LINK_MAP; # the special {link} map, which is always available
97 134
98# 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 ∕
99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 136our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100 137
101our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
140our $JITTER; # average jitter
103our $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 :)
104 147
105binmode STDOUT; 148binmode STDOUT;
106binmode STDERR; 149binmode STDERR;
107 150
108# read virtual server time, if available 151# read virtual server time, if available
109unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
110 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
111 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
112 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
113} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
114 159
115mkdir $_ 160mkdir $_
116 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
117 162
118our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
119 164
120sub 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::"} };
121 177
122############################################################################# 178#############################################################################
123 179
124=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
125 181
… …
161 217
162The raw value load value from the last tick. 218The raw value load value from the last tick.
163 219
164=item %cf::CFG 220=item %cf::CFG
165 221
166Configuration for the server, loaded from C</etc/crossfire/config>, or 222Configuration for the server, loaded from C</etc/deliantra-server/config>, or
167from wherever your confdir points to. 223from wherever your confdir points to.
168 224
169=item cf::wait_for_tick, cf::wait_for_tick_begin 225=item cf::wait_for_tick, cf::wait_for_tick_begin
170 226
171These 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
172returns 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
173per 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.
174 230
175=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
176 232
177This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
178C<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
179that call. 235that call.
180 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
181=back 243=back
182 244
183=cut 245=cut
184 246
185BEGIN { 247$Coro::State::WARNHOOK = sub {
186 *CORE::GLOBAL::warn = sub {
187 my $msg = join "", @_; 248 my $msg = join "", @_;
188 249
189 $msg .= "\n" 250 $msg .= "\n"
190 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
191 252
192 $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;
193 254
194 LOG llevError, $msg; 255 LOG llevError, $msg;
195 }; 256};
196} 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};
197 271
198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
208for my $pkg (qw( 282for my $pkg (qw(
209 cf::global cf::attachable 283 cf::global cf::attachable
210 cf::object cf::object::player 284 cf::object cf::object::player
211 cf::client cf::player 285 cf::client cf::player
212 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
213 cf::map cf::party cf::region 288 cf::party cf::region
214)) { 289)) {
215 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 291}
218 292
219$Event::DIED = sub { 293$EV::DIED = sub {
220 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
221}; 295};
222 296
223############################################################################# 297#############################################################################
224 298
225=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
247 $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;
248 $d 322 $d
249 } || "[unable to dump $_[0]: '$@']"; 323 } || "[unable to dump $_[0]: '$@']";
250} 324}
251 325
252=item $ref = cf::from_json $json 326=item $ref = cf::decode_json $json
253 327
254Converts a JSON string into the corresponding perl data structure. 328Converts a JSON string into the corresponding perl data structure.
255 329
256=item $json = cf::to_json $ref 330=item $json = cf::encode_json $ref
257 331
258Converts a perl data structure into its JSON representation. 332Converts a perl data structure into its JSON representation.
259 333
260=cut 334=cut
261 335
262our $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
263 337
264sub to_json ($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
265sub 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}
266 354
267=item cf::lock_wait $string 355=item cf::lock_wait $string
268 356
269Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
270 358
271=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
272 360
273Wait 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
274a 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,
275for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
276returned. 364returned.
277 365
278Locks 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
279deadlocked coro. 367deadlocked coro.
… …
285 373
286Return 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.
287 375
288=cut 376=cut
289 377
290our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
291our %LOCKER;#d#
292 379
293sub lock_wait($) { 380sub lock_wait($) {
294 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
300
301 # wait for lock, if any
302 while ($LOCK{$key}) {
303 push @{ $LOCK{$key} }, $Coro::current;
304 Coro::schedule;
305 }
306} 382}
307 383
308sub lock_acquire($) { 384sub lock_acquire($) {
309 my ($key) = @_; 385 $LOCKS->guard ($_[0])
310
311 # wait, to be sure we are not locked
312 lock_wait $key;
313
314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
316
317 Coro::guard {
318 delete $LOCKER{$key};#d#
319 # wake up all waiters, to be on the safe side
320 $_->ready for @{ delete $LOCK{$key} };
321 }
322} 386}
323 387
324sub lock_active($) { 388sub lock_active($) {
325 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
326
327 ! ! $LOCK{$key}
328} 390}
329 391
330sub freeze_mainloop { 392sub freeze_mainloop {
331 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
332 394
333 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
334 $TICK_WATCHER->start; 396}
335 }; 397
336 $TICK_WATCHER->stop; 398=item cf::periodic $interval, $cb
337 $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
338} 411}
339 412
340=item cf::get_slot $time[, $priority[, $name]] 413=item cf::get_slot $time[, $priority[, $name]]
341 414
342Allocate $time seconds of blocking CPU time at priority C<$priority>: 415Allocate $time seconds of blocking CPU time at priority C<$priority>:
… …
353our @SLOT_QUEUE; 426our @SLOT_QUEUE;
354our $SLOT_QUEUE; 427our $SLOT_QUEUE;
355 428
356$SLOT_QUEUE->cancel if $SLOT_QUEUE; 429$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357$SLOT_QUEUE = Coro::async { 430$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager");
432
358 my $signal = new Coro::Signal; 433 my $signal = new Coro::Signal;
359 434
360 while () { 435 while () {
361 next_job: 436 next_job:
362 my $avail = cf::till_tick; 437 my $avail = cf::till_tick;
… …
370 } 445 }
371 } 446 }
372 } 447 }
373 448
374 if (@SLOT_QUEUE) { 449 if (@SLOT_QUEUE) {
375 # we do not use wait_For_tick() as it returns immediately when tick is inactive 450 # we do not use wait_for_tick() as it returns immediately when tick is inactive
376 push @cf::WAIT_FOR_TICK, $signal; 451 push @cf::WAIT_FOR_TICK, $signal;
377 $signal->wait; 452 $signal->wait;
378 } else { 453 } else {
379 Coro::schedule; 454 Coro::schedule;
380 } 455 }
381 } 456 }
382}; 457};
383 458
384sub get_slot($;$$) { 459sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main;
461
385 my ($time, $pri, $name) = @_; 462 my ($time, $pri, $name) = @_;
386 463
387 $time = $TICK * .6 if $time > $TICK * .6; 464 $time = $TICK * .6 if $time > $TICK * .6;
388 my $sig = new Coro::Signal; 465 my $sig = new Coro::Signal;
389 466
… …
403 480
404BEGIN { *async = \&Coro::async_pool } 481BEGIN { *async = \&Coro::async_pool }
405 482
406=item cf::sync_job { BLOCK } 483=item cf::sync_job { BLOCK }
407 484
408The design of Crossfire TRT requires that the main coroutine ($Coro::main) 485The design of Deliantra requires that the main coroutine ($Coro::main)
409is always able to handle events or runnable, as Crossfire TRT is only 486is always able to handle events or runnable, as Deliantra is only
410partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 487partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
411acceptable. 488acceptable.
412 489
413If it must be done, put the blocking parts into C<sync_job>. This will run 490If it must be done, put the blocking parts into C<sync_job>. This will run
414the given BLOCK in another coroutine while waiting for the result. The 491the given BLOCK in another coroutine while waiting for the result. The
… …
419 496
420sub sync_job(&) { 497sub sync_job(&) {
421 my ($job) = @_; 498 my ($job) = @_;
422 499
423 if ($Coro::current == $Coro::main) { 500 if ($Coro::current == $Coro::main) {
424 my $time = Event::time; 501 my $time = EV::time;
425 502
426 # this is the main coro, too bad, we have to block 503 # this is the main coro, too bad, we have to block
427 # till the operation succeeds, freezing the server :/ 504 # till the operation succeeds, freezing the server :/
428 505
429 # TODO: use suspend/resume instead 506 LOG llevError, Carp::longmess "sync job";#d#
430 # (but this is cancel-safe) 507
431 my $freeze_guard = freeze_mainloop; 508 my $freeze_guard = freeze_mainloop;
432 509
433 my $busy = 1; 510 my $busy = 1;
434 my @res; 511 my @res;
435 512
436 (async { 513 (async {
514 $Coro::current->desc ("sync job coro");
437 @res = eval { $job->() }; 515 @res = eval { $job->() };
438 warn $@ if $@; 516 warn $@ if $@;
439 undef $busy; 517 undef $busy;
440 })->prio (Coro::PRIO_MAX); 518 })->prio (Coro::PRIO_MAX);
441 519
442 while ($busy) { 520 while ($busy) {
443 Coro::cede or Event::one_event; 521 if (Coro::nready) {
522 Coro::cede_notself;
523 } else {
524 EV::loop EV::LOOP_ONESHOT;
444 } 525 }
526 }
445 527
446 $time = Event::time - $time; 528 my $time = EV::time - $time;
447 529
448 LOG llevError | logBacktrace, Carp::longmess "long sync job"
449 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
450
451 $tick_start += $time; # do not account sync jobs to server load 530 $TICK_START += $time; # do not account sync jobs to server load
452 531
453 wantarray ? @res : $res[0] 532 wantarray ? @res : $res[0]
454 } else { 533 } else {
455 # we are in another coroutine, how wonderful, everything just works 534 # we are in another coroutine, how wonderful, everything just works
456 535
… …
481=item fork_call { }, $args 560=item fork_call { }, $args
482 561
483Executes the given code block with the given arguments in a seperate 562Executes the given code block with the given arguments in a seperate
484process, returning the results. Everything must be serialisable with 563process, returning the results. Everything must be serialisable with
485Coro::Storable. May, of course, block. Note that the executed sub may 564Coro::Storable. May, of course, block. Note that the executed sub may
486never block itself or use any form of Event handling. 565never block itself or use any form of event handling.
487 566
488=cut 567=cut
489 568
490sub fork_call(&@) { 569sub fork_call(&@) {
491 my ($cb, @args) = @_; 570 my ($cb, @args) = @_;
… …
498 reset_signals; 577 reset_signals;
499 &$cb 578 &$cb
500 }, @args; 579 }, @args;
501 580
502 wantarray ? @res : $res[-1] 581 wantarray ? @res : $res[-1]
582}
583
584=item $coin = coin_from_name $name
585
586=cut
587
588our %coin_alias = (
589 "silver" => "silvercoin",
590 "silvercoin" => "silvercoin",
591 "silvercoins" => "silvercoin",
592 "gold" => "goldcoin",
593 "goldcoin" => "goldcoin",
594 "goldcoins" => "goldcoin",
595 "platinum" => "platinacoin",
596 "platinumcoin" => "platinacoin",
597 "platinumcoins" => "platinacoin",
598 "platina" => "platinacoin",
599 "platinacoin" => "platinacoin",
600 "platinacoins" => "platinacoin",
601 "royalty" => "royalty",
602 "royalties" => "royalty",
603);
604
605sub coin_from_name($) {
606 $coin_alias{$_[0]}
607 ? cf::arch::find $coin_alias{$_[0]}
608 : undef
503} 609}
504 610
505=item $value = cf::db_get $family => $key 611=item $value = cf::db_get $family => $key
506 612
507Returns a single value from the environment database. 613Returns a single value from the environment database.
… …
646 752
647############################################################################# 753#############################################################################
648 754
649=head2 ATTACHABLE OBJECTS 755=head2 ATTACHABLE OBJECTS
650 756
651Many objects in crossfire are so-called attachable objects. That means you can 757Many objects in deliantra are so-called attachable objects. That means you can
652attach callbacks/event handlers (a collection of which is called an "attachment") 758attach callbacks/event handlers (a collection of which is called an "attachment")
653to it. All such attachable objects support the following methods. 759to it. All such attachable objects support the following methods.
654 760
655In the following description, CLASS can be any of C<global>, C<object> 761In the following description, CLASS can be any of C<global>, C<object>
656C<player>, C<client> or C<map> (i.e. the attachable objects in 762C<player>, C<client> or C<map> (i.e. the attachable objects in
657Crossfire TRT). 763Deliantra).
658 764
659=over 4 765=over 4
660 766
661=item $attachable->attach ($attachment, key => $value...) 767=item $attachable->attach ($attachment, key => $value...)
662 768
… …
706=item cf::CLASS::attachment $name, ... 812=item cf::CLASS::attachment $name, ...
707 813
708Register an attachment by C<$name> through which attachable objects of the 814Register an attachment by C<$name> through which attachable objects of the
709given CLASS can refer to this attachment. 815given CLASS can refer to this attachment.
710 816
711Some classes such as crossfire maps and objects can specify attachments 817Some classes such as deliantra maps and objects can specify attachments
712that are attached at load/instantiate time, thus the need for a name. 818that are attached at load/instantiate time, thus the need for a name.
713 819
714These calls expect any number of the following handler/hook descriptions: 820These calls expect any number of the following handler/hook descriptions:
715 821
716=over 4 822=over 4
… …
944 } 1050 }
945 1051
946 0 1052 0
947} 1053}
948 1054
949=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
950 1056
951=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1057=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
952 1058
953Generate an object-specific event with the given arguments. 1059Generate an object-specific event with the given arguments.
954 1060
… …
960 1066
961=cut 1067=cut
962 1068
963############################################################################# 1069#############################################################################
964# object support 1070# object support
965#
966 1071
1072sub _object_equal($$);
1073sub _object_equal($$) {
1074 my ($a, $b) = @_;
1075
1076 return 0 unless (ref $a) eq (ref $b);
1077
1078 if ("HASH" eq ref $a) {
1079 my @ka = keys %$a;
1080 my @kb = keys %$b;
1081
1082 return 0 if @ka != @kb;
1083
1084 for (0 .. $#ka) {
1085 return 0 unless $ka[$_] eq $kb[$_];
1086 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1087 }
1088
1089 } elsif ("ARRAY" eq ref $a) {
1090
1091 return 0 if @$a != @$b;
1092
1093 for (0 .. $#$a) {
1094 return 0 unless _object_equal $a->[$_], $b->[$_];
1095 }
1096
1097 } elsif ($a ne $b) {
1098 return 0;
1099 }
1100
1101 1
1102}
1103
1104our $SLOW_MERGES;#d#
967sub _can_merge { 1105sub _can_merge {
968 my ($ob1, $ob2) = @_; 1106 my ($ob1, $ob2) = @_;
969 1107
970 local $Storable::canonical = 1; 1108 ++$SLOW_MERGES;#d#
971 my $fob1 = Storable::freeze $ob1;
972 my $fob2 = Storable::freeze $ob2;
973 1109
974 $fob1 eq $fob2 1110 # we do the slow way here
1111 return _object_equal $ob1, $ob2
975} 1112}
976 1113
977sub reattach { 1114sub reattach {
978 # basically do the same as instantiate, without calling instantiate 1115 # basically do the same as instantiate, without calling instantiate
979 my ($obj) = @_; 1116 my ($obj) = @_;
980 1117
1118 # no longer needed after getting rid of delete_package?
981 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1119 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
982 1120
983 my $registry = $obj->registry; 1121 my $registry = $obj->registry;
984 1122
985 @$registry = (); 1123 @$registry = ();
986 1124
… …
1001cf::attachable->attach ( 1139cf::attachable->attach (
1002 prio => -1000000, 1140 prio => -1000000,
1003 on_instantiate => sub { 1141 on_instantiate => sub {
1004 my ($obj, $data) = @_; 1142 my ($obj, $data) = @_;
1005 1143
1006 $data = from_json $data; 1144 $data = decode_json $data;
1007 1145
1008 for (@$data) { 1146 for (@$data) {
1009 my ($name, $args) = @$_; 1147 my ($name, $args) = @$_;
1010 1148
1011 $obj->attach ($name, %{$args || {} }); 1149 $obj->attach ($name, %{$args || {} });
… …
1024 }, 1162 },
1025); 1163);
1026 1164
1027sub object_freezer_save { 1165sub object_freezer_save {
1028 my ($filename, $rdata, $objs) = @_; 1166 my ($filename, $rdata, $objs) = @_;
1029
1030 my $guard = cf::lock_acquire "io";
1031 1167
1032 sync_job { 1168 sync_job {
1033 if (length $$rdata) { 1169 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename); 1170 utf8::decode (my $decname = $filename);
1035 warn sprintf "saving %s (%d,%d)\n", 1171 warn sprintf "saving %s (%d,%d)\n",
1036 $decname, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1037 1173
1038 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1039 chmod SAVE_MODE, $fh; 1175 aio_chmod $fh, SAVE_MODE;
1040 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1041 aio_fsync $fh if $cf::USE_FSYNC; 1177 if ($cf::USE_FSYNC) {
1178 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;
1179 aio_fsync $fh;
1180 }
1042 close $fh; 1181 aio_close $fh;
1043 1182
1044 if (@$objs) { 1183 if (@$objs) {
1045 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1184 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1046 chmod SAVE_MODE, $fh; 1185 aio_chmod $fh, SAVE_MODE;
1047 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1048 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
1049 aio_fsync $fh if $cf::USE_FSYNC; 1188 if ($cf::USE_FSYNC) {
1189 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;
1190 aio_fsync $fh;
1191 }
1050 close $fh; 1192 aio_close $fh;
1051 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
1052 } 1194 }
1053 } else { 1195 } else {
1054 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
1055 } 1197 }
1056 1198
1057 aio_rename "$filename~", $filename; 1199 aio_rename "$filename~", $filename;
1200
1201 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC;
1058 } else { 1203 } else {
1059 warn "FATAL: $filename~: $!\n"; 1204 warn "unable to save objects: $filename~: $!\n";
1060 } 1205 }
1061 } else { 1206 } else {
1062 aio_unlink $filename; 1207 aio_unlink $filename;
1063 aio_unlink "$filename.pst"; 1208 aio_unlink "$filename.pst";
1064 } 1209 }
1065 }; 1210 };
1066
1067 undef $guard;
1068} 1211}
1069 1212
1070sub object_freezer_as_string { 1213sub object_freezer_as_string {
1071 my ($rdata, $objs) = @_; 1214 my ($rdata, $objs) = @_;
1072 1215
… …
1077 1220
1078sub object_thawer_load { 1221sub object_thawer_load {
1079 my ($filename) = @_; 1222 my ($filename) = @_;
1080 1223
1081 my ($data, $av); 1224 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1084 1225
1085 (aio_load $filename, $data) >= 0 1226 (aio_load $filename, $data) >= 0
1086 or return; 1227 or return;
1087 1228
1088 unless (aio_stat "$filename.pst") { 1229 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1230 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1231 or return;
1091 1232
1092 undef $guard;
1093 $av = eval { (Storable::thaw $av)->{objs} }; 1233 my $st = eval { Coro::Storable::thaw $av };
1234 $av = $st->{objs};
1094 } 1235 }
1095 1236
1096 utf8::decode (my $decname = $filename); 1237 utf8::decode (my $decname = $filename);
1097 warn sprintf "loading %s (%d,%d)\n", 1238 warn sprintf "loading %s (%d,%d)\n",
1098 $decname, length $data, scalar @{$av || []}; 1239 $decname, length $data, scalar @{$av || []};
… …
1159 my ($name, $cb) = @_; 1300 my ($name, $cb) = @_;
1160 1301
1161 $EXTICMD{$name} = $cb; 1302 $EXTICMD{$name} = $cb;
1162} 1303}
1163 1304
1305use File::Glob ();
1306
1164cf::player->attach ( 1307cf::player->attach (
1165 on_command => sub { 1308 on_command => sub {
1166 my ($pl, $name, $params) = @_; 1309 my ($pl, $name, $params) = @_;
1167 1310
1168 my $cb = $COMMAND{$name} 1311 my $cb = $COMMAND{$name}
… …
1200 1343
1201 cf::override; 1344 cf::override;
1202 }, 1345 },
1203); 1346);
1204 1347
1348# "readahead" all extensions
1349sub cache_extensions {
1350 my $grp = IO::AIO::aio_group;
1351
1352 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1353 for (grep /\.ext$/, @{$_[0]}) {
1354 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1355 }
1356 };
1357
1358 $grp
1359}
1360
1205sub load_extensions { 1361sub load_extensions {
1206 cf::sync_job { 1362 cf::sync_job {
1207 my %todo; 1363 my %todo;
1208 1364
1209 for my $path (<$LIBDIR/*.ext>) { 1365 for my $path (<$LIBDIR/*.ext>) {
… …
1228 1384
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231 1387
1232 $ext{source} = 1388 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n" 1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1234 . "#line 1 \"$path\"\n{\n" 1390 . "#line 1 \"$path\"\n{\n"
1235 . $source 1391 . $source
1236 . "\n};\n1"; 1392 . "\n};\n1";
1237 1393
1238 $todo{$base} = \%ext; 1394 $todo{$base} = \%ext;
… …
1254 my $msg = $@ ? "$v->{path}: $@\n" 1410 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n"; 1411 : "$v->{base}: extension inactive.\n";
1256 1412
1257 if (exists $v->{meta}{mandatory}) { 1413 if (exists $v->{meta}{mandatory}) {
1258 warn $msg; 1414 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n"; 1415 cf::cleanup "mandatory extension failed to load, exiting.";
1260 exit 1;
1261 } 1416 }
1262 1417
1263 warn $msg; 1418 warn $msg;
1264 } 1419 }
1265 1420
… …
1279 1434
1280=back 1435=back
1281 1436
1282=head2 CORE EXTENSIONS 1437=head2 CORE EXTENSIONS
1283 1438
1284Functions and methods that extend core crossfire objects. 1439Functions and methods that extend core deliantra objects.
1285 1440
1286=cut 1441=cut
1287 1442
1288package cf::player; 1443package cf::player;
1289 1444
… …
1332 1487
1333sub exists($) { 1488sub exists($) {
1334 my ($login) = @_; 1489 my ($login) = @_;
1335 1490
1336 $cf::PLAYER{$login} 1491 $cf::PLAYER{$login}
1337 or cf::sync_job { !aio_stat path $login } 1492 or !aio_stat path $login
1338} 1493}
1339 1494
1340sub find($) { 1495sub find($) {
1341 return $cf::PLAYER{$_[0]} || do { 1496 return $cf::PLAYER{$_[0]} || do {
1342 my $login = $_[0]; 1497 my $login = $_[0];
… …
1352 aio_unlink +(playerdir $login) . "/$login.pl"; 1507 aio_unlink +(playerdir $login) . "/$login.pl";
1353 1508
1354 my $f = new_from_file cf::object::thawer path $login 1509 my $f = new_from_file cf::object::thawer path $login
1355 or return; 1510 or return;
1356 1511
1357 $f->next;
1358 my $pl = cf::player::load_pl $f 1512 my $pl = cf::player::load_pl $f
1359 or return; 1513 or return;
1514
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1515 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1516 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1517 $cf::PLAYER{$login} = $pl
1363 } 1518 }
1364 } 1519 }
… …
1374 1529
1375 return if $pl->{deny_save}; 1530 return if $pl->{deny_save};
1376 1531
1377 aio_mkdir playerdir $pl, 0770; 1532 aio_mkdir playerdir $pl, 0770;
1378 $pl->{last_save} = $cf::RUNTIME; 1533 $pl->{last_save} = $cf::RUNTIME;
1534
1535 cf::get_slot 0.01;
1379 1536
1380 $pl->save_pl ($path); 1537 $pl->save_pl ($path);
1381 cf::cede_to_tick; 1538 cf::cede_to_tick;
1382} 1539}
1383 1540
… …
1415 my ($pl) = @_; 1572 my ($pl) = @_;
1416 1573
1417 my $name = $pl->ob->name; 1574 my $name = $pl->ob->name;
1418 1575
1419 $pl->{deny_save} = 1; 1576 $pl->{deny_save} = 1;
1420 $pl->password ("*"); # this should lock out the player until we nuked the dir 1577 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1421 1578
1422 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1423 $pl->deactivate; 1580 $pl->deactivate;
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1424 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1583 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1425 $pl->ns->destroy if $pl->ns; 1584 $pl->ns->destroy if $pl->ns;
1426 1585
1427 my $path = playerdir $pl; 1586 my $path = playerdir $pl;
1428 my $temp = "$path~$cf::RUNTIME~deleting~"; 1587 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1467 1626
1468 for my $login (@$dirs) { 1627 for my $login (@$dirs) {
1469 my $path = path $login; 1628 my $path = path $login;
1470 1629
1471 # a .pst is a dead give-away for a valid player 1630 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") { 1631 # if no pst file found, open and chekc for blocked users
1632 if (aio_stat "$path.pst") {
1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1633 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1474 aio_read $fh, 0, 512, my $buf, 0 or next; 1634 aio_read $fh, 0, 512, my $buf, 0 or next;
1475 $buf !~ /^password -------------$/m or next; # official not-valid tag 1635 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 } 1636 }
1477 1637
… …
1508 } 1668 }
1509 1669
1510 \@paths 1670 \@paths
1511} 1671}
1512 1672
1513=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1673=item $protocol_xml = $player->expand_cfpod ($cfpod)
1514 1674
1515Expand crossfire pod fragments into protocol xml. 1675Expand deliantra pod fragments into protocol xml.
1516
1517=cut
1518
1519sub expand_cfpod {
1520 ((my $self), (local $_)) = @_;
1521
1522 # escape & and <
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525
1526 # this is buggy, it needs to properly take care of nested <'s
1527
1528 1 while
1529 # replace B<>, I<>, U<> etc.
1530 s/B<([^\>]*)>/<b>$1<\/b>/
1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1534 # replace G<male|female> tags
1535 || s{G<([^>|]*)\|([^>]*)>}{
1536 $self->gender ? $2 : $1
1537 }ge
1538 # replace H<hint text>
1539 || s{H<([^\>]*)>}
1540 {
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "")
1544 [$self->{hintmode}]
1545 }ge;
1546
1547 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g;
1549
1550 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines
1555
1556 $_
1557}
1558
1559sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode}
1562}
1563 1676
1564=item $player->ext_reply ($msgid, @msg) 1677=item $player->ext_reply ($msgid, @msg)
1565 1678
1566Sends an ext reply to the player. 1679Sends an ext reply to the player.
1567 1680
… …
1634our $MAX_RESET = 3600; 1747our $MAX_RESET = 3600;
1635our $DEFAULT_RESET = 3000; 1748our $DEFAULT_RESET = 3000;
1636 1749
1637sub generate_random_map { 1750sub generate_random_map {
1638 my ($self, $rmp) = @_; 1751 my ($self, $rmp) = @_;
1752
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754
1639 # mit "rum" bekleckern, nicht 1755 # mit "rum" bekleckern, nicht
1640 $self->_create_random_map ( 1756 $self->_create_random_map (
1641 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1643 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1765 1881
1766# the temporary/swap location 1882# the temporary/swap location
1767sub save_path { 1883sub save_path {
1768 my ($self) = @_; 1884 my ($self) = @_;
1769 1885
1770 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1886 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771 "$TMPDIR/$path.map" 1887 "$TMPDIR/$path.map"
1772} 1888}
1773 1889
1774# the unique path, undef == no special unique path 1890# the unique path, undef == no special unique path
1775sub uniq_path { 1891sub uniq_path {
1776 my ($self) = @_; 1892 my ($self) = @_;
1777 1893
1778 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779 "$UNIQUEDIR/$path" 1895 "$UNIQUEDIR/$path"
1780}
1781
1782# and all this just because we cannot iterate over
1783# all maps in C++...
1784sub change_all_map_light {
1785 my ($change) = @_;
1786
1787 $_->change_map_light ($change)
1788 for grep $_->outdoor, values %cf::MAP;
1789} 1896}
1790 1897
1791sub decay_objects { 1898sub decay_objects {
1792 my ($self) = @_; 1899 my ($self) = @_;
1793 1900
… …
1877sub find { 1984sub find {
1878 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
1879 1986
1880 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
1881 1988
1882 cf::lock_wait "map_data:$path";#d#remove 1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1883 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
1884 1991
1885 $cf::MAP{$path} || do { 1992 $cf::MAP{$path} || do {
1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1889 my $map = new_from_path cf::map $path 1993 my $map = new_from_path cf::map $path
1890 or return; 1994 or return;
1891 1995
1892 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
1893 1997
… …
1895 or return; 1999 or return;
1896 2000
1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2001 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898 # doing this can freeze the server in a sync job, obviously 2002 # doing this can freeze the server in a sync job, obviously
1899 #$cf::WAIT_FOR_TICK->wait; 2003 #$cf::WAIT_FOR_TICK->wait;
2004 undef $guard2;
1900 undef $guard1; 2005 undef $guard1;
1901 undef $guard2;
1902 $map->reset; 2006 $map->reset;
1903 return find $path; 2007 return find $path;
1904 } 2008 }
1905 2009
1906 $cf::MAP{$path} = $map 2010 $cf::MAP{$path} = $map
… …
1933 my $f = new_from_file cf::object::thawer $self->{load_path}; 2037 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block; 2038 $f->skip_block;
1935 $self->_load_objects ($f) 2039 $self->_load_objects ($f)
1936 or return; 2040 or return;
1937 2041
1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2042 $self->post_load_original
1939 if delete $self->{load_original}; 2043 if delete $self->{load_original};
1940 2044
1941 if (my $uniq = $self->uniq_path) { 2045 if (my $uniq = $self->uniq_path) {
1942 utf8::encode $uniq; 2046 utf8::encode $uniq;
1943 unless (aio_stat $uniq) { 2047 unless (aio_stat $uniq) {
… …
1961 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
1962 $self->decay_objects; 2066 $self->decay_objects;
1963 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
1964 $self->update_buttons; 2068 $self->update_buttons;
1965 cf::cede_to_tick; 2069 cf::cede_to_tick;
1966 $self->set_darkness_map;
1967 cf::cede_to_tick;
1968 $self->activate; 2070 $self->activate;
1969 } 2071 }
1970 2072
1971 $self->{last_save} = $cf::RUNTIME; 2073 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME); 2074 $self->last_access ($cf::RUNTIME);
1973 2075
1974 $self->in_memory (cf::MAP_IN_MEMORY); 2076 $self->in_memory (cf::MAP_ACTIVE);
1975 } 2077 }
1976 2078
1977 $self->post_load; 2079 $self->post_load;
1978} 2080}
1979 2081
… …
2037 my ($path, $origin, $load) = @_; 2139 my ($path, $origin, $load) = @_;
2038 2140
2039 $path = normalise $path, $origin && $origin->{path}; 2141 $path = normalise $path, $origin && $origin->{path};
2040 2142
2041 if (my $map = $cf::MAP{$path}) { 2143 if (my $map = $cf::MAP{$path}) {
2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2144 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043 } 2145 }
2044 2146
2045 $MAP_PREFETCH{$path} |= $load; 2147 $MAP_PREFETCH{$path} |= $load;
2046 2148
2047 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2150 $Coro::current->{desc} = "map prefetcher";
2151
2048 while (%MAP_PREFETCH) { 2152 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2153 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2154 if (my $map = find $k) {
2051 $map->load if $v; 2155 $map->load if $v;
2052 } 2156 }
… …
2078 return if $self->{deny_save}; 2182 return if $self->{deny_save};
2079 2183
2080 local $self->{last_access} = $self->last_access;#d# 2184 local $self->{last_access} = $self->last_access;#d#
2081 2185
2082 cf::async { 2186 cf::async {
2187 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
2084 }; 2189 };
2190
2191 cf::get_slot 0.02;
2085 2192
2086 if ($uniq) { 2193 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2194 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2088 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2195 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2089 } else { 2196 } else {
… …
2098 $self->save; 2205 $self->save;
2099 2206
2100 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2207 my $lock = cf::lock_acquire "map_data:$self->{path}";
2101 2208
2102 return if $self->players; 2209 return if $self->players;
2103 return if $self->in_memory != cf::MAP_IN_MEMORY; 2210 return if $self->in_memory != cf::MAP_ACTIVE;
2104 return if $self->{deny_save}; 2211 return if $self->{deny_save};
2105 2212
2106 $self->in_memory (cf::MAP_SWAPPED); 2213 $self->in_memory (cf::MAP_SWAPPED);
2107 2214
2108 $self->deactivate; 2215 $self->deactivate;
… …
2133 2240
2134 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2135 2242
2136 return if $self->players; 2243 return if $self->players;
2137 2244
2138 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2139 2246
2140 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2141 2248
2142 # need to save uniques path 2249 # need to save uniques path
2143 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
… …
2226 2333
2227sub unique_maps() { 2334sub unique_maps() {
2228 [ 2335 [
2229 map { 2336 map {
2230 utf8::decode $_; 2337 utf8::decode $_;
2231 /\.map$/ 2338 s/\.map$//; # TODO future compatibility hack
2339 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2340 ? ()
2232 ? normalise $_ 2341 : normalise $_
2233 : ()
2234 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2235 ] 2343 ]
2236} 2344}
2237 2345
2238package cf; 2346=item cf::map::static_maps
2347
2348Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2349file in the shared directory excluding F</styles> and F</editor>). May
2350block.
2351
2352=cut
2353
2354sub static_maps() {
2355 my @dirs = "";
2356 my @maps;
2357
2358 while (@dirs) {
2359 my $dir = shift @dirs;
2360
2361 next if $dir eq "/styles" || $dir eq "/editor";
2362
2363 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2364 or return;
2365
2366 for (@$files) {
2367 s/\.map$// or next;
2368 utf8::decode $_;
2369 push @maps, "$dir/$_";
2370 }
2371
2372 push @dirs, map "$dir/$_", @$dirs;
2373 }
2374
2375 \@maps
2376}
2239 2377
2240=back 2378=back
2241 2379
2242=head3 cf::object 2380=head3 cf::object
2243 2381
… …
2247 2385
2248=over 4 2386=over 4
2249 2387
2250=item $ob->inv_recursive 2388=item $ob->inv_recursive
2251 2389
2252Returns the inventory of the object _and_ their inventories, recursively. 2390Returns the inventory of the object I<and> their inventories, recursively,
2391but I<not> the object itself.
2253 2392
2254=cut 2393=cut
2255 2394
2256sub inv_recursive_; 2395sub inv_recursive_;
2257sub inv_recursive_ { 2396sub inv_recursive_ {
… …
2262 inv_recursive_ inv $_[0] 2401 inv_recursive_ inv $_[0]
2263} 2402}
2264 2403
2265=item $ref = $ob->ref 2404=item $ref = $ob->ref
2266 2405
2267creates and returns a persistent reference to an objetc that can be stored as a string. 2406Creates and returns a persistent reference to an object that can be stored as a string.
2268 2407
2269=item $ob = cf::object::deref ($refstring) 2408=item $ob = cf::object::deref ($refstring)
2270 2409
2271returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2410returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272even if the object actually exists. May block. 2411even if the object actually exists. May block.
… …
2274=cut 2413=cut
2275 2414
2276sub deref { 2415sub deref {
2277 my ($ref) = @_; 2416 my ($ref) = @_;
2278 2417
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2418 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2419 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2420 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2421 or return;
2286 $pl->ob->uuid eq $uuid 2422 $pl->ob->uuid eq $uuid
2287 or return; 2423 or return;
… …
2307can be C<undef>. Does the right thing when the player is currently in a 2443can be C<undef>. Does the right thing when the player is currently in a
2308dialogue with the given NPC character. 2444dialogue with the given NPC character.
2309 2445
2310=cut 2446=cut
2311 2447
2448our $SAY_CHANNEL = {
2449 id => "say",
2450 title => "Map",
2451 reply => "say ",
2452 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2453};
2454
2455our $CHAT_CHANNEL = {
2456 id => "chat",
2457 title => "Chat",
2458 reply => "chat ",
2459 tooltip => "Player chat and shouts, global to the server.",
2460};
2461
2312# rough implementation of a future "reply" method that works 2462# rough implementation of a future "reply" method that works
2313# with dialog boxes. 2463# with dialog boxes.
2314#TODO: the first argument must go, split into a $npc->reply_to ( method 2464#TODO: the first argument must go, split into a $npc->reply_to ( method
2315sub cf::object::player::reply($$$;$) { 2465sub cf::object::player::reply($$$;$) {
2316 my ($self, $npc, $msg, $flags) = @_; 2466 my ($self, $npc, $msg, $flags) = @_;
… …
2327 my $dialog = $pl->{npc_dialog}; 2477 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329 2479
2330 } else { 2480 } else {
2331 $msg = $npc->name . " says: $msg" if $npc; 2481 $msg = $npc->name . " says: $msg" if $npc;
2332 $self->message ($msg, $flags); 2482 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333 } 2483 }
2334 } 2484 }
2335} 2485}
2336 2486
2337=item $object->send_msg ($channel, $msg, $color, [extra...]) 2487=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2362 2512
2363=item $player_object->enter_link 2513=item $player_object->enter_link
2364 2514
2365Freezes the player and moves him/her to a special map (C<{link}>). 2515Freezes the player and moves him/her to a special map (C<{link}>).
2366 2516
2367The player should be reasonably safe there for short amounts of time. You 2517The player should be reasonably safe there for short amounts of time (e.g.
2368I<MUST> call C<leave_link> as soon as possible, though. 2518for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2519though, as the palyer cannot control the character while it is on the link
2520map.
2369 2521
2370Will never block. 2522Will never block.
2371 2523
2372=item $player_object->leave_link ($map, $x, $y) 2524=item $player_object->leave_link ($map, $x, $y)
2373 2525
… …
2425 ($x, $y) = (-1, -1) 2577 ($x, $y) = (-1, -1)
2426 unless (defined $x) && (defined $y); 2578 unless (defined $x) && (defined $y);
2427 2579
2428 # use -1 or undef as default coordinates, not 0, 0 2580 # use -1 or undef as default coordinates, not 0, 0
2429 ($x, $y) = ($map->enter_x, $map->enter_y) 2581 ($x, $y) = ($map->enter_x, $map->enter_y)
2430 if $x <=0 && $y <= 0; 2582 if $x <= 0 && $y <= 0;
2431 2583
2432 $map->load; 2584 $map->load;
2433 $map->load_neighbours; 2585 $map->load_neighbours;
2434 2586
2435 return unless $self->contr->active; 2587 return unless $self->contr->active;
2436 $self->activate_recursive;
2437 2588
2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2439 $self->enter_map ($map, $x, $y); 2590 $self->enter_map ($map, $x, $y);
2591
2592 # only activate afterwards, to support waiting in hooks
2593 $self->activate_recursive;
2440} 2594}
2441 2595
2442=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2443 2597
2444Moves the player to the given map-path and coordinates by first freezing 2598Moves the player to the given map-path and coordinates by first freezing
2445her, loading and preparing them map, calling the provided $check callback 2599her, loading and preparing them map, calling the provided $check callback
2446that has to return the map if sucecssful, and then unfreezes the player on 2600that has to return the map if sucecssful, and then unfreezes the player on
2447the new (success) or old (failed) map position. In either case, $done will 2601the new (success) or old (failed) map position. In either case, $done will
2448be called at the end of this process. 2602be called at the end of this process.
2449 2603
2604Note that $check will be called with a potentially non-loaded map, so if
2605it needs a loaded map it has to call C<< ->load >>.
2606
2450=cut 2607=cut
2451 2608
2452our $GOTOGEN; 2609our $GOTOGEN;
2453 2610
2454sub cf::object::player::goto { 2611sub cf::object::player::goto {
… …
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2615 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2616
2460 $self->enter_link; 2617 $self->enter_link;
2461 2618
2462 (async { 2619 (async {
2620 $Coro::current->{desc} = "player::goto $path $x $y";
2621
2463 # *tag paths override both path and x|y 2622 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2623 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2624 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2625 my $ob = $obs[rand @obs];
2467 2626
2468 # see if we actually can go there 2627 # see if we actually can go there
2469 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) { 2628 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2470 $ob = $obs[rand @obs]; 2629 $ob = $obs[rand @obs];
2630 } else {
2631 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2471 } 2632 }
2472 # else put him there anyways for now #d# 2633 # else put us there anyways for now #d#
2473 2634
2474 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y); 2635 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2636 } else {
2637 ($path, $x, $y) = (undef, undef, undef);
2475 } 2638 }
2476 } 2639 }
2477 2640
2478 my $map = eval { 2641 my $map = eval {
2479 my $map = cf::map::find $path; 2642 my $map = defined $path ? cf::map::find $path : undef;
2480 2643
2481 if ($map) { 2644 if ($map) {
2482 $map = $map->customise_for ($self); 2645 $map = $map->customise_for ($self);
2483 $map = $check->($map) if $check && $map; 2646 $map = $check->($map) if $check && $map;
2484 } else { 2647 } else {
2485 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2648 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2486 } 2649 }
2487 2650
2488 $map 2651 $map
2489 }; 2652 };
2490 2653
… …
2526} 2689}
2527 2690
2528sub prepare_random_map { 2691sub prepare_random_map {
2529 my ($exit) = @_; 2692 my ($exit) = @_;
2530 2693
2531 my $guard = cf::lock_acquire "exit_prepare:$exit";
2532
2533 # all this does is basically replace the /! path by 2694 # all this does is basically replace the /! path by
2534 # a new random map path (?random/...) with a seed 2695 # a new random map path (?random/...) with a seed
2535 # that depends on the exit object 2696 # that depends on the exit object
2536 2697
2537 my $rmp = parse_random_map_params $exit->msg; 2698 my $rmp = parse_random_map_params $exit->msg;
… …
2539 if ($exit->map) { 2700 if ($exit->map) {
2540 $rmp->{region} = $exit->region->name; 2701 $rmp->{region} = $exit->region->name;
2541 $rmp->{origin_map} = $exit->map->path; 2702 $rmp->{origin_map} = $exit->map->path;
2542 $rmp->{origin_x} = $exit->x; 2703 $rmp->{origin_x} = $exit->x;
2543 $rmp->{origin_y} = $exit->y; 2704 $rmp->{origin_y} = $exit->y;
2705
2706 $exit->map->touch;
2544 } 2707 }
2545 2708
2546 $rmp->{random_seed} ||= $exit->random_seed; 2709 $rmp->{random_seed} ||= $exit->random_seed;
2547 2710
2548 my $data = cf::to_json $rmp; 2711 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2549 my $md5 = Digest::MD5::md5_hex $data; 2712 my $md5 = Digest::MD5::md5_hex $data;
2550 my $meta = "$RANDOMDIR/$md5.meta"; 2713 my $meta = "$RANDOMDIR/$md5.meta";
2551 2714
2552 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2715 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2553 aio_write $fh, 0, (length $data), $data, 0; 2716 aio_write $fh, 0, (length $data), $data, 0;
2554 undef $fh; 2717 undef $fh;
2555 aio_rename "$meta~", $meta; 2718 aio_rename "$meta~", $meta;
2556 2719
2720 my $slaying = "?random/$md5";
2721
2722 if ($exit->valid) {
2557 $exit->slaying ("?random/$md5"); 2723 $exit->slaying ("?random/$md5");
2558 $exit->msg (undef); 2724 $exit->msg (undef);
2725 }
2559 } 2726 }
2560} 2727}
2561 2728
2562sub cf::object::player::enter_exit { 2729sub cf::object::player::enter_exit {
2563 my ($self, $exit) = @_; 2730 my ($self, $exit) = @_;
2564 2731
2565 return unless $self->type == cf::PLAYER; 2732 return unless $self->type == cf::PLAYER;
2566 2733
2567 if ($exit->slaying eq "/!") {
2568 #TODO: this should de-fi-ni-te-ly not be a sync-job
2569 # the problem is that $exit might not survive long enough
2570 # so it needs to be done right now, right here
2571 cf::sync_job { prepare_random_map $exit };
2572 }
2573
2574 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2575 my $hp = $exit->stats->hp;
2576 my $sp = $exit->stats->sp;
2577
2578 $self->enter_link; 2734 $self->enter_link;
2579 2735
2580 # if exit is damned, update players death & WoR home-position
2581 $self->contr->savebed ($slaying, $hp, $sp)
2582 if $exit->flag (FLAG_DAMNED);
2583
2584 (async { 2736 (async {
2585 $self->deactivate_recursive; # just to be sure 2737 $Coro::current->{desc} = "enter_exit";
2738
2586 unless (eval { 2739 unless (eval {
2740 $self->deactivate_recursive; # just to be sure
2741
2742 # random map handling
2743 {
2744 my $guard = cf::lock_acquire "exit_prepare:$exit";
2745
2746 prepare_random_map $exit
2747 if $exit->slaying eq "/!";
2748 }
2749
2750 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2751 my $x = $exit->stats->hp;
2752 my $y = $exit->stats->sp;
2753
2587 $self->goto ($slaying, $hp, $sp); 2754 $self->goto ($map, $x, $y);
2588 2755
2756 # if exit is damned, update players death & WoR home-position
2757 $self->contr->savebed ($map, $x, $y)
2758 if $exit->flag (cf::FLAG_DAMNED);
2759
2589 1; 2760 1
2590 }) { 2761 }) {
2591 $self->message ("Something went wrong deep within the crossfire server. " 2762 $self->message ("Something went wrong deep within the deliantra server. "
2592 . "I'll try to bring you back to the map you were before. " 2763 . "I'll try to bring you back to the map you were before. "
2593 . "Please report this to the dungeon master!", 2764 . "Please report this to the dungeon master!",
2594 cf::NDI_UNIQUE | cf::NDI_RED); 2765 cf::NDI_UNIQUE | cf::NDI_RED);
2595 2766
2596 warn "ERROR in enter_exit: $@"; 2767 warn "ERROR in enter_exit: $@";
… …
2613sub cf::client::send_drawinfo { 2784sub cf::client::send_drawinfo {
2614 my ($self, $text, $flags) = @_; 2785 my ($self, $text, $flags) = @_;
2615 2786
2616 utf8::encode $text; 2787 utf8::encode $text;
2617 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2788 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2789}
2790
2791=item $client->send_big_packet ($pkt)
2792
2793Like C<send_packet>, but tries to compress large packets, and fragments
2794them as required.
2795
2796=cut
2797
2798our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2799
2800sub cf::client::send_big_packet {
2801 my ($self, $pkt) = @_;
2802
2803 # try lzf for large packets
2804 $pkt = "lzf " . Compress::LZF::compress $pkt
2805 if 1024 <= length $pkt and $self->{can_lzf};
2806
2807 # split very large packets
2808 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2809 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2810 $pkt = "frag";
2811 }
2812
2813 $self->send_packet ($pkt);
2618} 2814}
2619 2815
2620=item $client->send_msg ($channel, $msg, $color, [extra...]) 2816=item $client->send_msg ($channel, $msg, $color, [extra...])
2621 2817
2622Send a drawinfo or msg packet to the client, formatting the msg for the 2818Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2624the message, with C<log> being the default. If C<$color> is negative, suppress 2820the message, with C<log> being the default. If C<$color> is negative, suppress
2625the message unless the client supports the msg packet. 2821the message unless the client supports the msg packet.
2626 2822
2627=cut 2823=cut
2628 2824
2825# non-persistent channels (usually the info channel)
2629our %CHANNEL = ( 2826our %CHANNEL = (
2827 "c/motd" => {
2828 id => "infobox",
2829 title => "MOTD",
2830 reply => undef,
2831 tooltip => "The message of the day",
2832 },
2630 "c/identify" => { 2833 "c/identify" => {
2631 id => "identify", 2834 id => "infobox",
2632 title => "Identify", 2835 title => "Identify",
2633 reply => undef, 2836 reply => undef,
2634 tooltip => "Items recently identified", 2837 tooltip => "Items recently identified",
2635 }, 2838 },
2636 "c/examine" => { 2839 "c/examine" => {
2637 id => "examine", 2840 id => "infobox",
2638 title => "Examine", 2841 title => "Examine",
2639 reply => undef, 2842 reply => undef,
2640 tooltip => "Signs and other items you examined", 2843 tooltip => "Signs and other items you examined",
2641 }, 2844 },
2845 "c/shopinfo" => {
2846 id => "infobox",
2847 title => "Shop Info",
2848 reply => undef,
2849 tooltip => "What your bargaining skill tells you about the shop",
2850 },
2851 "c/book" => {
2852 id => "infobox",
2853 title => "Book",
2854 reply => undef,
2855 tooltip => "The contents of a note or book",
2856 },
2857 "c/lookat" => {
2858 id => "infobox",
2859 title => "Look",
2860 reply => undef,
2861 tooltip => "What you saw there",
2862 },
2863 "c/who" => {
2864 id => "infobox",
2865 title => "Players",
2866 reply => undef,
2867 tooltip => "Shows players who are currently online",
2868 },
2869 "c/body" => {
2870 id => "infobox",
2871 title => "Body Parts",
2872 reply => undef,
2873 tooltip => "Shows which body parts you posess and are available",
2874 },
2875 "c/statistics" => {
2876 id => "infobox",
2877 title => "Statistics",
2878 reply => undef,
2879 tooltip => "Shows your primary statistics",
2880 },
2881 "c/skills" => {
2882 id => "infobox",
2883 title => "Skills",
2884 reply => undef,
2885 tooltip => "Shows your experience per skill and item power",
2886 },
2887 "c/shopitems" => {
2888 id => "infobox",
2889 title => "Shop Items",
2890 reply => undef,
2891 tooltip => "Shows the items currently for sale in this shop",
2892 },
2893 "c/resistances" => {
2894 id => "infobox",
2895 title => "Resistances",
2896 reply => undef,
2897 tooltip => "Shows your resistances",
2898 },
2899 "c/pets" => {
2900 id => "infobox",
2901 title => "Pets",
2902 reply => undef,
2903 tooltip => "Shows information abotu your pets/a specific pet",
2904 },
2905 "c/perceiveself" => {
2906 id => "infobox",
2907 title => "Perceive Self",
2908 reply => undef,
2909 tooltip => "You gained detailed knowledge about yourself",
2910 },
2911 "c/uptime" => {
2912 id => "infobox",
2913 title => "Uptime",
2914 reply => undef,
2915 tooltip => "How long the server has been running since last restart",
2916 },
2917 "c/mapinfo" => {
2918 id => "infobox",
2919 title => "Map Info",
2920 reply => undef,
2921 tooltip => "Information related to the maps",
2922 },
2923 "c/party" => {
2924 id => "party",
2925 title => "Party",
2926 reply => "gsay ",
2927 tooltip => "Messages and chat related to your party",
2928 },
2929 "c/death" => {
2930 id => "death",
2931 title => "Death",
2932 reply => undef,
2933 tooltip => "Reason for and more info about your most recent death",
2934 },
2935 "c/say" => $SAY_CHANNEL,
2936 "c/chat" => $CHAT_CHANNEL,
2642); 2937);
2643 2938
2644sub cf::client::send_msg { 2939sub cf::client::send_msg {
2645 my ($self, $channel, $msg, $color, @extra) = @_; 2940 my ($self, $channel, $msg, $color, @extra) = @_;
2646 2941
2647 $msg = $self->pl->expand_cfpod ($msg); 2942 $msg = $self->pl->expand_cfpod ($msg)
2943 unless $color & cf::NDI_VERBATIM;
2648 2944
2649 $color &= cf::NDI_CLIENT_MASK; # just in case... 2945 $color &= cf::NDI_CLIENT_MASK; # just in case...
2650 2946
2651 # check predefined channels, for the benefit of C 2947 # check predefined channels, for the benefit of C
2652 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2948 if ($CHANNEL{$channel}) {
2949 $channel = $CHANNEL{$channel};
2653 2950
2951 $self->ext_msg (channel_info => $channel);
2952 $channel = $channel->{id};
2953
2654 if (ref $channel) { 2954 } elsif (ref $channel) {
2655 # send meta info to client, if not yet sent 2955 # send meta info to client, if not yet sent
2656 unless (exists $self->{channel}{$channel->{id}}) { 2956 unless (exists $self->{channel}{$channel->{id}}) {
2657 $self->{channel}{$channel->{id}} = $channel; 2957 $self->{channel}{$channel->{id}} = $channel;
2658 $self->ext_msg (channel_info => $channel) 2958 $self->ext_msg (channel_info => $channel);
2659 if $self->can_msg;
2660 } 2959 }
2661 2960
2662 $channel = $channel->{id}; 2961 $channel = $channel->{id};
2663 } 2962 }
2664 2963
2665 return unless @extra || length $msg; 2964 return unless @extra || length $msg;
2666 2965
2667 if ($self->can_msg) {
2668 # default colour, mask it out 2966 # default colour, mask it out
2669 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2967 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2670 if $color & cf::NDI_DEF; 2968 if $color & cf::NDI_DEF;
2671 2969
2672 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2970 my $pkt = "msg "
2971 . $self->{json_coder}->encode (
2673 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2972 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2674 } else { 2973 );
2675 if ($color >= 0) {
2676 # replace some tags by gcfclient-compatible ones
2677 for ($msg) {
2678 1 while
2679 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2680 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2681 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2682 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2683 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2684 }
2685 2974
2686 $color &= cf::NDI_COLOR_MASK; 2975 $self->send_big_packet ($pkt);
2687
2688 utf8::encode $msg;
2689
2690 if (0 && $msg =~ /\[/) {
2691 # COMMAND/INFO
2692 $self->send_packet ("drawextinfo $color 10 8 $msg")
2693 } else {
2694 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2695 $self->send_packet ("drawinfo $color $msg")
2696 }
2697 }
2698 }
2699} 2976}
2700 2977
2701=item $client->ext_msg ($type, @msg) 2978=item $client->ext_msg ($type, @msg)
2702 2979
2703Sends an ext event to the client. 2980Sends an ext event to the client.
… …
2706 2983
2707sub cf::client::ext_msg($$@) { 2984sub cf::client::ext_msg($$@) {
2708 my ($self, $type, @msg) = @_; 2985 my ($self, $type, @msg) = @_;
2709 2986
2710 if ($self->extcmd == 2) { 2987 if ($self->extcmd == 2) {
2711 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2988 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2712 } elsif ($self->extcmd == 1) { # TODO: remove 2989 } elsif ($self->extcmd == 1) { # TODO: remove
2713 push @msg, msgtype => "event_$type"; 2990 push @msg, msgtype => "event_$type";
2714 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2991 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2715 } 2992 }
2716} 2993}
2717 2994
2718=item $client->ext_reply ($msgid, @msg) 2995=item $client->ext_reply ($msgid, @msg)
2719 2996
… …
2723 3000
2724sub cf::client::ext_reply($$@) { 3001sub cf::client::ext_reply($$@) {
2725 my ($self, $id, @msg) = @_; 3002 my ($self, $id, @msg) = @_;
2726 3003
2727 if ($self->extcmd == 2) { 3004 if ($self->extcmd == 2) {
2728 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3005 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2729 } elsif ($self->extcmd == 1) { 3006 } elsif ($self->extcmd == 1) {
2730 #TODO: version 1, remove 3007 #TODO: version 1, remove
2731 unshift @msg, msgtype => "reply", msgid => $id; 3008 unshift @msg, msgtype => "reply", msgid => $id;
2732 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3009 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2733 } 3010 }
2734} 3011}
2735 3012
2736=item $success = $client->query ($flags, "text", \&cb) 3013=item $success = $client->query ($flags, "text", \&cb)
2737 3014
… …
2876=pod 3153=pod
2877 3154
2878The following functions and methods are available within a safe environment: 3155The following functions and methods are available within a safe environment:
2879 3156
2880 cf::object 3157 cf::object
2881 contr pay_amount pay_player map x y force_find force_add 3158 contr pay_amount pay_player map x y force_find force_add destroy
2882 insert remove name archname title slaying race decrease_ob_nr 3159 insert remove name archname title slaying race decrease split
3160 value
2883 3161
2884 cf::object::player 3162 cf::object::player
2885 player 3163 player
2886 3164
2887 cf::player 3165 cf::player
… …
2892 3170
2893=cut 3171=cut
2894 3172
2895for ( 3173for (
2896 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3174 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2897 insert remove inv name archname title slaying race 3175 insert remove inv nrof name archname title slaying race
2898 decrease_ob_nr)], 3176 decrease split destroy change_exp value msg lore send_msg)],
2899 ["cf::object::player" => qw(player)], 3177 ["cf::object::player" => qw(player)],
2900 ["cf::player" => qw(peaceful)], 3178 ["cf::player" => qw(peaceful send_msg)],
2901 ["cf::map" => qw(trigger)], 3179 ["cf::map" => qw(trigger)],
2902) { 3180) {
2903 no strict 'refs'; 3181 no strict 'refs';
2904 my ($pkg, @funs) = @$_; 3182 my ($pkg, @funs) = @$_;
2905 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3183 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2922 my ($code, %vars) = @_; 3200 my ($code, %vars) = @_;
2923 3201
2924 my $qcode = $code; 3202 my $qcode = $code;
2925 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3203 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2926 $qcode =~ s/\n/\\n/g; 3204 $qcode =~ s/\n/\\n/g;
3205
3206 %vars = (_dummy => 0) unless %vars;
2927 3207
2928 local $_; 3208 local $_;
2929 local @safe::cf::_safe_eval_args = values %vars; 3209 local @safe::cf::_safe_eval_args = values %vars;
2930 3210
2931 my $eval = 3211 my $eval =
… …
3008 { 3288 {
3009 my $faces = $facedata->{faceinfo}; 3289 my $faces = $facedata->{faceinfo};
3010 3290
3011 while (my ($face, $info) = each %$faces) { 3291 while (my ($face, $info) = each %$faces) {
3012 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3292 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3293
3013 cf::face::set_visibility $idx, $info->{visibility}; 3294 cf::face::set_visibility $idx, $info->{visibility};
3014 cf::face::set_magicmap $idx, $info->{magicmap}; 3295 cf::face::set_magicmap $idx, $info->{magicmap};
3015 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3296 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3016 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3297 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3017 3298
3018 cf::cede_to_tick; 3299 cf::cede_to_tick;
3019 } 3300 }
3020 3301
3021 while (my ($face, $info) = each %$faces) { 3302 while (my ($face, $info) = each %$faces) {
3022 next unless $info->{smooth}; 3303 next unless $info->{smooth};
3304
3023 my $idx = cf::face::find $face 3305 my $idx = cf::face::find $face
3024 or next; 3306 or next;
3307
3025 if (my $smooth = cf::face::find $info->{smooth}) { 3308 if (my $smooth = cf::face::find $info->{smooth}) {
3026 cf::face::set_smooth $idx, $smooth; 3309 cf::face::set_smooth $idx, $smooth;
3027 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3310 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3028 } else { 3311 } else {
3029 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3312 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3043 3326
3044 cf::anim::invalidate_all; # d'oh 3327 cf::anim::invalidate_all; # d'oh
3045 } 3328 }
3046 3329
3047 { 3330 {
3048 # TODO: for gcfclient pleasure, we should give resources
3049 # that gcfclient doesn't grok a >10000 face index.
3050 my $res = $facedata->{resource}; 3331 my $res = $facedata->{resource};
3051 3332
3052 my $soundconf = delete $res->{"res/sound.conf"};
3053
3054 while (my ($name, $info) = each %$res) { 3333 while (my ($name, $info) = each %$res) {
3334 if (defined $info->{type}) {
3055 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3335 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3056 my $data;
3057 3336
3058 if ($info->{type} & 1) { 3337 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3059 # prepend meta info 3338 cf::face::set_type $idx, $info->{type};
3060
3061 my $meta = $enc->encode ({
3062 name => $name,
3063 %{ $info->{meta} || {} },
3064 });
3065
3066 $data = pack "(w/a*)*", $meta, $info->{data};
3067 } else { 3339 } else {
3068 $data = $info->{data}; 3340 $RESOURCE{$name} = $info;
3069 } 3341 }
3070 3342
3071 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3072 cf::face::set_type $idx, $info->{type};
3073
3074 cf::cede_to_tick; 3343 cf::cede_to_tick;
3075 } 3344 }
3076
3077 if ($soundconf) {
3078 $soundconf = $enc->decode (delete $soundconf->{data});
3079
3080 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3081 my $sound = $soundconf->{compat}[$_]
3082 or next;
3083
3084 my $face = cf::face::find "sound/$sound->[1]";
3085 cf::sound::set $sound->[0] => $face;
3086 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3087 }
3088
3089 while (my ($k, $v) = each %{$soundconf->{event}}) {
3090 my $face = cf::face::find "sound/$v";
3091 cf::sound::set $k => $face;
3092 }
3093 }
3094 } 3345 }
3346
3347 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3095 3348
3096 1 3349 1
3097} 3350}
3351
3352cf::global->attach (on_resource_update => sub {
3353 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3354 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3355
3356 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3357 my $sound = $soundconf->{compat}[$_]
3358 or next;
3359
3360 my $face = cf::face::find "sound/$sound->[1]";
3361 cf::sound::set $sound->[0] => $face;
3362 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3363 }
3364
3365 while (my ($k, $v) = each %{$soundconf->{event}}) {
3366 my $face = cf::face::find "sound/$v";
3367 cf::sound::set $k => $face;
3368 }
3369 }
3370});
3098 3371
3099register_exticmd fx_want => sub { 3372register_exticmd fx_want => sub {
3100 my ($ns, $want) = @_; 3373 my ($ns, $want) = @_;
3101 3374
3102 while (my ($k, $v) = each %$want) { 3375 while (my ($k, $v) = each %$want) {
3103 $ns->fx_want ($k, $v); 3376 $ns->fx_want ($k, $v);
3104 } 3377 }
3105}; 3378};
3379
3380sub load_resource_file($) {
3381 my $guard = lock_acquire "load_resource_file";
3382
3383 my $status = load_resource_file_ $_[0];
3384 get_slot 0.1, 100;
3385 cf::arch::commit_load;
3386
3387 $status
3388}
3106 3389
3107sub reload_regions { 3390sub reload_regions {
3108 # HACK to clear player env face cache, we need some signal framework 3391 # HACK to clear player env face cache, we need some signal framework
3109 # for this (global event?) 3392 # for this (global event?)
3110 %ext::player_env::MUSIC_FACE_CACHE = (); 3393 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3124} 3407}
3125 3408
3126sub reload_archetypes { 3409sub reload_archetypes {
3127 load_resource_file "$DATADIR/archetypes" 3410 load_resource_file "$DATADIR/archetypes"
3128 or die "unable to load archetypes\n"; 3411 or die "unable to load archetypes\n";
3129 #d# NEED to laod twice to resolve forward references
3130 # this really needs to be done in an extra post-pass
3131 # (which needs to be synchronous, so solve it differently)
3132 load_resource_file "$DATADIR/archetypes"
3133 or die "unable to load archetypes\n";
3134} 3412}
3135 3413
3136sub reload_treasures { 3414sub reload_treasures {
3137 load_resource_file "$DATADIR/treasures" 3415 load_resource_file "$DATADIR/treasures"
3138 or die "unable to load treasurelists\n"; 3416 or die "unable to load treasurelists\n";
3139} 3417}
3140 3418
3141sub reload_resources { 3419sub reload_resources {
3142 warn "reloading resource files...\n"; 3420 warn "reloading resource files...\n";
3143 3421
3422 reload_facedata;
3423 reload_archetypes;
3144 reload_regions; 3424 reload_regions;
3145 reload_facedata;
3146 #reload_archetypes;#d#
3147 reload_archetypes;
3148 reload_treasures; 3425 reload_treasures;
3149 3426
3150 warn "finished reloading resource files\n"; 3427 warn "finished reloading resource files\n";
3151} 3428}
3152 3429
3153sub init {
3154 reload_resources;
3155}
3156
3157sub reload_config { 3430sub reload_config {
3431 warn "reloading config file...\n";
3432
3158 open my $fh, "<:utf8", "$CONFDIR/config" 3433 open my $fh, "<:utf8", "$CONFDIR/config"
3159 or return; 3434 or return;
3160 3435
3161 local $/; 3436 local $/;
3162 *CFG = YAML::Syck::Load <$fh>; 3437 *CFG = YAML::XS::Load scalar <$fh>;
3163 3438
3164 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3439 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3165 3440
3166 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3441 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3167 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3442 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3171 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3446 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3172 and die "WARNING: m(un)lockall failed: $!\n"; 3447 and die "WARNING: m(un)lockall failed: $!\n";
3173 }; 3448 };
3174 warn $@ if $@; 3449 warn $@ if $@;
3175 } 3450 }
3451
3452 warn "finished reloading resource files\n";
3453}
3454
3455sub pidfile() {
3456 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3457 or die "$PIDFILE: $!";
3458 flock $fh, &Fcntl::LOCK_EX
3459 or die "$PIDFILE: flock: $!";
3460 $fh
3461}
3462
3463# make sure only one server instance is running at any one time
3464sub atomic {
3465 my $fh = pidfile;
3466
3467 my $pid = <$fh>;
3468 kill 9, $pid if $pid > 0;
3469
3470 seek $fh, 0, 0;
3471 print $fh $$;
3472}
3473
3474sub main_loop {
3475 warn "EV::loop starting\n";
3476 if (1) {
3477 EV::loop;
3478 }
3479 warn "EV::loop returned\n";
3480 goto &main_loop unless $REALLY_UNLOOP;
3176} 3481}
3177 3482
3178sub main { 3483sub main {
3484 cf::init_globals; # initialise logging
3485
3486 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3487 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3488 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3489 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3490
3491 cf::init_experience;
3492 cf::init_anim;
3493 cf::init_attackmess;
3494 cf::init_dynamic;
3495
3496 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3497
3179 # we must not ever block the main coroutine 3498 # we must not ever block the main coroutine
3180 local $Coro::idle = sub { 3499 local $Coro::idle = sub {
3181 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3500 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3182 (async { 3501 (async {
3183 Event::one_event; 3502 $Coro::current->{desc} = "IDLE BUG HANDLER";
3503 EV::loop EV::LOOP_ONESHOT;
3184 })->prio (Coro::PRIO_MAX); 3504 })->prio (Coro::PRIO_MAX);
3185 }; 3505 };
3186 3506
3507 evthread_start IO::AIO::poll_fileno;
3508
3509 cf::sync_job {
3510 cf::load_settings;
3511 cf::load_materials;
3512
3513 reload_resources;
3187 reload_config; 3514 reload_config;
3188 db_init; 3515 db_init;
3516
3517 cf::init_uuid;
3518 cf::init_signals;
3519 cf::init_commands;
3520 cf::init_skills;
3521
3522 cf::init_beforeplay;
3523
3524 atomic;
3525
3189 load_extensions; 3526 load_extensions;
3190 3527
3191 $TICK_WATCHER->start; 3528 utime time, time, $RUNTIMEFILE;
3192 Event::loop; 3529
3530 # no (long-running) fork's whatsoever before this point(!)
3531 use POSIX ();
3532 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3533
3534 (pop @POST_INIT)->(0) while @POST_INIT;
3535 };
3536
3537 main_loop;
3193} 3538}
3194 3539
3195############################################################################# 3540#############################################################################
3196# initialisation and cleanup 3541# initialisation and cleanup
3197 3542
3198# install some emergency cleanup handlers 3543# install some emergency cleanup handlers
3199BEGIN { 3544BEGIN {
3545 our %SIGWATCHER = ();
3200 for my $signal (qw(INT HUP TERM)) { 3546 for my $signal (qw(INT HUP TERM)) {
3201 Event->signal ( 3547 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3202 reentrant => 0,
3203 data => WF_AUTOCANCEL,
3204 signal => $signal,
3205 prio => 0,
3206 cb => sub {
3207 cf::cleanup "SIG$signal"; 3548 cf::cleanup "SIG$signal";
3208 },
3209 ); 3549 };
3210 } 3550 }
3211} 3551}
3212 3552
3213sub write_runtime { 3553sub write_runtime_sync {
3214 my $runtime = "$LOCALDIR/runtime";
3215
3216 # first touch the runtime file to show we are still running: 3554 # first touch the runtime file to show we are still running:
3217 # the fsync below can take a very very long time. 3555 # the fsync below can take a very very long time.
3218 3556
3219 IO::AIO::aio_utime $runtime, undef, undef; 3557 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3220 3558
3221 my $guard = cf::lock_acquire "write_runtime"; 3559 my $guard = cf::lock_acquire "write_runtime";
3222 3560
3223 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3561 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3224 or return; 3562 or return;
3225 3563
3226 my $value = $cf::RUNTIME + 90 + 10; 3564 my $value = $cf::RUNTIME + 90 + 10;
3227 # 10 is the runtime save interval, for a monotonic clock 3565 # 10 is the runtime save interval, for a monotonic clock
3228 # 60 allows for the watchdog to kill the server. 3566 # 60 allows for the watchdog to kill the server.
… …
3238 aio_utime $fh, undef, undef; 3576 aio_utime $fh, undef, undef;
3239 3577
3240 close $fh 3578 close $fh
3241 or return; 3579 or return;
3242 3580
3243 aio_rename "$runtime~", $runtime 3581 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3244 and return; 3582 and return;
3245 3583
3246 warn "runtime file written.\n"; 3584 warn "runtime file written.\n";
3247 3585
3248 1 3586 1
3587}
3588
3589our $uuid_lock;
3590our $uuid_skip;
3591
3592sub write_uuid_sync($) {
3593 $uuid_skip ||= $_[0];
3594
3595 return if $uuid_lock;
3596 local $uuid_lock = 1;
3597
3598 my $uuid = "$LOCALDIR/uuid";
3599
3600 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3601 or return;
3602
3603 my $value = uuid_seq uuid_cur;
3604
3605 unless ($value) {
3606 warn "cowardly refusing to write zero uuid value!\n";
3607 return;
3608 }
3609
3610 my $value = uuid_str $value + $uuid_skip;
3611 $uuid_skip = 0;
3612
3613 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3614 and return;
3615
3616 # always fsync - this file is important
3617 aio_fsync $fh
3618 and return;
3619
3620 close $fh
3621 or return;
3622
3623 aio_rename "$uuid~", $uuid
3624 and return;
3625
3626 warn "uuid file written ($value).\n";
3627
3628 1
3629
3630}
3631
3632sub write_uuid($$) {
3633 my ($skip, $sync) = @_;
3634
3635 $sync ? write_uuid_sync $skip
3636 : async { write_uuid_sync $skip };
3249} 3637}
3250 3638
3251sub emergency_save() { 3639sub emergency_save() {
3252 my $freeze_guard = cf::freeze_mainloop; 3640 my $freeze_guard = cf::freeze_mainloop;
3253 3641
3254 warn "enter emergency perl save\n"; 3642 warn "emergency_perl_save: enter\n";
3255 3643
3256 cf::sync_job { 3644 cf::sync_job {
3645 # this is a trade-off: we want to be very quick here, so
3646 # save all maps without fsync, and later call a global sync
3647 # (which in turn might be very very slow)
3648 local $USE_FSYNC = 0;
3649
3257 # use a peculiar iteration method to avoid tripping on perl 3650 # use a peculiar iteration method to avoid tripping on perl
3258 # refcount bugs in for. also avoids problems with players 3651 # refcount bugs in for. also avoids problems with players
3259 # and maps saved/destroyed asynchronously. 3652 # and maps saved/destroyed asynchronously.
3260 warn "begin emergency player save\n"; 3653 warn "emergency_perl_save: begin player save\n";
3261 for my $login (keys %cf::PLAYER) { 3654 for my $login (keys %cf::PLAYER) {
3262 my $pl = $cf::PLAYER{$login} or next; 3655 my $pl = $cf::PLAYER{$login} or next;
3263 $pl->valid or next; 3656 $pl->valid or next;
3657 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3264 $pl->save; 3658 $pl->save;
3265 } 3659 }
3266 warn "end emergency player save\n"; 3660 warn "emergency_perl_save: end player save\n";
3267 3661
3268 warn "begin emergency map save\n"; 3662 warn "emergency_perl_save: begin map save\n";
3269 for my $path (keys %cf::MAP) { 3663 for my $path (keys %cf::MAP) {
3270 my $map = $cf::MAP{$path} or next; 3664 my $map = $cf::MAP{$path} or next;
3271 $map->valid or next; 3665 $map->valid or next;
3272 $map->save; 3666 $map->save;
3273 } 3667 }
3274 warn "end emergency map save\n"; 3668 warn "emergency_perl_save: end map save\n";
3275 3669
3276 warn "begin emergency database checkpoint\n"; 3670 warn "emergency_perl_save: begin database checkpoint\n";
3277 BDB::db_env_txn_checkpoint $DB_ENV; 3671 BDB::db_env_txn_checkpoint $DB_ENV;
3278 warn "end emergency database checkpoint\n"; 3672 warn "emergency_perl_save: end database checkpoint\n";
3673
3674 warn "emergency_perl_save: begin write uuid\n";
3675 write_uuid_sync 1;
3676 warn "emergency_perl_save: end write uuid\n";
3279 }; 3677 };
3280 3678
3679 warn "emergency_perl_save: starting sync()\n";
3680 IO::AIO::aio_sync sub {
3681 warn "emergency_perl_save: finished sync()\n";
3682 };
3683
3281 warn "leave emergency perl save\n"; 3684 warn "emergency_perl_save: leave\n";
3282} 3685}
3283 3686
3284sub post_cleanup { 3687sub post_cleanup {
3285 my ($make_core) = @_; 3688 my ($make_core) = @_;
3286 3689
3287 warn Carp::longmess "post_cleanup backtrace" 3690 warn Carp::longmess "post_cleanup backtrace"
3288 if $make_core; 3691 if $make_core;
3692
3693 my $fh = pidfile;
3694 unlink $PIDFILE if <$fh> == $$;
3695}
3696
3697# a safer delete_package, copied from Symbol
3698sub clear_package($) {
3699 my $pkg = shift;
3700
3701 # expand to full symbol table name if needed
3702 unless ($pkg =~ /^main::.*::$/) {
3703 $pkg = "main$pkg" if $pkg =~ /^::/;
3704 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3705 $pkg .= '::' unless $pkg =~ /::$/;
3706 }
3707
3708 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3709 my $stem_symtab = *{$stem}{HASH};
3710
3711 defined $stem_symtab and exists $stem_symtab->{$leaf}
3712 or return;
3713
3714 # clear all symbols
3715 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3716 for my $name (keys %$leaf_symtab) {
3717 _gv_clear *{"$pkg$name"};
3718# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3719 }
3720 warn "cleared package $pkg\n";#d#
3289} 3721}
3290 3722
3291sub do_reload_perl() { 3723sub do_reload_perl() {
3292 # can/must only be called in main 3724 # can/must only be called in main
3293 if ($Coro::current != $Coro::main) { 3725 if ($Coro::current != $Coro::main) {
3294 warn "can only reload from main coroutine"; 3726 warn "can only reload from main coroutine";
3295 return; 3727 return;
3296 } 3728 }
3297 3729
3730 return if $RELOAD++;
3731
3732 my $t1 = EV::time;
3733
3734 while ($RELOAD) {
3298 warn "reloading..."; 3735 warn "reloading...";
3299 3736
3300 warn "entering sync_job"; 3737 warn "entering sync_job";
3301 3738
3302 cf::sync_job { 3739 cf::sync_job {
3303 cf::write_runtime; # external watchdog should not bark 3740 cf::write_runtime_sync; # external watchdog should not bark
3304 cf::emergency_save; 3741 cf::emergency_save;
3305 cf::write_runtime; # external watchdog should not bark 3742 cf::write_runtime_sync; # external watchdog should not bark
3306 3743
3307 warn "syncing database to disk"; 3744 warn "syncing database to disk";
3308 BDB::db_env_txn_checkpoint $DB_ENV; 3745 BDB::db_env_txn_checkpoint $DB_ENV;
3309 3746
3310 # if anything goes wrong in here, we should simply crash as we already saved 3747 # if anything goes wrong in here, we should simply crash as we already saved
3311 3748
3312 warn "cancelling all WF_AUTOCANCEL watchers";
3313 for (Event::all_watchers) {
3314 $_->cancel if $_->data & WF_AUTOCANCEL;
3315 }
3316
3317 warn "flushing outstanding aio requests"; 3749 warn "flushing outstanding aio requests";
3318 for (;;) {
3319 BDB::flush;
3320 IO::AIO::flush;
3321 Coro::cede;
3322 last unless IO::AIO::nreqs || BDB::nreqs; 3750 while (IO::AIO::nreqs || BDB::nreqs) {
3323 warn "iterate..."; 3751 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3324 }
3325
3326 ++$RELOAD;
3327
3328 warn "cancelling all extension coros";
3329 $_->cancel for values %EXT_CORO;
3330 %EXT_CORO = ();
3331
3332 warn "removing commands";
3333 %COMMAND = ();
3334
3335 warn "removing ext/exti commands";
3336 %EXTCMD = ();
3337 %EXTICMD = ();
3338
3339 warn "unloading/nuking all extensions";
3340 for my $pkg (@EXTS) {
3341 warn "... unloading $pkg";
3342
3343 if (my $cb = $pkg->can ("unload")) {
3344 eval {
3345 $cb->($pkg);
3346 1
3347 } or warn "$pkg unloaded, but with errors: $@";
3348 } 3752 }
3349 3753
3350 warn "... nuking $pkg"; 3754 warn "cancelling all extension coros";
3351 Symbol::delete_package $pkg; 3755 $_->cancel for values %EXT_CORO;
3352 } 3756 %EXT_CORO = ();
3353 3757
3354 warn "unloading all perl modules loaded from $LIBDIR"; 3758 warn "removing commands";
3355 while (my ($k, $v) = each %INC) { 3759 %COMMAND = ();
3356 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3357 3760
3761 warn "removing ext/exti commands";
3762 %EXTCMD = ();
3763 %EXTICMD = ();
3764
3765 warn "unloading/nuking all extensions";
3766 for my $pkg (@EXTS) {
3358 warn "... unloading $k"; 3767 warn "... unloading $pkg";
3359 delete $INC{$k};
3360 3768
3361 $k =~ s/\.pm$//;
3362 $k =~ s/\//::/g;
3363
3364 if (my $cb = $k->can ("unload_module")) { 3769 if (my $cb = $pkg->can ("unload")) {
3770 eval {
3365 $cb->(); 3771 $cb->($pkg);
3772 1
3773 } or warn "$pkg unloaded, but with errors: $@";
3774 }
3775
3776 warn "... clearing $pkg";
3777 clear_package $pkg;
3366 } 3778 }
3367 3779
3368 Symbol::delete_package $k; 3780 warn "unloading all perl modules loaded from $LIBDIR";
3781 while (my ($k, $v) = each %INC) {
3782 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3783
3784 warn "... unloading $k";
3785 delete $INC{$k};
3786
3787 $k =~ s/\.pm$//;
3788 $k =~ s/\//::/g;
3789
3790 if (my $cb = $k->can ("unload_module")) {
3791 $cb->();
3792 }
3793
3794 clear_package $k;
3369 } 3795 }
3370 3796
3371 warn "getting rid of safe::, as good as possible"; 3797 warn "getting rid of safe::, as good as possible";
3372 Symbol::delete_package "safe::$_" 3798 clear_package "safe::$_"
3373 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3799 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3374 3800
3375 warn "unloading cf.pm \"a bit\""; 3801 warn "unloading cf.pm \"a bit\"";
3376 delete $INC{"cf.pm"}; 3802 delete $INC{"cf.pm"};
3377 delete $INC{"cf/pod.pm"}; 3803 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3378 3804
3379 # don't, removes xs symbols, too, 3805 # don't, removes xs symbols, too,
3380 # and global variables created in xs 3806 # and global variables created in xs
3381 #Symbol::delete_package __PACKAGE__; 3807 #clear_package __PACKAGE__;
3382 3808
3383 warn "unload completed, starting to reload now"; 3809 warn "unload completed, starting to reload now";
3384 3810
3385 warn "reloading cf.pm"; 3811 warn "reloading cf.pm";
3386 require cf; 3812 require cf;
3387 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3813 cf::_connect_to_perl_1;
3388 3814
3389 warn "loading config and database again"; 3815 warn "loading config and database again";
3390 cf::reload_config; 3816 cf::reload_config;
3391 3817
3392 warn "loading extensions"; 3818 warn "loading extensions";
3393 cf::load_extensions; 3819 cf::load_extensions;
3394 3820
3821 if ($REATTACH_ON_RELOAD) {
3395 warn "reattaching attachments to objects/players"; 3822 warn "reattaching attachments to objects/players";
3396 _global_reattach; # objects, sockets 3823 _global_reattach; # objects, sockets
3397 warn "reattaching attachments to maps"; 3824 warn "reattaching attachments to maps";
3398 reattach $_ for values %MAP; 3825 reattach $_ for values %MAP;
3399 warn "reattaching attachments to players"; 3826 warn "reattaching attachments to players";
3400 reattach $_ for values %PLAYER; 3827 reattach $_ for values %PLAYER;
3828 }
3401 3829
3830 warn "running post_init jobs";
3831 (pop @POST_INIT)->(1) while @POST_INIT;
3832
3402 warn "leaving sync_job"; 3833 warn "leaving sync_job";
3403 3834
3404 1 3835 1
3405 } or do { 3836 } or do {
3406 warn $@; 3837 warn $@;
3407 warn "error while reloading, exiting."; 3838 cf::cleanup "error while reloading, exiting.";
3408 exit 1;
3409 }; 3839 };
3410 3840
3411 warn "reloaded"; 3841 warn "reloaded";
3842 --$RELOAD;
3843 }
3844
3845 $t1 = EV::time - $t1;
3846 warn "reload completed in ${t1}s\n";
3412}; 3847};
3413 3848
3414our $RELOAD_WATCHER; # used only during reload 3849our $RELOAD_WATCHER; # used only during reload
3415 3850
3416sub reload_perl() { 3851sub reload_perl() {
3417 # doing reload synchronously and two reloads happen back-to-back, 3852 # doing reload synchronously and two reloads happen back-to-back,
3418 # coro crashes during coro_state_free->destroy here. 3853 # coro crashes during coro_state_free->destroy here.
3419 3854
3420 $RELOAD_WATCHER ||= Event->timer ( 3855 $RELOAD_WATCHER ||= cf::async {
3421 reentrant => 0, 3856 Coro::AIO::aio_wait cache_extensions;
3422 after => 0, 3857
3423 data => WF_AUTOCANCEL, 3858 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3424 cb => sub {
3425 do_reload_perl; 3859 do_reload_perl;
3426 undef $RELOAD_WATCHER; 3860 undef $RELOAD_WATCHER;
3427 }, 3861 };
3428 ); 3862 };
3429} 3863}
3430 3864
3431register_command "reload" => sub { 3865register_command "reload" => sub {
3432 my ($who, $arg) = @_; 3866 my ($who, $arg) = @_;
3433 3867
3434 if ($who->flag (FLAG_WIZ)) { 3868 if ($who->flag (FLAG_WIZ)) {
3435 $who->message ("reloading server."); 3869 $who->message ("reloading server.");
3870 async {
3871 $Coro::current->{desc} = "perl_reload";
3436 async { reload_perl }; 3872 reload_perl;
3873 };
3437 } 3874 }
3438}; 3875};
3439 3876
3440unshift @INC, $LIBDIR; 3877unshift @INC, $LIBDIR;
3441 3878
… …
3443 3880
3444our @WAIT_FOR_TICK; 3881our @WAIT_FOR_TICK;
3445our @WAIT_FOR_TICK_BEGIN; 3882our @WAIT_FOR_TICK_BEGIN;
3446 3883
3447sub wait_for_tick { 3884sub wait_for_tick {
3448 return unless $TICK_WATCHER->is_active;
3449 return if $Coro::current == $Coro::main; 3885 return if tick_inhibit || $Coro::current == $Coro::main;
3450 3886
3451 my $signal = new Coro::Signal; 3887 my $signal = new Coro::Signal;
3452 push @WAIT_FOR_TICK, $signal; 3888 push @WAIT_FOR_TICK, $signal;
3453 $signal->wait; 3889 $signal->wait;
3454} 3890}
3455 3891
3456sub wait_for_tick_begin { 3892sub wait_for_tick_begin {
3457 return unless $TICK_WATCHER->is_active;
3458 return if $Coro::current == $Coro::main; 3893 return if tick_inhibit || $Coro::current == $Coro::main;
3459 3894
3460 my $signal = new Coro::Signal; 3895 my $signal = new Coro::Signal;
3461 push @WAIT_FOR_TICK_BEGIN, $signal; 3896 push @WAIT_FOR_TICK_BEGIN, $signal;
3462 $signal->wait; 3897 $signal->wait;
3463} 3898}
3464 3899
3465our $stat_fh; 3900sub tick {
3466sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3467
3468$TICK_WATCHER = Event->timer (
3469 reentrant => 0,
3470 parked => 1,
3471 prio => 0,
3472 at => $NEXT_TICK || $TICK,
3473 data => WF_AUTOCANCEL,
3474 cb => sub {
3475 if ($Coro::current != $Coro::main) { 3901 if ($Coro::current != $Coro::main) {
3476 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3902 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3477 unless ++$bug_warning > 10; 3903 unless ++$bug_warning > 10;
3478 return; 3904 return;
3479 } 3905 }
3480 3906
3481 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3482
3483 $NOW = $tick_start = Event::time;
3484
3485 cf::server_tick; # one server iteration 3907 cf::server_tick; # one server iteration
3486 3908
3487 $RUNTIME += $TICK;
3488 $NEXT_TICK += $TICK;
3489
3490 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3909 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3491 $NEXT_RUNTIME_WRITE = $NOW + 10; 3910 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3492 Coro::async_pool { 3911 Coro::async_pool {
3912 $Coro::current->{desc} = "runtime saver";
3493 write_runtime 3913 write_runtime_sync
3494 or warn "ERROR: unable to write runtime file: $!"; 3914 or warn "ERROR: unable to write runtime file: $!";
3495 };
3496 } 3915 };
3916 }
3497 3917
3498# my $AFTER = Event::time;
3499# warn $AFTER - $NOW;#d#
3500
3501 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3918 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3502 $sig->send; 3919 $sig->send;
3503 } 3920 }
3504 while (my $sig = shift @WAIT_FOR_TICK) { 3921 while (my $sig = shift @WAIT_FOR_TICK) {
3505 $sig->send; 3922 $sig->send;
3506 } 3923 }
3507 3924
3508 $NOW = Event::time; 3925 $LOAD = ($NOW - $TICK_START) / $TICK;
3509
3510 # if we are delayed by four ticks or more, skip them all
3511 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3512
3513 $TICK_WATCHER->at ($NEXT_TICK);
3514 $TICK_WATCHER->start;
3515
3516 $LOAD = ($NOW - $tick_start) / $TICK;
3517 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3926 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3518 3927
3519 _post_tick; 3928 if (0) {
3520 3929 if ($NEXT_TICK) {
3521 # gather some statistics#d# 3930 my $jitter = $TICK_START - $NEXT_TICK;
3522 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d# 3931 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3523 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d# 3932 warn "jitter $JITTER\n";#d#
3933 }
3524 }, 3934 }
3525); 3935}
3526 3936
3527{ 3937{
3938 # configure BDB
3939
3528 BDB::min_parallel 8; 3940 BDB::min_parallel 8;
3529 BDB::max_poll_time $TICK * 0.1; 3941 BDB::max_poll_reqs $TICK * 0.1;
3530 $BDB_POLL_WATCHER = Event->io ( 3942 $AnyEvent::BDB::WATCHER->priority (1);
3531 reentrant => 0,
3532 fd => BDB::poll_fileno,
3533 poll => 'r',
3534 prio => 0,
3535 data => WF_AUTOCANCEL,
3536 cb => \&BDB::poll_cb,
3537 );
3538
3539 BDB::set_sync_prepare {
3540 my $status;
3541 my $current = $Coro::current;
3542 (
3543 sub {
3544 $status = $!;
3545 $current->ready; undef $current;
3546 },
3547 sub {
3548 Coro::schedule while defined $current;
3549 $! = $status;
3550 },
3551 )
3552 };
3553 3943
3554 unless ($DB_ENV) { 3944 unless ($DB_ENV) {
3555 $DB_ENV = BDB::db_env_create; 3945 $DB_ENV = BDB::db_env_create;
3946 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3947 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3948 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3949 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3950 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3556 3951
3557 cf::sync_job { 3952 cf::sync_job {
3558 eval { 3953 eval {
3559 BDB::db_env_open 3954 BDB::db_env_open
3560 $DB_ENV, 3955 $DB_ENV,
… …
3562 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3957 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3563 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3958 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3564 0666; 3959 0666;
3565 3960
3566 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3961 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3567
3568 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3569 | BDB::LOG_AUTOREMOVE, 1);
3570 $DB_ENV->set_lk_detect;
3571 }; 3962 };
3572 3963
3573 cf::cleanup "db_env_open(db): $@" if $@; 3964 cf::cleanup "db_env_open(db): $@" if $@;
3574 }; 3965 };
3575 } 3966 }
3576 3967
3577 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3968 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3578 after => 11, 3969 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3579 interval => 60, 3970 };
3580 hard => 1, 3971 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3581 prio => 0,
3582 data => WF_AUTOCANCEL,
3583 cb => sub {
3584 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3972 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3585 },
3586 ); 3973 };
3587 $BDB_TRICKLE_WATCHER = Event->timer ( 3974 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3588 after => 5,
3589 interval => 10,
3590 hard => 1,
3591 prio => 0,
3592 data => WF_AUTOCANCEL,
3593 cb => sub {
3594 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3975 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3595 },
3596 ); 3976 };
3597} 3977}
3598 3978
3599{ 3979{
3980 # configure IO::AIO
3981
3600 IO::AIO::min_parallel 8; 3982 IO::AIO::min_parallel 8;
3601
3602 undef $Coro::AIO::WATCHER;
3603 IO::AIO::max_poll_time $TICK * 0.1; 3983 IO::AIO::max_poll_time $TICK * 0.1;
3604 $AIO_POLL_WATCHER = Event->io ( 3984 undef $AnyEvent::AIO::WATCHER;
3605 reentrant => 0,
3606 data => WF_AUTOCANCEL,
3607 fd => IO::AIO::poll_fileno,
3608 poll => 'r',
3609 prio => 6,
3610 cb => \&IO::AIO::poll_cb,
3611 );
3612} 3985}
3613 3986
3614my $_log_backtrace; 3987my $_log_backtrace;
3615 3988
3616sub _log_backtrace { 3989sub _log_backtrace {
… …
3619 $msg =~ s/\n//; 3992 $msg =~ s/\n//;
3620 3993
3621 # limit the # of concurrent backtraces 3994 # limit the # of concurrent backtraces
3622 if ($_log_backtrace < 2) { 3995 if ($_log_backtrace < 2) {
3623 ++$_log_backtrace; 3996 ++$_log_backtrace;
3997 my $perl_bt = Carp::longmess $msg;
3624 async { 3998 async {
3999 $Coro::current->{desc} = "abt $msg";
4000
3625 my @bt = fork_call { 4001 my @bt = fork_call {
3626 @addr = map { sprintf "%x", $_ } @addr; 4002 @addr = map { sprintf "%x", $_ } @addr;
3627 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4003 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3628 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4004 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3629 or die "addr2line: $!"; 4005 or die "addr2line: $!";
… …
3637 } 4013 }
3638 4014
3639 @funcs 4015 @funcs
3640 }; 4016 };
3641 4017
3642 LOG llevInfo, "[ABT] $msg\n"; 4018 LOG llevInfo, "[ABT] $perl_bt\n";
4019 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3643 LOG llevInfo, "[ABT] $_\n" for @bt; 4020 LOG llevInfo, "[ABT] $_\n" for @bt;
3644 --$_log_backtrace; 4021 --$_log_backtrace;
3645 }; 4022 };
3646 } else { 4023 } else {
3647 LOG llevInfo, "[ABT] $msg\n"; 4024 LOG llevInfo, "[ABT] $msg\n";
3648 LOG llevInfo, "[ABT] [suppressed]\n"; 4025 LOG llevInfo, "[ABT] [suppressed]\n";
3649 } 4026 }
3650} 4027}
3651 4028
3652# load additional modules 4029# load additional modules
3653use cf::pod; 4030require "cf/$_.pm" for @EXTRA_MODULES;
4031cf::_connect_to_perl_2;
3654 4032
3655END { cf::emergency_save } 4033END { cf::emergency_save }
3656 4034
36571 40351
3658 4036

Diff Legend

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