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.290 by root, Mon Jul 2 03:15:30 2007 UTC vs.
Revision 1.510 by root, Tue Apr 6 22:59:28 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 575
414sub fork_call(&@) { 576sub fork_call(&@) {
415 my ($cb, @args) = @_; 577 my ($cb, @args) = @_;
416 578
417# 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,
418# or die "socketpair: $!"; 580 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 581 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 582
422 if (my $pid = fork) { 583 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 $res = Coro::Storable::thaw $res;
427
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals; 584 reset_signals;
435 local $SIG{__WARN__}; 585 &$cb
436 local $SIG{__DIE__}; 586 }, @args;
437 eval {
438 close $fh1;
439 587
440 my @res = eval { $cb->(@args) }; 588 wantarray ? @res : $res[-1]
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 589}
442 };
443 590
444 warn $@ if $@; 591=item $coin = coin_from_name $name
445 _exit 0; 592
446 } 593=cut
594
595our %coin_alias = (
596 "silver" => "silvercoin",
597 "silvercoin" => "silvercoin",
598 "silvercoins" => "silvercoin",
599 "gold" => "goldcoin",
600 "goldcoin" => "goldcoin",
601 "goldcoins" => "goldcoin",
602 "platinum" => "platinacoin",
603 "platinumcoin" => "platinacoin",
604 "platinumcoins" => "platinacoin",
605 "platina" => "platinacoin",
606 "platinacoin" => "platinacoin",
607 "platinacoins" => "platinacoin",
608 "royalty" => "royalty",
609 "royalties" => "royalty",
610);
611
612sub coin_from_name($) {
613 $coin_alias{$_[0]}
614 ? cf::arch::find $coin_alias{$_[0]}
615 : undef
447} 616}
448 617
449=item $value = cf::db_get $family => $key 618=item $value = cf::db_get $family => $key
450 619
451Returns a single value from the environment database. 620Returns a single value from the environment database.
… …
453=item cf::db_put $family => $key => $value 622=item cf::db_put $family => $key => $value
454 623
455Stores 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
456data 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).
457 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
458=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}
459 650
460our $DB; 651our $DB;
461 652
462sub db_init { 653sub db_init {
463 unless ($DB) {
464 $DB = BDB::db_create $DB_ENV;
465
466 cf::sync_job { 654 cf::sync_job {
467 eval { 655 $DB ||= db_table "db";
468 $DB->set_flags (BDB::CHKSUM);
469
470 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
472 cf::cleanup "db_open(db): $!" if $!;
473 };
474 cf::cleanup "db_open(db): $@" if $@;
475 };
476 } 656 };
477} 657}
478 658
479sub db_get($$) { 659sub db_get($$) {
480 my $key = "$_[0]/$_[1]"; 660 my $key = "$_[0]/$_[1]";
481 661
… …
531 if (1) { 711 if (1) {
532 $md5 = 712 $md5 =
533 join "\x00", 713 join "\x00",
534 $processversion, 714 $processversion,
535 map { 715 map {
536 Coro::cede; 716 cf::cede_to_tick;
537 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 717 ($src->[$_], Digest::MD5::md5_hex $data[$_])
538 } 0.. $#$src; 718 } 0.. $#$src;
539 719
540 720
541 my $dbmd5 = db_get cache => "$id/md5"; 721 my $dbmd5 = db_get cache => "$id/md5";
… …
579 759
580############################################################################# 760#############################################################################
581 761
582=head2 ATTACHABLE OBJECTS 762=head2 ATTACHABLE OBJECTS
583 763
584Many 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
585attach callbacks/event handlers (a collection of which is called an "attachment") 765attach callbacks/event handlers (a collection of which is called an "attachment")
586to it. All such attachable objects support the following methods. 766to it. All such attachable objects support the following methods.
587 767
588In 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>
589C<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
590Crossfire TRT). 770Deliantra).
591 771
592=over 4 772=over 4
593 773
594=item $attachable->attach ($attachment, key => $value...) 774=item $attachable->attach ($attachment, key => $value...)
595 775
… …
639=item cf::CLASS::attachment $name, ... 819=item cf::CLASS::attachment $name, ...
640 820
641Register an attachment by C<$name> through which attachable objects of the 821Register an attachment by C<$name> through which attachable objects of the
642given CLASS can refer to this attachment. 822given CLASS can refer to this attachment.
643 823
644Some classes such as crossfire maps and objects can specify attachments 824Some classes such as deliantra maps and objects can specify attachments
645that 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.
646 826
647These calls expect any number of the following handler/hook descriptions: 827These calls expect any number of the following handler/hook descriptions:
648 828
649=over 4 829=over 4
… …
847 "; 1027 ";
848 die if $@; 1028 die if $@;
849} 1029}
850 1030
851our $override; 1031our $override;
852our @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?
853 1033
854sub override { 1034sub override {
855 $override = 1; 1035 $override = 1;
856 @invoke_results = (); 1036 @INVOKE_RESULTS = (@_);
857} 1037}
858 1038
859sub do_invoke { 1039sub do_invoke {
860 my $event = shift; 1040 my $event = shift;
861 my $callbacks = shift; 1041 my $callbacks = shift;
862 1042
863 @invoke_results = (); 1043 @INVOKE_RESULTS = ();
864 1044
865 local $override; 1045 local $override;
866 1046
867 for (@$callbacks) { 1047 for (@$callbacks) {
868 eval { &{$_->[1]} }; 1048 eval { &{$_->[1]} };
… …
877 } 1057 }
878 1058
879 0 1059 0
880} 1060}
881 1061
882=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1062=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
883 1063
884=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1064=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
885 1065
886Generate an object-specific event with the given arguments. 1066Generate an object-specific event with the given arguments.
887 1067
888This 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
889removed 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
890results (if you must, access C<@cf::invoke_results> directly). 1070results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 1071
892=back 1072=back
893 1073
894=cut 1074=cut
895 1075
896############################################################################# 1076#############################################################################
897# 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}
898 1120
899sub reattach { 1121sub reattach {
900 # basically do the same as instantiate, without calling instantiate 1122 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 1123 my ($obj) = @_;
902 1124
1125 # no longer needed after getting rid of delete_package?
903 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
904 1127
905 my $registry = $obj->registry; 1128 my $registry = $obj->registry;
906 1129
907 @$registry = (); 1130 @$registry = ();
908 1131
… …
923cf::attachable->attach ( 1146cf::attachable->attach (
924 prio => -1000000, 1147 prio => -1000000,
925 on_instantiate => sub { 1148 on_instantiate => sub {
926 my ($obj, $data) = @_; 1149 my ($obj, $data) = @_;
927 1150
928 $data = from_json $data; 1151 $data = decode_json $data;
929 1152
930 for (@$data) { 1153 for (@$data) {
931 my ($name, $args) = @$_; 1154 my ($name, $args) = @$_;
932 1155
933 $obj->attach ($name, %{$args || {} }); 1156 $obj->attach ($name, %{$args || {} });
… …
949sub object_freezer_save { 1172sub object_freezer_save {
950 my ($filename, $rdata, $objs) = @_; 1173 my ($filename, $rdata, $objs) = @_;
951 1174
952 sync_job { 1175 sync_job {
953 if (length $$rdata) { 1176 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename);
954 warn sprintf "saving %s (%d,%d)\n", 1178 warn sprintf "saving %s (%d,%d)\n",
955 $filename, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
956 1180
957 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1182 aio_chmod $fh, SAVE_MODE;
959 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960 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 }
961 close $fh; 1188 aio_close $fh;
962 1189
963 if (@$objs) { 1190 if (@$objs) {
964 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) {
965 chmod SAVE_MODE, $fh; 1192 aio_chmod $fh, SAVE_MODE;
966 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
967 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
968 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 }
969 close $fh; 1199 aio_close $fh;
970 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
971 } 1201 }
972 } else { 1202 } else {
973 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
974 } 1204 }
975 1205
976 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
977 } else { 1210 } else {
978 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
979 } 1212 }
980 } else { 1213 } else {
981 aio_unlink $filename; 1214 aio_unlink $filename;
982 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
983 } 1216 }
984 } 1217 };
985} 1218}
986 1219
987sub object_freezer_as_string { 1220sub object_freezer_as_string {
988 my ($rdata, $objs) = @_; 1221 my ($rdata, $objs) = @_;
989 1222
… …
1001 or return; 1234 or return;
1002 1235
1003 unless (aio_stat "$filename.pst") { 1236 unless (aio_stat "$filename.pst") {
1004 (aio_load "$filename.pst", $av) >= 0 1237 (aio_load "$filename.pst", $av) >= 0
1005 or return; 1238 or return;
1239
1006 $av = eval { (Storable::thaw $av)->{objs} }; 1240 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs};
1007 } 1242 }
1008 1243
1244 utf8::decode (my $decname = $filename);
1009 warn sprintf "loading %s (%d)\n", 1245 warn sprintf "loading %s (%d,%d)\n",
1010 $filename, length $data, scalar @{$av || []}; 1246 $decname, length $data, scalar @{$av || []};
1247
1011 return ($data, $av); 1248 ($data, $av)
1012} 1249}
1013 1250
1014=head2 COMMAND CALLBACKS 1251=head2 COMMAND CALLBACKS
1015 1252
1016=over 4 1253=over 4
… …
1070 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1071 1308
1072 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1073} 1310}
1074 1311
1312use File::Glob ();
1313
1075cf::player->attach ( 1314cf::player->attach (
1076 on_command => sub { 1315 on_unknown_command => sub {
1077 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1078 1317
1079 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1080 or return; 1319 or return;
1081 1320
… …
1089 my ($pl, $buf) = @_; 1328 my ($pl, $buf) = @_;
1090 1329
1091 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1330 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1331
1093 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
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1340 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1341 @reply = $cb->($pl, @payload);
1096 $pl->ext_reply ($msg->{msgid}, %reply);
1097 }
1098 } 1342 }
1343
1344 $pl->ext_reply ($reply, @reply)
1345 if $reply;
1346
1099 } else { 1347 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1348 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1349 }
1102 1350
1103 cf::override; 1351 cf::override;
1104 }, 1352 },
1105); 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}
1106 1367
1107sub load_extensions { 1368sub load_extensions {
1108 cf::sync_job { 1369 cf::sync_job {
1109 my %todo; 1370 my %todo;
1110 1371
… …
1130 1391
1131 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1132 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1133 1394
1134 $ext{source} = 1395 $ext{source} =
1135 "package $pkg; use strict; use utf8;\n" 1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1136 . "#line 1 \"$path\"\n{\n" 1397 . "#line 1 \"$path\"\n{\n"
1137 . $source 1398 . $source
1138 . "\n};\n1"; 1399 . "\n};\n1";
1139 1400
1140 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1141 } 1402 }
1142 1403
1404 my $pass = 0;
1143 my %done; 1405 my %done;
1144 while (%todo) { 1406 while (%todo) {
1145 my $progress; 1407 my $progress;
1146 1408
1409 ++$pass;
1410
1411 ext:
1147 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1148 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1149 goto skip 1414 next ext
1150 unless exists $done{$_}; 1415 unless exists $done{$_};
1151 } 1416 }
1152 1417
1153 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1154 1419
1155 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1156 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1157 : "$v->{base}: extension inactive.\n";
1158 1424
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1159 if (exists $v->{meta}{mandatory}) { 1426 if exists $v->{meta}{mandatory};
1160 warn $msg; 1427 } else {
1161 warn "mandatory extension failed to load, exiting.\n"; 1428 $done{$k} = delete $todo{$k};
1162 exit 1; 1429 push @EXTS, $v->{pkg};
1163 } 1430 $progress = 1;
1164 1431
1165 warn $msg; 1432 warn "$v->{base}: extension inactive.\n"
1433 unless $active;
1166 } 1434 }
1167
1168 $done{$k} = delete $todo{$k};
1169 push @EXTS, $v->{pkg};
1170 $progress = 1;
1171 } 1435 }
1172 1436
1173 skip: 1437 unless ($progress) {
1174 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1175 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 }
1176 } 1445 }
1177 }; 1446 };
1178} 1447}
1179 1448
1180############################################################################# 1449#############################################################################
1181 1450
1182=back 1451=back
1183 1452
1184=head2 CORE EXTENSIONS 1453=head2 CORE EXTENSIONS
1185 1454
1186Functions and methods that extend core crossfire objects. 1455Functions and methods that extend core deliantra objects.
1187 1456
1188=cut 1457=cut
1189 1458
1190package cf::player; 1459package cf::player;
1191 1460
1192use Coro::AIO; 1461use Coro::AIO;
1193 1462
1194=head3 cf::player 1463=head3 cf::player
1195 1464
1196=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}
1197 1480
1198=item cf::player::find $login 1481=item cf::player::find $login
1199 1482
1200Returns the given player object, loading it if necessary (might block). 1483Returns the given player object, loading it if necessary (might block).
1201 1484
… …
1220 1503
1221sub exists($) { 1504sub exists($) {
1222 my ($login) = @_; 1505 my ($login) = @_;
1223 1506
1224 $cf::PLAYER{$login} 1507 $cf::PLAYER{$login}
1225 or cf::sync_job { !aio_stat path $login } 1508 or !aio_stat path $login
1226} 1509}
1227 1510
1228sub find($) { 1511sub find($) {
1229 return $cf::PLAYER{$_[0]} || do { 1512 return $cf::PLAYER{$_[0]} || do {
1230 my $login = $_[0]; 1513 my $login = $_[0];
… …
1237 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1520 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1521 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1522 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240 aio_unlink +(playerdir $login) . "/$login.pl"; 1523 aio_unlink +(playerdir $login) . "/$login.pl";
1241 1524
1242 my $pl = load_pl path $login 1525 my $f = new_from_file cf::object::thawer path $login
1243 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;
1244 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
1245 } 1534 }
1246 } 1535 }
1247} 1536}
1248 1537
… …
1257 return if $pl->{deny_save}; 1546 return if $pl->{deny_save};
1258 1547
1259 aio_mkdir playerdir $pl, 0770; 1548 aio_mkdir playerdir $pl, 0770;
1260 $pl->{last_save} = $cf::RUNTIME; 1549 $pl->{last_save} = $cf::RUNTIME;
1261 1550
1551 cf::get_slot 0.01;
1552
1262 $pl->save_pl ($path); 1553 $pl->save_pl ($path);
1263 Coro::cede; 1554 cf::cede_to_tick;
1264} 1555}
1265 1556
1266sub new($) { 1557sub new($) {
1267 my ($login) = @_; 1558 my ($login) = @_;
1268 1559
… …
1274 $cf::PLAYER{$login} = $self; 1565 $cf::PLAYER{$login} = $self;
1275 1566
1276 $self 1567 $self
1277} 1568}
1278 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
1279=item $pl->quit_character 1580=item $pl->quit_character
1280 1581
1281Nukes the player without looking back. If logged in, the connection will 1582Nukes the player without looking back. If logged in, the connection will
1282be destroyed. May block for a long time. 1583be destroyed. May block for a long time.
1283 1584
… …
1287 my ($pl) = @_; 1588 my ($pl) = @_;
1288 1589
1289 my $name = $pl->ob->name; 1590 my $name = $pl->ob->name;
1290 1591
1291 $pl->{deny_save} = 1; 1592 $pl->{deny_save} = 1;
1292 $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
1293 1594
1294 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1595 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1295 $pl->deactivate; 1596 $pl->deactivate;
1597 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1598 $pl->ob->check_score;
1296 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1599 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1297 $pl->ns->destroy if $pl->ns; 1600 $pl->ns->destroy if $pl->ns;
1298 1601
1299 my $path = playerdir $pl; 1602 my $path = playerdir $pl;
1300 my $temp = "$path~$cf::RUNTIME~deleting~"; 1603 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1336 or return []; 1639 or return [];
1337 1640
1338 my @logins; 1641 my @logins;
1339 1642
1340 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") {
1341 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1649 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342 aio_read $fh, 0, 512, my $buf, 0 or next; 1650 aio_read $fh, 0, 512, my $buf, 0 or next;
1343 $buf !~ /^password -------------$/m or next; # official not-valid tag 1651 $buf !~ /^password -------------$/m or next; # official not-valid tag
1652 }
1344 1653
1345 utf8::decode $login; 1654 utf8::decode $login;
1346 push @logins, $login; 1655 push @logins, $login;
1347 } 1656 }
1348 1657
… …
1375 } 1684 }
1376 1685
1377 \@paths 1686 \@paths
1378} 1687}
1379 1688
1380=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1689=item $protocol_xml = $player->expand_cfpod ($cfpod)
1381 1690
1382Expand crossfire pod fragments into protocol xml. 1691Expand deliantra pod fragments into protocol xml.
1383 1692
1384=cut
1385
1386sub expand_cfpod {
1387 ((my $self), (local $_)) = @_;
1388
1389 # escape & and <
1390 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g;
1392
1393 # this is buggy, it needs to properly take care of nested <'s
1394
1395 1 while
1396 # replace B<>, I<>, U<> etc.
1397 s/B<([^\>]*)>/<b>$1<\/b>/
1398 || s/I<([^\>]*)>/<i>$1<\/i>/
1399 || s/U<([^\>]*)>/<u>$1<\/u>/
1400 # replace G<male|female> tags
1401 || s{G<([^>|]*)\|([^>]*)>}{
1402 $self->gender ? $2 : $1
1403 }ge
1404 # replace H<hint text>
1405 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1406
1407 # create single paragraphs (very hackish)
1408 s/(?<=\S)\n(?=\w)/ /g;
1409
1410 $_
1411}
1412
1413=item $player->ext_reply ($msgid, %msg) 1693=item $player->ext_reply ($msgid, @msg)
1414 1694
1415Sends an ext reply to the player. 1695Sends an ext reply to the player.
1416 1696
1417=cut 1697=cut
1418 1698
1419sub ext_reply($$%) { 1699sub ext_reply($$@) {
1420 my ($self, $id, %msg) = @_; 1700 my ($self, $id, @msg) = @_;
1421 1701
1422 $msg{msgid} = $id; 1702 $self->ns->ext_reply ($id, @msg)
1423 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1424} 1703}
1425 1704
1426=item $player->ext_event ($type, %msg) 1705=item $player->ext_msg ($type, @msg)
1427 1706
1428Sends an ext event to the client. 1707Sends an ext event to the client.
1429 1708
1430=cut 1709=cut
1431 1710
1432sub ext_event($$%) { 1711sub ext_msg($$@) {
1433 my ($self, $type, %msg) = @_; 1712 my ($self, $type, @msg) = @_;
1434 1713
1435 $self->ns->ext_event ($type, %msg); 1714 $self->ns->ext_msg ($type, @msg);
1436} 1715}
1437 1716
1438=head3 cf::region 1717=head3 cf::region
1439 1718
1440=over 4 1719=over 4
… …
1453 my ($path) = @_; 1732 my ($path) = @_;
1454 1733
1455 my ($match, $specificity); 1734 my ($match, $specificity);
1456 1735
1457 for my $region (list) { 1736 for my $region (list) {
1458 if ($region->match && $path =~ $region->match) { 1737 if ($region->{match} && $path =~ $region->{match}) {
1459 ($match, $specificity) = ($region, $region->specificity) 1738 ($match, $specificity) = ($region, $region->specificity)
1460 if $region->specificity > $specificity; 1739 if $region->specificity > $specificity;
1461 } 1740 }
1462 } 1741 }
1463 1742
… …
1484our $MAX_RESET = 3600; 1763our $MAX_RESET = 3600;
1485our $DEFAULT_RESET = 3000; 1764our $DEFAULT_RESET = 3000;
1486 1765
1487sub generate_random_map { 1766sub generate_random_map {
1488 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
1489 # mit "rum" bekleckern, nicht 1771 # mit "rum" bekleckern, nicht
1490 $self->_create_random_map ( 1772 $self->_create_random_map (
1491 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1773 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1492 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1774 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1493 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1775 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1494 $rmp->{exit_on_final_map}, 1776 $rmp->{exit_on_final_map},
1495 $rmp->{xsize}, $rmp->{ysize}, 1777 $rmp->{xsize}, $rmp->{ysize},
1496 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1778 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1497 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1779 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1583 $self->init; # pass $1 etc. 1865 $self->init; # pass $1 etc.
1584 return $self; 1866 return $self;
1585 } 1867 }
1586 } 1868 }
1587 1869
1588 Carp::carp "unable to resolve path '$path' (base '$base')."; 1870 Carp::cluck "unable to resolve path '$path' (base '$base').";
1589 () 1871 ()
1590} 1872}
1591 1873
1592sub init { 1874sub init {
1593 my ($self) = @_; 1875 my ($self) = @_;
… …
1615 1897
1616# the temporary/swap location 1898# the temporary/swap location
1617sub save_path { 1899sub save_path {
1618 my ($self) = @_; 1900 my ($self) = @_;
1619 1901
1620 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1902 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1621 "$TMPDIR/$path.map" 1903 "$TMPDIR/$path.map"
1622} 1904}
1623 1905
1624# the unique path, undef == no special unique path 1906# the unique path, undef == no special unique path
1625sub uniq_path { 1907sub uniq_path {
1626 my ($self) = @_; 1908 my ($self) = @_;
1627 1909
1628 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1910 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1629 "$UNIQUEDIR/$path" 1911 "$UNIQUEDIR/$path"
1630}
1631
1632# and all this just because we cannot iterate over
1633# all maps in C++...
1634sub change_all_map_light {
1635 my ($change) = @_;
1636
1637 $_->change_map_light ($change)
1638 for grep $_->outdoor, values %cf::MAP;
1639} 1912}
1640 1913
1641sub decay_objects { 1914sub decay_objects {
1642 my ($self) = @_; 1915 my ($self) = @_;
1643 1916
… …
1656 1929
1657sub load_header_from($) { 1930sub load_header_from($) {
1658 my ($self, $path) = @_; 1931 my ($self, $path) = @_;
1659 1932
1660 utf8::encode $path; 1933 utf8::encode $path;
1661 #aio_open $path, O_RDONLY, 0 1934 my $f = new_from_file cf::object::thawer $path
1662 # or return;
1663
1664 $self->_load_header ($path)
1665 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;
1666 1942
1667 $self->{load_path} = $path; 1943 $self->{load_path} = $path;
1668 1944
1669 1 1945 1
1670} 1946}
… …
1724sub find { 2000sub find {
1725 my ($path, $origin) = @_; 2001 my ($path, $origin) = @_;
1726 2002
1727 $path = normalise $path, $origin && $origin->path; 2003 $path = normalise $path, $origin && $origin->path;
1728 2004
2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1729 cf::lock_wait "map_find:$path"; 2006 my $guard2 = cf::lock_acquire "map_find:$path";
1730 2007
1731 $cf::MAP{$path} || do { 2008 $cf::MAP{$path} || do {
1732 my $guard = cf::lock_acquire "map_find:$path";
1733 my $map = new_from_path cf::map $path 2009 my $map = new_from_path cf::map $path
1734 or return; 2010 or return;
1735 2011
1736 $map->{last_save} = $cf::RUNTIME; 2012 $map->{last_save} = $cf::RUNTIME;
1737 2013
… …
1739 or return; 2015 or return;
1740 2016
1741 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2017 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1742 # doing this can freeze the server in a sync job, obviously 2018 # doing this can freeze the server in a sync job, obviously
1743 #$cf::WAIT_FOR_TICK->wait; 2019 #$cf::WAIT_FOR_TICK->wait;
2020 undef $guard2;
2021 undef $guard1;
1744 $map->reset; 2022 $map->reset;
1745 undef $guard;
1746 return find $path; 2023 return find $path;
1747 } 2024 }
1748 2025
1749 $cf::MAP{$path} = $map 2026 $cf::MAP{$path} = $map
1750 } 2027 }
1751} 2028}
1752 2029
1753sub pre_load { } 2030sub pre_load { }
1754sub post_load { } 2031#sub post_load { } # XS
1755 2032
1756sub load { 2033sub load {
1757 my ($self) = @_; 2034 my ($self) = @_;
1758 2035
1759 local $self->{deny_reset} = 1; # loading can take a long time 2036 local $self->{deny_reset} = 1; # loading can take a long time
1760 2037
1761 my $path = $self->{path}; 2038 my $path = $self->{path};
1762 2039
1763 { 2040 {
1764 my $guard = cf::lock_acquire "map_load:$path"; 2041 my $guard = cf::lock_acquire "map_data:$path";
1765 2042
2043 return unless $self->valid;
1766 return if $self->in_memory != cf::MAP_SWAPPED; 2044 return unless $self->in_memory == cf::MAP_SWAPPED;
1767 2045
1768 $self->in_memory (cf::MAP_LOADING); 2046 $self->in_memory (cf::MAP_LOADING);
1769 2047
1770 $self->alloc; 2048 $self->alloc;
1771 2049
1772 $self->pre_load; 2050 $self->pre_load;
1773 Coro::cede; 2051 cf::cede_to_tick;
1774 2052
2053 my $f = new_from_file cf::object::thawer $self->{load_path};
2054 $f->skip_block;
1775 $self->_load_objects ($self->{load_path}, 1) 2055 $self->_load_objects ($f)
1776 or return; 2056 or return;
1777 2057
1778 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2058 $self->post_load_original
1779 if delete $self->{load_original}; 2059 if delete $self->{load_original};
1780 2060
1781 if (my $uniq = $self->uniq_path) { 2061 if (my $uniq = $self->uniq_path) {
1782 utf8::encode $uniq; 2062 utf8::encode $uniq;
1783 if (aio_open $uniq, O_RDONLY, 0) { 2063 unless (aio_stat $uniq) {
2064 if (my $f = new_from_file cf::object::thawer $uniq) {
1784 $self->clear_unique_items; 2065 $self->clear_unique_items;
1785 $self->_load_objects ($uniq, 0); 2066 $self->_load_objects ($f);
2067 $f->resolve_delayed_derefs;
2068 }
1786 } 2069 }
1787 } 2070 }
1788 2071
1789 Coro::cede; 2072 $f->resolve_delayed_derefs;
2073
2074 cf::cede_to_tick;
1790 # now do the right thing for maps 2075 # now do the right thing for maps
1791 $self->link_multipart_objects; 2076 $self->link_multipart_objects;
1792 $self->difficulty ($self->estimate_difficulty) 2077 $self->difficulty ($self->estimate_difficulty)
1793 unless $self->difficulty; 2078 unless $self->difficulty;
1794 Coro::cede; 2079 cf::cede_to_tick;
1795 2080
1796 unless ($self->{deny_activate}) { 2081 unless ($self->{deny_activate}) {
1797 $self->decay_objects; 2082 $self->decay_objects;
1798 $self->fix_auto_apply; 2083 $self->fix_auto_apply;
1799 $self->update_buttons; 2084 $self->update_buttons;
1800 Coro::cede; 2085 cf::cede_to_tick;
1801 $self->set_darkness_map;
1802 Coro::cede;
1803 $self->activate; 2086 $self->activate;
1804 } 2087 }
1805 2088
2089 $self->{last_save} = $cf::RUNTIME;
2090 $self->last_access ($cf::RUNTIME);
2091
1806 $self->in_memory (cf::MAP_IN_MEMORY); 2092 $self->in_memory (cf::MAP_ACTIVE);
1807 } 2093 }
1808 2094
1809 $self->post_load; 2095 $self->post_load;
1810} 2096}
1811 2097
2098# customize the map for a given player, i.e.
2099# return the _real_ map. used by e.g. per-player
2100# maps to change the path to ~playername/mappath
1812sub customise_for { 2101sub customise_for {
1813 my ($self, $ob) = @_; 2102 my ($self, $ob) = @_;
1814 2103
1815 return find "~" . $ob->name . "/" . $self->{path} 2104 return find "~" . $ob->name . "/" . $self->{path}
1816 if $self->per_player; 2105 if $self->per_player;
… …
1820 2109
1821 $self 2110 $self
1822} 2111}
1823 2112
1824# find and load all maps in the 3x3 area around a map 2113# find and load all maps in the 3x3 area around a map
1825sub load_diag { 2114sub load_neighbours {
1826 my ($map) = @_; 2115 my ($map) = @_;
1827 2116
1828 my @diag; # diagonal neighbours 2117 my @neigh; # diagonal neighbours
1829 2118
1830 for (0 .. 3) { 2119 for (0 .. 3) {
1831 my $neigh = $map->tile_path ($_) 2120 my $neigh = $map->tile_path ($_)
1832 or next; 2121 or next;
1833 $neigh = find $neigh, $map 2122 $neigh = find $neigh, $map
1834 or next; 2123 or next;
1835 $neigh->load; 2124 $neigh->load;
1836 2125
2126 push @neigh,
1837 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2127 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1838 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2128 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1839 } 2129 }
1840 2130
1841 for (@diag) { 2131 for (grep defined $_->[0], @neigh) {
2132 my ($path, $origin) = @$_;
1842 my $neigh = find @$_ 2133 my $neigh = find $path, $origin
1843 or next; 2134 or next;
1844 $neigh->load; 2135 $neigh->load;
1845 } 2136 }
1846} 2137}
1847 2138
… …
1852} 2143}
1853 2144
1854sub do_load_sync { 2145sub do_load_sync {
1855 my ($map) = @_; 2146 my ($map) = @_;
1856 2147
2148 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2149 if $Coro::current == $Coro::main;
2150
1857 cf::sync_job { $map->load }; 2151 cf::sync_job { $map->load };
1858} 2152}
1859 2153
1860our %MAP_PREFETCH; 2154our %MAP_PREFETCH;
1861our $MAP_PREFETCHER = undef; 2155our $MAP_PREFETCHER = undef;
1862 2156
1863sub find_async { 2157sub find_async {
1864 my ($path, $origin) = @_; 2158 my ($path, $origin, $load) = @_;
1865 2159
1866 $path = normalise $path, $origin && $origin->{path}; 2160 $path = normalise $path, $origin && $origin->{path};
1867 2161
1868 if (my $map = $cf::MAP{$path}) { 2162 if (my $map = $cf::MAP{$path}) {
1869 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2163 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1870 } 2164 }
1871 2165
1872 undef $MAP_PREFETCH{$path}; 2166 $MAP_PREFETCH{$path} |= $load;
2167
1873 $MAP_PREFETCHER ||= cf::async { 2168 $MAP_PREFETCHER ||= cf::async {
2169 $Coro::current->{desc} = "map prefetcher";
2170
1874 while (%MAP_PREFETCH) { 2171 while (%MAP_PREFETCH) {
1875 for my $path (keys %MAP_PREFETCH) { 2172 while (my ($k, $v) = each %MAP_PREFETCH) {
1876 my $map = find $path 2173 if (my $map = find $k) {
1877 or next;
1878 $map->load; 2174 $map->load if $v;
2175 }
1879 2176
1880 delete $MAP_PREFETCH{$path}; 2177 delete $MAP_PREFETCH{$k};
1881 } 2178 }
1882 } 2179 }
1883 undef $MAP_PREFETCHER; 2180 undef $MAP_PREFETCHER;
1884 }; 2181 };
1885 $MAP_PREFETCHER->prio (6); 2182 $MAP_PREFETCHER->prio (6);
… …
1888} 2185}
1889 2186
1890sub save { 2187sub save {
1891 my ($self) = @_; 2188 my ($self) = @_;
1892 2189
1893 my $lock = cf::lock_acquire "map_data:" . $self->path; 2190 my $lock = cf::lock_acquire "map_data:$self->{path}";
1894 2191
1895 $self->{last_save} = $cf::RUNTIME; 2192 $self->{last_save} = $cf::RUNTIME;
1896 2193
1897 return unless $self->dirty; 2194 return unless $self->dirty;
1898 2195
… …
1904 return if $self->{deny_save}; 2201 return if $self->{deny_save};
1905 2202
1906 local $self->{last_access} = $self->last_access;#d# 2203 local $self->{last_access} = $self->last_access;#d#
1907 2204
1908 cf::async { 2205 cf::async {
2206 $Coro::current->{desc} = "map player save";
1909 $_->contr->save for $self->players; 2207 $_->contr->save for $self->players;
1910 }; 2208 };
2209
2210 cf::get_slot 0.02;
1911 2211
1912 if ($uniq) { 2212 if ($uniq) {
1913 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2213 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1914 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2214 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1915 } else { 2215 } else {
… …
1921 my ($self) = @_; 2221 my ($self) = @_;
1922 2222
1923 # save first because save cedes 2223 # save first because save cedes
1924 $self->save; 2224 $self->save;
1925 2225
1926 my $lock = cf::lock_acquire "map_data:" . $self->path; 2226 my $lock = cf::lock_acquire "map_data:$self->{path}";
1927 2227
1928 return if $self->players; 2228 return if $self->players;
1929 return if $self->in_memory != cf::MAP_IN_MEMORY; 2229 return if $self->in_memory != cf::MAP_ACTIVE;
1930 return if $self->{deny_save}; 2230 return if $self->{deny_save};
1931 2231
2232 $self->in_memory (cf::MAP_SWAPPED);
2233
2234 $self->deactivate;
2235 $_->clear_links_to ($self) for values %cf::MAP;
1932 $self->clear; 2236 $self->clear;
1933 $self->in_memory (cf::MAP_SWAPPED);
1934} 2237}
1935 2238
1936sub reset_at { 2239sub reset_at {
1937 my ($self) = @_; 2240 my ($self) = @_;
1938 2241
… …
1956 2259
1957 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
1958 2261
1959 return if $self->players; 2262 return if $self->players;
1960 2263
1961 warn "resetting map ", $self->path; 2264 warn "resetting map ", $self->path, "\n";
1962 2265
1963 $self->in_memory (cf::MAP_SWAPPED); 2266 $self->in_memory (cf::MAP_SWAPPED);
1964 2267
1965 # need to save uniques path 2268 # need to save uniques path
1966 unless ($self->{deny_save}) { 2269 unless ($self->{deny_save}) {
… …
1970 if $uniq; 2273 if $uniq;
1971 } 2274 }
1972 2275
1973 delete $cf::MAP{$self->path}; 2276 delete $cf::MAP{$self->path};
1974 2277
2278 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP;
1975 $self->clear; 2280 $self->clear;
1976
1977 $_->clear_links_to ($self) for values %cf::MAP;
1978 2281
1979 $self->unlink_save; 2282 $self->unlink_save;
1980 $self->destroy; 2283 $self->destroy;
1981} 2284}
1982 2285
1983my $nuke_counter = "aaaa"; 2286my $nuke_counter = "aaaa";
1984 2287
1985sub nuke { 2288sub nuke {
1986 my ($self) = @_; 2289 my ($self) = @_;
1987 2290
2291 {
2292 my $lock = cf::lock_acquire "map_data:$self->{path}";
2293
1988 delete $cf::MAP{$self->path}; 2294 delete $cf::MAP{$self->path};
1989 2295
1990 $self->unlink_save; 2296 $self->unlink_save;
1991 2297
1992 bless $self, "cf::map"; 2298 bless $self, "cf::map";
1993 delete $self->{deny_reset}; 2299 delete $self->{deny_reset};
1994 $self->{deny_save} = 1; 2300 $self->{deny_save} = 1;
1995 $self->reset_timeout (1); 2301 $self->reset_timeout (1);
1996 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2302 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1997 2303
1998 $cf::MAP{$self->path} = $self; 2304 $cf::MAP{$self->path} = $self;
2305 }
1999 2306
2000 $self->reset; # polite request, might not happen 2307 $self->reset; # polite request, might not happen
2001} 2308}
2002 2309
2003=item $maps = cf::map::tmp_maps 2310=item $maps = cf::map::tmp_maps
… …
2045 2352
2046sub unique_maps() { 2353sub unique_maps() {
2047 [ 2354 [
2048 map { 2355 map {
2049 utf8::decode $_; 2356 utf8::decode $_;
2050 /\.map$/ 2357 s/\.map$//; # TODO future compatibility hack
2358 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2359 ? ()
2051 ? normalise $_ 2360 : normalise $_
2052 : ()
2053 } @{ aio_readdir $UNIQUEDIR or [] } 2361 } @{ aio_readdir $UNIQUEDIR or [] }
2054 ] 2362 ]
2055} 2363}
2056 2364
2057package cf; 2365=item cf::map::static_maps
2366
2367Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2368file in the shared directory excluding F</styles> and F</editor>). May
2369block.
2370
2371=cut
2372
2373sub static_maps() {
2374 my @dirs = "";
2375 my @maps;
2376
2377 while (@dirs) {
2378 my $dir = shift @dirs;
2379
2380 next if $dir eq "/styles" || $dir eq "/editor";
2381
2382 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2383 or return;
2384
2385 for (@$files) {
2386 s/\.map$// or next;
2387 utf8::decode $_;
2388 push @maps, "$dir/$_";
2389 }
2390
2391 push @dirs, map "$dir/$_", @$dirs;
2392 }
2393
2394 \@maps
2395}
2058 2396
2059=back 2397=back
2060 2398
2061=head3 cf::object 2399=head3 cf::object
2062 2400
… …
2066 2404
2067=over 4 2405=over 4
2068 2406
2069=item $ob->inv_recursive 2407=item $ob->inv_recursive
2070 2408
2071Returns the inventory of the object _and_ their inventories, recursively. 2409Returns the inventory of the object I<and> their inventories, recursively,
2410but I<not> the object itself.
2072 2411
2073=cut 2412=cut
2074 2413
2075sub inv_recursive_; 2414sub inv_recursive_;
2076sub inv_recursive_ { 2415sub inv_recursive_ {
… …
2079 2418
2080sub inv_recursive { 2419sub inv_recursive {
2081 inv_recursive_ inv $_[0] 2420 inv_recursive_ inv $_[0]
2082} 2421}
2083 2422
2423=item $ref = $ob->ref
2424
2425Creates and returns a persistent reference to an object that can be stored as a string.
2426
2427=item $ob = cf::object::deref ($refstring)
2428
2429returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2430even if the object actually exists. May block.
2431
2432=cut
2433
2434sub deref {
2435 my ($ref) = @_;
2436
2437 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2438 my ($uuid, $name) = ($1, $2);
2439 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2440 or return;
2441 $pl->ob->uuid eq $uuid
2442 or return;
2443
2444 $pl->ob
2445 } else {
2446 warn "$ref: cannot resolve object reference\n";
2447 undef
2448 }
2449}
2450
2084package cf; 2451package cf;
2085 2452
2086=back 2453=back
2087 2454
2088=head3 cf::object::player 2455=head3 cf::object::player
… …
2094Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2461Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2095can be C<undef>. Does the right thing when the player is currently in a 2462can be C<undef>. Does the right thing when the player is currently in a
2096dialogue with the given NPC character. 2463dialogue with the given NPC character.
2097 2464
2098=cut 2465=cut
2466
2467our $SAY_CHANNEL = {
2468 id => "say",
2469 title => "Map",
2470 reply => "say ",
2471 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2472};
2473
2474our $CHAT_CHANNEL = {
2475 id => "chat",
2476 title => "Chat",
2477 reply => "chat ",
2478 tooltip => "Player chat and shouts, global to the server.",
2479};
2099 2480
2100# rough implementation of a future "reply" method that works 2481# rough implementation of a future "reply" method that works
2101# with dialog boxes. 2482# with dialog boxes.
2102#TODO: the first argument must go, split into a $npc->reply_to ( method 2483#TODO: the first argument must go, split into a $npc->reply_to ( method
2103sub cf::object::player::reply($$$;$) { 2484sub cf::object::player::reply($$$;$) {
… …
2110 2491
2111 } else { 2492 } else {
2112 my $pl = $self->contr; 2493 my $pl = $self->contr;
2113 2494
2114 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2495 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2115 my $diag = $pl->{npc_dialog}; 2496 my $dialog = $pl->{npc_dialog};
2116 $diag->{pl}->ext_reply ( 2497 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2117 $diag->{id},
2118 msgtype => "reply",
2119 msg => $diag->{pl}->expand_cfpod ($msg),
2120 add_topics => []
2121 );
2122 2498
2123 } else { 2499 } else {
2124 $msg = $npc->name . " says: $msg" if $npc; 2500 $msg = $npc->name . " says: $msg" if $npc;
2125 $self->message ($msg, $flags); 2501 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2126 } 2502 }
2127 } 2503 }
2504}
2505
2506=item $object->send_msg ($channel, $msg, $color, [extra...])
2507
2508=cut
2509
2510sub cf::object::send_msg {
2511 my $pl = shift->contr
2512 or return;
2513 $pl->send_msg (@_);
2128} 2514}
2129 2515
2130=item $player_object->may ("access") 2516=item $player_object->may ("access")
2131 2517
2132Returns wether the given player is authorized to access resource "access" 2518Returns wether the given player is authorized to access resource "access"
… …
2145 2531
2146=item $player_object->enter_link 2532=item $player_object->enter_link
2147 2533
2148Freezes the player and moves him/her to a special map (C<{link}>). 2534Freezes the player and moves him/her to a special map (C<{link}>).
2149 2535
2150The player should be reasonably safe there for short amounts of time. You 2536The player should be reasonably safe there for short amounts of time (e.g.
2151I<MUST> call C<leave_link> as soon as possible, though. 2537for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2538though, as the palyer cannot control the character while it is on the link
2539map.
2152 2540
2153Will never block. 2541Will never block.
2154 2542
2155=item $player_object->leave_link ($map, $x, $y) 2543=item $player_object->leave_link ($map, $x, $y)
2156 2544
… …
2208 ($x, $y) = (-1, -1) 2596 ($x, $y) = (-1, -1)
2209 unless (defined $x) && (defined $y); 2597 unless (defined $x) && (defined $y);
2210 2598
2211 # use -1 or undef as default coordinates, not 0, 0 2599 # use -1 or undef as default coordinates, not 0, 0
2212 ($x, $y) = ($map->enter_x, $map->enter_y) 2600 ($x, $y) = ($map->enter_x, $map->enter_y)
2213 if $x <=0 && $y <= 0; 2601 if $x <= 0 && $y <= 0;
2214 2602
2215 $map->load; 2603 $map->load;
2216 $map->load_diag; 2604 $map->load_neighbours;
2217 2605
2218 return unless $self->contr->active; 2606 return unless $self->contr->active;
2219 $self->activate_recursive;
2220 2607
2221 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2222 $self->enter_map ($map, $x, $y); 2609 $self->enter_map ($map, $x, $y);
2223}
2224 2610
2611 # only activate afterwards, to support waiting in hooks
2612 $self->activate_recursive;
2613}
2614
2225=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2615=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2226 2616
2227Moves the player to the given map-path and coordinates by first freezing 2617Moves the player to the given map-path and coordinates by first freezing
2228her, loading and preparing them map, calling the provided $check callback 2618her, loading and preparing them map, calling the provided $check callback
2229that has to return the map if sucecssful, and then unfreezes the player on 2619that has to return the map if sucecssful, and then unfreezes the player on
2230the new (success) or old (failed) map position. 2620the new (success) or old (failed) map position. In either case, $done will
2621be called at the end of this process.
2622
2623Note that $check will be called with a potentially non-loaded map, so if
2624it needs a loaded map it has to call C<< ->load >>.
2231 2625
2232=cut 2626=cut
2233 2627
2234our $GOTOGEN; 2628our $GOTOGEN;
2235 2629
2236sub cf::object::player::goto { 2630sub cf::object::player::goto {
2237 my ($self, $path, $x, $y, $check) = @_; 2631 my ($self, $path, $x, $y, $check, $done) = @_;
2238 2632
2239 # do generation counting so two concurrent goto's will be executed in-order 2633 # do generation counting so two concurrent goto's will be executed in-order
2240 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2634 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2241 2635
2242 $self->enter_link; 2636 $self->enter_link;
2243 2637
2244 (async { 2638 (async {
2639 $Coro::current->{desc} = "player::goto $path $x $y";
2640
2641 # *tag paths override both path and x|y
2642 if ($path =~ /^\*(.*)$/) {
2643 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2644 my $ob = $obs[rand @obs];
2645
2646 # see if we actually can go there
2647 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2648 $ob = $obs[rand @obs];
2649 } else {
2650 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2651 }
2652 # else put us there anyways for now #d#
2653
2654 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2655 } else {
2656 ($path, $x, $y) = (undef, undef, undef);
2657 }
2658 }
2659
2245 my $map = eval { 2660 my $map = eval {
2246 my $map = cf::map::find $path; 2661 my $map = defined $path ? cf::map::find $path : undef;
2247 2662
2248 if ($map) { 2663 if ($map) {
2249 $map = $map->customise_for ($self); 2664 $map = $map->customise_for ($self);
2250 $map = $check->($map) if $check && $map; 2665 $map = $check->($map) if $check && $map;
2251 } else { 2666 } else {
2252 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2667 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2253 } 2668 }
2254 2669
2255 $map 2670 $map
2256 }; 2671 };
2257 2672
… …
2262 2677
2263 if ($gen == $self->{_goto_generation}) { 2678 if ($gen == $self->{_goto_generation}) {
2264 delete $self->{_goto_generation}; 2679 delete $self->{_goto_generation};
2265 $self->leave_link ($map, $x, $y); 2680 $self->leave_link ($map, $x, $y);
2266 } 2681 }
2682
2683 $done->() if $done;
2267 })->prio (1); 2684 })->prio (1);
2268} 2685}
2269 2686
2270=item $player_object->enter_exit ($exit_object) 2687=item $player_object->enter_exit ($exit_object)
2271 2688
… …
2291} 2708}
2292 2709
2293sub prepare_random_map { 2710sub prepare_random_map {
2294 my ($exit) = @_; 2711 my ($exit) = @_;
2295 2712
2296 my $guard = cf::lock_acquire "exit_prepare:$exit";
2297
2298 # all this does is basically replace the /! path by 2713 # all this does is basically replace the /! path by
2299 # a new random map path (?random/...) with a seed 2714 # a new random map path (?random/...) with a seed
2300 # that depends on the exit object 2715 # that depends on the exit object
2301 2716
2302 my $rmp = parse_random_map_params $exit->msg; 2717 my $rmp = parse_random_map_params $exit->msg;
… …
2304 if ($exit->map) { 2719 if ($exit->map) {
2305 $rmp->{region} = $exit->region->name; 2720 $rmp->{region} = $exit->region->name;
2306 $rmp->{origin_map} = $exit->map->path; 2721 $rmp->{origin_map} = $exit->map->path;
2307 $rmp->{origin_x} = $exit->x; 2722 $rmp->{origin_x} = $exit->x;
2308 $rmp->{origin_y} = $exit->y; 2723 $rmp->{origin_y} = $exit->y;
2724
2725 $exit->map->touch;
2309 } 2726 }
2310 2727
2311 $rmp->{random_seed} ||= $exit->random_seed; 2728 $rmp->{random_seed} ||= $exit->random_seed;
2312 2729
2313 my $data = cf::to_json $rmp; 2730 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2314 my $md5 = Digest::MD5::md5_hex $data; 2731 my $md5 = Digest::MD5::md5_hex $data;
2315 my $meta = "$RANDOMDIR/$md5.meta"; 2732 my $meta = "$RANDOMDIR/$md5.meta";
2316 2733
2317 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2734 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2318 aio_write $fh, 0, (length $data), $data, 0; 2735 aio_write $fh, 0, (length $data), $data, 0;
2319 undef $fh; 2736 undef $fh;
2320 aio_rename "$meta~", $meta; 2737 aio_rename "$meta~", $meta;
2321 2738
2739 my $slaying = "?random/$md5";
2740
2741 if ($exit->valid) {
2322 $exit->slaying ("?random/$md5"); 2742 $exit->slaying ("?random/$md5");
2323 $exit->msg (undef); 2743 $exit->msg (undef);
2744 }
2324 } 2745 }
2325} 2746}
2326 2747
2327sub cf::object::player::enter_exit { 2748sub cf::object::player::enter_exit {
2328 my ($self, $exit) = @_; 2749 my ($self, $exit) = @_;
2329 2750
2330 return unless $self->type == cf::PLAYER; 2751 return unless $self->type == cf::PLAYER;
2331 2752
2332 if ($exit->slaying eq "/!") {
2333 #TODO: this should de-fi-ni-te-ly not be a sync-job
2334 # the problem is that $exit might not survive long enough
2335 # so it needs to be done right now, right here
2336 cf::sync_job { prepare_random_map $exit };
2337 }
2338
2339 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2340 my $hp = $exit->stats->hp;
2341 my $sp = $exit->stats->sp;
2342
2343 $self->enter_link; 2753 $self->enter_link;
2344 2754
2345 (async { 2755 (async {
2346 $self->deactivate_recursive; # just to be sure 2756 $Coro::current->{desc} = "enter_exit";
2757
2347 unless (eval { 2758 unless (eval {
2759 $self->deactivate_recursive; # just to be sure
2760
2761 # random map handling
2762 {
2763 my $guard = cf::lock_acquire "exit_prepare:$exit";
2764
2765 prepare_random_map $exit
2766 if $exit->slaying eq "/!";
2767 }
2768
2769 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2770 my $x = $exit->stats->hp;
2771 my $y = $exit->stats->sp;
2772
2348 $self->goto ($slaying, $hp, $sp); 2773 $self->goto ($map, $x, $y);
2349 2774
2775 # if exit is damned, update players death & WoR home-position
2776 $self->contr->savebed ($map, $x, $y)
2777 if $exit->flag (cf::FLAG_DAMNED);
2778
2350 1; 2779 1
2351 }) { 2780 }) {
2352 $self->message ("Something went wrong deep within the crossfire server. " 2781 $self->message ("Something went wrong deep within the deliantra server. "
2353 . "I'll try to bring you back to the map you were before. " 2782 . "I'll try to bring you back to the map you were before. "
2354 . "Please report this to the dungeon master!", 2783 . "Please report this to the dungeon master!",
2355 cf::NDI_UNIQUE | cf::NDI_RED); 2784 cf::NDI_UNIQUE | cf::NDI_RED);
2356 2785
2357 warn "ERROR in enter_exit: $@"; 2786 warn "ERROR in enter_exit: $@";
… …
2376 2805
2377 utf8::encode $text; 2806 utf8::encode $text;
2378 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2807 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2379} 2808}
2380 2809
2810=item $client->send_big_packet ($pkt)
2811
2812Like C<send_packet>, but tries to compress large packets, and fragments
2813them as required.
2814
2815=cut
2816
2817our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2818
2819sub cf::client::send_big_packet {
2820 my ($self, $pkt) = @_;
2821
2822 # try lzf for large packets
2823 $pkt = "lzf " . Compress::LZF::compress $pkt
2824 if 1024 <= length $pkt and $self->{can_lzf};
2825
2826 # split very large packets
2827 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2828 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2829 $pkt = "frag";
2830 }
2831
2832 $self->send_packet ($pkt);
2833}
2834
2381=item $client->send_msg ($color, $type, $msg, [extra...]) 2835=item $client->send_msg ($channel, $msg, $color, [extra...])
2382 2836
2383Send a drawinfo or msg packet to the client, formatting the msg for the 2837Send a drawinfo or msg packet to the client, formatting the msg for the
2384client if neccessary. C<$type> should be a string identifying the type of 2838client if neccessary. C<$type> should be a string identifying the type of
2385the message, with C<log> being the default. If C<$color> is negative, suppress 2839the message, with C<log> being the default. If C<$color> is negative, suppress
2386the message unless the client supports the msg packet. 2840the message unless the client supports the msg packet.
2387 2841
2388=cut 2842=cut
2389 2843
2844# non-persistent channels (usually the info channel)
2845our %CHANNEL = (
2846 "c/motd" => {
2847 id => "infobox",
2848 title => "MOTD",
2849 reply => undef,
2850 tooltip => "The message of the day",
2851 },
2852 "c/identify" => {
2853 id => "infobox",
2854 title => "Identify",
2855 reply => undef,
2856 tooltip => "Items recently identified",
2857 },
2858 "c/examine" => {
2859 id => "infobox",
2860 title => "Examine",
2861 reply => undef,
2862 tooltip => "Signs and other items you examined",
2863 },
2864 "c/shopinfo" => {
2865 id => "infobox",
2866 title => "Shop Info",
2867 reply => undef,
2868 tooltip => "What your bargaining skill tells you about the shop",
2869 },
2870 "c/book" => {
2871 id => "infobox",
2872 title => "Book",
2873 reply => undef,
2874 tooltip => "The contents of a note or book",
2875 },
2876 "c/lookat" => {
2877 id => "infobox",
2878 title => "Look",
2879 reply => undef,
2880 tooltip => "What you saw there",
2881 },
2882 "c/who" => {
2883 id => "infobox",
2884 title => "Players",
2885 reply => undef,
2886 tooltip => "Shows players who are currently online",
2887 },
2888 "c/body" => {
2889 id => "infobox",
2890 title => "Body Parts",
2891 reply => undef,
2892 tooltip => "Shows which body parts you posess and are available",
2893 },
2894 "c/statistics" => {
2895 id => "infobox",
2896 title => "Statistics",
2897 reply => undef,
2898 tooltip => "Shows your primary statistics",
2899 },
2900 "c/skills" => {
2901 id => "infobox",
2902 title => "Skills",
2903 reply => undef,
2904 tooltip => "Shows your experience per skill and item power",
2905 },
2906 "c/shopitems" => {
2907 id => "infobox",
2908 title => "Shop Items",
2909 reply => undef,
2910 tooltip => "Shows the items currently for sale in this shop",
2911 },
2912 "c/resistances" => {
2913 id => "infobox",
2914 title => "Resistances",
2915 reply => undef,
2916 tooltip => "Shows your resistances",
2917 },
2918 "c/pets" => {
2919 id => "infobox",
2920 title => "Pets",
2921 reply => undef,
2922 tooltip => "Shows information abotu your pets/a specific pet",
2923 },
2924 "c/perceiveself" => {
2925 id => "infobox",
2926 title => "Perceive Self",
2927 reply => undef,
2928 tooltip => "You gained detailed knowledge about yourself",
2929 },
2930 "c/uptime" => {
2931 id => "infobox",
2932 title => "Uptime",
2933 reply => undef,
2934 tooltip => "How long the server has been running since last restart",
2935 },
2936 "c/mapinfo" => {
2937 id => "infobox",
2938 title => "Map Info",
2939 reply => undef,
2940 tooltip => "Information related to the maps",
2941 },
2942 "c/party" => {
2943 id => "party",
2944 title => "Party",
2945 reply => "gsay ",
2946 tooltip => "Messages and chat related to your party",
2947 },
2948 "c/death" => {
2949 id => "death",
2950 title => "Death",
2951 reply => undef,
2952 tooltip => "Reason for and more info about your most recent death",
2953 },
2954 "c/say" => $SAY_CHANNEL,
2955 "c/chat" => $CHAT_CHANNEL,
2956);
2957
2390sub cf::client::send_msg { 2958sub cf::client::send_msg {
2391 my ($self, $color, $type, $msg, @extra) = @_; 2959 my ($self, $channel, $msg, $color, @extra) = @_;
2392 2960
2393 $msg = $self->pl->expand_cfpod ($msg); 2961 $msg = $self->pl->expand_cfpod ($msg)
2962 unless $color & cf::NDI_VERBATIM;
2394 2963
2395 if ($self->can_msg) { 2964 $color &= cf::NDI_CLIENT_MASK; # just in case...
2396 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
2397 } else {
2398 # replace some tags by gcfclient-compatible ones
2399 for ($msg) {
2400 1 while
2401 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2402 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2403 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2404 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2405 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2406 }
2407 2965
2408 if ($color >= 0) { 2966 # check predefined channels, for the benefit of C
2409 if (0 && $msg =~ /\[/) { 2967 if ($CHANNEL{$channel}) {
2410 $self->send_packet ("drawextinfo $color 4 0 $msg") 2968 $channel = $CHANNEL{$channel};
2411 } else { 2969
2412 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2970 $self->ext_msg (channel_info => $channel);
2413 $self->send_packet ("drawinfo $color $msg") 2971 $channel = $channel->{id};
2972
2973 } elsif (ref $channel) {
2974 # send meta info to client, if not yet sent
2975 unless (exists $self->{channel}{$channel->{id}}) {
2976 $self->{channel}{$channel->{id}} = $channel;
2977 $self->ext_msg (channel_info => $channel);
2414 } 2978 }
2415 }
2416 }
2417}
2418 2979
2980 $channel = $channel->{id};
2981 }
2982
2983 return unless @extra || length $msg;
2984
2985 # default colour, mask it out
2986 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2987 if $color & cf::NDI_DEF;
2988
2989 my $pkt = "msg "
2990 . $self->{json_coder}->encode (
2991 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2992 );
2993
2994 $self->send_big_packet ($pkt);
2995}
2996
2419=item $client->ext_event ($type, %msg) 2997=item $client->ext_msg ($type, @msg)
2420 2998
2421Sends an ext event to the client. 2999Sends an ext event to the client.
2422 3000
2423=cut 3001=cut
2424 3002
2425sub cf::client::ext_event($$%) { 3003sub cf::client::ext_msg($$@) {
2426 my ($self, $type, %msg) = @_; 3004 my ($self, $type, @msg) = @_;
2427 3005
3006 if ($self->extcmd == 2) {
3007 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3008 } elsif ($self->extcmd == 1) { # TODO: remove
2428 $msg{msgtype} = "event_$type"; 3009 push @msg, msgtype => "event_$type";
2429 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3011 }
3012}
3013
3014=item $client->ext_reply ($msgid, @msg)
3015
3016Sends an ext reply to the client.
3017
3018=cut
3019
3020sub cf::client::ext_reply($$@) {
3021 my ($self, $id, @msg) = @_;
3022
3023 if ($self->extcmd == 2) {
3024 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3025 } elsif ($self->extcmd == 1) {
3026 #TODO: version 1, remove
3027 unshift @msg, msgtype => "reply", msgid => $id;
3028 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3029 }
2430} 3030}
2431 3031
2432=item $success = $client->query ($flags, "text", \&cb) 3032=item $success = $client->query ($flags, "text", \&cb)
2433 3033
2434Queues a query to the client, calling the given callback with 3034Queues a query to the client, calling the given callback with
… …
2489 my ($ns, $buf) = @_; 3089 my ($ns, $buf) = @_;
2490 3090
2491 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3091 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2492 3092
2493 if (ref $msg) { 3093 if (ref $msg) {
3094 my ($type, $reply, @payload) =
3095 "ARRAY" eq ref $msg
3096 ? @$msg
3097 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3098
3099 my @reply;
3100
2494 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3101 if (my $cb = $EXTICMD{$type}) {
2495 if (my %reply = $cb->($ns, $msg)) { 3102 @reply = $cb->($ns, @payload);
2496 $reply{msgid} = $msg->{msgid};
2497 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2498 }
2499 } 3103 }
3104
3105 $ns->ext_reply ($reply, @reply)
3106 if $reply;
3107
2500 } else { 3108 } else {
2501 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3109 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2502 } 3110 }
2503 3111
2504 cf::override; 3112 cf::override;
… …
2526 3134
2527 $coro 3135 $coro
2528} 3136}
2529 3137
2530cf::client->attach ( 3138cf::client->attach (
2531 on_destroy => sub { 3139 on_client_destroy => sub {
2532 my ($ns) = @_; 3140 my ($ns) = @_;
2533 3141
2534 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3142 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2535 }, 3143 },
2536); 3144);
… …
2551our $safe = new Safe "safe"; 3159our $safe = new Safe "safe";
2552our $safe_hole = new Safe::Hole; 3160our $safe_hole = new Safe::Hole;
2553 3161
2554$SIG{FPE} = 'IGNORE'; 3162$SIG{FPE} = 'IGNORE';
2555 3163
2556$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3164$safe->permit_only (Opcode::opset qw(
3165 :base_core :base_mem :base_orig :base_math :base_loop
3166 grepstart grepwhile mapstart mapwhile
3167 sort time
3168));
2557 3169
2558# here we export the classes and methods available to script code 3170# here we export the classes and methods available to script code
2559 3171
2560=pod 3172=pod
2561 3173
2562The following functions and methods are available within a safe environment: 3174The following functions and methods are available within a safe environment:
2563 3175
2564 cf::object contr pay_amount pay_player map 3176 cf::object
3177 contr pay_amount pay_player map x y force_find force_add destroy
3178 insert remove name archname title slaying race decrease split
3179 value
3180
2565 cf::object::player player 3181 cf::object::player
2566 cf::player peaceful 3182 player
2567 cf::map trigger 3183
3184 cf::player
3185 peaceful
3186
3187 cf::map
3188 trigger
2568 3189
2569=cut 3190=cut
2570 3191
2571for ( 3192for (
2572 ["cf::object" => qw(contr pay_amount pay_player map)], 3193 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3194 insert remove inv nrof name archname title slaying race
3195 decrease split destroy change_exp value msg lore send_msg)],
2573 ["cf::object::player" => qw(player)], 3196 ["cf::object::player" => qw(player)],
2574 ["cf::player" => qw(peaceful)], 3197 ["cf::player" => qw(peaceful send_msg)],
2575 ["cf::map" => qw(trigger)], 3198 ["cf::map" => qw(trigger)],
2576) { 3199) {
2577 no strict 'refs'; 3200 no strict 'refs';
2578 my ($pkg, @funs) = @$_; 3201 my ($pkg, @funs) = @$_;
2579 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3202 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2597 3220
2598 my $qcode = $code; 3221 my $qcode = $code;
2599 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3222 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2600 $qcode =~ s/\n/\\n/g; 3223 $qcode =~ s/\n/\\n/g;
2601 3224
3225 %vars = (_dummy => 0) unless %vars;
3226
3227 my @res;
2602 local $_; 3228 local $_;
2603 local @safe::cf::_safe_eval_args = values %vars;
2604 3229
2605 my $eval = 3230 my $eval =
2606 "do {\n" 3231 "do {\n"
2607 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3232 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2608 . "#line 0 \"{$qcode}\"\n" 3233 . "#line 0 \"{$qcode}\"\n"
2609 . $code 3234 . $code
2610 . "\n}" 3235 . "\n}"
2611 ; 3236 ;
2612 3237
3238 if ($CFG{safe_eval}) {
2613 sub_generation_inc; 3239 sub_generation_inc;
3240 local @safe::cf::_safe_eval_args = values %vars;
2614 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3241 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2615 sub_generation_inc; 3242 sub_generation_inc;
3243 } else {
3244 local @cf::_safe_eval_args = values %vars;
3245 @res = wantarray ? eval eval : scalar eval $eval;
3246 }
2616 3247
2617 if ($@) { 3248 if ($@) {
2618 warn "$@"; 3249 warn "$@";
2619 warn "while executing safe code '$code'\n"; 3250 warn "while executing safe code '$code'\n";
2620 warn "with arguments " . (join " ", %vars) . "\n"; 3251 warn "with arguments " . (join " ", %vars) . "\n";
… …
2639=cut 3270=cut
2640 3271
2641sub register_script_function { 3272sub register_script_function {
2642 my ($fun, $cb) = @_; 3273 my ($fun, $cb) = @_;
2643 3274
2644 no strict 'refs'; 3275 $fun = "safe::$fun" if $CFG{safe_eval};
2645 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3276 *$fun = $safe_hole->wrap ($cb);
2646} 3277}
2647 3278
2648=back 3279=back
2649 3280
2650=cut 3281=cut
… …
2652############################################################################# 3283#############################################################################
2653# the server's init and main functions 3284# the server's init and main functions
2654 3285
2655sub load_facedata($) { 3286sub load_facedata($) {
2656 my ($path) = @_; 3287 my ($path) = @_;
3288
3289 # HACK to clear player env face cache, we need some signal framework
3290 # for this (global event?)
3291 %ext::player_env::MUSIC_FACE_CACHE = ();
3292
3293 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2657 3294
2658 warn "loading facedata from $path\n"; 3295 warn "loading facedata from $path\n";
2659 3296
2660 my $facedata; 3297 my $facedata;
2661 0 < aio_load $path, $facedata 3298 0 < aio_load $path, $facedata
… …
2664 $facedata = Coro::Storable::thaw $facedata; 3301 $facedata = Coro::Storable::thaw $facedata;
2665 3302
2666 $facedata->{version} == 2 3303 $facedata->{version} == 2
2667 or cf::cleanup "$path: version mismatch, cannot proceed."; 3304 or cf::cleanup "$path: version mismatch, cannot proceed.";
2668 3305
3306 # patch in the exptable
3307 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3308 $facedata->{resource}{"res/exp_table"} = {
3309 type => FT_RSRC,
3310 data => $exp_table,
3311 hash => (Digest::MD5::md5 $exp_table),
3312 };
3313 cf::cede_to_tick;
3314
2669 { 3315 {
2670 my $faces = $facedata->{faceinfo}; 3316 my $faces = $facedata->{faceinfo};
2671 3317
2672 while (my ($face, $info) = each %$faces) { 3318 while (my ($face, $info) = each %$faces) {
2673 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3319 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3320
2674 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3321 cf::face::set_visibility $idx, $info->{visibility};
3322 cf::face::set_magicmap $idx, $info->{magicmap};
2675 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3323 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2676 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3324 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2677 Coro::cede; 3325
3326 cf::cede_to_tick;
2678 } 3327 }
2679 3328
2680 while (my ($face, $info) = each %$faces) { 3329 while (my ($face, $info) = each %$faces) {
2681 next unless $info->{smooth}; 3330 next unless $info->{smooth};
3331
2682 my $idx = cf::face::find $face 3332 my $idx = cf::face::find $face
2683 or next; 3333 or next;
3334
2684 if (my $smooth = cf::face::find $info->{smooth}) { 3335 if (my $smooth = cf::face::find $info->{smooth}) {
3336 cf::face::set_smooth $idx, $smooth;
2685 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3337 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2686 } else { 3338 } else {
2687 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3339 warn "smooth face '$info->{smooth}' not found for face '$face'";
2688 } 3340 }
2689 Coro::cede; 3341
3342 cf::cede_to_tick;
2690 } 3343 }
2691 } 3344 }
2692 3345
2693 { 3346 {
2694 my $anims = $facedata->{animinfo}; 3347 my $anims = $facedata->{animinfo};
2695 3348
2696 while (my ($anim, $info) = each %$anims) { 3349 while (my ($anim, $info) = each %$anims) {
2697 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3350 cf::anim::set $anim, $info->{frames}, $info->{facings};
2698 Coro::cede; 3351 cf::cede_to_tick;
2699 } 3352 }
2700 3353
2701 cf::anim::invalidate_all; # d'oh 3354 cf::anim::invalidate_all; # d'oh
2702 } 3355 }
2703 3356
3357 {
3358 my $res = $facedata->{resource};
3359
3360 while (my ($name, $info) = each %$res) {
3361 if (defined $info->{type}) {
3362 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3363
3364 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3365 cf::face::set_type $idx, $info->{type};
3366 } else {
3367 $RESOURCE{$name} = $info;
3368 }
3369
3370 cf::cede_to_tick;
3371 }
3372 }
3373
3374 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3375
2704 1 3376 1
2705} 3377}
2706 3378
3379cf::global->attach (on_resource_update => sub {
3380 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3381 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3382
3383 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3384 my $sound = $soundconf->{compat}[$_]
3385 or next;
3386
3387 my $face = cf::face::find "sound/$sound->[1]";
3388 cf::sound::set $sound->[0] => $face;
3389 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3390 }
3391
3392 while (my ($k, $v) = each %{$soundconf->{event}}) {
3393 my $face = cf::face::find "sound/$v";
3394 cf::sound::set $k => $face;
3395 }
3396 }
3397});
3398
3399register_exticmd fx_want => sub {
3400 my ($ns, $want) = @_;
3401
3402 while (my ($k, $v) = each %$want) {
3403 $ns->fx_want ($k, $v);
3404 }
3405};
3406
3407sub load_resource_file($) {
3408 my $guard = lock_acquire "load_resource_file";
3409
3410 my $status = load_resource_file_ $_[0];
3411 get_slot 0.1, 100;
3412 cf::arch::commit_load;
3413
3414 $status
3415}
3416
2707sub reload_regions { 3417sub reload_regions {
3418 # HACK to clear player env face cache, we need some signal framework
3419 # for this (global event?)
3420 %ext::player_env::MUSIC_FACE_CACHE = ();
3421
2708 load_resource_file "$MAPDIR/regions" 3422 load_resource_file "$MAPDIR/regions"
2709 or die "unable to load regions file\n"; 3423 or die "unable to load regions file\n";
3424
3425 for (cf::region::list) {
3426 $_->{match} = qr/$_->{match}/
3427 if exists $_->{match};
3428 }
2710} 3429}
2711 3430
2712sub reload_facedata { 3431sub reload_facedata {
2713 load_facedata "$DATADIR/facedata" 3432 load_facedata "$DATADIR/facedata"
2714 or die "unable to load facedata\n"; 3433 or die "unable to load facedata\n";
2715} 3434}
2716 3435
2717sub reload_archetypes { 3436sub reload_archetypes {
2718 load_resource_file "$DATADIR/archetypes" 3437 load_resource_file "$DATADIR/archetypes"
2719 or die "unable to load archetypes\n"; 3438 or die "unable to load archetypes\n";
2720 #d# NEED to laod twice to resolve forward references
2721 # this really needs to be done in an extra post-pass
2722 # (which needs to be synchronous, so solve it differently)
2723 load_resource_file "$DATADIR/archetypes"
2724 or die "unable to load archetypes\n";
2725} 3439}
2726 3440
2727sub reload_treasures { 3441sub reload_treasures {
2728 load_resource_file "$DATADIR/treasures" 3442 load_resource_file "$DATADIR/treasures"
2729 or die "unable to load treasurelists\n"; 3443 or die "unable to load treasurelists\n";
2730} 3444}
2731 3445
2732sub reload_resources { 3446sub reload_resources {
2733 warn "reloading resource files...\n"; 3447 warn "reloading resource files...\n";
2734 3448
3449 reload_facedata;
3450 reload_archetypes;
2735 reload_regions; 3451 reload_regions;
2736 reload_facedata;
2737 #reload_archetypes;#d#
2738 reload_archetypes;
2739 reload_treasures; 3452 reload_treasures;
2740 3453
2741 warn "finished reloading resource files\n"; 3454 warn "finished reloading resource files\n";
2742} 3455}
2743 3456
2744sub init { 3457sub reload_config {
2745 reload_resources; 3458 warn "reloading config file...\n";
2746}
2747 3459
2748sub cfg_load {
2749 open my $fh, "<:utf8", "$CONFDIR/config" 3460 open my $fh, "<:utf8", "$CONFDIR/config"
2750 or return; 3461 or return;
2751 3462
2752 local $/; 3463 local $/;
2753 *CFG = YAML::Syck::Load <$fh>; 3464 *CFG = YAML::XS::Load scalar <$fh>;
2754 3465
2755 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3466 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2756 3467
2757 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3468 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2758 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3469 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2762 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3473 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2763 and die "WARNING: m(un)lockall failed: $!\n"; 3474 and die "WARNING: m(un)lockall failed: $!\n";
2764 }; 3475 };
2765 warn $@ if $@; 3476 warn $@ if $@;
2766 } 3477 }
3478
3479 warn "finished reloading resource files\n";
3480}
3481
3482sub pidfile() {
3483 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3484 or die "$PIDFILE: $!";
3485 flock $fh, &Fcntl::LOCK_EX
3486 or die "$PIDFILE: flock: $!";
3487 $fh
3488}
3489
3490# make sure only one server instance is running at any one time
3491sub atomic {
3492 my $fh = pidfile;
3493
3494 my $pid = <$fh>;
3495 kill 9, $pid if $pid > 0;
3496
3497 seek $fh, 0, 0;
3498 print $fh $$;
3499}
3500
3501sub main_loop {
3502 warn "EV::loop starting\n";
3503 if (1) {
3504 EV::loop;
3505 }
3506 warn "EV::loop returned\n";
3507 goto &main_loop unless $REALLY_UNLOOP;
2767} 3508}
2768 3509
2769sub main { 3510sub main {
3511 cf::init_globals; # initialise logging
3512
3513 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3514 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3515 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3516 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3517
3518 cf::init_experience;
3519 cf::init_anim;
3520 cf::init_attackmess;
3521 cf::init_dynamic;
3522
3523 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3524
2770 # we must not ever block the main coroutine 3525 # we must not ever block the main coroutine
2771 local $Coro::idle = sub { 3526 local $Coro::idle = sub {
2772 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3527 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2773 (async { 3528 (async {
2774 Event::one_event; 3529 $Coro::current->{desc} = "IDLE BUG HANDLER";
3530 EV::loop EV::LOOP_ONESHOT;
2775 })->prio (Coro::PRIO_MAX); 3531 })->prio (Coro::PRIO_MAX);
2776 }; 3532 };
2777 3533
2778 cfg_load; 3534 evthread_start IO::AIO::poll_fileno;
3535
3536 cf::sync_job {
3537 cf::load_settings;
3538 cf::load_materials;
3539
3540 reload_resources;
3541 reload_config;
2779 db_init; 3542 db_init;
3543
3544 cf::init_uuid;
3545 cf::init_signals;
3546 cf::init_skills;
3547
3548 cf::init_beforeplay;
3549
3550 atomic;
3551
2780 load_extensions; 3552 load_extensions;
2781 3553
2782 $TICK_WATCHER->start; 3554 utime time, time, $RUNTIMEFILE;
2783 Event::loop; 3555
3556 # no (long-running) fork's whatsoever before this point(!)
3557 use POSIX ();
3558 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3559
3560 (pop @POST_INIT)->(0) while @POST_INIT;
3561 };
3562
3563 main_loop;
2784} 3564}
2785 3565
2786############################################################################# 3566#############################################################################
2787# initialisation and cleanup 3567# initialisation and cleanup
2788 3568
2789# install some emergency cleanup handlers 3569# install some emergency cleanup handlers
2790BEGIN { 3570BEGIN {
3571 our %SIGWATCHER = ();
2791 for my $signal (qw(INT HUP TERM)) { 3572 for my $signal (qw(INT HUP TERM)) {
2792 Event->signal ( 3573 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2793 reentrant => 0,
2794 data => WF_AUTOCANCEL,
2795 signal => $signal,
2796 prio => 0,
2797 cb => sub {
2798 cf::cleanup "SIG$signal"; 3574 cf::cleanup "SIG$signal";
2799 },
2800 ); 3575 };
2801 } 3576 }
2802} 3577}
2803 3578
2804sub write_runtime { 3579sub write_runtime_sync {
2805 my $runtime = "$LOCALDIR/runtime"; 3580 my $t0 = EV::time;
2806 3581
2807 # first touch the runtime file to show we are still running: 3582 # first touch the runtime file to show we are still running:
2808 # the fsync below can take a very very long time. 3583 # the fsync below can take a very very long time.
2809 3584
2810 IO::AIO::aio_utime $runtime, undef, undef; 3585 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2811 3586
2812 my $guard = cf::lock_acquire "write_runtime"; 3587 my $guard = cf::lock_acquire "write_runtime";
2813 3588
2814 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3589 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
2815 or return; 3590 or return;
2816 3591
2817 my $value = $cf::RUNTIME + 90 + 10; 3592 my $value = $cf::RUNTIME + 90 + 10;
2818 # 10 is the runtime save interval, for a monotonic clock 3593 # 10 is the runtime save interval, for a monotonic clock
2819 # 60 allows for the watchdog to kill the server. 3594 # 60 allows for the watchdog to kill the server.
… …
2829 aio_utime $fh, undef, undef; 3604 aio_utime $fh, undef, undef;
2830 3605
2831 close $fh 3606 close $fh
2832 or return; 3607 or return;
2833 3608
2834 aio_rename "$runtime~", $runtime 3609 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2835 and return; 3610 and return;
2836 3611
2837 warn "runtime file written.\n"; 3612 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
2838 3613
2839 1 3614 1
3615}
3616
3617our $uuid_lock;
3618our $uuid_skip;
3619
3620sub write_uuid_sync($) {
3621 $uuid_skip ||= $_[0];
3622
3623 return if $uuid_lock;
3624 local $uuid_lock = 1;
3625
3626 my $uuid = "$LOCALDIR/uuid";
3627
3628 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3629 or return;
3630
3631 my $value = uuid_seq uuid_cur;
3632
3633 unless ($value) {
3634 warn "cowardly refusing to write zero uuid value!\n";
3635 return;
3636 }
3637
3638 my $value = uuid_str $value + $uuid_skip;
3639 $uuid_skip = 0;
3640
3641 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3642 and return;
3643
3644 # always fsync - this file is important
3645 aio_fsync $fh
3646 and return;
3647
3648 close $fh
3649 or return;
3650
3651 aio_rename "$uuid~", $uuid
3652 and return;
3653
3654 warn "uuid file written ($value).\n";
3655
3656 1
3657
3658}
3659
3660sub write_uuid($$) {
3661 my ($skip, $sync) = @_;
3662
3663 $sync ? write_uuid_sync $skip
3664 : async { write_uuid_sync $skip };
2840} 3665}
2841 3666
2842sub emergency_save() { 3667sub emergency_save() {
2843 my $freeze_guard = cf::freeze_mainloop; 3668 my $freeze_guard = cf::freeze_mainloop;
2844 3669
2845 warn "enter emergency perl save\n"; 3670 warn "emergency_perl_save: enter\n";
2846 3671
2847 cf::sync_job { 3672 cf::sync_job {
3673 # this is a trade-off: we want to be very quick here, so
3674 # save all maps without fsync, and later call a global sync
3675 # (which in turn might be very very slow)
3676 local $USE_FSYNC = 0;
3677
2848 # use a peculiar iteration method to avoid tripping on perl 3678 # use a peculiar iteration method to avoid tripping on perl
2849 # refcount bugs in for. also avoids problems with players 3679 # refcount bugs in for. also avoids problems with players
2850 # and maps saved/destroyed asynchronously. 3680 # and maps saved/destroyed asynchronously.
2851 warn "begin emergency player save\n"; 3681 warn "emergency_perl_save: begin player save\n";
2852 for my $login (keys %cf::PLAYER) { 3682 for my $login (keys %cf::PLAYER) {
2853 my $pl = $cf::PLAYER{$login} or next; 3683 my $pl = $cf::PLAYER{$login} or next;
2854 $pl->valid or next; 3684 $pl->valid or next;
3685 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2855 $pl->save; 3686 $pl->save;
2856 } 3687 }
2857 warn "end emergency player save\n"; 3688 warn "emergency_perl_save: end player save\n";
2858 3689
2859 warn "begin emergency map save\n"; 3690 warn "emergency_perl_save: begin map save\n";
2860 for my $path (keys %cf::MAP) { 3691 for my $path (keys %cf::MAP) {
2861 my $map = $cf::MAP{$path} or next; 3692 my $map = $cf::MAP{$path} or next;
2862 $map->valid or next; 3693 $map->valid or next;
2863 $map->save; 3694 $map->save;
2864 } 3695 }
2865 warn "end emergency map save\n"; 3696 warn "emergency_perl_save: end map save\n";
2866 3697
2867 warn "begin emergency database checkpoint\n"; 3698 warn "emergency_perl_save: begin database checkpoint\n";
2868 BDB::db_env_txn_checkpoint $DB_ENV; 3699 BDB::db_env_txn_checkpoint $DB_ENV;
2869 warn "end emergency database checkpoint\n"; 3700 warn "emergency_perl_save: end database checkpoint\n";
3701
3702 warn "emergency_perl_save: begin write uuid\n";
3703 write_uuid_sync 1;
3704 warn "emergency_perl_save: end write uuid\n";
2870 }; 3705 };
2871 3706
3707 warn "emergency_perl_save: starting sync()\n";
3708 IO::AIO::aio_sync sub {
3709 warn "emergency_perl_save: finished sync()\n";
3710 };
3711
2872 warn "leave emergency perl save\n"; 3712 warn "emergency_perl_save: leave\n";
2873} 3713}
2874 3714
2875sub post_cleanup { 3715sub post_cleanup {
2876 my ($make_core) = @_; 3716 my ($make_core) = @_;
2877 3717
2878 warn Carp::longmess "post_cleanup backtrace" 3718 warn Carp::longmess "post_cleanup backtrace"
2879 if $make_core; 3719 if $make_core;
3720
3721 my $fh = pidfile;
3722 unlink $PIDFILE if <$fh> == $$;
3723}
3724
3725# a safer delete_package, copied from Symbol
3726sub clear_package($) {
3727 my $pkg = shift;
3728
3729 # expand to full symbol table name if needed
3730 unless ($pkg =~ /^main::.*::$/) {
3731 $pkg = "main$pkg" if $pkg =~ /^::/;
3732 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3733 $pkg .= '::' unless $pkg =~ /::$/;
3734 }
3735
3736 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3737 my $stem_symtab = *{$stem}{HASH};
3738
3739 defined $stem_symtab and exists $stem_symtab->{$leaf}
3740 or return;
3741
3742 # clear all symbols
3743 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3744 for my $name (keys %$leaf_symtab) {
3745 _gv_clear *{"$pkg$name"};
3746# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3747 }
3748 warn "cleared package $pkg\n";#d#
2880} 3749}
2881 3750
2882sub do_reload_perl() { 3751sub do_reload_perl() {
2883 # can/must only be called in main 3752 # can/must only be called in main
2884 if ($Coro::current != $Coro::main) { 3753 if ($Coro::current != $Coro::main) {
2885 warn "can only reload from main coroutine"; 3754 warn "can only reload from main coroutine";
2886 return; 3755 return;
2887 } 3756 }
2888 3757
3758 return if $RELOAD++;
3759
3760 my $t1 = EV::time;
3761
3762 while ($RELOAD) {
2889 warn "reloading..."; 3763 warn "reloading...";
2890 3764
2891 warn "entering sync_job"; 3765 warn "entering sync_job";
2892 3766
2893 cf::sync_job { 3767 cf::sync_job {
2894 cf::write_runtime; # external watchdog should not bark 3768 cf::write_runtime_sync; # external watchdog should not bark
2895 cf::emergency_save; 3769 cf::emergency_save;
2896 cf::write_runtime; # external watchdog should not bark 3770 cf::write_runtime_sync; # external watchdog should not bark
2897 3771
2898 warn "syncing database to disk"; 3772 warn "syncing database to disk";
2899 BDB::db_env_txn_checkpoint $DB_ENV; 3773 BDB::db_env_txn_checkpoint $DB_ENV;
2900 3774
2901 # if anything goes wrong in here, we should simply crash as we already saved 3775 # if anything goes wrong in here, we should simply crash as we already saved
2902 3776
2903 warn "cancelling all WF_AUTOCANCEL watchers";
2904 for (Event::all_watchers) {
2905 $_->cancel if $_->data & WF_AUTOCANCEL;
2906 }
2907
2908 warn "flushing outstanding aio requests"; 3777 warn "flushing outstanding aio requests";
2909 for (;;) {
2910 BDB::flush;
2911 IO::AIO::flush;
2912 Coro::cede;
2913 last unless IO::AIO::nreqs || BDB::nreqs; 3778 while (IO::AIO::nreqs || BDB::nreqs) {
2914 warn "iterate..."; 3779 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2915 }
2916
2917 ++$RELOAD;
2918
2919 warn "cancelling all extension coros";
2920 $_->cancel for values %EXT_CORO;
2921 %EXT_CORO = ();
2922
2923 warn "removing commands";
2924 %COMMAND = ();
2925
2926 warn "removing ext/exti commands";
2927 %EXTCMD = ();
2928 %EXTICMD = ();
2929
2930 warn "unloading/nuking all extensions";
2931 for my $pkg (@EXTS) {
2932 warn "... unloading $pkg";
2933
2934 if (my $cb = $pkg->can ("unload")) {
2935 eval {
2936 $cb->($pkg);
2937 1
2938 } or warn "$pkg unloaded, but with errors: $@";
2939 } 3780 }
2940 3781
2941 warn "... nuking $pkg"; 3782 warn "cancelling all extension coros";
2942 Symbol::delete_package $pkg; 3783 $_->cancel for values %EXT_CORO;
2943 } 3784 %EXT_CORO = ();
2944 3785
2945 warn "unloading all perl modules loaded from $LIBDIR"; 3786 warn "removing commands";
2946 while (my ($k, $v) = each %INC) { 3787 %COMMAND = ();
2947 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2948 3788
3789 warn "removing ext/exti commands";
3790 %EXTCMD = ();
3791 %EXTICMD = ();
3792
3793 warn "unloading/nuking all extensions";
3794 for my $pkg (@EXTS) {
2949 warn "... unloading $k"; 3795 warn "... unloading $pkg";
2950 delete $INC{$k};
2951 3796
2952 $k =~ s/\.pm$//;
2953 $k =~ s/\//::/g;
2954
2955 if (my $cb = $k->can ("unload_module")) { 3797 if (my $cb = $pkg->can ("unload")) {
3798 eval {
2956 $cb->(); 3799 $cb->($pkg);
3800 1
3801 } or warn "$pkg unloaded, but with errors: $@";
3802 }
3803
3804 warn "... clearing $pkg";
3805 clear_package $pkg;
2957 } 3806 }
2958 3807
2959 Symbol::delete_package $k; 3808 warn "unloading all perl modules loaded from $LIBDIR";
3809 while (my ($k, $v) = each %INC) {
3810 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3811
3812 warn "... unloading $k";
3813 delete $INC{$k};
3814
3815 $k =~ s/\.pm$//;
3816 $k =~ s/\//::/g;
3817
3818 if (my $cb = $k->can ("unload_module")) {
3819 $cb->();
3820 }
3821
3822 clear_package $k;
2960 } 3823 }
2961 3824
2962 warn "getting rid of safe::, as good as possible"; 3825 warn "getting rid of safe::, as good as possible";
2963 Symbol::delete_package "safe::$_" 3826 clear_package "safe::$_"
2964 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3827 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2965 3828
2966 warn "unloading cf.pm \"a bit\""; 3829 warn "unloading cf.pm \"a bit\"";
2967 delete $INC{"cf.pm"}; 3830 delete $INC{"cf.pm"};
2968 delete $INC{"cf/pod.pm"}; 3831 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
2969 3832
2970 # don't, removes xs symbols, too, 3833 # don't, removes xs symbols, too,
2971 # and global variables created in xs 3834 # and global variables created in xs
2972 #Symbol::delete_package __PACKAGE__; 3835 #clear_package __PACKAGE__;
2973 3836
2974 warn "unload completed, starting to reload now"; 3837 warn "unload completed, starting to reload now";
2975 3838
2976 warn "reloading cf.pm"; 3839 warn "reloading cf.pm";
2977 require cf; 3840 require cf;
2978 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3841 cf::_connect_to_perl_1;
2979 3842
2980 warn "loading config and database again"; 3843 warn "loading config and database again";
2981 cf::cfg_load; 3844 cf::reload_config;
2982 3845
2983 warn "loading extensions"; 3846 warn "loading extensions";
2984 cf::load_extensions; 3847 cf::load_extensions;
2985 3848
3849 if ($REATTACH_ON_RELOAD) {
2986 warn "reattaching attachments to objects/players"; 3850 warn "reattaching attachments to objects/players";
2987 _global_reattach; # objects, sockets 3851 _global_reattach; # objects, sockets
2988 warn "reattaching attachments to maps"; 3852 warn "reattaching attachments to maps";
2989 reattach $_ for values %MAP; 3853 reattach $_ for values %MAP;
2990 warn "reattaching attachments to players"; 3854 warn "reattaching attachments to players";
2991 reattach $_ for values %PLAYER; 3855 reattach $_ for values %PLAYER;
3856 }
2992 3857
3858 warn "running post_init jobs";
3859 (pop @POST_INIT)->(1) while @POST_INIT;
3860
2993 warn "leaving sync_job"; 3861 warn "leaving sync_job";
2994 3862
2995 1 3863 1
2996 } or do { 3864 } or do {
2997 warn $@; 3865 warn $@;
2998 warn "error while reloading, exiting."; 3866 cf::cleanup "error while reloading, exiting.";
2999 exit 1;
3000 }; 3867 };
3001 3868
3002 warn "reloaded"; 3869 warn "reloaded";
3870 --$RELOAD;
3871 }
3872
3873 $t1 = EV::time - $t1;
3874 warn "reload completed in ${t1}s\n";
3003}; 3875};
3004 3876
3005our $RELOAD_WATCHER; # used only during reload 3877our $RELOAD_WATCHER; # used only during reload
3006 3878
3007sub reload_perl() { 3879sub reload_perl() {
3008 # doing reload synchronously and two reloads happen back-to-back, 3880 # doing reload synchronously and two reloads happen back-to-back,
3009 # coro crashes during coro_state_free->destroy here. 3881 # coro crashes during coro_state_free->destroy here.
3010 3882
3011 $RELOAD_WATCHER ||= Event->timer ( 3883 $RELOAD_WATCHER ||= cf::async {
3012 reentrant => 0, 3884 Coro::AIO::aio_wait cache_extensions;
3013 after => 0, 3885
3014 data => WF_AUTOCANCEL, 3886 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3015 cb => sub {
3016 do_reload_perl; 3887 do_reload_perl;
3017 undef $RELOAD_WATCHER; 3888 undef $RELOAD_WATCHER;
3018 }, 3889 };
3019 ); 3890 };
3020} 3891}
3021 3892
3022register_command "reload" => sub { 3893register_command "reload" => sub {
3023 my ($who, $arg) = @_; 3894 my ($who, $arg) = @_;
3024 3895
3025 if ($who->flag (FLAG_WIZ)) { 3896 if ($who->flag (FLAG_WIZ)) {
3026 $who->message ("reloading server."); 3897 $who->message ("reloading server.");
3898 async {
3899 $Coro::current->{desc} = "perl_reload";
3027 async { reload_perl }; 3900 reload_perl;
3901 };
3028 } 3902 }
3029}; 3903};
3030 3904
3031unshift @INC, $LIBDIR; 3905unshift @INC, $LIBDIR;
3032 3906
… …
3034 3908
3035our @WAIT_FOR_TICK; 3909our @WAIT_FOR_TICK;
3036our @WAIT_FOR_TICK_BEGIN; 3910our @WAIT_FOR_TICK_BEGIN;
3037 3911
3038sub wait_for_tick { 3912sub wait_for_tick {
3039 return unless $TICK_WATCHER->is_active;
3040 return if $Coro::current == $Coro::main; 3913 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3041 3914
3042 my $signal = new Coro::Signal; 3915 my $signal = new Coro::Signal;
3043 push @WAIT_FOR_TICK, $signal; 3916 push @WAIT_FOR_TICK, $signal;
3044 $signal->wait; 3917 $signal->wait;
3045} 3918}
3046 3919
3047sub wait_for_tick_begin { 3920sub wait_for_tick_begin {
3048 return unless $TICK_WATCHER->is_active;
3049 return if $Coro::current == $Coro::main; 3921 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3050 3922
3051 my $signal = new Coro::Signal; 3923 my $signal = new Coro::Signal;
3052 push @WAIT_FOR_TICK_BEGIN, $signal; 3924 push @WAIT_FOR_TICK_BEGIN, $signal;
3053 $signal->wait; 3925 $signal->wait;
3054} 3926}
3055 3927
3056 my $min = 1e6;#d# 3928sub tick {
3057 my $avg = 10;
3058$TICK_WATCHER = Event->timer (
3059 reentrant => 0,
3060 parked => 1,
3061 prio => 0,
3062 at => $NEXT_TICK || $TICK,
3063 data => WF_AUTOCANCEL,
3064 cb => sub {
3065 if ($Coro::current != $Coro::main) { 3929 if ($Coro::current != $Coro::main) {
3066 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3930 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3067 unless ++$bug_warning > 10; 3931 unless ++$bug_warning > 10;
3068 return; 3932 return;
3069 } 3933 }
3070 3934
3071 $NOW = $tick_start = Event::time;
3072
3073 cf::server_tick; # one server iteration 3935 cf::server_tick; # one server iteration
3074 3936
3075 0 && sync_job {#d# 3937 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3076 for(1..10) {
3077 my $t = Event::time;
3078 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3079 or die;
3080 3938
3081 $map->width (50); 3939 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3082 $map->height (50); 3940 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3083 $map->alloc; 3941 Coro::async_pool {
3084 $map->_load_objects ("/tmp/x.map", 1); 3942 $Coro::current->{desc} = "runtime saver";
3085 my $t = Event::time - $t; 3943 write_runtime_sync
3086 3944 or warn "ERROR: unable to write runtime file: $!";
3087 #next unless $t < 0.0013;#d#
3088 if ($t < $min) {
3089 $min = $t;
3090 }
3091 $avg = $avg * 0.99 + $t * 0.01;
3092 }
3093 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3094 exit 0;
3095 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3096 }; 3945 };
3946 }
3097 3947
3098 $RUNTIME += $TICK;
3099 $NEXT_TICK += $TICK;
3100
3101 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3102 $NEXT_RUNTIME_WRITE = $NOW + 10;
3103 Coro::async_pool {
3104 write_runtime
3105 or warn "ERROR: unable to write runtime file: $!";
3106 };
3107 }
3108
3109# my $AFTER = Event::time;
3110# warn $AFTER - $NOW;#d#
3111
3112 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3948 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3113 $sig->send; 3949 $sig->send;
3114 } 3950 }
3115 while (my $sig = shift @WAIT_FOR_TICK) { 3951 while (my $sig = shift @WAIT_FOR_TICK) {
3116 $sig->send; 3952 $sig->send;
3117 } 3953 }
3118 3954
3119 $NOW = Event::time; 3955 $LOAD = ($NOW - $TICK_START) / $TICK;
3120
3121 # if we are delayed by four ticks or more, skip them all
3122 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3123
3124 $TICK_WATCHER->at ($NEXT_TICK);
3125 $TICK_WATCHER->start;
3126
3127 $LOAD = ($NOW - $tick_start) / $TICK;
3128 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3956 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3129 3957
3130 _post_tick; 3958 if (0) {
3131 3959 if ($NEXT_TICK) {
3132 3960 my $jitter = $TICK_START - $NEXT_TICK;
3961 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3962 warn "jitter $JITTER\n";#d#
3963 }
3133 }, 3964 }
3134); 3965}
3135 3966
3136{ 3967{
3137 BDB::max_poll_time $TICK * 0.1; 3968 # configure BDB
3138 $BDB_POLL_WATCHER = Event->io ( 3969
3139 reentrant => 0,
3140 fd => BDB::poll_fileno,
3141 poll => 'r',
3142 prio => 0,
3143 data => WF_AUTOCANCEL,
3144 cb => \&BDB::poll_cb,
3145 );
3146 BDB::min_parallel 8; 3970 BDB::min_parallel 16;
3147 3971 BDB::max_poll_reqs $TICK * 0.1;
3148 BDB::set_sync_prepare { 3972 $AnyEvent::BDB::WATCHER->priority (1);
3149 my $status;
3150 my $current = $Coro::current;
3151 (
3152 sub {
3153 $status = $!;
3154 $current->ready; undef $current;
3155 },
3156 sub {
3157 Coro::schedule while defined $current;
3158 $! = $status;
3159 },
3160 )
3161 };
3162 3973
3163 unless ($DB_ENV) { 3974 unless ($DB_ENV) {
3164 $DB_ENV = BDB::db_env_create; 3975 $DB_ENV = BDB::db_env_create;
3976 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3977 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3978 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3979 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3980 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3165 3981
3166 cf::sync_job { 3982 cf::sync_job {
3167 eval { 3983 eval {
3168 BDB::db_env_open 3984 BDB::db_env_open
3169 $DB_ENV, 3985 $DB_ENV,
… …
3171 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3987 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3172 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3988 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3173 0666; 3989 0666;
3174 3990
3175 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3991 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3176
3177 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3178 $DB_ENV->set_lk_detect;
3179 }; 3992 };
3180 3993
3181 cf::cleanup "db_env_open(db): $@" if $@; 3994 cf::cleanup "db_env_open(db): $@" if $@;
3182 }; 3995 };
3183 } 3996 }
3997
3998 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3999 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4000 };
4001 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4002 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4003 };
4004 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4005 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4006 };
3184} 4007}
3185 4008
3186{ 4009{
4010 # configure IO::AIO
4011
3187 IO::AIO::min_parallel 8; 4012 IO::AIO::min_parallel 8;
3188
3189 undef $Coro::AIO::WATCHER;
3190 IO::AIO::max_poll_time $TICK * 0.1; 4013 IO::AIO::max_poll_time $TICK * 0.1;
3191 $AIO_POLL_WATCHER = Event->io ( 4014 undef $AnyEvent::AIO::WATCHER;
3192 reentrant => 0,
3193 data => WF_AUTOCANCEL,
3194 fd => IO::AIO::poll_fileno,
3195 poll => 'r',
3196 prio => 6,
3197 cb => \&IO::AIO::poll_cb,
3198 );
3199} 4015}
3200 4016
3201my $_log_backtrace; 4017my $_log_backtrace;
3202 4018
3203sub _log_backtrace { 4019sub _log_backtrace {
… …
3206 $msg =~ s/\n//; 4022 $msg =~ s/\n//;
3207 4023
3208 # limit the # of concurrent backtraces 4024 # limit the # of concurrent backtraces
3209 if ($_log_backtrace < 2) { 4025 if ($_log_backtrace < 2) {
3210 ++$_log_backtrace; 4026 ++$_log_backtrace;
4027 my $perl_bt = Carp::longmess $msg;
3211 async { 4028 async {
4029 $Coro::current->{desc} = "abt $msg";
4030
3212 my @bt = fork_call { 4031 my @bt = fork_call {
3213 @addr = map { sprintf "%x", $_ } @addr; 4032 @addr = map { sprintf "%x", $_ } @addr;
3214 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4033 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3215 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4034 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3216 or die "addr2line: $!"; 4035 or die "addr2line: $!";
… …
3224 } 4043 }
3225 4044
3226 @funcs 4045 @funcs
3227 }; 4046 };
3228 4047
3229 LOG llevInfo, "[ABT] $msg\n"; 4048 LOG llevInfo, "[ABT] $perl_bt\n";
4049 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3230 LOG llevInfo, "[ABT] $_\n" for @bt; 4050 LOG llevInfo, "[ABT] $_\n" for @bt;
3231 --$_log_backtrace; 4051 --$_log_backtrace;
3232 }; 4052 };
3233 } else { 4053 } else {
3234 LOG llevInfo, "[ABT] $msg\n"; 4054 LOG llevInfo, "[ABT] $msg\n";
3235 LOG llevInfo, "[ABT] [suppressed]\n"; 4055 LOG llevInfo, "[ABT] [suppressed]\n";
3236 } 4056 }
3237} 4057}
3238 4058
3239# load additional modules 4059# load additional modules
3240use cf::pod; 4060require "cf/$_.pm" for @EXTRA_MODULES;
4061cf::_connect_to_perl_2;
3241 4062
3242END { cf::emergency_save } 4063END { cf::emergency_save }
3243 4064
32441 40651
3245 4066

Diff Legend

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