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.299 by root, Sun Jul 8 14:56:05 2007 UTC vs.
Revision 1.506 by root, Wed Feb 3 20:48:22 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
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.61 (); 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;
53use Coro::Util ();
24 54
25use JSON::XS 1.4 (); 55use JSON::XS 2.01 ();
26use BDB (); 56use BDB ();
27use Data::Dumper; 57use Data::Dumper;
28use Digest::MD5;
29use Fcntl; 58use Fcntl;
30use YAML::Syck (); 59use YAML::XS ();
31use IO::AIO 2.32 (); 60use IO::AIO ();
32use Time::HiRes; 61use Time::HiRes;
33use Compress::LZF; 62use Compress::LZF;
63use Digest::MD5 ();
64
65AnyEvent::detect;
34 66
35# configure various modules to our taste 67# configure various modules to our taste
36# 68#
37$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
38Coro::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";
39Compress::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
40 77
41$Event::Eval = 1; # no idea why this is required, but it is 78# strictly for debugging
42 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1;
45
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 80
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 82
50our %COMMAND = (); 83our %COMMAND = ();
51our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
54our %EXTCMD = (); 87our %EXTCMD = ();
55our %EXTICMD = (); 88our %EXTICMD = ();
56our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
57our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
58 91
59our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
60our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
61 96
62our $CONFDIR = confdir; 97our $CONFDIR = confdir;
63our $DATADIR = datadir; 98our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
67our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE;
73 112
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 115our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
81 117
118our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER;
82our $BDB_POLL_WATCHER; 120our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 121our $DB_ENV;
122
123our @EXTRA_MODULES = qw(pod match mapscript);
84 124
85our %CFG; 125our %CFG;
86 126
87our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 128our $RUNTIME;
129our $NOW;
89 130
90our %PLAYER; # all users 131our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 132our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 133our $LINK_MAP; # the special {link} map, which is always available
93 134
94# 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 ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 136our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 137
97our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
140our $JITTER; # average jitter
99our $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 :)
100 147
101binmode STDOUT; 148binmode STDOUT;
102binmode STDERR; 149binmode STDERR;
103 150
104# read virtual server time, if available 151# read virtual server time, if available
105unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
106 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
107 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
108 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
109} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
110 159
111mkdir $_ 160mkdir $_
112 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
113 162
114our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
115 164
116sub 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::"} };
117 177
118############################################################################# 178#############################################################################
119 179
120=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
121 181
… …
157 217
158The raw value load value from the last tick. 218The raw value load value from the last tick.
159 219
160=item %cf::CFG 220=item %cf::CFG
161 221
162Configuration for the server, loaded from C</etc/crossfire/config>, or 222Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 223from wherever your confdir points to.
164 224
165=item cf::wait_for_tick, cf::wait_for_tick_begin 225=item cf::wait_for_tick, cf::wait_for_tick_begin
166 226
167These 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
168returns 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
169per 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.
170 230
231=item @cf::INVOKE_RESULTS
232
233This array contains the results of the last C<invoke ()> call. When
234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
235that call.
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
171=back 243=back
172 244
173=cut 245=cut
174 246
175BEGIN { 247$Coro::State::WARNHOOK = sub {
176 *CORE::GLOBAL::warn = sub {
177 my $msg = join "", @_; 248 my $msg = join "", @_;
178 249
179 $msg .= "\n" 250 $msg .= "\n"
180 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
181 252
182 $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;
183 254
184 utf8::encode $msg;
185 LOG llevError, $msg; 255 LOG llevError, $msg;
186 }; 256};
187} 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};
188 271
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
199for my $pkg (qw( 282for my $pkg (qw(
200 cf::global cf::attachable 283 cf::global cf::attachable
201 cf::object cf::object::player 284 cf::object cf::object::player
202 cf::client cf::player 285 cf::client cf::player
203 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
204 cf::map cf::party cf::region 288 cf::party cf::region
205)) { 289)) {
206 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 291}
209 292
210$Event::DIED = sub { 293$EV::DIED = sub {
211 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
212}; 295};
213 296
214############################################################################# 297#############################################################################
215 298
216=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
238 $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;
239 $d 322 $d
240 } || "[unable to dump $_[0]: '$@']"; 323 } || "[unable to dump $_[0]: '$@']";
241} 324}
242 325
243=item $ref = cf::from_json $json 326=item $ref = cf::decode_json $json
244 327
245Converts a JSON string into the corresponding perl data structure. 328Converts a JSON string into the corresponding perl data structure.
246 329
247=item $json = cf::to_json $ref 330=item $json = cf::encode_json $ref
248 331
249Converts a perl data structure into its JSON representation. 332Converts a perl data structure into its JSON representation.
250 333
251=cut 334=cut
252 335
253our $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
254 337
255sub to_json ($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
256sub 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}
257 354
258=item cf::lock_wait $string 355=item cf::lock_wait $string
259 356
260Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
261 358
262=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
263 360
264Wait 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
265a 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,
266for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
267returned. 364returned.
268 365
366Locks are *not* recursive, locking from the same coro twice results in a
367deadlocked coro.
368
269Lock names should begin with a unique identifier (for example, cf::map::find 369Lock names should begin with a unique identifier (for example, cf::map::find
270uses map_find and cf::map::load uses map_load). 370uses map_find and cf::map::load uses map_load).
271 371
272=item $locked = cf::lock_active $string 372=item $locked = cf::lock_active $string
273 373
274Return 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.
275 375
276=cut 376=cut
277 377
278our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
279 379
280sub lock_wait($) { 380sub lock_wait($) {
281 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
282
283 # wait for lock, if any
284 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule;
287 }
288} 382}
289 383
290sub lock_acquire($) { 384sub lock_acquire($) {
291 my ($key) = @_; 385 $LOCKS->guard ($_[0])
292
293 # wait, to be sure we are not locked
294 lock_wait $key;
295
296 $LOCK{$key} = [];
297
298 Coro::guard {
299 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} };
301 }
302} 386}
303 387
304sub lock_active($) { 388sub lock_active($) {
305 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
306
307 ! ! $LOCK{$key}
308} 390}
309 391
310sub freeze_mainloop { 392sub freeze_mainloop {
311 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
312 394
313 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
314 $TICK_WATCHER->start; 396}
397
398=item cf::periodic $interval, $cb
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
411}
412
413=item cf::get_slot $time[, $priority[, $name]]
414
415Allocate $time seconds of blocking CPU time at priority C<$priority>:
416This call blocks and returns only when you have at least C<$time> seconds
417of cpu time till the next tick. The slot is only valid till the next cede.
418
419The optional C<$name> can be used to identify the job to run. It might be
420used for statistical purposes and should identify the same time-class.
421
422Useful for short background jobs.
423
424=cut
425
426our @SLOT_QUEUE;
427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
429
430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
431$SLOT_QUEUE = Coro::async {
432 $Coro::current->desc ("timeslot manager");
433
434 my $signal = new Coro::Signal;
435 my $busy;
436
437 while () {
438 next_job:
439
440 my $avail = cf::till_tick;
441
442 for (0 .. $#SLOT_QUEUE) {
443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
445 my $job = splice @SLOT_QUEUE, $_, 1, ();
446 $job->[2]->send;
447 Coro::cede;
448 goto next_job;
449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
451 }
452 }
453
454 if (@SLOT_QUEUE) {
455 # we do not use wait_for_tick() as it returns immediately when tick is inactive
456 push @cf::WAIT_FOR_TICK, $signal;
457 $signal->wait;
458 } else {
459 $busy = 0;
460 Coro::schedule;
461 }
315 }; 462 }
316 $TICK_WATCHER->stop; 463};
317 $guard 464
465sub get_slot($;$$) {
466 return if tick_inhibit || $Coro::current == $Coro::main;
467
468 my ($time, $pri, $name) = @_;
469
470 $time = clamp $time, 0.01, $TICK * .6;
471
472 my $sig = new Coro::Signal;
473
474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
476 $SLOT_QUEUE->ready;
477 $sig->wait;
318} 478}
319 479
320=item cf::async { BLOCK } 480=item cf::async { BLOCK }
321 481
322Currently the same as Coro::async_pool, meaning you cannot use 482Currently the same as Coro::async_pool, meaning you cannot use
… …
327 487
328BEGIN { *async = \&Coro::async_pool } 488BEGIN { *async = \&Coro::async_pool }
329 489
330=item cf::sync_job { BLOCK } 490=item cf::sync_job { BLOCK }
331 491
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 492The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 493is always able to handle events or runnable, as Deliantra is only
334partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 494partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
335acceptable. 495acceptable.
336 496
337If it must be done, put the blocking parts into C<sync_job>. This will run 497If it must be done, put the blocking parts into C<sync_job>. This will run
338the given BLOCK in another coroutine while waiting for the result. The 498the given BLOCK in another coroutine while waiting for the result. The
… …
343 503
344sub sync_job(&) { 504sub sync_job(&) {
345 my ($job) = @_; 505 my ($job) = @_;
346 506
347 if ($Coro::current == $Coro::main) { 507 if ($Coro::current == $Coro::main) {
348 my $time = Event::time; 508 my $time = EV::time;
349 509
350 # this is the main coro, too bad, we have to block 510 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 511 # till the operation succeeds, freezing the server :/
352 512
353 # TODO: use suspend/resume instead 513 LOG llevError, Carp::longmess "sync job";#d#
354 # (but this is cancel-safe) 514
355 my $freeze_guard = freeze_mainloop; 515 my $freeze_guard = freeze_mainloop;
356 516
357 my $busy = 1; 517 my $busy = 1;
358 my @res; 518 my @res;
359 519
360 (async { 520 (async {
521 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 522 @res = eval { $job->() };
362 warn $@ if $@; 523 warn $@ if $@;
363 undef $busy; 524 undef $busy;
364 })->prio (Coro::PRIO_MAX); 525 })->prio (Coro::PRIO_MAX);
365 526
366 while ($busy) { 527 while ($busy) {
367 Coro::cede or Event::one_event; 528 if (Coro::nready) {
529 Coro::cede_notself;
530 } else {
531 EV::loop EV::LOOP_ONESHOT;
368 } 532 }
533 }
369 534
370 $time = Event::time - $time; 535 my $time = EV::time - $time;
371 536
372 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374
375 $tick_start += $time; # do not account sync jobs to server load 537 $TICK_START += $time; # do not account sync jobs to server load
376 538
377 wantarray ? @res : $res[0] 539 wantarray ? @res : $res[0]
378 } else { 540 } else {
379 # we are in another coroutine, how wonderful, everything just works 541 # we are in another coroutine, how wonderful, everything just works
380 542
… …
405=item fork_call { }, $args 567=item fork_call { }, $args
406 568
407Executes the given code block with the given arguments in a seperate 569Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 570process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 571Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 572never block itself or use any form of event handling.
411 573
412=cut 574=cut
413
414sub _store_scalar {
415 open my $fh, ">", \my $buf
416 or die "fork_call: cannot open fh-to-buf in child : $!";
417 Storable::store_fd $_[0], $fh;
418 close $fh;
419
420 $buf
421}
422 575
423sub fork_call(&@) { 576sub fork_call(&@) {
424 my ($cb, @args) = @_; 577 my ($cb, @args) = @_;
425 578
426# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 579 # we seemingly have to make a local copy of the whole thing,
427# or die "socketpair: $!"; 580 # otherwise perl prematurely frees the stuff :/
428 pipe my $fh1, my $fh2 581 # TODO: investigate and fix (likely this will be rather laborious)
429 or die "pipe: $!";
430 582
431 if (my $pid = fork) { 583 my @res = Coro::Util::fork_eval {
432 close $fh2;
433
434 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
435 warn "pst<$res>" unless $res =~ /^pst/;
436 $res = Coro::Storable::thaw $res;
437
438 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
439
440 Carp::confess $$res unless "ARRAY" eq ref $res;
441
442 return wantarray ? @$res : $res->[-1];
443 } else {
444 reset_signals; 584 reset_signals;
445 local $SIG{__WARN__}; 585 &$cb
446 local $SIG{__DIE__}; 586 }, @args;
447 # just in case, this hack effectively disables event
448 # in the child. cleaner and slower would be canceling all watchers,
449 # but this works for the time being.
450 local $Coro::idle;
451 $Coro::current->prio (Coro::PRIO_MAX);
452 587
453 eval { 588 wantarray ? @res : $res[-1]
454 close $fh1; 589}
455 590
456 my @res = eval { $cb->(@args) }; 591=item $coin = coin_from_name $name
457 592
458 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 593=cut
459 close $fh2;
460 };
461 594
462 warn $@ if $@; 595our %coin_alias = (
463 _exit 0; 596 "silver" => "silvercoin",
464 } 597 "silvercoin" => "silvercoin",
598 "silvercoins" => "silvercoin",
599 "gold" => "goldcoin",
600 "goldcoin" => "goldcoin",
601 "goldcoins" => "goldcoin",
602 "platinum" => "platinacoin",
603 "platinumcoin" => "platinacoin",
604 "platinumcoins" => "platinacoin",
605 "platina" => "platinacoin",
606 "platinacoin" => "platinacoin",
607 "platinacoins" => "platinacoin",
608 "royalty" => "royalty",
609 "royalties" => "royalty",
610);
611
612sub coin_from_name($) {
613 $coin_alias{$_[0]}
614 ? cf::arch::find $coin_alias{$_[0]}
615 : undef
465} 616}
466 617
467=item $value = cf::db_get $family => $key 618=item $value = cf::db_get $family => $key
468 619
469Returns a single value from the environment database. 620Returns a single value from the environment database.
… …
471=item cf::db_put $family => $key => $value 622=item cf::db_put $family => $key => $value
472 623
473Stores the given C<$value> in the family. It can currently store binary 624Stores the given C<$value> in the family. It can currently store binary
474data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 625data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
475 626
627=item $db = cf::db_table "name"
628
629Create and/or open a new database table. The string must not be "db" and must be unique
630within each server.
631
476=cut 632=cut
633
634sub db_table($) {
635 my ($name) = @_;
636 my $db = BDB::db_create $DB_ENV;
637
638 eval {
639 $db->set_flags (BDB::CHKSUM);
640
641 utf8::encode $name;
642 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
643 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
644 cf::cleanup "db_open(db): $!" if $!;
645 };
646 cf::cleanup "db_open(db): $@" if $@;
647
648 $db
649}
477 650
478our $DB; 651our $DB;
479 652
480sub db_init { 653sub db_init {
481 unless ($DB) {
482 $DB = BDB::db_create $DB_ENV;
483
484 cf::sync_job { 654 cf::sync_job {
485 eval { 655 $DB ||= db_table "db";
486 $DB->set_flags (BDB::CHKSUM);
487
488 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
489 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
490 cf::cleanup "db_open(db): $!" if $!;
491 };
492 cf::cleanup "db_open(db): $@" if $@;
493 };
494 } 656 };
495} 657}
496 658
497sub db_get($$) { 659sub db_get($$) {
498 my $key = "$_[0]/$_[1]"; 660 my $key = "$_[0]/$_[1]";
499 661
… …
549 if (1) { 711 if (1) {
550 $md5 = 712 $md5 =
551 join "\x00", 713 join "\x00",
552 $processversion, 714 $processversion,
553 map { 715 map {
554 Coro::cede; 716 cf::cede_to_tick;
555 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 717 ($src->[$_], Digest::MD5::md5_hex $data[$_])
556 } 0.. $#$src; 718 } 0.. $#$src;
557 719
558 720
559 my $dbmd5 = db_get cache => "$id/md5"; 721 my $dbmd5 = db_get cache => "$id/md5";
… …
597 759
598############################################################################# 760#############################################################################
599 761
600=head2 ATTACHABLE OBJECTS 762=head2 ATTACHABLE OBJECTS
601 763
602Many objects in crossfire are so-called attachable objects. That means you can 764Many objects in deliantra are so-called attachable objects. That means you can
603attach callbacks/event handlers (a collection of which is called an "attachment") 765attach callbacks/event handlers (a collection of which is called an "attachment")
604to it. All such attachable objects support the following methods. 766to it. All such attachable objects support the following methods.
605 767
606In the following description, CLASS can be any of C<global>, C<object> 768In the following description, CLASS can be any of C<global>, C<object>
607C<player>, C<client> or C<map> (i.e. the attachable objects in 769C<player>, C<client> or C<map> (i.e. the attachable objects in
608Crossfire TRT). 770Deliantra).
609 771
610=over 4 772=over 4
611 773
612=item $attachable->attach ($attachment, key => $value...) 774=item $attachable->attach ($attachment, key => $value...)
613 775
… …
657=item cf::CLASS::attachment $name, ... 819=item cf::CLASS::attachment $name, ...
658 820
659Register an attachment by C<$name> through which attachable objects of the 821Register an attachment by C<$name> through which attachable objects of the
660given CLASS can refer to this attachment. 822given CLASS can refer to this attachment.
661 823
662Some classes such as crossfire maps and objects can specify attachments 824Some classes such as deliantra maps and objects can specify attachments
663that are attached at load/instantiate time, thus the need for a name. 825that are attached at load/instantiate time, thus the need for a name.
664 826
665These calls expect any number of the following handler/hook descriptions: 827These calls expect any number of the following handler/hook descriptions:
666 828
667=over 4 829=over 4
… …
865 "; 1027 ";
866 die if $@; 1028 die if $@;
867} 1029}
868 1030
869our $override; 1031our $override;
870our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1032our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
871 1033
872sub override { 1034sub override {
873 $override = 1; 1035 $override = 1;
874 @invoke_results = (); 1036 @INVOKE_RESULTS = (@_);
875} 1037}
876 1038
877sub do_invoke { 1039sub do_invoke {
878 my $event = shift; 1040 my $event = shift;
879 my $callbacks = shift; 1041 my $callbacks = shift;
880 1042
881 @invoke_results = (); 1043 @INVOKE_RESULTS = ();
882 1044
883 local $override; 1045 local $override;
884 1046
885 for (@$callbacks) { 1047 for (@$callbacks) {
886 eval { &{$_->[1]} }; 1048 eval { &{$_->[1]} };
… …
895 } 1057 }
896 1058
897 0 1059 0
898} 1060}
899 1061
900=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1062=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
901 1063
902=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1064=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
903 1065
904Generate an object-specific event with the given arguments. 1066Generate an object-specific event with the given arguments.
905 1067
906This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1068This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
907removed in future versions), and there is no public API to access override 1069removed in future versions), and there is no public API to access override
908results (if you must, access C<@cf::invoke_results> directly). 1070results (if you must, access C<@cf::INVOKE_RESULTS> directly).
909 1071
910=back 1072=back
911 1073
912=cut 1074=cut
913 1075
914############################################################################# 1076#############################################################################
915# object support 1077# object support
1078
1079sub _object_equal($$);
1080sub _object_equal($$) {
1081 my ($a, $b) = @_;
1082
1083 return 0 unless (ref $a) eq (ref $b);
1084
1085 if ("HASH" eq ref $a) {
1086 my @ka = keys %$a;
1087 my @kb = keys %$b;
1088
1089 return 0 if @ka != @kb;
1090
1091 for (0 .. $#ka) {
1092 return 0 unless $ka[$_] eq $kb[$_];
1093 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1094 }
1095
1096 } elsif ("ARRAY" eq ref $a) {
1097
1098 return 0 if @$a != @$b;
1099
1100 for (0 .. $#$a) {
1101 return 0 unless _object_equal $a->[$_], $b->[$_];
1102 }
1103
1104 } elsif ($a ne $b) {
1105 return 0;
1106 }
1107
1108 1
1109}
1110
1111our $SLOW_MERGES;#d#
1112sub _can_merge {
1113 my ($ob1, $ob2) = @_;
1114
1115 ++$SLOW_MERGES;#d#
1116
1117 # we do the slow way here
1118 return _object_equal $ob1, $ob2
1119}
916 1120
917sub reattach { 1121sub reattach {
918 # basically do the same as instantiate, without calling instantiate 1122 # basically do the same as instantiate, without calling instantiate
919 my ($obj) = @_; 1123 my ($obj) = @_;
920 1124
1125 # no longer needed after getting rid of delete_package?
921 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1126 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
922 1127
923 my $registry = $obj->registry; 1128 my $registry = $obj->registry;
924 1129
925 @$registry = (); 1130 @$registry = ();
926 1131
… …
941cf::attachable->attach ( 1146cf::attachable->attach (
942 prio => -1000000, 1147 prio => -1000000,
943 on_instantiate => sub { 1148 on_instantiate => sub {
944 my ($obj, $data) = @_; 1149 my ($obj, $data) = @_;
945 1150
946 $data = from_json $data; 1151 $data = decode_json $data;
947 1152
948 for (@$data) { 1153 for (@$data) {
949 my ($name, $args) = @$_; 1154 my ($name, $args) = @$_;
950 1155
951 $obj->attach ($name, %{$args || {} }); 1156 $obj->attach ($name, %{$args || {} });
… …
967sub object_freezer_save { 1172sub object_freezer_save {
968 my ($filename, $rdata, $objs) = @_; 1173 my ($filename, $rdata, $objs) = @_;
969 1174
970 sync_job { 1175 sync_job {
971 if (length $$rdata) { 1176 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename);
972 warn sprintf "saving %s (%d,%d)\n", 1178 warn sprintf "saving %s (%d,%d)\n",
973 $filename, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
974 1180
975 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
976 chmod SAVE_MODE, $fh; 1182 aio_chmod $fh, SAVE_MODE;
977 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
978 aio_fsync $fh if $cf::USE_FSYNC; 1184 if ($cf::USE_FSYNC) {
1185 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1186 aio_fsync $fh;
1187 }
979 close $fh; 1188 aio_close $fh;
980 1189
981 if (@$objs) { 1190 if (@$objs) {
982 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1191 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
983 chmod SAVE_MODE, $fh; 1192 aio_chmod $fh, SAVE_MODE;
984 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
985 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
986 aio_fsync $fh if $cf::USE_FSYNC; 1195 if ($cf::USE_FSYNC) {
1196 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1197 aio_fsync $fh;
1198 }
987 close $fh; 1199 aio_close $fh;
988 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
989 } 1201 }
990 } else { 1202 } else {
991 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
992 } 1204 }
993 1205
994 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
995 } else { 1210 } else {
996 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
997 } 1212 }
998 } else { 1213 } else {
999 aio_unlink $filename; 1214 aio_unlink $filename;
1000 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1001 } 1216 }
1002 } 1217 };
1003} 1218}
1004 1219
1005sub object_freezer_as_string { 1220sub object_freezer_as_string {
1006 my ($rdata, $objs) = @_; 1221 my ($rdata, $objs) = @_;
1007 1222
… …
1019 or return; 1234 or return;
1020 1235
1021 unless (aio_stat "$filename.pst") { 1236 unless (aio_stat "$filename.pst") {
1022 (aio_load "$filename.pst", $av) >= 0 1237 (aio_load "$filename.pst", $av) >= 0
1023 or return; 1238 or return;
1239
1024 $av = eval { (Storable::thaw $av)->{objs} }; 1240 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs};
1025 } 1242 }
1026 1243
1244 utf8::decode (my $decname = $filename);
1027 warn sprintf "loading %s (%d)\n", 1245 warn sprintf "loading %s (%d,%d)\n",
1028 $filename, length $data, scalar @{$av || []}; 1246 $decname, length $data, scalar @{$av || []};
1247
1029 return ($data, $av); 1248 ($data, $av)
1030} 1249}
1031 1250
1032=head2 COMMAND CALLBACKS 1251=head2 COMMAND CALLBACKS
1033 1252
1034=over 4 1253=over 4
… …
1088 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1089 1308
1090 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1091} 1310}
1092 1311
1312use File::Glob ();
1313
1093cf::player->attach ( 1314cf::player->attach (
1094 on_command => sub { 1315 on_command => sub {
1095 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1096 1317
1097 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
… …
1107 my ($pl, $buf) = @_; 1328 my ($pl, $buf) = @_;
1108 1329
1109 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1330 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1110 1331
1111 if (ref $msg) { 1332 if (ref $msg) {
1333 my ($type, $reply, @payload) =
1334 "ARRAY" eq ref $msg
1335 ? @$msg
1336 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1337
1338 my @reply;
1339
1112 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1340 if (my $cb = $EXTCMD{$type}) {
1113 if (my %reply = $cb->($pl, $msg)) { 1341 @reply = $cb->($pl, @payload);
1114 $pl->ext_reply ($msg->{msgid}, %reply);
1115 }
1116 } 1342 }
1343
1344 $pl->ext_reply ($reply, @reply)
1345 if $reply;
1346
1117 } else { 1347 } else {
1118 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1348 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1119 } 1349 }
1120 1350
1121 cf::override; 1351 cf::override;
1122 }, 1352 },
1123); 1353);
1354
1355# "readahead" all extensions
1356sub cache_extensions {
1357 my $grp = IO::AIO::aio_group;
1358
1359 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1360 for (grep /\.ext$/, @{$_[0]}) {
1361 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1362 }
1363 };
1364
1365 $grp
1366}
1124 1367
1125sub load_extensions { 1368sub load_extensions {
1126 cf::sync_job { 1369 cf::sync_job {
1127 my %todo; 1370 my %todo;
1128 1371
… …
1148 1391
1149 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1150 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1151 1394
1152 $ext{source} = 1395 $ext{source} =
1153 "package $pkg; use strict; use utf8;\n" 1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1154 . "#line 1 \"$path\"\n{\n" 1397 . "#line 1 \"$path\"\n{\n"
1155 . $source 1398 . $source
1156 . "\n};\n1"; 1399 . "\n};\n1";
1157 1400
1158 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1159 } 1402 }
1160 1403
1404 my $pass = 0;
1161 my %done; 1405 my %done;
1162 while (%todo) { 1406 while (%todo) {
1163 my $progress; 1407 my $progress;
1164 1408
1409 ++$pass;
1410
1411 ext:
1165 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1166 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1167 goto skip 1414 next ext
1168 unless exists $done{$_}; 1415 unless exists $done{$_};
1169 } 1416 }
1170 1417
1171 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1172 1419
1173 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1174 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1175 : "$v->{base}: extension inactive.\n";
1176 1424
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1177 if (exists $v->{meta}{mandatory}) { 1426 if exists $v->{meta}{mandatory};
1178 warn $msg; 1427 } else {
1179 warn "mandatory extension failed to load, exiting.\n"; 1428 $done{$k} = delete $todo{$k};
1180 exit 1; 1429 push @EXTS, $v->{pkg};
1181 } 1430 $progress = 1;
1182 1431
1183 warn $msg; 1432 warn "$v->{base}: extension inactive.\n"
1433 unless $active;
1184 } 1434 }
1185
1186 $done{$k} = delete $todo{$k};
1187 push @EXTS, $v->{pkg};
1188 $progress = 1;
1189 } 1435 }
1190 1436
1191 skip: 1437 unless ($progress) {
1192 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1193 unless $progress; 1439
1440 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory};
1443 }
1444 }
1194 } 1445 }
1195 }; 1446 };
1196} 1447}
1197 1448
1198############################################################################# 1449#############################################################################
1199 1450
1200=back 1451=back
1201 1452
1202=head2 CORE EXTENSIONS 1453=head2 CORE EXTENSIONS
1203 1454
1204Functions and methods that extend core crossfire objects. 1455Functions and methods that extend core deliantra objects.
1205 1456
1206=cut 1457=cut
1207 1458
1208package cf::player; 1459package cf::player;
1209 1460
1210use Coro::AIO; 1461use Coro::AIO;
1211 1462
1212=head3 cf::player 1463=head3 cf::player
1213 1464
1214=over 4 1465=over 4
1466
1467=item cf::player::num_playing
1468
1469Returns the official number of playing players, as per the Crossfire metaserver rules.
1470
1471=cut
1472
1473sub num_playing {
1474 scalar grep
1475 $_->ob->map
1476 && !$_->hidden
1477 && !$_->ob->flag (cf::FLAG_WIZ),
1478 cf::player::list
1479}
1215 1480
1216=item cf::player::find $login 1481=item cf::player::find $login
1217 1482
1218Returns the given player object, loading it if necessary (might block). 1483Returns the given player object, loading it if necessary (might block).
1219 1484
… …
1238 1503
1239sub exists($) { 1504sub exists($) {
1240 my ($login) = @_; 1505 my ($login) = @_;
1241 1506
1242 $cf::PLAYER{$login} 1507 $cf::PLAYER{$login}
1243 or cf::sync_job { !aio_stat path $login } 1508 or !aio_stat path $login
1244} 1509}
1245 1510
1246sub find($) { 1511sub find($) {
1247 return $cf::PLAYER{$_[0]} || do { 1512 return $cf::PLAYER{$_[0]} || do {
1248 my $login = $_[0]; 1513 my $login = $_[0];
… …
1255 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1520 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1256 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1521 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1257 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1522 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1258 aio_unlink +(playerdir $login) . "/$login.pl"; 1523 aio_unlink +(playerdir $login) . "/$login.pl";
1259 1524
1260 my $pl = load_pl path $login 1525 my $f = new_from_file cf::object::thawer path $login
1261 or return; 1526 or return;
1527
1528 my $pl = cf::player::load_pl $f
1529 or return;
1530
1531 local $cf::PLAYER_LOADING{$login} = $pl;
1532 $f->resolve_delayed_derefs;
1262 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
1263 } 1534 }
1264 } 1535 }
1265} 1536}
1266 1537
… …
1275 return if $pl->{deny_save}; 1546 return if $pl->{deny_save};
1276 1547
1277 aio_mkdir playerdir $pl, 0770; 1548 aio_mkdir playerdir $pl, 0770;
1278 $pl->{last_save} = $cf::RUNTIME; 1549 $pl->{last_save} = $cf::RUNTIME;
1279 1550
1551 cf::get_slot 0.01;
1552
1280 $pl->save_pl ($path); 1553 $pl->save_pl ($path);
1281 Coro::cede; 1554 cf::cede_to_tick;
1282} 1555}
1283 1556
1284sub new($) { 1557sub new($) {
1285 my ($login) = @_; 1558 my ($login) = @_;
1286 1559
… …
1292 $cf::PLAYER{$login} = $self; 1565 $cf::PLAYER{$login} = $self;
1293 1566
1294 $self 1567 $self
1295} 1568}
1296 1569
1570=item $player->send_msg ($channel, $msg, $color, [extra...])
1571
1572=cut
1573
1574sub send_msg {
1575 my $ns = shift->ns
1576 or return;
1577 $ns->send_msg (@_);
1578}
1579
1297=item $pl->quit_character 1580=item $pl->quit_character
1298 1581
1299Nukes the player without looking back. If logged in, the connection will 1582Nukes the player without looking back. If logged in, the connection will
1300be destroyed. May block for a long time. 1583be destroyed. May block for a long time.
1301 1584
… …
1305 my ($pl) = @_; 1588 my ($pl) = @_;
1306 1589
1307 my $name = $pl->ob->name; 1590 my $name = $pl->ob->name;
1308 1591
1309 $pl->{deny_save} = 1; 1592 $pl->{deny_save} = 1;
1310 $pl->password ("*"); # this should lock out the player until we nuked the dir 1593 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1311 1594
1312 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1595 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1313 $pl->deactivate; 1596 $pl->deactivate;
1597 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1598 $pl->ob->check_score;
1314 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1599 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1315 $pl->ns->destroy if $pl->ns; 1600 $pl->ns->destroy if $pl->ns;
1316 1601
1317 my $path = playerdir $pl; 1602 my $path = playerdir $pl;
1318 my $temp = "$path~$cf::RUNTIME~deleting~"; 1603 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1354 or return []; 1639 or return [];
1355 1640
1356 my @logins; 1641 my @logins;
1357 1642
1358 for my $login (@$dirs) { 1643 for my $login (@$dirs) {
1644 my $path = path $login;
1645
1646 # a .pst is a dead give-away for a valid player
1647 # if no pst file found, open and chekc for blocked users
1648 if (aio_stat "$path.pst") {
1359 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1649 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1360 aio_read $fh, 0, 512, my $buf, 0 or next; 1650 aio_read $fh, 0, 512, my $buf, 0 or next;
1361 $buf !~ /^password -------------$/m or next; # official not-valid tag 1651 $buf !~ /^password -------------$/m or next; # official not-valid tag
1652 }
1362 1653
1363 utf8::decode $login; 1654 utf8::decode $login;
1364 push @logins, $login; 1655 push @logins, $login;
1365 } 1656 }
1366 1657
… …
1393 } 1684 }
1394 1685
1395 \@paths 1686 \@paths
1396} 1687}
1397 1688
1398=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1689=item $protocol_xml = $player->expand_cfpod ($cfpod)
1399 1690
1400Expand crossfire pod fragments into protocol xml. 1691Expand deliantra pod fragments into protocol xml.
1401 1692
1402=cut
1403
1404sub expand_cfpod {
1405 ((my $self), (local $_)) = @_;
1406
1407 # escape & and <
1408 s/&/&amp;/g;
1409 s/(?<![BIUGH])</&lt;/g;
1410
1411 # this is buggy, it needs to properly take care of nested <'s
1412
1413 1 while
1414 # replace B<>, I<>, U<> etc.
1415 s/B<([^\>]*)>/<b>$1<\/b>/
1416 || s/I<([^\>]*)>/<i>$1<\/i>/
1417 || s/U<([^\>]*)>/<u>$1<\/u>/
1418 # replace G<male|female> tags
1419 || s{G<([^>|]*)\|([^>]*)>}{
1420 $self->gender ? $2 : $1
1421 }ge
1422 # replace H<hint text>
1423 || s{H<([^\>]*)>}
1424 {
1425 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1426 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1427 "")
1428 [$self->{hintmode}]
1429 }ge;
1430
1431 # create single paragraphs (very hackish)
1432 s/(?<=\S)\n(?=\w)/ /g;
1433
1434 # compress some whitespace
1435 s/\s+\n/\n/g; # ws line-ends
1436 s/\n\n+/\n/g; # double lines
1437 s/^\n+//; # beginning lines
1438 s/\n+$//; # ending lines
1439
1440 $_
1441}
1442
1443sub hintmode {
1444 $_[0]{hintmode} = $_[1] if @_ > 1;
1445 $_[0]{hintmode}
1446}
1447
1448=item $player->ext_reply ($msgid, %msg) 1693=item $player->ext_reply ($msgid, @msg)
1449 1694
1450Sends an ext reply to the player. 1695Sends an ext reply to the player.
1451 1696
1452=cut 1697=cut
1453 1698
1454sub ext_reply($$%) { 1699sub ext_reply($$@) {
1455 my ($self, $id, %msg) = @_; 1700 my ($self, $id, @msg) = @_;
1456 1701
1457 $msg{msgid} = $id; 1702 $self->ns->ext_reply ($id, @msg)
1458 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1459} 1703}
1460 1704
1461=item $player->ext_event ($type, %msg) 1705=item $player->ext_msg ($type, @msg)
1462 1706
1463Sends an ext event to the client. 1707Sends an ext event to the client.
1464 1708
1465=cut 1709=cut
1466 1710
1467sub ext_event($$%) { 1711sub ext_msg($$@) {
1468 my ($self, $type, %msg) = @_; 1712 my ($self, $type, @msg) = @_;
1469 1713
1470 $self->ns->ext_event ($type, %msg); 1714 $self->ns->ext_msg ($type, @msg);
1471} 1715}
1472 1716
1473=head3 cf::region 1717=head3 cf::region
1474 1718
1475=over 4 1719=over 4
… …
1488 my ($path) = @_; 1732 my ($path) = @_;
1489 1733
1490 my ($match, $specificity); 1734 my ($match, $specificity);
1491 1735
1492 for my $region (list) { 1736 for my $region (list) {
1493 if ($region->match && $path =~ $region->match) { 1737 if ($region->{match} && $path =~ $region->{match}) {
1494 ($match, $specificity) = ($region, $region->specificity) 1738 ($match, $specificity) = ($region, $region->specificity)
1495 if $region->specificity > $specificity; 1739 if $region->specificity > $specificity;
1496 } 1740 }
1497 } 1741 }
1498 1742
… …
1519our $MAX_RESET = 3600; 1763our $MAX_RESET = 3600;
1520our $DEFAULT_RESET = 3000; 1764our $DEFAULT_RESET = 3000;
1521 1765
1522sub generate_random_map { 1766sub generate_random_map {
1523 my ($self, $rmp) = @_; 1767 my ($self, $rmp) = @_;
1768
1769 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1770
1524 # mit "rum" bekleckern, nicht 1771 # mit "rum" bekleckern, nicht
1525 $self->_create_random_map ( 1772 $self->_create_random_map (
1526 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1773 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1527 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1774 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1528 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1775 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1618 $self->init; # pass $1 etc. 1865 $self->init; # pass $1 etc.
1619 return $self; 1866 return $self;
1620 } 1867 }
1621 } 1868 }
1622 1869
1623 Carp::carp "unable to resolve path '$path' (base '$base')."; 1870 Carp::cluck "unable to resolve path '$path' (base '$base').";
1624 () 1871 ()
1625} 1872}
1626 1873
1627sub init { 1874sub init {
1628 my ($self) = @_; 1875 my ($self) = @_;
… …
1650 1897
1651# the temporary/swap location 1898# the temporary/swap location
1652sub save_path { 1899sub save_path {
1653 my ($self) = @_; 1900 my ($self) = @_;
1654 1901
1655 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1902 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1656 "$TMPDIR/$path.map" 1903 "$TMPDIR/$path.map"
1657} 1904}
1658 1905
1659# the unique path, undef == no special unique path 1906# the unique path, undef == no special unique path
1660sub uniq_path { 1907sub uniq_path {
1661 my ($self) = @_; 1908 my ($self) = @_;
1662 1909
1663 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1910 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1664 "$UNIQUEDIR/$path" 1911 "$UNIQUEDIR/$path"
1665}
1666
1667# and all this just because we cannot iterate over
1668# all maps in C++...
1669sub change_all_map_light {
1670 my ($change) = @_;
1671
1672 $_->change_map_light ($change)
1673 for grep $_->outdoor, values %cf::MAP;
1674} 1912}
1675 1913
1676sub decay_objects { 1914sub decay_objects {
1677 my ($self) = @_; 1915 my ($self) = @_;
1678 1916
… …
1691 1929
1692sub load_header_from($) { 1930sub load_header_from($) {
1693 my ($self, $path) = @_; 1931 my ($self, $path) = @_;
1694 1932
1695 utf8::encode $path; 1933 utf8::encode $path;
1696 #aio_open $path, O_RDONLY, 0 1934 my $f = new_from_file cf::object::thawer $path
1697 # or return;
1698
1699 $self->_load_header ($path)
1700 or return; 1935 or return;
1936
1937 $self->_load_header ($f)
1938 or return;
1939
1940 local $MAP_LOADING{$self->{path}} = $self;
1941 $f->resolve_delayed_derefs;
1701 1942
1702 $self->{load_path} = $path; 1943 $self->{load_path} = $path;
1703 1944
1704 1 1945 1
1705} 1946}
… …
1759sub find { 2000sub find {
1760 my ($path, $origin) = @_; 2001 my ($path, $origin) = @_;
1761 2002
1762 $path = normalise $path, $origin && $origin->path; 2003 $path = normalise $path, $origin && $origin->path;
1763 2004
2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1764 cf::lock_wait "map_find:$path"; 2006 my $guard2 = cf::lock_acquire "map_find:$path";
1765 2007
1766 $cf::MAP{$path} || do { 2008 $cf::MAP{$path} || do {
1767 my $guard = cf::lock_acquire "map_find:$path";
1768 my $map = new_from_path cf::map $path 2009 my $map = new_from_path cf::map $path
1769 or return; 2010 or return;
1770 2011
1771 $map->{last_save} = $cf::RUNTIME; 2012 $map->{last_save} = $cf::RUNTIME;
1772 2013
… …
1774 or return; 2015 or return;
1775 2016
1776 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2017 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1777 # doing this can freeze the server in a sync job, obviously 2018 # doing this can freeze the server in a sync job, obviously
1778 #$cf::WAIT_FOR_TICK->wait; 2019 #$cf::WAIT_FOR_TICK->wait;
2020 undef $guard2;
2021 undef $guard1;
1779 $map->reset; 2022 $map->reset;
1780 undef $guard;
1781 return find $path; 2023 return find $path;
1782 } 2024 }
1783 2025
1784 $cf::MAP{$path} = $map 2026 $cf::MAP{$path} = $map
1785 } 2027 }
1786} 2028}
1787 2029
1788sub pre_load { } 2030sub pre_load { }
1789sub post_load { } 2031#sub post_load { } # XS
1790 2032
1791sub load { 2033sub load {
1792 my ($self) = @_; 2034 my ($self) = @_;
1793 2035
1794 local $self->{deny_reset} = 1; # loading can take a long time 2036 local $self->{deny_reset} = 1; # loading can take a long time
1795 2037
1796 my $path = $self->{path}; 2038 my $path = $self->{path};
1797 2039
1798 { 2040 {
1799 my $guard = cf::lock_acquire "map_load:$path"; 2041 my $guard = cf::lock_acquire "map_data:$path";
1800 2042
2043 return unless $self->valid;
1801 return if $self->in_memory != cf::MAP_SWAPPED; 2044 return unless $self->in_memory == cf::MAP_SWAPPED;
1802 2045
1803 $self->in_memory (cf::MAP_LOADING); 2046 $self->in_memory (cf::MAP_LOADING);
1804 2047
1805 $self->alloc; 2048 $self->alloc;
1806 2049
1807 $self->pre_load; 2050 $self->pre_load;
1808 Coro::cede; 2051 cf::cede_to_tick;
1809 2052
2053 my $f = new_from_file cf::object::thawer $self->{load_path};
2054 $f->skip_block;
1810 $self->_load_objects ($self->{load_path}, 1) 2055 $self->_load_objects ($f)
1811 or return; 2056 or return;
1812 2057
1813 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2058 $self->post_load_original
1814 if delete $self->{load_original}; 2059 if delete $self->{load_original};
1815 2060
1816 if (my $uniq = $self->uniq_path) { 2061 if (my $uniq = $self->uniq_path) {
1817 utf8::encode $uniq; 2062 utf8::encode $uniq;
1818 if (aio_open $uniq, O_RDONLY, 0) { 2063 unless (aio_stat $uniq) {
2064 if (my $f = new_from_file cf::object::thawer $uniq) {
1819 $self->clear_unique_items; 2065 $self->clear_unique_items;
1820 $self->_load_objects ($uniq, 0); 2066 $self->_load_objects ($f);
2067 $f->resolve_delayed_derefs;
2068 }
1821 } 2069 }
1822 } 2070 }
1823 2071
1824 Coro::cede; 2072 $f->resolve_delayed_derefs;
2073
2074 cf::cede_to_tick;
1825 # now do the right thing for maps 2075 # now do the right thing for maps
1826 $self->link_multipart_objects; 2076 $self->link_multipart_objects;
1827 $self->difficulty ($self->estimate_difficulty) 2077 $self->difficulty ($self->estimate_difficulty)
1828 unless $self->difficulty; 2078 unless $self->difficulty;
1829 Coro::cede; 2079 cf::cede_to_tick;
1830 2080
1831 unless ($self->{deny_activate}) { 2081 unless ($self->{deny_activate}) {
1832 $self->decay_objects; 2082 $self->decay_objects;
1833 $self->fix_auto_apply; 2083 $self->fix_auto_apply;
1834 $self->update_buttons; 2084 $self->update_buttons;
1835 Coro::cede; 2085 cf::cede_to_tick;
1836 $self->set_darkness_map;
1837 Coro::cede;
1838 $self->activate; 2086 $self->activate;
1839 } 2087 }
1840 2088
2089 $self->{last_save} = $cf::RUNTIME;
2090 $self->last_access ($cf::RUNTIME);
2091
1841 $self->in_memory (cf::MAP_IN_MEMORY); 2092 $self->in_memory (cf::MAP_ACTIVE);
1842 } 2093 }
1843 2094
1844 $self->post_load; 2095 $self->post_load;
1845} 2096}
1846 2097
… …
1855 2106
1856 $self 2107 $self
1857} 2108}
1858 2109
1859# find and load all maps in the 3x3 area around a map 2110# find and load all maps in the 3x3 area around a map
1860sub load_diag { 2111sub load_neighbours {
1861 my ($map) = @_; 2112 my ($map) = @_;
1862 2113
1863 my @diag; # diagonal neighbours 2114 my @neigh; # diagonal neighbours
1864 2115
1865 for (0 .. 3) { 2116 for (0 .. 3) {
1866 my $neigh = $map->tile_path ($_) 2117 my $neigh = $map->tile_path ($_)
1867 or next; 2118 or next;
1868 $neigh = find $neigh, $map 2119 $neigh = find $neigh, $map
1869 or next; 2120 or next;
1870 $neigh->load; 2121 $neigh->load;
1871 2122
2123 push @neigh,
1872 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2124 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1873 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2125 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1874 } 2126 }
1875 2127
1876 for (@diag) { 2128 for (grep defined $_->[0], @neigh) {
2129 my ($path, $origin) = @$_;
1877 my $neigh = find @$_ 2130 my $neigh = find $path, $origin
1878 or next; 2131 or next;
1879 $neigh->load; 2132 $neigh->load;
1880 } 2133 }
1881} 2134}
1882 2135
… …
1887} 2140}
1888 2141
1889sub do_load_sync { 2142sub do_load_sync {
1890 my ($map) = @_; 2143 my ($map) = @_;
1891 2144
2145 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2146 if $Coro::current == $Coro::main;
2147
1892 cf::sync_job { $map->load }; 2148 cf::sync_job { $map->load };
1893} 2149}
1894 2150
1895our %MAP_PREFETCH; 2151our %MAP_PREFETCH;
1896our $MAP_PREFETCHER = undef; 2152our $MAP_PREFETCHER = undef;
1897 2153
1898sub find_async { 2154sub find_async {
1899 my ($path, $origin) = @_; 2155 my ($path, $origin, $load) = @_;
1900 2156
1901 $path = normalise $path, $origin && $origin->{path}; 2157 $path = normalise $path, $origin && $origin->{path};
1902 2158
1903 if (my $map = $cf::MAP{$path}) { 2159 if (my $map = $cf::MAP{$path}) {
1904 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2160 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1905 } 2161 }
1906 2162
1907 undef $MAP_PREFETCH{$path}; 2163 $MAP_PREFETCH{$path} |= $load;
2164
1908 $MAP_PREFETCHER ||= cf::async { 2165 $MAP_PREFETCHER ||= cf::async {
2166 $Coro::current->{desc} = "map prefetcher";
2167
1909 while (%MAP_PREFETCH) { 2168 while (%MAP_PREFETCH) {
1910 for my $path (keys %MAP_PREFETCH) { 2169 while (my ($k, $v) = each %MAP_PREFETCH) {
1911 my $map = find $path 2170 if (my $map = find $k) {
1912 or next;
1913 $map->load; 2171 $map->load if $v;
2172 }
1914 2173
1915 delete $MAP_PREFETCH{$path}; 2174 delete $MAP_PREFETCH{$k};
1916 } 2175 }
1917 } 2176 }
1918 undef $MAP_PREFETCHER; 2177 undef $MAP_PREFETCHER;
1919 }; 2178 };
1920 $MAP_PREFETCHER->prio (6); 2179 $MAP_PREFETCHER->prio (6);
… …
1923} 2182}
1924 2183
1925sub save { 2184sub save {
1926 my ($self) = @_; 2185 my ($self) = @_;
1927 2186
1928 my $lock = cf::lock_acquire "map_data:" . $self->path; 2187 my $lock = cf::lock_acquire "map_data:$self->{path}";
1929 2188
1930 $self->{last_save} = $cf::RUNTIME; 2189 $self->{last_save} = $cf::RUNTIME;
1931 2190
1932 return unless $self->dirty; 2191 return unless $self->dirty;
1933 2192
… …
1939 return if $self->{deny_save}; 2198 return if $self->{deny_save};
1940 2199
1941 local $self->{last_access} = $self->last_access;#d# 2200 local $self->{last_access} = $self->last_access;#d#
1942 2201
1943 cf::async { 2202 cf::async {
2203 $Coro::current->{desc} = "map player save";
1944 $_->contr->save for $self->players; 2204 $_->contr->save for $self->players;
1945 }; 2205 };
2206
2207 cf::get_slot 0.02;
1946 2208
1947 if ($uniq) { 2209 if ($uniq) {
1948 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2210 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1949 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2211 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1950 } else { 2212 } else {
… …
1956 my ($self) = @_; 2218 my ($self) = @_;
1957 2219
1958 # save first because save cedes 2220 # save first because save cedes
1959 $self->save; 2221 $self->save;
1960 2222
1961 my $lock = cf::lock_acquire "map_data:" . $self->path; 2223 my $lock = cf::lock_acquire "map_data:$self->{path}";
1962 2224
1963 return if $self->players; 2225 return if $self->players;
1964 return if $self->in_memory != cf::MAP_IN_MEMORY; 2226 return if $self->in_memory != cf::MAP_ACTIVE;
1965 return if $self->{deny_save}; 2227 return if $self->{deny_save};
1966 2228
2229 $self->in_memory (cf::MAP_SWAPPED);
2230
2231 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP;
1967 $self->clear; 2233 $self->clear;
1968 $self->in_memory (cf::MAP_SWAPPED);
1969} 2234}
1970 2235
1971sub reset_at { 2236sub reset_at {
1972 my ($self) = @_; 2237 my ($self) = @_;
1973 2238
… …
1991 2256
1992 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
1993 2258
1994 return if $self->players; 2259 return if $self->players;
1995 2260
1996 warn "resetting map ", $self->path; 2261 warn "resetting map ", $self->path, "\n";
1997 2262
1998 $self->in_memory (cf::MAP_SWAPPED); 2263 $self->in_memory (cf::MAP_SWAPPED);
1999 2264
2000 # need to save uniques path 2265 # need to save uniques path
2001 unless ($self->{deny_save}) { 2266 unless ($self->{deny_save}) {
… …
2005 if $uniq; 2270 if $uniq;
2006 } 2271 }
2007 2272
2008 delete $cf::MAP{$self->path}; 2273 delete $cf::MAP{$self->path};
2009 2274
2275 $self->deactivate;
2276 $_->clear_links_to ($self) for values %cf::MAP;
2010 $self->clear; 2277 $self->clear;
2011
2012 $_->clear_links_to ($self) for values %cf::MAP;
2013 2278
2014 $self->unlink_save; 2279 $self->unlink_save;
2015 $self->destroy; 2280 $self->destroy;
2016} 2281}
2017 2282
2018my $nuke_counter = "aaaa"; 2283my $nuke_counter = "aaaa";
2019 2284
2020sub nuke { 2285sub nuke {
2021 my ($self) = @_; 2286 my ($self) = @_;
2022 2287
2288 {
2289 my $lock = cf::lock_acquire "map_data:$self->{path}";
2290
2023 delete $cf::MAP{$self->path}; 2291 delete $cf::MAP{$self->path};
2024 2292
2025 $self->unlink_save; 2293 $self->unlink_save;
2026 2294
2027 bless $self, "cf::map"; 2295 bless $self, "cf::map";
2028 delete $self->{deny_reset}; 2296 delete $self->{deny_reset};
2029 $self->{deny_save} = 1; 2297 $self->{deny_save} = 1;
2030 $self->reset_timeout (1); 2298 $self->reset_timeout (1);
2031 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2299 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2032 2300
2033 $cf::MAP{$self->path} = $self; 2301 $cf::MAP{$self->path} = $self;
2302 }
2034 2303
2035 $self->reset; # polite request, might not happen 2304 $self->reset; # polite request, might not happen
2036} 2305}
2037 2306
2038=item $maps = cf::map::tmp_maps 2307=item $maps = cf::map::tmp_maps
… …
2080 2349
2081sub unique_maps() { 2350sub unique_maps() {
2082 [ 2351 [
2083 map { 2352 map {
2084 utf8::decode $_; 2353 utf8::decode $_;
2085 /\.map$/ 2354 s/\.map$//; # TODO future compatibility hack
2355 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2356 ? ()
2086 ? normalise $_ 2357 : normalise $_
2087 : ()
2088 } @{ aio_readdir $UNIQUEDIR or [] } 2358 } @{ aio_readdir $UNIQUEDIR or [] }
2089 ] 2359 ]
2090} 2360}
2091 2361
2092package cf; 2362=item cf::map::static_maps
2363
2364Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2365file in the shared directory excluding F</styles> and F</editor>). May
2366block.
2367
2368=cut
2369
2370sub static_maps() {
2371 my @dirs = "";
2372 my @maps;
2373
2374 while (@dirs) {
2375 my $dir = shift @dirs;
2376
2377 next if $dir eq "/styles" || $dir eq "/editor";
2378
2379 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2380 or return;
2381
2382 for (@$files) {
2383 s/\.map$// or next;
2384 utf8::decode $_;
2385 push @maps, "$dir/$_";
2386 }
2387
2388 push @dirs, map "$dir/$_", @$dirs;
2389 }
2390
2391 \@maps
2392}
2093 2393
2094=back 2394=back
2095 2395
2096=head3 cf::object 2396=head3 cf::object
2097 2397
… …
2101 2401
2102=over 4 2402=over 4
2103 2403
2104=item $ob->inv_recursive 2404=item $ob->inv_recursive
2105 2405
2106Returns the inventory of the object _and_ their inventories, recursively. 2406Returns the inventory of the object I<and> their inventories, recursively,
2407but I<not> the object itself.
2107 2408
2108=cut 2409=cut
2109 2410
2110sub inv_recursive_; 2411sub inv_recursive_;
2111sub inv_recursive_ { 2412sub inv_recursive_ {
… …
2114 2415
2115sub inv_recursive { 2416sub inv_recursive {
2116 inv_recursive_ inv $_[0] 2417 inv_recursive_ inv $_[0]
2117} 2418}
2118 2419
2420=item $ref = $ob->ref
2421
2422Creates and returns a persistent reference to an object that can be stored as a string.
2423
2424=item $ob = cf::object::deref ($refstring)
2425
2426returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2427even if the object actually exists. May block.
2428
2429=cut
2430
2431sub deref {
2432 my ($ref) = @_;
2433
2434 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2435 my ($uuid, $name) = ($1, $2);
2436 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2437 or return;
2438 $pl->ob->uuid eq $uuid
2439 or return;
2440
2441 $pl->ob
2442 } else {
2443 warn "$ref: cannot resolve object reference\n";
2444 undef
2445 }
2446}
2447
2119package cf; 2448package cf;
2120 2449
2121=back 2450=back
2122 2451
2123=head3 cf::object::player 2452=head3 cf::object::player
… …
2129Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2458Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2130can be C<undef>. Does the right thing when the player is currently in a 2459can be C<undef>. Does the right thing when the player is currently in a
2131dialogue with the given NPC character. 2460dialogue with the given NPC character.
2132 2461
2133=cut 2462=cut
2463
2464our $SAY_CHANNEL = {
2465 id => "say",
2466 title => "Map",
2467 reply => "say ",
2468 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2469};
2470
2471our $CHAT_CHANNEL = {
2472 id => "chat",
2473 title => "Chat",
2474 reply => "chat ",
2475 tooltip => "Player chat and shouts, global to the server.",
2476};
2134 2477
2135# rough implementation of a future "reply" method that works 2478# rough implementation of a future "reply" method that works
2136# with dialog boxes. 2479# with dialog boxes.
2137#TODO: the first argument must go, split into a $npc->reply_to ( method 2480#TODO: the first argument must go, split into a $npc->reply_to ( method
2138sub cf::object::player::reply($$$;$) { 2481sub cf::object::player::reply($$$;$) {
… …
2145 2488
2146 } else { 2489 } else {
2147 my $pl = $self->contr; 2490 my $pl = $self->contr;
2148 2491
2149 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2492 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2150 my $diag = $pl->{npc_dialog}; 2493 my $dialog = $pl->{npc_dialog};
2151 $diag->{pl}->ext_reply ( 2494 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2152 $diag->{id},
2153 msgtype => "reply",
2154 msg => $diag->{pl}->expand_cfpod ($msg),
2155 add_topics => []
2156 );
2157 2495
2158 } else { 2496 } else {
2159 $msg = $npc->name . " says: $msg" if $npc; 2497 $msg = $npc->name . " says: $msg" if $npc;
2160 $self->message ($msg, $flags); 2498 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2161 } 2499 }
2162 } 2500 }
2501}
2502
2503=item $object->send_msg ($channel, $msg, $color, [extra...])
2504
2505=cut
2506
2507sub cf::object::send_msg {
2508 my $pl = shift->contr
2509 or return;
2510 $pl->send_msg (@_);
2163} 2511}
2164 2512
2165=item $player_object->may ("access") 2513=item $player_object->may ("access")
2166 2514
2167Returns wether the given player is authorized to access resource "access" 2515Returns wether the given player is authorized to access resource "access"
… …
2180 2528
2181=item $player_object->enter_link 2529=item $player_object->enter_link
2182 2530
2183Freezes the player and moves him/her to a special map (C<{link}>). 2531Freezes the player and moves him/her to a special map (C<{link}>).
2184 2532
2185The player should be reasonably safe there for short amounts of time. You 2533The player should be reasonably safe there for short amounts of time (e.g.
2186I<MUST> call C<leave_link> as soon as possible, though. 2534for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2535though, as the palyer cannot control the character while it is on the link
2536map.
2187 2537
2188Will never block. 2538Will never block.
2189 2539
2190=item $player_object->leave_link ($map, $x, $y) 2540=item $player_object->leave_link ($map, $x, $y)
2191 2541
… …
2243 ($x, $y) = (-1, -1) 2593 ($x, $y) = (-1, -1)
2244 unless (defined $x) && (defined $y); 2594 unless (defined $x) && (defined $y);
2245 2595
2246 # use -1 or undef as default coordinates, not 0, 0 2596 # use -1 or undef as default coordinates, not 0, 0
2247 ($x, $y) = ($map->enter_x, $map->enter_y) 2597 ($x, $y) = ($map->enter_x, $map->enter_y)
2248 if $x <=0 && $y <= 0; 2598 if $x <= 0 && $y <= 0;
2249 2599
2250 $map->load; 2600 $map->load;
2251 $map->load_diag; 2601 $map->load_neighbours;
2252 2602
2253 return unless $self->contr->active; 2603 return unless $self->contr->active;
2254 $self->activate_recursive;
2255 2604
2256 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2605 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2257 $self->enter_map ($map, $x, $y); 2606 $self->enter_map ($map, $x, $y);
2258}
2259 2607
2608 # only activate afterwards, to support waiting in hooks
2609 $self->activate_recursive;
2610}
2611
2260=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2612=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2261 2613
2262Moves the player to the given map-path and coordinates by first freezing 2614Moves the player to the given map-path and coordinates by first freezing
2263her, loading and preparing them map, calling the provided $check callback 2615her, loading and preparing them map, calling the provided $check callback
2264that has to return the map if sucecssful, and then unfreezes the player on 2616that has to return the map if sucecssful, and then unfreezes the player on
2265the new (success) or old (failed) map position. 2617the new (success) or old (failed) map position. In either case, $done will
2618be called at the end of this process.
2619
2620Note that $check will be called with a potentially non-loaded map, so if
2621it needs a loaded map it has to call C<< ->load >>.
2266 2622
2267=cut 2623=cut
2268 2624
2269our $GOTOGEN; 2625our $GOTOGEN;
2270 2626
2271sub cf::object::player::goto { 2627sub cf::object::player::goto {
2272 my ($self, $path, $x, $y, $check) = @_; 2628 my ($self, $path, $x, $y, $check, $done) = @_;
2273 2629
2274 # do generation counting so two concurrent goto's will be executed in-order 2630 # do generation counting so two concurrent goto's will be executed in-order
2275 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2631 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2276 2632
2277 $self->enter_link; 2633 $self->enter_link;
2278 2634
2279 (async { 2635 (async {
2636 $Coro::current->{desc} = "player::goto $path $x $y";
2637
2638 # *tag paths override both path and x|y
2639 if ($path =~ /^\*(.*)$/) {
2640 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2641 my $ob = $obs[rand @obs];
2642
2643 # see if we actually can go there
2644 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2645 $ob = $obs[rand @obs];
2646 } else {
2647 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2648 }
2649 # else put us there anyways for now #d#
2650
2651 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2652 } else {
2653 ($path, $x, $y) = (undef, undef, undef);
2654 }
2655 }
2656
2280 my $map = eval { 2657 my $map = eval {
2281 my $map = cf::map::find $path; 2658 my $map = defined $path ? cf::map::find $path : undef;
2282 2659
2283 if ($map) { 2660 if ($map) {
2284 $map = $map->customise_for ($self); 2661 $map = $map->customise_for ($self);
2285 $map = $check->($map) if $check && $map; 2662 $map = $check->($map) if $check && $map;
2286 } else { 2663 } else {
2287 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2664 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2288 } 2665 }
2289 2666
2290 $map 2667 $map
2291 }; 2668 };
2292 2669
… …
2297 2674
2298 if ($gen == $self->{_goto_generation}) { 2675 if ($gen == $self->{_goto_generation}) {
2299 delete $self->{_goto_generation}; 2676 delete $self->{_goto_generation};
2300 $self->leave_link ($map, $x, $y); 2677 $self->leave_link ($map, $x, $y);
2301 } 2678 }
2679
2680 $done->() if $done;
2302 })->prio (1); 2681 })->prio (1);
2303} 2682}
2304 2683
2305=item $player_object->enter_exit ($exit_object) 2684=item $player_object->enter_exit ($exit_object)
2306 2685
… …
2326} 2705}
2327 2706
2328sub prepare_random_map { 2707sub prepare_random_map {
2329 my ($exit) = @_; 2708 my ($exit) = @_;
2330 2709
2331 my $guard = cf::lock_acquire "exit_prepare:$exit";
2332
2333 # all this does is basically replace the /! path by 2710 # all this does is basically replace the /! path by
2334 # a new random map path (?random/...) with a seed 2711 # a new random map path (?random/...) with a seed
2335 # that depends on the exit object 2712 # that depends on the exit object
2336 2713
2337 my $rmp = parse_random_map_params $exit->msg; 2714 my $rmp = parse_random_map_params $exit->msg;
… …
2339 if ($exit->map) { 2716 if ($exit->map) {
2340 $rmp->{region} = $exit->region->name; 2717 $rmp->{region} = $exit->region->name;
2341 $rmp->{origin_map} = $exit->map->path; 2718 $rmp->{origin_map} = $exit->map->path;
2342 $rmp->{origin_x} = $exit->x; 2719 $rmp->{origin_x} = $exit->x;
2343 $rmp->{origin_y} = $exit->y; 2720 $rmp->{origin_y} = $exit->y;
2721
2722 $exit->map->touch;
2344 } 2723 }
2345 2724
2346 $rmp->{random_seed} ||= $exit->random_seed; 2725 $rmp->{random_seed} ||= $exit->random_seed;
2347 2726
2348 my $data = cf::to_json $rmp; 2727 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2349 my $md5 = Digest::MD5::md5_hex $data; 2728 my $md5 = Digest::MD5::md5_hex $data;
2350 my $meta = "$RANDOMDIR/$md5.meta"; 2729 my $meta = "$RANDOMDIR/$md5.meta";
2351 2730
2352 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2731 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2353 aio_write $fh, 0, (length $data), $data, 0; 2732 aio_write $fh, 0, (length $data), $data, 0;
2354 undef $fh; 2733 undef $fh;
2355 aio_rename "$meta~", $meta; 2734 aio_rename "$meta~", $meta;
2356 2735
2736 my $slaying = "?random/$md5";
2737
2738 if ($exit->valid) {
2357 $exit->slaying ("?random/$md5"); 2739 $exit->slaying ("?random/$md5");
2358 $exit->msg (undef); 2740 $exit->msg (undef);
2741 }
2359 } 2742 }
2360} 2743}
2361 2744
2362sub cf::object::player::enter_exit { 2745sub cf::object::player::enter_exit {
2363 my ($self, $exit) = @_; 2746 my ($self, $exit) = @_;
2364 2747
2365 return unless $self->type == cf::PLAYER; 2748 return unless $self->type == cf::PLAYER;
2366 2749
2367 if ($exit->slaying eq "/!") {
2368 #TODO: this should de-fi-ni-te-ly not be a sync-job
2369 # the problem is that $exit might not survive long enough
2370 # so it needs to be done right now, right here
2371 cf::sync_job { prepare_random_map $exit };
2372 }
2373
2374 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2375 my $hp = $exit->stats->hp;
2376 my $sp = $exit->stats->sp;
2377
2378 $self->enter_link; 2750 $self->enter_link;
2379 2751
2380 # if exit is damned, update players death & WoR home-position
2381 $self->contr->savebed ($slaying, $hp, $sp)
2382 if $exit->flag (FLAG_DAMNED);
2383
2384 (async { 2752 (async {
2385 $self->deactivate_recursive; # just to be sure 2753 $Coro::current->{desc} = "enter_exit";
2754
2386 unless (eval { 2755 unless (eval {
2756 $self->deactivate_recursive; # just to be sure
2757
2758 # random map handling
2759 {
2760 my $guard = cf::lock_acquire "exit_prepare:$exit";
2761
2762 prepare_random_map $exit
2763 if $exit->slaying eq "/!";
2764 }
2765
2766 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2767 my $x = $exit->stats->hp;
2768 my $y = $exit->stats->sp;
2769
2387 $self->goto ($slaying, $hp, $sp); 2770 $self->goto ($map, $x, $y);
2388 2771
2772 # if exit is damned, update players death & WoR home-position
2773 $self->contr->savebed ($map, $x, $y)
2774 if $exit->flag (cf::FLAG_DAMNED);
2775
2389 1; 2776 1
2390 }) { 2777 }) {
2391 $self->message ("Something went wrong deep within the crossfire server. " 2778 $self->message ("Something went wrong deep within the deliantra server. "
2392 . "I'll try to bring you back to the map you were before. " 2779 . "I'll try to bring you back to the map you were before. "
2393 . "Please report this to the dungeon master!", 2780 . "Please report this to the dungeon master!",
2394 cf::NDI_UNIQUE | cf::NDI_RED); 2781 cf::NDI_UNIQUE | cf::NDI_RED);
2395 2782
2396 warn "ERROR in enter_exit: $@"; 2783 warn "ERROR in enter_exit: $@";
… …
2415 2802
2416 utf8::encode $text; 2803 utf8::encode $text;
2417 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2804 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2418} 2805}
2419 2806
2807=item $client->send_big_packet ($pkt)
2808
2809Like C<send_packet>, but tries to compress large packets, and fragments
2810them as required.
2811
2812=cut
2813
2814our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2815
2816sub cf::client::send_big_packet {
2817 my ($self, $pkt) = @_;
2818
2819 # try lzf for large packets
2820 $pkt = "lzf " . Compress::LZF::compress $pkt
2821 if 1024 <= length $pkt and $self->{can_lzf};
2822
2823 # split very large packets
2824 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2825 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2826 $pkt = "frag";
2827 }
2828
2829 $self->send_packet ($pkt);
2830}
2831
2420=item $client->send_msg ($color, $type, $msg, [extra...]) 2832=item $client->send_msg ($channel, $msg, $color, [extra...])
2421 2833
2422Send a drawinfo or msg packet to the client, formatting the msg for the 2834Send a drawinfo or msg packet to the client, formatting the msg for the
2423client if neccessary. C<$type> should be a string identifying the type of 2835client if neccessary. C<$type> should be a string identifying the type of
2424the message, with C<log> being the default. If C<$color> is negative, suppress 2836the message, with C<log> being the default. If C<$color> is negative, suppress
2425the message unless the client supports the msg packet. 2837the message unless the client supports the msg packet.
2426 2838
2427=cut 2839=cut
2428 2840
2841# non-persistent channels (usually the info channel)
2842our %CHANNEL = (
2843 "c/motd" => {
2844 id => "infobox",
2845 title => "MOTD",
2846 reply => undef,
2847 tooltip => "The message of the day",
2848 },
2849 "c/identify" => {
2850 id => "infobox",
2851 title => "Identify",
2852 reply => undef,
2853 tooltip => "Items recently identified",
2854 },
2855 "c/examine" => {
2856 id => "infobox",
2857 title => "Examine",
2858 reply => undef,
2859 tooltip => "Signs and other items you examined",
2860 },
2861 "c/shopinfo" => {
2862 id => "infobox",
2863 title => "Shop Info",
2864 reply => undef,
2865 tooltip => "What your bargaining skill tells you about the shop",
2866 },
2867 "c/book" => {
2868 id => "infobox",
2869 title => "Book",
2870 reply => undef,
2871 tooltip => "The contents of a note or book",
2872 },
2873 "c/lookat" => {
2874 id => "infobox",
2875 title => "Look",
2876 reply => undef,
2877 tooltip => "What you saw there",
2878 },
2879 "c/who" => {
2880 id => "infobox",
2881 title => "Players",
2882 reply => undef,
2883 tooltip => "Shows players who are currently online",
2884 },
2885 "c/body" => {
2886 id => "infobox",
2887 title => "Body Parts",
2888 reply => undef,
2889 tooltip => "Shows which body parts you posess and are available",
2890 },
2891 "c/statistics" => {
2892 id => "infobox",
2893 title => "Statistics",
2894 reply => undef,
2895 tooltip => "Shows your primary statistics",
2896 },
2897 "c/skills" => {
2898 id => "infobox",
2899 title => "Skills",
2900 reply => undef,
2901 tooltip => "Shows your experience per skill and item power",
2902 },
2903 "c/shopitems" => {
2904 id => "infobox",
2905 title => "Shop Items",
2906 reply => undef,
2907 tooltip => "Shows the items currently for sale in this shop",
2908 },
2909 "c/resistances" => {
2910 id => "infobox",
2911 title => "Resistances",
2912 reply => undef,
2913 tooltip => "Shows your resistances",
2914 },
2915 "c/pets" => {
2916 id => "infobox",
2917 title => "Pets",
2918 reply => undef,
2919 tooltip => "Shows information abotu your pets/a specific pet",
2920 },
2921 "c/perceiveself" => {
2922 id => "infobox",
2923 title => "Perceive Self",
2924 reply => undef,
2925 tooltip => "You gained detailed knowledge about yourself",
2926 },
2927 "c/uptime" => {
2928 id => "infobox",
2929 title => "Uptime",
2930 reply => undef,
2931 tooltip => "How long the server has been running since last restart",
2932 },
2933 "c/mapinfo" => {
2934 id => "infobox",
2935 title => "Map Info",
2936 reply => undef,
2937 tooltip => "Information related to the maps",
2938 },
2939 "c/party" => {
2940 id => "party",
2941 title => "Party",
2942 reply => "gsay ",
2943 tooltip => "Messages and chat related to your party",
2944 },
2945 "c/death" => {
2946 id => "death",
2947 title => "Death",
2948 reply => undef,
2949 tooltip => "Reason for and more info about your most recent death",
2950 },
2951 "c/say" => $SAY_CHANNEL,
2952 "c/chat" => $CHAT_CHANNEL,
2953);
2954
2429sub cf::client::send_msg { 2955sub cf::client::send_msg {
2430 my ($self, $color, $type, $msg, @extra) = @_; 2956 my ($self, $channel, $msg, $color, @extra) = @_;
2431 2957
2432 $msg = $self->pl->expand_cfpod ($msg); 2958 $msg = $self->pl->expand_cfpod ($msg)
2959 unless $color & cf::NDI_VERBATIM;
2960
2961 $color &= cf::NDI_CLIENT_MASK; # just in case...
2962
2963 # check predefined channels, for the benefit of C
2964 if ($CHANNEL{$channel}) {
2965 $channel = $CHANNEL{$channel};
2966
2967 $self->ext_msg (channel_info => $channel);
2968 $channel = $channel->{id};
2969
2970 } elsif (ref $channel) {
2971 # send meta info to client, if not yet sent
2972 unless (exists $self->{channel}{$channel->{id}}) {
2973 $self->{channel}{$channel->{id}} = $channel;
2974 $self->ext_msg (channel_info => $channel);
2975 }
2976
2977 $channel = $channel->{id};
2978 }
2433 2979
2434 return unless @extra || length $msg; 2980 return unless @extra || length $msg;
2435 2981
2436 if ($self->can_msg) { 2982 # default colour, mask it out
2437 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2983 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2438 } else { 2984 if $color & cf::NDI_DEF;
2439 # replace some tags by gcfclient-compatible ones
2440 for ($msg) {
2441 1 while
2442 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2443 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2444 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2445 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2446 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2447 }
2448 2985
2449 if ($color >= 0) { 2986 my $pkt = "msg "
2450 if (0 && $msg =~ /\[/) { 2987 . $self->{json_coder}->encode (
2451 $self->send_packet ("drawextinfo $color 4 0 $msg") 2988 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2452 } else { 2989 );
2453 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2454 $self->send_packet ("drawinfo $color $msg")
2455 }
2456 }
2457 }
2458}
2459 2990
2991 $self->send_big_packet ($pkt);
2992}
2993
2460=item $client->ext_event ($type, %msg) 2994=item $client->ext_msg ($type, @msg)
2461 2995
2462Sends an ext event to the client. 2996Sends an ext event to the client.
2463 2997
2464=cut 2998=cut
2465 2999
2466sub cf::client::ext_event($$%) { 3000sub cf::client::ext_msg($$@) {
2467 my ($self, $type, %msg) = @_; 3001 my ($self, $type, @msg) = @_;
2468 3002
3003 if ($self->extcmd == 2) {
3004 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3005 } elsif ($self->extcmd == 1) { # TODO: remove
2469 $msg{msgtype} = "event_$type"; 3006 push @msg, msgtype => "event_$type";
2470 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 3007 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3008 }
3009}
3010
3011=item $client->ext_reply ($msgid, @msg)
3012
3013Sends an ext reply to the client.
3014
3015=cut
3016
3017sub cf::client::ext_reply($$@) {
3018 my ($self, $id, @msg) = @_;
3019
3020 if ($self->extcmd == 2) {
3021 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3022 } elsif ($self->extcmd == 1) {
3023 #TODO: version 1, remove
3024 unshift @msg, msgtype => "reply", msgid => $id;
3025 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3026 }
2471} 3027}
2472 3028
2473=item $success = $client->query ($flags, "text", \&cb) 3029=item $success = $client->query ($flags, "text", \&cb)
2474 3030
2475Queues a query to the client, calling the given callback with 3031Queues a query to the client, calling the given callback with
… …
2530 my ($ns, $buf) = @_; 3086 my ($ns, $buf) = @_;
2531 3087
2532 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3088 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2533 3089
2534 if (ref $msg) { 3090 if (ref $msg) {
3091 my ($type, $reply, @payload) =
3092 "ARRAY" eq ref $msg
3093 ? @$msg
3094 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3095
3096 my @reply;
3097
2535 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3098 if (my $cb = $EXTICMD{$type}) {
2536 if (my %reply = $cb->($ns, $msg)) { 3099 @reply = $cb->($ns, @payload);
2537 $reply{msgid} = $msg->{msgid};
2538 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2539 }
2540 } 3100 }
3101
3102 $ns->ext_reply ($reply, @reply)
3103 if $reply;
3104
2541 } else { 3105 } else {
2542 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3106 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2543 } 3107 }
2544 3108
2545 cf::override; 3109 cf::override;
… …
2592our $safe = new Safe "safe"; 3156our $safe = new Safe "safe";
2593our $safe_hole = new Safe::Hole; 3157our $safe_hole = new Safe::Hole;
2594 3158
2595$SIG{FPE} = 'IGNORE'; 3159$SIG{FPE} = 'IGNORE';
2596 3160
2597$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3161$safe->permit_only (Opcode::opset qw(
3162 :base_core :base_mem :base_orig :base_math :base_loop
3163 grepstart grepwhile mapstart mapwhile
3164 sort time
3165));
2598 3166
2599# here we export the classes and methods available to script code 3167# here we export the classes and methods available to script code
2600 3168
2601=pod 3169=pod
2602 3170
2603The following functions and methods are available within a safe environment: 3171The following functions and methods are available within a safe environment:
2604 3172
2605 cf::object 3173 cf::object
2606 contr pay_amount pay_player map x y force_find force_add 3174 contr pay_amount pay_player map x y force_find force_add destroy
2607 insert remove 3175 insert remove name archname title slaying race decrease split
3176 value
2608 3177
2609 cf::object::player 3178 cf::object::player
2610 player 3179 player
2611 3180
2612 cf::player 3181 cf::player
… …
2617 3186
2618=cut 3187=cut
2619 3188
2620for ( 3189for (
2621 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3190 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2622 insert remove)], 3191 insert remove inv nrof name archname title slaying race
3192 decrease split destroy change_exp value msg lore send_msg)],
2623 ["cf::object::player" => qw(player)], 3193 ["cf::object::player" => qw(player)],
2624 ["cf::player" => qw(peaceful)], 3194 ["cf::player" => qw(peaceful send_msg)],
2625 ["cf::map" => qw(trigger)], 3195 ["cf::map" => qw(trigger)],
2626) { 3196) {
2627 no strict 'refs'; 3197 no strict 'refs';
2628 my ($pkg, @funs) = @$_; 3198 my ($pkg, @funs) = @$_;
2629 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3199 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2647 3217
2648 my $qcode = $code; 3218 my $qcode = $code;
2649 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3219 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2650 $qcode =~ s/\n/\\n/g; 3220 $qcode =~ s/\n/\\n/g;
2651 3221
3222 %vars = (_dummy => 0) unless %vars;
3223
3224 my @res;
2652 local $_; 3225 local $_;
2653 local @safe::cf::_safe_eval_args = values %vars;
2654 3226
2655 my $eval = 3227 my $eval =
2656 "do {\n" 3228 "do {\n"
2657 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3229 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2658 . "#line 0 \"{$qcode}\"\n" 3230 . "#line 0 \"{$qcode}\"\n"
2659 . $code 3231 . $code
2660 . "\n}" 3232 . "\n}"
2661 ; 3233 ;
2662 3234
3235 if ($CFG{safe_eval}) {
2663 sub_generation_inc; 3236 sub_generation_inc;
3237 local @safe::cf::_safe_eval_args = values %vars;
2664 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3238 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2665 sub_generation_inc; 3239 sub_generation_inc;
3240 } else {
3241 local @cf::_safe_eval_args = values %vars;
3242 @res = wantarray ? eval eval : scalar eval $eval;
3243 }
2666 3244
2667 if ($@) { 3245 if ($@) {
2668 warn "$@"; 3246 warn "$@";
2669 warn "while executing safe code '$code'\n"; 3247 warn "while executing safe code '$code'\n";
2670 warn "with arguments " . (join " ", %vars) . "\n"; 3248 warn "with arguments " . (join " ", %vars) . "\n";
… …
2689=cut 3267=cut
2690 3268
2691sub register_script_function { 3269sub register_script_function {
2692 my ($fun, $cb) = @_; 3270 my ($fun, $cb) = @_;
2693 3271
2694 no strict 'refs'; 3272 $fun = "safe::$fun" if $CFG{safe_eval};
2695 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3273 *$fun = $safe_hole->wrap ($cb);
2696} 3274}
2697 3275
2698=back 3276=back
2699 3277
2700=cut 3278=cut
… …
2702############################################################################# 3280#############################################################################
2703# the server's init and main functions 3281# the server's init and main functions
2704 3282
2705sub load_facedata($) { 3283sub load_facedata($) {
2706 my ($path) = @_; 3284 my ($path) = @_;
3285
3286 # HACK to clear player env face cache, we need some signal framework
3287 # for this (global event?)
3288 %ext::player_env::MUSIC_FACE_CACHE = ();
3289
3290 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2707 3291
2708 warn "loading facedata from $path\n"; 3292 warn "loading facedata from $path\n";
2709 3293
2710 my $facedata; 3294 my $facedata;
2711 0 < aio_load $path, $facedata 3295 0 < aio_load $path, $facedata
… …
2714 $facedata = Coro::Storable::thaw $facedata; 3298 $facedata = Coro::Storable::thaw $facedata;
2715 3299
2716 $facedata->{version} == 2 3300 $facedata->{version} == 2
2717 or cf::cleanup "$path: version mismatch, cannot proceed."; 3301 or cf::cleanup "$path: version mismatch, cannot proceed.";
2718 3302
3303 # patch in the exptable
3304 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3305 $facedata->{resource}{"res/exp_table"} = {
3306 type => FT_RSRC,
3307 data => $exp_table,
3308 hash => (Digest::MD5::md5 $exp_table),
3309 };
3310 cf::cede_to_tick;
3311
2719 { 3312 {
2720 my $faces = $facedata->{faceinfo}; 3313 my $faces = $facedata->{faceinfo};
2721 3314
2722 while (my ($face, $info) = each %$faces) { 3315 while (my ($face, $info) = each %$faces) {
2723 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3316 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3317
2724 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3318 cf::face::set_visibility $idx, $info->{visibility};
3319 cf::face::set_magicmap $idx, $info->{magicmap};
2725 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3320 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2726 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3321 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2727 Coro::cede; 3322
3323 cf::cede_to_tick;
2728 } 3324 }
2729 3325
2730 while (my ($face, $info) = each %$faces) { 3326 while (my ($face, $info) = each %$faces) {
2731 next unless $info->{smooth}; 3327 next unless $info->{smooth};
3328
2732 my $idx = cf::face::find $face 3329 my $idx = cf::face::find $face
2733 or next; 3330 or next;
3331
2734 if (my $smooth = cf::face::find $info->{smooth}) { 3332 if (my $smooth = cf::face::find $info->{smooth}) {
3333 cf::face::set_smooth $idx, $smooth;
2735 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3334 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2736 } else { 3335 } else {
2737 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3336 warn "smooth face '$info->{smooth}' not found for face '$face'";
2738 } 3337 }
2739 Coro::cede; 3338
3339 cf::cede_to_tick;
2740 } 3340 }
2741 } 3341 }
2742 3342
2743 { 3343 {
2744 my $anims = $facedata->{animinfo}; 3344 my $anims = $facedata->{animinfo};
2745 3345
2746 while (my ($anim, $info) = each %$anims) { 3346 while (my ($anim, $info) = each %$anims) {
2747 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3347 cf::anim::set $anim, $info->{frames}, $info->{facings};
2748 Coro::cede; 3348 cf::cede_to_tick;
2749 } 3349 }
2750 3350
2751 cf::anim::invalidate_all; # d'oh 3351 cf::anim::invalidate_all; # d'oh
2752 } 3352 }
2753 3353
3354 {
3355 my $res = $facedata->{resource};
3356
3357 while (my ($name, $info) = each %$res) {
3358 if (defined $info->{type}) {
3359 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3360
3361 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3362 cf::face::set_type $idx, $info->{type};
3363 } else {
3364 $RESOURCE{$name} = $info;
3365 }
3366
3367 cf::cede_to_tick;
3368 }
3369 }
3370
3371 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3372
2754 1 3373 1
2755} 3374}
2756 3375
3376cf::global->attach (on_resource_update => sub {
3377 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3378 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3379
3380 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3381 my $sound = $soundconf->{compat}[$_]
3382 or next;
3383
3384 my $face = cf::face::find "sound/$sound->[1]";
3385 cf::sound::set $sound->[0] => $face;
3386 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3387 }
3388
3389 while (my ($k, $v) = each %{$soundconf->{event}}) {
3390 my $face = cf::face::find "sound/$v";
3391 cf::sound::set $k => $face;
3392 }
3393 }
3394});
3395
3396register_exticmd fx_want => sub {
3397 my ($ns, $want) = @_;
3398
3399 while (my ($k, $v) = each %$want) {
3400 $ns->fx_want ($k, $v);
3401 }
3402};
3403
3404sub load_resource_file($) {
3405 my $guard = lock_acquire "load_resource_file";
3406
3407 my $status = load_resource_file_ $_[0];
3408 get_slot 0.1, 100;
3409 cf::arch::commit_load;
3410
3411 $status
3412}
3413
2757sub reload_regions { 3414sub reload_regions {
3415 # HACK to clear player env face cache, we need some signal framework
3416 # for this (global event?)
3417 %ext::player_env::MUSIC_FACE_CACHE = ();
3418
2758 load_resource_file "$MAPDIR/regions" 3419 load_resource_file "$MAPDIR/regions"
2759 or die "unable to load regions file\n"; 3420 or die "unable to load regions file\n";
3421
3422 for (cf::region::list) {
3423 $_->{match} = qr/$_->{match}/
3424 if exists $_->{match};
3425 }
2760} 3426}
2761 3427
2762sub reload_facedata { 3428sub reload_facedata {
2763 load_facedata "$DATADIR/facedata" 3429 load_facedata "$DATADIR/facedata"
2764 or die "unable to load facedata\n"; 3430 or die "unable to load facedata\n";
2765} 3431}
2766 3432
2767sub reload_archetypes { 3433sub reload_archetypes {
2768 load_resource_file "$DATADIR/archetypes" 3434 load_resource_file "$DATADIR/archetypes"
2769 or die "unable to load archetypes\n"; 3435 or die "unable to load archetypes\n";
2770 #d# NEED to laod twice to resolve forward references
2771 # this really needs to be done in an extra post-pass
2772 # (which needs to be synchronous, so solve it differently)
2773 load_resource_file "$DATADIR/archetypes"
2774 or die "unable to load archetypes\n";
2775} 3436}
2776 3437
2777sub reload_treasures { 3438sub reload_treasures {
2778 load_resource_file "$DATADIR/treasures" 3439 load_resource_file "$DATADIR/treasures"
2779 or die "unable to load treasurelists\n"; 3440 or die "unable to load treasurelists\n";
2780} 3441}
2781 3442
2782sub reload_resources { 3443sub reload_resources {
2783 warn "reloading resource files...\n"; 3444 warn "reloading resource files...\n";
2784 3445
3446 reload_facedata;
3447 reload_archetypes;
2785 reload_regions; 3448 reload_regions;
2786 reload_facedata;
2787 #reload_archetypes;#d#
2788 reload_archetypes;
2789 reload_treasures; 3449 reload_treasures;
2790 3450
2791 warn "finished reloading resource files\n"; 3451 warn "finished reloading resource files\n";
2792} 3452}
2793 3453
2794sub init { 3454sub reload_config {
2795 reload_resources; 3455 warn "reloading config file...\n";
2796}
2797 3456
2798sub cfg_load {
2799 open my $fh, "<:utf8", "$CONFDIR/config" 3457 open my $fh, "<:utf8", "$CONFDIR/config"
2800 or return; 3458 or return;
2801 3459
2802 local $/; 3460 local $/;
2803 *CFG = YAML::Syck::Load <$fh>; 3461 *CFG = YAML::XS::Load scalar <$fh>;
2804 3462
2805 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3463 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2806 3464
2807 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3465 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2808 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3466 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2812 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3470 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2813 and die "WARNING: m(un)lockall failed: $!\n"; 3471 and die "WARNING: m(un)lockall failed: $!\n";
2814 }; 3472 };
2815 warn $@ if $@; 3473 warn $@ if $@;
2816 } 3474 }
3475
3476 warn "finished reloading resource files\n";
3477}
3478
3479sub pidfile() {
3480 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3481 or die "$PIDFILE: $!";
3482 flock $fh, &Fcntl::LOCK_EX
3483 or die "$PIDFILE: flock: $!";
3484 $fh
3485}
3486
3487# make sure only one server instance is running at any one time
3488sub atomic {
3489 my $fh = pidfile;
3490
3491 my $pid = <$fh>;
3492 kill 9, $pid if $pid > 0;
3493
3494 seek $fh, 0, 0;
3495 print $fh $$;
3496}
3497
3498sub main_loop {
3499 warn "EV::loop starting\n";
3500 if (1) {
3501 EV::loop;
3502 }
3503 warn "EV::loop returned\n";
3504 goto &main_loop unless $REALLY_UNLOOP;
2817} 3505}
2818 3506
2819sub main { 3507sub main {
3508 cf::init_globals; # initialise logging
3509
3510 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3511 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3512 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3513 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3514
3515 cf::init_experience;
3516 cf::init_anim;
3517 cf::init_attackmess;
3518 cf::init_dynamic;
3519
3520 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3521
2820 # we must not ever block the main coroutine 3522 # we must not ever block the main coroutine
2821 local $Coro::idle = sub { 3523 local $Coro::idle = sub {
2822 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3524 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2823 (async { 3525 (async {
2824 Event::one_event; 3526 $Coro::current->{desc} = "IDLE BUG HANDLER";
3527 EV::loop EV::LOOP_ONESHOT;
2825 })->prio (Coro::PRIO_MAX); 3528 })->prio (Coro::PRIO_MAX);
2826 }; 3529 };
2827 3530
2828 cfg_load; 3531 evthread_start IO::AIO::poll_fileno;
3532
3533 cf::sync_job {
3534 cf::load_settings;
3535 cf::load_materials;
3536
3537 reload_resources;
3538 reload_config;
2829 db_init; 3539 db_init;
3540
3541 cf::init_uuid;
3542 cf::init_signals;
3543 cf::init_commands;
3544 cf::init_skills;
3545
3546 cf::init_beforeplay;
3547
3548 atomic;
3549
2830 load_extensions; 3550 load_extensions;
2831 3551
2832 $TICK_WATCHER->start; 3552 utime time, time, $RUNTIMEFILE;
2833 Event::loop; 3553
3554 # no (long-running) fork's whatsoever before this point(!)
3555 use POSIX ();
3556 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3557
3558 (pop @POST_INIT)->(0) while @POST_INIT;
3559 };
3560
3561 main_loop;
2834} 3562}
2835 3563
2836############################################################################# 3564#############################################################################
2837# initialisation and cleanup 3565# initialisation and cleanup
2838 3566
2839# install some emergency cleanup handlers 3567# install some emergency cleanup handlers
2840BEGIN { 3568BEGIN {
3569 our %SIGWATCHER = ();
2841 for my $signal (qw(INT HUP TERM)) { 3570 for my $signal (qw(INT HUP TERM)) {
2842 Event->signal ( 3571 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2843 reentrant => 0,
2844 data => WF_AUTOCANCEL,
2845 signal => $signal,
2846 prio => 0,
2847 cb => sub {
2848 cf::cleanup "SIG$signal"; 3572 cf::cleanup "SIG$signal";
2849 },
2850 ); 3573 };
2851 } 3574 }
2852} 3575}
2853 3576
2854sub write_runtime { 3577sub write_runtime_sync {
2855 my $runtime = "$LOCALDIR/runtime"; 3578 my $t0 = EV::time;
2856 3579
2857 # first touch the runtime file to show we are still running: 3580 # first touch the runtime file to show we are still running:
2858 # the fsync below can take a very very long time. 3581 # the fsync below can take a very very long time.
2859 3582
2860 IO::AIO::aio_utime $runtime, undef, undef; 3583 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2861 3584
2862 my $guard = cf::lock_acquire "write_runtime"; 3585 my $guard = cf::lock_acquire "write_runtime";
2863 3586
2864 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3587 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
2865 or return; 3588 or return;
2866 3589
2867 my $value = $cf::RUNTIME + 90 + 10; 3590 my $value = $cf::RUNTIME + 90 + 10;
2868 # 10 is the runtime save interval, for a monotonic clock 3591 # 10 is the runtime save interval, for a monotonic clock
2869 # 60 allows for the watchdog to kill the server. 3592 # 60 allows for the watchdog to kill the server.
… …
2879 aio_utime $fh, undef, undef; 3602 aio_utime $fh, undef, undef;
2880 3603
2881 close $fh 3604 close $fh
2882 or return; 3605 or return;
2883 3606
2884 aio_rename "$runtime~", $runtime 3607 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2885 and return; 3608 and return;
2886 3609
2887 warn "runtime file written.\n"; 3610 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
2888 3611
2889 1 3612 1
3613}
3614
3615our $uuid_lock;
3616our $uuid_skip;
3617
3618sub write_uuid_sync($) {
3619 $uuid_skip ||= $_[0];
3620
3621 return if $uuid_lock;
3622 local $uuid_lock = 1;
3623
3624 my $uuid = "$LOCALDIR/uuid";
3625
3626 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3627 or return;
3628
3629 my $value = uuid_seq uuid_cur;
3630
3631 unless ($value) {
3632 warn "cowardly refusing to write zero uuid value!\n";
3633 return;
3634 }
3635
3636 my $value = uuid_str $value + $uuid_skip;
3637 $uuid_skip = 0;
3638
3639 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3640 and return;
3641
3642 # always fsync - this file is important
3643 aio_fsync $fh
3644 and return;
3645
3646 close $fh
3647 or return;
3648
3649 aio_rename "$uuid~", $uuid
3650 and return;
3651
3652 warn "uuid file written ($value).\n";
3653
3654 1
3655
3656}
3657
3658sub write_uuid($$) {
3659 my ($skip, $sync) = @_;
3660
3661 $sync ? write_uuid_sync $skip
3662 : async { write_uuid_sync $skip };
2890} 3663}
2891 3664
2892sub emergency_save() { 3665sub emergency_save() {
2893 my $freeze_guard = cf::freeze_mainloop; 3666 my $freeze_guard = cf::freeze_mainloop;
2894 3667
2895 warn "enter emergency perl save\n"; 3668 warn "emergency_perl_save: enter\n";
2896 3669
2897 cf::sync_job { 3670 cf::sync_job {
3671 # this is a trade-off: we want to be very quick here, so
3672 # save all maps without fsync, and later call a global sync
3673 # (which in turn might be very very slow)
3674 local $USE_FSYNC = 0;
3675
2898 # use a peculiar iteration method to avoid tripping on perl 3676 # use a peculiar iteration method to avoid tripping on perl
2899 # refcount bugs in for. also avoids problems with players 3677 # refcount bugs in for. also avoids problems with players
2900 # and maps saved/destroyed asynchronously. 3678 # and maps saved/destroyed asynchronously.
2901 warn "begin emergency player save\n"; 3679 warn "emergency_perl_save: begin player save\n";
2902 for my $login (keys %cf::PLAYER) { 3680 for my $login (keys %cf::PLAYER) {
2903 my $pl = $cf::PLAYER{$login} or next; 3681 my $pl = $cf::PLAYER{$login} or next;
2904 $pl->valid or next; 3682 $pl->valid or next;
3683 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2905 $pl->save; 3684 $pl->save;
2906 } 3685 }
2907 warn "end emergency player save\n"; 3686 warn "emergency_perl_save: end player save\n";
2908 3687
2909 warn "begin emergency map save\n"; 3688 warn "emergency_perl_save: begin map save\n";
2910 for my $path (keys %cf::MAP) { 3689 for my $path (keys %cf::MAP) {
2911 my $map = $cf::MAP{$path} or next; 3690 my $map = $cf::MAP{$path} or next;
2912 $map->valid or next; 3691 $map->valid or next;
2913 $map->save; 3692 $map->save;
2914 } 3693 }
2915 warn "end emergency map save\n"; 3694 warn "emergency_perl_save: end map save\n";
2916 3695
2917 warn "begin emergency database checkpoint\n"; 3696 warn "emergency_perl_save: begin database checkpoint\n";
2918 BDB::db_env_txn_checkpoint $DB_ENV; 3697 BDB::db_env_txn_checkpoint $DB_ENV;
2919 warn "end emergency database checkpoint\n"; 3698 warn "emergency_perl_save: end database checkpoint\n";
3699
3700 warn "emergency_perl_save: begin write uuid\n";
3701 write_uuid_sync 1;
3702 warn "emergency_perl_save: end write uuid\n";
2920 }; 3703 };
2921 3704
3705 warn "emergency_perl_save: starting sync()\n";
3706 IO::AIO::aio_sync sub {
3707 warn "emergency_perl_save: finished sync()\n";
3708 };
3709
2922 warn "leave emergency perl save\n"; 3710 warn "emergency_perl_save: leave\n";
2923} 3711}
2924 3712
2925sub post_cleanup { 3713sub post_cleanup {
2926 my ($make_core) = @_; 3714 my ($make_core) = @_;
2927 3715
2928 warn Carp::longmess "post_cleanup backtrace" 3716 warn Carp::longmess "post_cleanup backtrace"
2929 if $make_core; 3717 if $make_core;
3718
3719 my $fh = pidfile;
3720 unlink $PIDFILE if <$fh> == $$;
3721}
3722
3723# a safer delete_package, copied from Symbol
3724sub clear_package($) {
3725 my $pkg = shift;
3726
3727 # expand to full symbol table name if needed
3728 unless ($pkg =~ /^main::.*::$/) {
3729 $pkg = "main$pkg" if $pkg =~ /^::/;
3730 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3731 $pkg .= '::' unless $pkg =~ /::$/;
3732 }
3733
3734 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3735 my $stem_symtab = *{$stem}{HASH};
3736
3737 defined $stem_symtab and exists $stem_symtab->{$leaf}
3738 or return;
3739
3740 # clear all symbols
3741 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3742 for my $name (keys %$leaf_symtab) {
3743 _gv_clear *{"$pkg$name"};
3744# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3745 }
3746 warn "cleared package $pkg\n";#d#
2930} 3747}
2931 3748
2932sub do_reload_perl() { 3749sub do_reload_perl() {
2933 # can/must only be called in main 3750 # can/must only be called in main
2934 if ($Coro::current != $Coro::main) { 3751 if ($Coro::current != $Coro::main) {
2935 warn "can only reload from main coroutine"; 3752 warn "can only reload from main coroutine";
2936 return; 3753 return;
2937 } 3754 }
2938 3755
3756 return if $RELOAD++;
3757
3758 my $t1 = EV::time;
3759
3760 while ($RELOAD) {
2939 warn "reloading..."; 3761 warn "reloading...";
2940 3762
2941 warn "entering sync_job"; 3763 warn "entering sync_job";
2942 3764
2943 cf::sync_job { 3765 cf::sync_job {
2944 cf::write_runtime; # external watchdog should not bark 3766 cf::write_runtime_sync; # external watchdog should not bark
2945 cf::emergency_save; 3767 cf::emergency_save;
2946 cf::write_runtime; # external watchdog should not bark 3768 cf::write_runtime_sync; # external watchdog should not bark
2947 3769
2948 warn "syncing database to disk"; 3770 warn "syncing database to disk";
2949 BDB::db_env_txn_checkpoint $DB_ENV; 3771 BDB::db_env_txn_checkpoint $DB_ENV;
2950 3772
2951 # if anything goes wrong in here, we should simply crash as we already saved 3773 # if anything goes wrong in here, we should simply crash as we already saved
2952 3774
2953 warn "cancelling all WF_AUTOCANCEL watchers";
2954 for (Event::all_watchers) {
2955 $_->cancel if $_->data & WF_AUTOCANCEL;
2956 }
2957
2958 warn "flushing outstanding aio requests"; 3775 warn "flushing outstanding aio requests";
2959 for (;;) {
2960 BDB::flush;
2961 IO::AIO::flush;
2962 Coro::cede;
2963 last unless IO::AIO::nreqs || BDB::nreqs; 3776 while (IO::AIO::nreqs || BDB::nreqs) {
2964 warn "iterate..."; 3777 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2965 }
2966
2967 ++$RELOAD;
2968
2969 warn "cancelling all extension coros";
2970 $_->cancel for values %EXT_CORO;
2971 %EXT_CORO = ();
2972
2973 warn "removing commands";
2974 %COMMAND = ();
2975
2976 warn "removing ext/exti commands";
2977 %EXTCMD = ();
2978 %EXTICMD = ();
2979
2980 warn "unloading/nuking all extensions";
2981 for my $pkg (@EXTS) {
2982 warn "... unloading $pkg";
2983
2984 if (my $cb = $pkg->can ("unload")) {
2985 eval {
2986 $cb->($pkg);
2987 1
2988 } or warn "$pkg unloaded, but with errors: $@";
2989 } 3778 }
2990 3779
2991 warn "... nuking $pkg"; 3780 warn "cancelling all extension coros";
2992 Symbol::delete_package $pkg; 3781 $_->cancel for values %EXT_CORO;
2993 } 3782 %EXT_CORO = ();
2994 3783
2995 warn "unloading all perl modules loaded from $LIBDIR"; 3784 warn "removing commands";
2996 while (my ($k, $v) = each %INC) { 3785 %COMMAND = ();
2997 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2998 3786
3787 warn "removing ext/exti commands";
3788 %EXTCMD = ();
3789 %EXTICMD = ();
3790
3791 warn "unloading/nuking all extensions";
3792 for my $pkg (@EXTS) {
2999 warn "... unloading $k"; 3793 warn "... unloading $pkg";
3000 delete $INC{$k};
3001 3794
3002 $k =~ s/\.pm$//;
3003 $k =~ s/\//::/g;
3004
3005 if (my $cb = $k->can ("unload_module")) { 3795 if (my $cb = $pkg->can ("unload")) {
3796 eval {
3006 $cb->(); 3797 $cb->($pkg);
3798 1
3799 } or warn "$pkg unloaded, but with errors: $@";
3800 }
3801
3802 warn "... clearing $pkg";
3803 clear_package $pkg;
3007 } 3804 }
3008 3805
3009 Symbol::delete_package $k; 3806 warn "unloading all perl modules loaded from $LIBDIR";
3807 while (my ($k, $v) = each %INC) {
3808 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3809
3810 warn "... unloading $k";
3811 delete $INC{$k};
3812
3813 $k =~ s/\.pm$//;
3814 $k =~ s/\//::/g;
3815
3816 if (my $cb = $k->can ("unload_module")) {
3817 $cb->();
3818 }
3819
3820 clear_package $k;
3010 } 3821 }
3011 3822
3012 warn "getting rid of safe::, as good as possible"; 3823 warn "getting rid of safe::, as good as possible";
3013 Symbol::delete_package "safe::$_" 3824 clear_package "safe::$_"
3014 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3825 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3015 3826
3016 warn "unloading cf.pm \"a bit\""; 3827 warn "unloading cf.pm \"a bit\"";
3017 delete $INC{"cf.pm"}; 3828 delete $INC{"cf.pm"};
3018 delete $INC{"cf/pod.pm"}; 3829 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3019 3830
3020 # don't, removes xs symbols, too, 3831 # don't, removes xs symbols, too,
3021 # and global variables created in xs 3832 # and global variables created in xs
3022 #Symbol::delete_package __PACKAGE__; 3833 #clear_package __PACKAGE__;
3023 3834
3024 warn "unload completed, starting to reload now"; 3835 warn "unload completed, starting to reload now";
3025 3836
3026 warn "reloading cf.pm"; 3837 warn "reloading cf.pm";
3027 require cf; 3838 require cf;
3028 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3839 cf::_connect_to_perl_1;
3029 3840
3030 warn "loading config and database again"; 3841 warn "loading config and database again";
3031 cf::cfg_load; 3842 cf::reload_config;
3032 3843
3033 warn "loading extensions"; 3844 warn "loading extensions";
3034 cf::load_extensions; 3845 cf::load_extensions;
3035 3846
3847 if ($REATTACH_ON_RELOAD) {
3036 warn "reattaching attachments to objects/players"; 3848 warn "reattaching attachments to objects/players";
3037 _global_reattach; # objects, sockets 3849 _global_reattach; # objects, sockets
3038 warn "reattaching attachments to maps"; 3850 warn "reattaching attachments to maps";
3039 reattach $_ for values %MAP; 3851 reattach $_ for values %MAP;
3040 warn "reattaching attachments to players"; 3852 warn "reattaching attachments to players";
3041 reattach $_ for values %PLAYER; 3853 reattach $_ for values %PLAYER;
3854 }
3042 3855
3856 warn "running post_init jobs";
3857 (pop @POST_INIT)->(1) while @POST_INIT;
3858
3043 warn "leaving sync_job"; 3859 warn "leaving sync_job";
3044 3860
3045 1 3861 1
3046 } or do { 3862 } or do {
3047 warn $@; 3863 warn $@;
3048 warn "error while reloading, exiting."; 3864 cf::cleanup "error while reloading, exiting.";
3049 exit 1;
3050 }; 3865 };
3051 3866
3052 warn "reloaded"; 3867 warn "reloaded";
3868 --$RELOAD;
3869 }
3870
3871 $t1 = EV::time - $t1;
3872 warn "reload completed in ${t1}s\n";
3053}; 3873};
3054 3874
3055our $RELOAD_WATCHER; # used only during reload 3875our $RELOAD_WATCHER; # used only during reload
3056 3876
3057sub reload_perl() { 3877sub reload_perl() {
3058 # doing reload synchronously and two reloads happen back-to-back, 3878 # doing reload synchronously and two reloads happen back-to-back,
3059 # coro crashes during coro_state_free->destroy here. 3879 # coro crashes during coro_state_free->destroy here.
3060 3880
3061 $RELOAD_WATCHER ||= Event->timer ( 3881 $RELOAD_WATCHER ||= cf::async {
3062 reentrant => 0, 3882 Coro::AIO::aio_wait cache_extensions;
3063 after => 0, 3883
3064 data => WF_AUTOCANCEL, 3884 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3065 cb => sub {
3066 do_reload_perl; 3885 do_reload_perl;
3067 undef $RELOAD_WATCHER; 3886 undef $RELOAD_WATCHER;
3068 }, 3887 };
3069 ); 3888 };
3070} 3889}
3071 3890
3072register_command "reload" => sub { 3891register_command "reload" => sub {
3073 my ($who, $arg) = @_; 3892 my ($who, $arg) = @_;
3074 3893
3075 if ($who->flag (FLAG_WIZ)) { 3894 if ($who->flag (FLAG_WIZ)) {
3076 $who->message ("reloading server."); 3895 $who->message ("reloading server.");
3896 async {
3897 $Coro::current->{desc} = "perl_reload";
3077 async { reload_perl }; 3898 reload_perl;
3899 };
3078 } 3900 }
3079}; 3901};
3080 3902
3081unshift @INC, $LIBDIR; 3903unshift @INC, $LIBDIR;
3082 3904
… …
3084 3906
3085our @WAIT_FOR_TICK; 3907our @WAIT_FOR_TICK;
3086our @WAIT_FOR_TICK_BEGIN; 3908our @WAIT_FOR_TICK_BEGIN;
3087 3909
3088sub wait_for_tick { 3910sub wait_for_tick {
3089 return unless $TICK_WATCHER->is_active;
3090 return if $Coro::current == $Coro::main; 3911 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3091 3912
3092 my $signal = new Coro::Signal; 3913 my $signal = new Coro::Signal;
3093 push @WAIT_FOR_TICK, $signal; 3914 push @WAIT_FOR_TICK, $signal;
3094 $signal->wait; 3915 $signal->wait;
3095} 3916}
3096 3917
3097sub wait_for_tick_begin { 3918sub wait_for_tick_begin {
3098 return unless $TICK_WATCHER->is_active;
3099 return if $Coro::current == $Coro::main; 3919 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3100 3920
3101 my $signal = new Coro::Signal; 3921 my $signal = new Coro::Signal;
3102 push @WAIT_FOR_TICK_BEGIN, $signal; 3922 push @WAIT_FOR_TICK_BEGIN, $signal;
3103 $signal->wait; 3923 $signal->wait;
3104} 3924}
3105 3925
3106 my $min = 1e6;#d# 3926sub tick {
3107 my $avg = 10;
3108$TICK_WATCHER = Event->timer (
3109 reentrant => 0,
3110 parked => 1,
3111 prio => 0,
3112 at => $NEXT_TICK || $TICK,
3113 data => WF_AUTOCANCEL,
3114 cb => sub {
3115 if ($Coro::current != $Coro::main) { 3927 if ($Coro::current != $Coro::main) {
3116 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3928 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3117 unless ++$bug_warning > 10; 3929 unless ++$bug_warning > 10;
3118 return; 3930 return;
3119 } 3931 }
3120 3932
3121 $NOW = $tick_start = Event::time;
3122
3123 cf::server_tick; # one server iteration 3933 cf::server_tick; # one server iteration
3124 3934
3125 0 && sync_job {#d# 3935 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3126 for(1..10) {
3127 my $t = Event::time;
3128 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3129 or die;
3130 3936
3131 $map->width (50); 3937 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3132 $map->height (50); 3938 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3133 $map->alloc; 3939 Coro::async_pool {
3134 $map->_load_objects ("/tmp/x.map", 1); 3940 $Coro::current->{desc} = "runtime saver";
3135 my $t = Event::time - $t; 3941 write_runtime_sync
3136 3942 or warn "ERROR: unable to write runtime file: $!";
3137 #next unless $t < 0.0013;#d#
3138 if ($t < $min) {
3139 $min = $t;
3140 }
3141 $avg = $avg * 0.99 + $t * 0.01;
3142 }
3143 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3144 exit 0;
3145 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3146 }; 3943 };
3944 }
3147 3945
3148 $RUNTIME += $TICK;
3149 $NEXT_TICK += $TICK;
3150
3151 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3152 $NEXT_RUNTIME_WRITE = $NOW + 10;
3153 Coro::async_pool {
3154 write_runtime
3155 or warn "ERROR: unable to write runtime file: $!";
3156 };
3157 }
3158
3159# my $AFTER = Event::time;
3160# warn $AFTER - $NOW;#d#
3161
3162 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3946 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3163 $sig->send; 3947 $sig->send;
3164 } 3948 }
3165 while (my $sig = shift @WAIT_FOR_TICK) { 3949 while (my $sig = shift @WAIT_FOR_TICK) {
3166 $sig->send; 3950 $sig->send;
3167 } 3951 }
3168 3952
3169 $NOW = Event::time; 3953 $LOAD = ($NOW - $TICK_START) / $TICK;
3170
3171 # if we are delayed by four ticks or more, skip them all
3172 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3173
3174 $TICK_WATCHER->at ($NEXT_TICK);
3175 $TICK_WATCHER->start;
3176
3177 $LOAD = ($NOW - $tick_start) / $TICK;
3178 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3954 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3179 3955
3180 _post_tick; 3956 if (0) {
3181 3957 if ($NEXT_TICK) {
3182 3958 my $jitter = $TICK_START - $NEXT_TICK;
3959 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3960 warn "jitter $JITTER\n";#d#
3961 }
3183 }, 3962 }
3184); 3963}
3185 3964
3186{ 3965{
3187 BDB::max_poll_time $TICK * 0.1; 3966 # configure BDB
3188 $BDB_POLL_WATCHER = Event->io ( 3967
3189 reentrant => 0,
3190 fd => BDB::poll_fileno,
3191 poll => 'r',
3192 prio => 0,
3193 data => WF_AUTOCANCEL,
3194 cb => \&BDB::poll_cb,
3195 );
3196 BDB::min_parallel 8; 3968 BDB::min_parallel 16;
3197 3969 BDB::max_poll_reqs $TICK * 0.1;
3198 BDB::set_sync_prepare { 3970 $AnyEvent::BDB::WATCHER->priority (1);
3199 my $status;
3200 my $current = $Coro::current;
3201 (
3202 sub {
3203 $status = $!;
3204 $current->ready; undef $current;
3205 },
3206 sub {
3207 Coro::schedule while defined $current;
3208 $! = $status;
3209 },
3210 )
3211 };
3212 3971
3213 unless ($DB_ENV) { 3972 unless ($DB_ENV) {
3214 $DB_ENV = BDB::db_env_create; 3973 $DB_ENV = BDB::db_env_create;
3974 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3975 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3976 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3977 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3978 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3215 3979
3216 cf::sync_job { 3980 cf::sync_job {
3217 eval { 3981 eval {
3218 BDB::db_env_open 3982 BDB::db_env_open
3219 $DB_ENV, 3983 $DB_ENV,
… …
3221 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3985 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3222 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3986 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3223 0666; 3987 0666;
3224 3988
3225 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3989 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3226
3227 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3228 $DB_ENV->set_lk_detect;
3229 }; 3990 };
3230 3991
3231 cf::cleanup "db_env_open(db): $@" if $@; 3992 cf::cleanup "db_env_open(db): $@" if $@;
3232 }; 3993 };
3233 } 3994 }
3995
3996 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3997 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3998 };
3999 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4000 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4001 };
4002 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4003 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4004 };
3234} 4005}
3235 4006
3236{ 4007{
4008 # configure IO::AIO
4009
3237 IO::AIO::min_parallel 8; 4010 IO::AIO::min_parallel 8;
3238
3239 undef $Coro::AIO::WATCHER;
3240 IO::AIO::max_poll_time $TICK * 0.1; 4011 IO::AIO::max_poll_time $TICK * 0.1;
3241 $AIO_POLL_WATCHER = Event->io ( 4012 undef $AnyEvent::AIO::WATCHER;
3242 reentrant => 0,
3243 data => WF_AUTOCANCEL,
3244 fd => IO::AIO::poll_fileno,
3245 poll => 'r',
3246 prio => 6,
3247 cb => \&IO::AIO::poll_cb,
3248 );
3249} 4013}
3250 4014
3251my $_log_backtrace; 4015my $_log_backtrace;
3252 4016
3253sub _log_backtrace { 4017sub _log_backtrace {
… …
3256 $msg =~ s/\n//; 4020 $msg =~ s/\n//;
3257 4021
3258 # limit the # of concurrent backtraces 4022 # limit the # of concurrent backtraces
3259 if ($_log_backtrace < 2) { 4023 if ($_log_backtrace < 2) {
3260 ++$_log_backtrace; 4024 ++$_log_backtrace;
4025 my $perl_bt = Carp::longmess $msg;
3261 async { 4026 async {
4027 $Coro::current->{desc} = "abt $msg";
4028
3262 my @bt = fork_call { 4029 my @bt = fork_call {
3263 @addr = map { sprintf "%x", $_ } @addr; 4030 @addr = map { sprintf "%x", $_ } @addr;
3264 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4031 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3265 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4032 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3266 or die "addr2line: $!"; 4033 or die "addr2line: $!";
… …
3274 } 4041 }
3275 4042
3276 @funcs 4043 @funcs
3277 }; 4044 };
3278 4045
3279 LOG llevInfo, "[ABT] $msg\n"; 4046 LOG llevInfo, "[ABT] $perl_bt\n";
4047 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3280 LOG llevInfo, "[ABT] $_\n" for @bt; 4048 LOG llevInfo, "[ABT] $_\n" for @bt;
3281 --$_log_backtrace; 4049 --$_log_backtrace;
3282 }; 4050 };
3283 } else { 4051 } else {
3284 LOG llevInfo, "[ABT] $msg\n"; 4052 LOG llevInfo, "[ABT] $msg\n";
3285 LOG llevInfo, "[ABT] [suppressed]\n"; 4053 LOG llevInfo, "[ABT] [suppressed]\n";
3286 } 4054 }
3287} 4055}
3288 4056
3289# load additional modules 4057# load additional modules
3290use cf::pod; 4058require "cf/$_.pm" for @EXTRA_MODULES;
4059cf::_connect_to_perl_2;
3291 4060
3292END { cf::emergency_save } 4061END { cf::emergency_save }
3293 4062
32941 40631
3295 4064

Diff Legend

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