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.388 by root, Thu Oct 18 02:56:13 2007 UTC vs.
Revision 1.539 by root, Tue May 4 22:49:21 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Event; 30use EV;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 4.1 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
24use Coro::Util (); 51use Coro::Util ();
25 52
26use JSON::XS (); 53use JSON::XS 2.01 ();
27use BDB (); 54use BDB ();
28use Data::Dumper; 55use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 56use Fcntl;
31use YAML::Syck (); 57use YAML::XS ();
32use IO::AIO 2.51 (); 58use IO::AIO ();
33use Time::HiRes; 59use Time::HiRes;
34use Compress::LZF; 60use Compress::LZF;
35use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
36 64
37# configure various modules to our taste 65# configure various modules to our taste
38# 66#
39$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 75
43$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
44 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 78
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 80
52our %COMMAND = (); 81our %COMMAND = ();
53our %COMMAND_TIME = (); 82our %COMMAND_TIME = ();
56our %EXTCMD = (); 85our %EXTCMD = ();
57our %EXTICMD = (); 86our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 87our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 88our %EXT_MAP = (); # pluggable maps
60 89
61our $RELOAD; # number of reloads so far 90our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 91our @EVENT;
92our @REFLECT; # set by XS
93our %REFLECT; # set by us
63 94
64our $CONFDIR = confdir; 95our $CONFDIR = confdir;
65our $DATADIR = datadir; 96our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 97our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 98our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 99our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 100our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 101our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 102our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 103our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 104our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 105our $BDBDIR = "$LOCALDIR/db";
106our $PIDFILE = "$LOCALDIR/pid";
107our $RUNTIMEFILE = "$LOCALDIR/runtime";
108
109our %RESOURCE; # unused
110
111our $OUTPUT_RATE_MIN = 3000;
112our $OUTPUT_RATE_MAX = 1000000;
113
114our $MAX_LINKS = 32; # how many chained exits to follow
115our $VERBOSE_IO = 1;
75 116
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 117our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 118our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 119our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 120our $USE_FSYNC = 1; # use fsync to write maps - default on
83 121
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 122our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 123our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 124our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 125our $DB_ENV;
89 126
127our @EXTRA_MODULES = qw(pod match mapscript);
128
90our %CFG; 129our %CFG;
91 130
92our $UPTIME; $UPTIME ||= time; 131our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 132our $RUNTIME;
133our $NOW;
94 134
95our (%PLAYER, %PLAYER_LOADING); # all users 135our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 136our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 137our $LINK_MAP; # the special {link} map, which is always available
98 138
99# used to convert map paths into valid unix filenames by replacing / by ∕ 139# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 140our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 141
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 142our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 143our $LOADAVG; # same thing, but with alpha-smoothing
144our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 145our $TICK_START; # for load detecting purposes
146
147our @POST_INIT;
148
149our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
150our $REALLY_UNLOOP; # never set to true, please :)
105 151
106binmode STDOUT; 152binmode STDOUT;
107binmode STDERR; 153binmode STDERR;
108 154
109# read virtual server time, if available 155# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 156unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 157 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 158 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 159 $RUNTIME = <$fh> + 0.;
114} 160}
161
162eval "sub TICK() { $TICK } 1" or die;
115 163
116mkdir $_ 164mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 165 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 166
119our $EMERGENCY_POSITION; 167our $EMERGENCY_POSITION;
120 168
121sub cf::map::normalise; 169sub cf::map::normalise;
170
171sub in_main() {
172 $Coro::current == $Coro::main
173}
174
175#############################################################################
176
177%REFLECT = ();
178for (@REFLECT) {
179 my $reflect = JSON::XS::decode_json $_;
180 $REFLECT{$reflect->{class}} = $reflect;
181}
182
183# this is decidedly evil
184$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
122 185
123############################################################################# 186#############################################################################
124 187
125=head2 GLOBAL VARIABLES 188=head2 GLOBAL VARIABLES
126 189
162 225
163The raw value load value from the last tick. 226The raw value load value from the last tick.
164 227
165=item %cf::CFG 228=item %cf::CFG
166 229
167Configuration for the server, loaded from C</etc/crossfire/config>, or 230Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 231from wherever your confdir points to.
169 232
170=item cf::wait_for_tick, cf::wait_for_tick_begin 233=item cf::wait_for_tick, cf::wait_for_tick_begin
171 234
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 235These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
173returns directly I<after> the tick processing (and consequently, can only wake one process 236returns directly I<after> the tick processing (and consequently, can only wake one process
174per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 237per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
175 238
176=item @cf::INVOKE_RESULTS 239=item @cf::INVOKE_RESULTS
177 240
178This array contains the results of the last C<invoke ()> call. When 241This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 242C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call. 243that call.
181 244
245=item %cf::REFLECT
246
247Contains, for each (C++) class name, a hash reference with information
248about object members (methods, scalars, arrays and flags) and other
249metadata, which is useful for introspection.
250
182=back 251=back
183 252
184=cut 253=cut
185 254
186BEGIN { 255sub error(@) { LOG llevError, join "", @_ }
187 *CORE::GLOBAL::warn = sub { 256sub warn (@) { LOG llevWarn , join "", @_ }
257sub info (@) { LOG llevInfo , join "", @_ }
258sub debug(@) { LOG llevDebug, join "", @_ }
259sub trace(@) { LOG llevTrace, join "", @_ }
260
261$Coro::State::WARNHOOK = sub {
188 my $msg = join "", @_; 262 my $msg = join "", @_;
189 263
190 $msg .= "\n" 264 $msg .= "\n"
191 unless $msg =~ /\n$/; 265 unless $msg =~ /\n$/;
192 266
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 267 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 268
195 LOG llevError, $msg; 269 LOG llevWarn, $msg;
196 }; 270};
197} 271
272$Coro::State::DIEHOOK = sub {
273 return unless $^S eq 0; # "eq", not "=="
274
275 error Carp::longmess $_[0];
276
277 if (in_main) {#d#
278 error "DIEHOOK called in main context, Coro bug?\n";#d#
279 return;#d#
280 }#d#
281
282 # kill coroutine otherwise
283 Coro::terminate
284};
198 285
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 286@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 287@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 288@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 289@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 296for my $pkg (qw(
210 cf::global cf::attachable 297 cf::global cf::attachable
211 cf::object cf::object::player 298 cf::object cf::object::player
212 cf::client cf::player 299 cf::client cf::player
213 cf::arch cf::living 300 cf::arch cf::living
301 cf::map cf::mapspace
214 cf::map cf::party cf::region 302 cf::party cf::region
215)) { 303)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 304 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 305}
219 306
220$Event::DIED = sub { 307$EV::DIED = sub {
221 warn "error in event callback: @_"; 308 Carp::cluck "error in event callback: @_";
222}; 309};
223 310
224############################################################################# 311#############################################################################
225 312
226=head2 UTILITY FUNCTIONS 313=head2 UTILITY FUNCTIONS
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 335 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 336 $d
250 } || "[unable to dump $_[0]: '$@']"; 337 } || "[unable to dump $_[0]: '$@']";
251} 338}
252 339
253=item $ref = cf::from_json $json 340=item $ref = cf::decode_json $json
254 341
255Converts a JSON string into the corresponding perl data structure. 342Converts a JSON string into the corresponding perl data structure.
256 343
257=item $json = cf::to_json $ref 344=item $json = cf::encode_json $ref
258 345
259Converts a perl data structure into its JSON representation. 346Converts a perl data structure into its JSON representation.
260 347
261=cut 348=cut
262 349
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 350our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 351
265sub to_json ($) { $json_coder->encode ($_[0]) } 352sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 353sub decode_json($) { $json_coder->decode ($_[0]) }
354
355=item cf::post_init { BLOCK }
356
357Execute the given codeblock, I<after> all extensions have been (re-)loaded,
358but I<before> the server starts ticking again.
359
360The cdoeblock will have a single boolean argument to indicate whether this
361is a reload or not.
362
363=cut
364
365sub post_init(&) {
366 push @POST_INIT, shift;
367}
267 368
268=item cf::lock_wait $string 369=item cf::lock_wait $string
269 370
270Wait until the given lock is available. See cf::lock_acquire. 371Wait until the given lock is available. See cf::lock_acquire.
271 372
272=item my $lock = cf::lock_acquire $string 373=item my $lock = cf::lock_acquire $string
273 374
274Wait until the given lock is available and then acquires it and returns 375Wait until the given lock is available and then acquires it and returns
275a Coro::guard object. If the guard object gets destroyed (goes out of scope, 376a L<Guard> object. If the guard object gets destroyed (goes out of scope,
276for example when the coroutine gets canceled), the lock is automatically 377for example when the coroutine gets canceled), the lock is automatically
277returned. 378returned.
278 379
279Locks are *not* recursive, locking from the same coro twice results in a 380Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro. 381deadlocked coro.
286 387
287Return true if the lock is currently active, i.e. somebody has locked it. 388Return true if the lock is currently active, i.e. somebody has locked it.
288 389
289=cut 390=cut
290 391
291our %LOCK; 392our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 393
294sub lock_wait($) { 394sub lock_wait($) {
295 my ($key) = @_; 395 $LOCKS->wait ($_[0]);
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
301
302 # wait for lock, if any
303 while ($LOCK{$key}) {
304 push @{ $LOCK{$key} }, $Coro::current;
305 Coro::schedule;
306 }
307} 396}
308 397
309sub lock_acquire($) { 398sub lock_acquire($) {
310 my ($key) = @_; 399 $LOCKS->guard ($_[0])
311
312 # wait, to be sure we are not locked
313 lock_wait $key;
314
315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
317
318 Coro::guard {
319 delete $LOCKER{$key};#d#
320 # wake up all waiters, to be on the safe side
321 $_->ready for @{ delete $LOCK{$key} };
322 }
323} 400}
324 401
325sub lock_active($) { 402sub lock_active($) {
326 my ($key) = @_; 403 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 404}
330 405
331sub freeze_mainloop { 406sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 407 tick_inhibit_inc;
333 408
334 my $guard = Coro::guard { 409 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start; 410}
336 }; 411
337 $TICK_WATCHER->stop; 412=item cf::periodic $interval, $cb
338 $guard 413
414Like EV::periodic, but randomly selects a starting point so that the actions
415get spread over time.
416
417=cut
418
419sub periodic($$) {
420 my ($interval, $cb) = @_;
421
422 my $start = rand List::Util::min 180, $interval;
423
424 EV::periodic $start, $interval, 0, $cb
339} 425}
340 426
341=item cf::get_slot $time[, $priority[, $name]] 427=item cf::get_slot $time[, $priority[, $name]]
342 428
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 429Allocate $time seconds of blocking CPU time at priority C<$priority>:
351 437
352=cut 438=cut
353 439
354our @SLOT_QUEUE; 440our @SLOT_QUEUE;
355our $SLOT_QUEUE; 441our $SLOT_QUEUE;
442our $SLOT_DECAY = 0.9;
356 443
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 444$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 445$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager"); 446 $Coro::current->desc ("timeslot manager");
360 447
361 my $signal = new Coro::Signal; 448 my $signal = new Coro::Signal;
449 my $busy;
362 450
363 while () { 451 while () {
364 next_job: 452 next_job:
453
365 my $avail = cf::till_tick; 454 my $avail = cf::till_tick;
366 if ($avail > 0.01) { 455
367 for (0 .. $#SLOT_QUEUE) { 456 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) { 457 if ($SLOT_QUEUE[$_][0] <= $avail) {
458 $busy = 0;
369 my $job = splice @SLOT_QUEUE, $_, 1, (); 459 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send; 460 $job->[2]->send;
371 Coro::cede; 461 Coro::cede;
372 goto next_job; 462 goto next_job;
373 } 463 } else {
464 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
374 } 465 }
375 } 466 }
376 467
377 if (@SLOT_QUEUE) { 468 if (@SLOT_QUEUE) {
378 # we do not use wait_for_tick() as it returns immediately when tick is inactive 469 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal; 470 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 471 $signal->wait;
381 } else { 472 } else {
473 $busy = 0;
382 Coro::schedule; 474 Coro::schedule;
383 } 475 }
384 } 476 }
385}; 477};
386 478
387sub get_slot($;$$) { 479sub get_slot($;$$) {
480 return if tick_inhibit || $Coro::current == $Coro::main;
481
388 my ($time, $pri, $name) = @_; 482 my ($time, $pri, $name) = @_;
389 483
390 $time = $TICK * .6 if $time > $TICK * .6; 484 $time = clamp $time, 0.01, $TICK * .6;
485
391 my $sig = new Coro::Signal; 486 my $sig = new Coro::Signal;
392 487
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 488 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 489 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready; 490 $SLOT_QUEUE->ready;
406 501
407BEGIN { *async = \&Coro::async_pool } 502BEGIN { *async = \&Coro::async_pool }
408 503
409=item cf::sync_job { BLOCK } 504=item cf::sync_job { BLOCK }
410 505
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 506The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 507is always able to handle events or runnable, as Deliantra is only
413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 508partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 509acceptable.
415 510
416If it must be done, put the blocking parts into C<sync_job>. This will run 511If it must be done, put the blocking parts into C<sync_job>. This will run
417the given BLOCK in another coroutine while waiting for the result. The 512the given BLOCK in another coroutine while waiting for the result. The
421=cut 516=cut
422 517
423sub sync_job(&) { 518sub sync_job(&) {
424 my ($job) = @_; 519 my ($job) = @_;
425 520
426 if ($Coro::current == $Coro::main) { 521 if (in_main) {
427 my $time = Event::time; 522 my $time = AE::time;
428 523
429 # this is the main coro, too bad, we have to block 524 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 525 # till the operation succeeds, freezing the server :/
431 526
432 LOG llevError, Carp::longmess "sync job";#d# 527 #LOG llevError, Carp::longmess "sync job";#d#
433 528
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 529 my $freeze_guard = freeze_mainloop;
437 530
438 my $busy = 1; 531 my $busy = 1;
439 my @res; 532 my @res;
440 533
441 (async { 534 (async {
442 $Coro::current->desc ("sync job coro"); 535 $Coro::current->desc ("sync job coro");
443 @res = eval { $job->() }; 536 @res = eval { $job->() };
444 warn $@ if $@; 537 error $@ if $@;
445 undef $busy; 538 undef $busy;
446 })->prio (Coro::PRIO_MAX); 539 })->prio (Coro::PRIO_MAX);
447 540
448 while ($busy) { 541 while ($busy) {
449 if (Coro::nready) { 542 if (Coro::nready) {
450 Coro::cede_notself; 543 Coro::cede_notself;
451 } else { 544 } else {
452 Event::one_event; 545 EV::loop EV::LOOP_ONESHOT;
453 } 546 }
454 } 547 }
455 548
456 $time = Event::time - $time; 549 my $time = AE::time - $time;
457 550
458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
459 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460
461 $tick_start += $time; # do not account sync jobs to server load 551 $TICK_START += $time; # do not account sync jobs to server load
462 552
463 wantarray ? @res : $res[0] 553 wantarray ? @res : $res[0]
464 } else { 554 } else {
465 # we are in another coroutine, how wonderful, everything just works 555 # we are in another coroutine, how wonderful, everything just works
466 556
491=item fork_call { }, $args 581=item fork_call { }, $args
492 582
493Executes the given code block with the given arguments in a seperate 583Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 584process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 585Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 586never block itself or use any form of event handling.
497 587
498=cut 588=cut
499 589
500sub fork_call(&@) { 590sub fork_call(&@) {
501 my ($cb, @args) = @_; 591 my ($cb, @args) = @_;
510 }, @args; 600 }, @args;
511 601
512 wantarray ? @res : $res[-1] 602 wantarray ? @res : $res[-1]
513} 603}
514 604
605sub objinfo {
606 (
607 "counter value" => cf::object::object_count,
608 "objects created" => cf::object::create_count,
609 "objects destroyed" => cf::object::destroy_count,
610 "freelist size" => cf::object::free_count,
611 "allocated objects" => cf::object::objects_size,
612 "active objects" => cf::object::actives_size,
613 )
614}
615
616=item $coin = coin_from_name $name
617
618=cut
619
620our %coin_alias = (
621 "silver" => "silvercoin",
622 "silvercoin" => "silvercoin",
623 "silvercoins" => "silvercoin",
624 "gold" => "goldcoin",
625 "goldcoin" => "goldcoin",
626 "goldcoins" => "goldcoin",
627 "platinum" => "platinacoin",
628 "platinumcoin" => "platinacoin",
629 "platinumcoins" => "platinacoin",
630 "platina" => "platinacoin",
631 "platinacoin" => "platinacoin",
632 "platinacoins" => "platinacoin",
633 "royalty" => "royalty",
634 "royalties" => "royalty",
635);
636
637sub coin_from_name($) {
638 $coin_alias{$_[0]}
639 ? cf::arch::find $coin_alias{$_[0]}
640 : undef
641}
642
515=item $value = cf::db_get $family => $key 643=item $value = cf::db_get $family => $key
516 644
517Returns a single value from the environment database. 645Returns a single value from the environment database.
518 646
519=item cf::db_put $family => $key => $value 647=item cf::db_put $family => $key => $value
527within each server. 655within each server.
528 656
529=cut 657=cut
530 658
531sub db_table($) { 659sub db_table($) {
660 cf::error "db_get called from main context"
661 if $Coro::current == $Coro::main;
662
532 my ($name) = @_; 663 my ($name) = @_;
533 my $db = BDB::db_create $DB_ENV; 664 my $db = BDB::db_create $DB_ENV;
534 665
535 eval { 666 eval {
536 $db->set_flags (BDB::CHKSUM); 667 $db->set_flags (BDB::CHKSUM);
546} 677}
547 678
548our $DB; 679our $DB;
549 680
550sub db_init { 681sub db_init {
551 cf::sync_job {
552 $DB ||= db_table "db"; 682 $DB ||= db_table "db";
553 };
554} 683}
555 684
556sub db_get($$) { 685sub db_get($$) {
557 my $key = "$_[0]/$_[1]"; 686 my $key = "$_[0]/$_[1]";
558 687
559 cf::sync_job { 688 cf::error "db_get called from main context"
689 if $Coro::current == $Coro::main;
690
560 BDB::db_get $DB, undef, $key, my $data; 691 BDB::db_get $DB, undef, $key, my $data;
561 692
562 $! ? () 693 $! ? ()
563 : $data 694 : $data
564 }
565} 695}
566 696
567sub db_put($$$) { 697sub db_put($$$) {
568 BDB::dbreq_pri 4; 698 BDB::dbreq_pri 4;
569 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 699 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
625 755
626 my $t1 = Time::HiRes::time; 756 my $t1 = Time::HiRes::time;
627 my $data = $process->(\@data); 757 my $data = $process->(\@data);
628 my $t2 = Time::HiRes::time; 758 my $t2 = Time::HiRes::time;
629 759
630 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 760 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
631 761
632 db_put cache => "$id/data", $data; 762 db_put cache => "$id/data", $data;
633 db_put cache => "$id/md5" , $md5; 763 db_put cache => "$id/md5" , $md5;
634 db_put cache => "$id/meta", $meta; 764 db_put cache => "$id/meta", $meta;
635 765
645 775
646=cut 776=cut
647 777
648sub datalog($@) { 778sub datalog($@) {
649 my ($type, %kv) = @_; 779 my ($type, %kv) = @_;
650 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 780 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
651} 781}
652 782
653=back 783=back
654 784
655=cut 785=cut
656 786
657############################################################################# 787#############################################################################
658 788
659=head2 ATTACHABLE OBJECTS 789=head2 ATTACHABLE OBJECTS
660 790
661Many objects in crossfire are so-called attachable objects. That means you can 791Many objects in deliantra are so-called attachable objects. That means you can
662attach callbacks/event handlers (a collection of which is called an "attachment") 792attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 793to it. All such attachable objects support the following methods.
664 794
665In the following description, CLASS can be any of C<global>, C<object> 795In the following description, CLASS can be any of C<global>, C<object>
666C<player>, C<client> or C<map> (i.e. the attachable objects in 796C<player>, C<client> or C<map> (i.e. the attachable objects in
667Crossfire TRT). 797Deliantra).
668 798
669=over 4 799=over 4
670 800
671=item $attachable->attach ($attachment, key => $value...) 801=item $attachable->attach ($attachment, key => $value...)
672 802
716=item cf::CLASS::attachment $name, ... 846=item cf::CLASS::attachment $name, ...
717 847
718Register an attachment by C<$name> through which attachable objects of the 848Register an attachment by C<$name> through which attachable objects of the
719given CLASS can refer to this attachment. 849given CLASS can refer to this attachment.
720 850
721Some classes such as crossfire maps and objects can specify attachments 851Some classes such as deliantra maps and objects can specify attachments
722that are attached at load/instantiate time, thus the need for a name. 852that are attached at load/instantiate time, thus the need for a name.
723 853
724These calls expect any number of the following handler/hook descriptions: 854These calls expect any number of the following handler/hook descriptions:
725 855
726=over 4 856=over 4
850 980
851 } elsif (exists $cb_id{$type}) { 981 } elsif (exists $cb_id{$type}) {
852 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 982 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
853 983
854 } elsif (ref $type) { 984 } elsif (ref $type) {
855 warn "attaching objects not supported, ignoring.\n"; 985 error "attaching objects not supported, ignoring.\n";
856 986
857 } else { 987 } else {
858 shift @arg; 988 shift @arg;
859 warn "attach argument '$type' not supported, ignoring.\n"; 989 error "attach argument '$type' not supported, ignoring.\n";
860 } 990 }
861 } 991 }
862} 992}
863 993
864sub _object_attach { 994sub _object_attach {
874 _attach $registry, $klass, @attach; 1004 _attach $registry, $klass, @attach;
875 } 1005 }
876 1006
877 $obj->{$name} = \%arg; 1007 $obj->{$name} = \%arg;
878 } else { 1008 } else {
879 warn "object uses attachment '$name' which is not available, postponing.\n"; 1009 info "object uses attachment '$name' which is not available, postponing.\n";
880 } 1010 }
881 1011
882 $obj->{_attachment}{$name} = undef; 1012 $obj->{_attachment}{$name} = undef;
883} 1013}
884 1014
943 1073
944 for (@$callbacks) { 1074 for (@$callbacks) {
945 eval { &{$_->[1]} }; 1075 eval { &{$_->[1]} };
946 1076
947 if ($@) { 1077 if ($@) {
948 warn "$@";
949 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1078 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
950 override; 1079 override;
951 } 1080 }
952 1081
953 return 1 if $override; 1082 return 1 if $override;
954 } 1083 }
955 1084
956 0 1085 0
957} 1086}
958 1087
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1088=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 1089
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1090=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 1091
963Generate an object-specific event with the given arguments. 1092Generate an object-specific event with the given arguments.
964 1093
1017 1146
1018sub reattach { 1147sub reattach {
1019 # basically do the same as instantiate, without calling instantiate 1148 # basically do the same as instantiate, without calling instantiate
1020 my ($obj) = @_; 1149 my ($obj) = @_;
1021 1150
1151 # no longer needed after getting rid of delete_package?
1022 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1152 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1023 1153
1024 my $registry = $obj->registry; 1154 my $registry = $obj->registry;
1025 1155
1026 @$registry = (); 1156 @$registry = ();
1027 1157
1032 for (@$attach) { 1162 for (@$attach) {
1033 my ($klass, @attach) = @$_; 1163 my ($klass, @attach) = @$_;
1034 _attach $registry, $klass, @attach; 1164 _attach $registry, $klass, @attach;
1035 } 1165 }
1036 } else { 1166 } else {
1037 warn "object uses attachment '$name' that is not available, postponing.\n"; 1167 info "object uses attachment '$name' that is not available, postponing.\n";
1038 } 1168 }
1039 } 1169 }
1040} 1170}
1041 1171
1042cf::attachable->attach ( 1172cf::attachable->attach (
1043 prio => -1000000, 1173 prio => -1000000,
1044 on_instantiate => sub { 1174 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1175 my ($obj, $data) = @_;
1046 1176
1047 $data = from_json $data; 1177 $data = decode_json $data;
1048 1178
1049 for (@$data) { 1179 for (@$data) {
1050 my ($name, $args) = @$_; 1180 my ($name, $args) = @$_;
1051 1181
1052 $obj->attach ($name, %{$args || {} }); 1182 $obj->attach ($name, %{$args || {} });
1069 my ($filename, $rdata, $objs) = @_; 1199 my ($filename, $rdata, $objs) = @_;
1070 1200
1071 sync_job { 1201 sync_job {
1072 if (length $$rdata) { 1202 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename); 1203 utf8::decode (my $decname = $filename);
1074 warn sprintf "saving %s (%d,%d)\n", 1204 trace sprintf "saving %s (%d,%d)\n",
1075 $decname, length $$rdata, scalar @$objs; 1205 $decname, length $$rdata, scalar @$objs
1206 if $VERBOSE_IO;
1076 1207
1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1208 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1078 chmod SAVE_MODE, $fh; 1209 aio_chmod $fh, SAVE_MODE;
1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1210 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1080 aio_fsync $fh if $cf::USE_FSYNC; 1211 if ($cf::USE_FSYNC) {
1212 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1213 aio_fsync $fh;
1214 }
1081 close $fh; 1215 aio_close $fh;
1082 1216
1083 if (@$objs) { 1217 if (@$objs) {
1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1218 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1085 chmod SAVE_MODE, $fh; 1219 aio_chmod $fh, SAVE_MODE;
1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1220 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1221 aio_write $fh, 0, (length $data), $data, 0;
1088 aio_fsync $fh if $cf::USE_FSYNC; 1222 if ($cf::USE_FSYNC) {
1223 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1224 aio_fsync $fh;
1225 }
1089 close $fh; 1226 aio_close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1227 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1228 }
1092 } else { 1229 } else {
1093 aio_unlink "$filename.pst"; 1230 aio_unlink "$filename.pst";
1094 } 1231 }
1095 1232
1096 aio_rename "$filename~", $filename; 1233 aio_rename "$filename~", $filename;
1234
1235 $filename =~ s%/[^/]+$%%;
1236 aio_pathsync $filename if $cf::USE_FSYNC;
1097 } else { 1237 } else {
1098 warn "FATAL: $filename~: $!\n"; 1238 error "unable to save objects: $filename~: $!\n";
1099 } 1239 }
1100 } else { 1240 } else {
1101 aio_unlink $filename; 1241 aio_unlink $filename;
1102 aio_unlink "$filename.pst"; 1242 aio_unlink "$filename.pst";
1103 } 1243 }
1127 my $st = eval { Coro::Storable::thaw $av }; 1267 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs}; 1268 $av = $st->{objs};
1129 } 1269 }
1130 1270
1131 utf8::decode (my $decname = $filename); 1271 utf8::decode (my $decname = $filename);
1132 warn sprintf "loading %s (%d,%d)\n", 1272 trace sprintf "loading %s (%d,%d)\n",
1133 $decname, length $data, scalar @{$av || []}; 1273 $decname, length $data, scalar @{$av || []}
1274 if $VERBOSE_IO;
1134 1275
1135 ($data, $av) 1276 ($data, $av)
1136} 1277}
1137 1278
1138=head2 COMMAND CALLBACKS 1279=head2 COMMAND CALLBACKS
1194 my ($name, $cb) = @_; 1335 my ($name, $cb) = @_;
1195 1336
1196 $EXTICMD{$name} = $cb; 1337 $EXTICMD{$name} = $cb;
1197} 1338}
1198 1339
1340use File::Glob ();
1341
1199cf::player->attach ( 1342cf::player->attach (
1200 on_command => sub { 1343 on_unknown_command => sub {
1201 my ($pl, $name, $params) = @_; 1344 my ($pl, $name, $params) = @_;
1202 1345
1203 my $cb = $COMMAND{$name} 1346 my $cb = $COMMAND{$name}
1204 or return; 1347 or return;
1205 1348
1228 1371
1229 $pl->ext_reply ($reply, @reply) 1372 $pl->ext_reply ($reply, @reply)
1230 if $reply; 1373 if $reply;
1231 1374
1232 } else { 1375 } else {
1233 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1376 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1234 } 1377 }
1235 1378
1236 cf::override; 1379 cf::override;
1237 }, 1380 },
1238); 1381);
1239 1382
1383# "readahead" all extensions
1384sub cache_extensions {
1385 my $grp = IO::AIO::aio_group;
1386
1387 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1388 for (grep /\.ext$/, @{$_[0]}) {
1389 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1390 }
1391 };
1392
1393 $grp
1394}
1395
1240sub load_extensions { 1396sub load_extensions {
1397 info "loading extensions...";
1398
1241 cf::sync_job { 1399 cf::sync_job {
1242 my %todo; 1400 my %todo;
1243 1401
1244 for my $path (<$LIBDIR/*.ext>) { 1402 for my $path (<$LIBDIR/*.ext>) {
1245 next unless -r $path; 1403 next unless -r $path;
1263 1421
1264 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1422 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1265 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1423 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1266 1424
1267 $ext{source} = 1425 $ext{source} =
1268 "package $pkg; use strict; use utf8;\n" 1426 "package $pkg; use common::sense;\n"
1269 . "#line 1 \"$path\"\n{\n" 1427 . "#line 1 \"$path\"\n{\n"
1270 . $source 1428 . $source
1271 . "\n};\n1"; 1429 . "\n};\n1";
1272 1430
1273 $todo{$base} = \%ext; 1431 $todo{$base} = \%ext;
1274 } 1432 }
1275 1433
1434 my $pass = 0;
1276 my %done; 1435 my %done;
1277 while (%todo) { 1436 while (%todo) {
1278 my $progress; 1437 my $progress;
1279 1438
1439 ++$pass;
1440
1441 ext:
1280 while (my ($k, $v) = each %todo) { 1442 while (my ($k, $v) = each %todo) {
1281 for (split /,\s*/, $v->{meta}{depends}) { 1443 for (split /,\s*/, $v->{meta}{depends}) {
1282 goto skip 1444 next ext
1283 unless exists $done{$_}; 1445 unless exists $done{$_};
1284 } 1446 }
1285 1447
1286 warn "... loading '$k' into '$v->{pkg}'\n"; 1448 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1287 1449
1288 unless (eval $v->{source}) { 1450 my $active = eval $v->{source};
1451
1452 if (length $@) {
1289 my $msg = $@ ? "$v->{path}: $@\n" 1453 error "$v->{path}: $@\n";
1290 : "$v->{base}: extension inactive.\n"; 1454 undef $@; # work around perl 5.10.0 utf-8 caching bug
1291 1455
1456 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1292 if (exists $v->{meta}{mandatory}) { 1457 if exists $v->{meta}{mandatory};
1293 warn $msg; 1458
1294 warn "mandatory extension failed to load, exiting.\n"; 1459 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1295 exit 1; 1460 delete $todo{$k};
1296 } 1461 } else {
1297 1462 $done{$k} = delete $todo{$k};
1298 warn $msg; 1463 push @EXTS, $v->{pkg};
1464 $progress = 1;
1465
1466 info "$v->{base}: extension inactive.\n"
1467 unless $active;
1299 } 1468 }
1300
1301 $done{$k} = delete $todo{$k};
1302 push @EXTS, $v->{pkg};
1303 $progress = 1;
1304 } 1469 }
1305 1470
1306 skip: 1471 unless ($progress) {
1307 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1472 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1308 unless $progress; 1473
1474 while (my ($k, $v) = each %todo) {
1475 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1476 if exists $v->{meta}{mandatory};
1477 }
1478 }
1309 } 1479 }
1310 }; 1480 };
1311} 1481}
1312 1482
1313############################################################################# 1483#############################################################################
1314 1484
1315=back 1485=back
1316 1486
1317=head2 CORE EXTENSIONS 1487=head2 CORE EXTENSIONS
1318 1488
1319Functions and methods that extend core crossfire objects. 1489Functions and methods that extend core deliantra objects.
1320 1490
1321=cut 1491=cut
1322 1492
1323package cf::player; 1493package cf::player;
1324 1494
1367 1537
1368sub exists($) { 1538sub exists($) {
1369 my ($login) = @_; 1539 my ($login) = @_;
1370 1540
1371 $cf::PLAYER{$login} 1541 $cf::PLAYER{$login}
1372 or cf::sync_job { !aio_stat path $login } 1542 or !aio_stat path $login
1373} 1543}
1374 1544
1375sub find($) { 1545sub find($) {
1376 return $cf::PLAYER{$_[0]} || do { 1546 return $cf::PLAYER{$_[0]} || do {
1377 my $login = $_[0]; 1547 my $login = $_[0];
1389 my $f = new_from_file cf::object::thawer path $login 1559 my $f = new_from_file cf::object::thawer path $login
1390 or return; 1560 or return;
1391 1561
1392 my $pl = cf::player::load_pl $f 1562 my $pl = cf::player::load_pl $f
1393 or return; 1563 or return;
1564
1394 local $cf::PLAYER_LOADING{$login} = $pl; 1565 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs; 1566 $f->resolve_delayed_derefs;
1396 $cf::PLAYER{$login} = $pl 1567 $cf::PLAYER{$login} = $pl
1397 } 1568 }
1398 } 1569 }
1399} 1570}
1400 1571
1572cf::player->attach (
1573 on_load => sub {
1574 my ($pl, $path) = @_;
1575
1576 # restore slots saved in save, below
1577 my $slots = delete $pl->{_slots};
1578
1579 $pl->ob->current_weapon ($slots->[0]);
1580 $pl->combat_ob ($slots->[1]);
1581 $pl->ranged_ob ($slots->[2]);
1582 },
1583);
1584
1401sub save($) { 1585sub save($) {
1402 my ($pl) = @_; 1586 my ($pl) = @_;
1403 1587
1404 return if $pl->{deny_save}; 1588 return if $pl->{deny_save};
1405 1589
1408 1592
1409 return if $pl->{deny_save}; 1593 return if $pl->{deny_save};
1410 1594
1411 aio_mkdir playerdir $pl, 0770; 1595 aio_mkdir playerdir $pl, 0770;
1412 $pl->{last_save} = $cf::RUNTIME; 1596 $pl->{last_save} = $cf::RUNTIME;
1597
1598 cf::get_slot 0.01;
1599
1600 # save slots, to be restored later
1601 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1413 1602
1414 $pl->save_pl ($path); 1603 $pl->save_pl ($path);
1415 cf::cede_to_tick; 1604 cf::cede_to_tick;
1416} 1605}
1417 1606
1449 my ($pl) = @_; 1638 my ($pl) = @_;
1450 1639
1451 my $name = $pl->ob->name; 1640 my $name = $pl->ob->name;
1452 1641
1453 $pl->{deny_save} = 1; 1642 $pl->{deny_save} = 1;
1454 $pl->password ("*"); # this should lock out the player until we nuked the dir 1643 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1455 1644
1456 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1645 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1457 $pl->deactivate; 1646 $pl->deactivate;
1647 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1458 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1648 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1459 $pl->ns->destroy if $pl->ns; 1649 $pl->ns->destroy if $pl->ns;
1460 1650
1461 my $path = playerdir $pl; 1651 my $path = playerdir $pl;
1462 my $temp = "$path~$cf::RUNTIME~deleting~"; 1652 my $temp = "$path~$cf::RUNTIME~deleting~";
1501 1691
1502 for my $login (@$dirs) { 1692 for my $login (@$dirs) {
1503 my $path = path $login; 1693 my $path = path $login;
1504 1694
1505 # a .pst is a dead give-away for a valid player 1695 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") { 1696 # if no pst file found, open and chekc for blocked users
1697 if (aio_stat "$path.pst") {
1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1698 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508 aio_read $fh, 0, 512, my $buf, 0 or next; 1699 aio_read $fh, 0, 512, my $buf, 0 or next;
1509 $buf !~ /^password -------------$/m or next; # official not-valid tag 1700 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 } 1701 }
1511 1702
1515 1706
1516 \@logins 1707 \@logins
1517} 1708}
1518 1709
1519=item $player->maps 1710=item $player->maps
1711
1712=item cf::player::maps $login
1520 1713
1521Returns an arrayref of map paths that are private for this 1714Returns an arrayref of map paths that are private for this
1522player. May block. 1715player. May block.
1523 1716
1524=cut 1717=cut
1542 } 1735 }
1543 1736
1544 \@paths 1737 \@paths
1545} 1738}
1546 1739
1547=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1740=item $protocol_xml = $player->expand_cfpod ($cfpod)
1548 1741
1549Expand crossfire pod fragments into protocol xml. 1742Expand deliantra pod fragments into protocol xml.
1550
1551=cut
1552
1553sub expand_cfpod {
1554 ((my $self), (local $_)) = @_;
1555
1556 # escape & and <
1557 s/&/&amp;/g;
1558 s/(?<![BIUGHT])</&lt;/g;
1559
1560 # this is buggy, it needs to properly take care of nested <'s
1561
1562 1 while
1563 # replace B<>, I<>, U<> etc.
1564 s/B<([^\>]*)>/<b>$1<\/b>/
1565 || s/I<([^\>]*)>/<i>$1<\/i>/
1566 || s/U<([^\>]*)>/<u>$1<\/u>/
1567 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1568 # replace G<male|female> tags
1569 || s{G<([^>|]*)\|([^>]*)>}{
1570 $self->gender ? $2 : $1
1571 }ge
1572 # replace H<hint text>
1573 || s{H<([^\>]*)>}
1574 {
1575 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1576 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1577 "")
1578 [$self->{hintmode}]
1579 }ge;
1580
1581 # create single paragraphs (very hackish)
1582 s/(?<=\S)\n(?=\w)/ /g;
1583
1584 # compress some whitespace
1585 s/\s+\n/\n/g; # ws line-ends
1586 s/\n\n+/\n/g; # double lines
1587 s/^\n+//; # beginning lines
1588 s/\n+$//; # ending lines
1589
1590 $_
1591}
1592
1593sub hintmode {
1594 $_[0]{hintmode} = $_[1] if @_ > 1;
1595 $_[0]{hintmode}
1596}
1597 1743
1598=item $player->ext_reply ($msgid, @msg) 1744=item $player->ext_reply ($msgid, @msg)
1599 1745
1600Sends an ext reply to the player. 1746Sends an ext reply to the player.
1601 1747
1633 1779
1634=cut 1780=cut
1635 1781
1636sub find_by_path($) { 1782sub find_by_path($) {
1637 my ($path) = @_; 1783 my ($path) = @_;
1784
1785 $path =~ s/^~[^\/]*//; # skip ~login
1638 1786
1639 my ($match, $specificity); 1787 my ($match, $specificity);
1640 1788
1641 for my $region (list) { 1789 for my $region (list) {
1642 if ($region->{match} && $path =~ $region->{match}) { 1790 if ($region->{match} && $path =~ $region->{match}) {
1668our $MAX_RESET = 3600; 1816our $MAX_RESET = 3600;
1669our $DEFAULT_RESET = 3000; 1817our $DEFAULT_RESET = 3000;
1670 1818
1671sub generate_random_map { 1819sub generate_random_map {
1672 my ($self, $rmp) = @_; 1820 my ($self, $rmp) = @_;
1821
1822 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1823
1673 # mit "rum" bekleckern, nicht 1824 # mit "rum" bekleckern, nicht
1674 $self->_create_random_map ( 1825 $self->_create_random_map (
1675 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1826 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1676 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1827 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1677 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1828 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1678 $rmp->{exit_on_final_map}, 1829 $rmp->{exit_on_final_map},
1679 $rmp->{xsize}, $rmp->{ysize}, 1830 $rmp->{xsize}, $rmp->{ysize},
1680 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1831 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1681 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1832 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1696 1847
1697sub register { 1848sub register {
1698 my (undef, $regex, $prio) = @_; 1849 my (undef, $regex, $prio) = @_;
1699 my $pkg = caller; 1850 my $pkg = caller;
1700 1851
1701 no strict;
1702 push @{"$pkg\::ISA"}, __PACKAGE__; 1852 push @{"$pkg\::ISA"}, __PACKAGE__;
1703 1853
1704 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1854 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1705} 1855}
1706 1856
1707# also paths starting with '/' 1857# also paths starting with '/'
1708$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1858$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1709 1859
1710sub thawer_merge { 1860sub thawer_merge {
1711 my ($self, $merge) = @_; 1861 my ($self, $merge) = @_;
1712 1862
1713 # we have to keep some variables in memory intact 1863 # we have to keep some variables in memory intact
1799 1949
1800# the temporary/swap location 1950# the temporary/swap location
1801sub save_path { 1951sub save_path {
1802 my ($self) = @_; 1952 my ($self) = @_;
1803 1953
1804 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1954 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1805 "$TMPDIR/$path.map" 1955 "$TMPDIR/$path.map"
1806} 1956}
1807 1957
1808# the unique path, undef == no special unique path 1958# the unique path, undef == no special unique path
1809sub uniq_path { 1959sub uniq_path {
1810 my ($self) = @_; 1960 my ($self) = @_;
1811 1961
1812 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1962 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1813 "$UNIQUEDIR/$path" 1963 "$UNIQUEDIR/$path"
1814}
1815
1816# and all this just because we cannot iterate over
1817# all maps in C++...
1818sub change_all_map_light {
1819 my ($change) = @_;
1820
1821 $_->change_map_light ($change)
1822 for grep $_->outdoor, values %cf::MAP;
1823} 1964}
1824 1965
1825sub decay_objects { 1966sub decay_objects {
1826 my ($self) = @_; 1967 my ($self) = @_;
1827 1968
1911sub find { 2052sub find {
1912 my ($path, $origin) = @_; 2053 my ($path, $origin) = @_;
1913 2054
1914 $path = normalise $path, $origin && $origin->path; 2055 $path = normalise $path, $origin && $origin->path;
1915 2056
1916 cf::lock_wait "map_data:$path";#d#remove 2057 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1917 cf::lock_wait "map_find:$path"; 2058 my $guard2 = cf::lock_acquire "map_find:$path";
1918 2059
1919 $cf::MAP{$path} || do { 2060 $cf::MAP{$path} || do {
1920 my $guard1 = cf::lock_acquire "map_find:$path";
1921 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1922
1923 my $map = new_from_path cf::map $path 2061 my $map = new_from_path cf::map $path
1924 or return; 2062 or return;
1925 2063
1926 $map->{last_save} = $cf::RUNTIME; 2064 $map->{last_save} = $cf::RUNTIME;
1927 2065
1929 or return; 2067 or return;
1930 2068
1931 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2069 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1932 # doing this can freeze the server in a sync job, obviously 2070 # doing this can freeze the server in a sync job, obviously
1933 #$cf::WAIT_FOR_TICK->wait; 2071 #$cf::WAIT_FOR_TICK->wait;
2072 undef $guard2;
1934 undef $guard1; 2073 undef $guard1;
1935 undef $guard2;
1936 $map->reset; 2074 $map->reset;
1937 return find $path; 2075 return find $path;
1938 } 2076 }
1939 2077
1940 $cf::MAP{$path} = $map 2078 $cf::MAP{$path} = $map
1941 } 2079 }
1942} 2080}
1943 2081
1944sub pre_load { } 2082sub pre_load { }
1945sub post_load { } 2083#sub post_load { } # XS
1946 2084
1947sub load { 2085sub load {
1948 my ($self) = @_; 2086 my ($self) = @_;
1949 2087
1950 local $self->{deny_reset} = 1; # loading can take a long time 2088 local $self->{deny_reset} = 1; # loading can take a long time
1967 my $f = new_from_file cf::object::thawer $self->{load_path}; 2105 my $f = new_from_file cf::object::thawer $self->{load_path};
1968 $f->skip_block; 2106 $f->skip_block;
1969 $self->_load_objects ($f) 2107 $self->_load_objects ($f)
1970 or return; 2108 or return;
1971 2109
1972 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2110 $self->post_load_original
1973 if delete $self->{load_original}; 2111 if delete $self->{load_original};
1974 2112
1975 if (my $uniq = $self->uniq_path) { 2113 if (my $uniq = $self->uniq_path) {
1976 utf8::encode $uniq; 2114 utf8::encode $uniq;
1977 unless (aio_stat $uniq) { 2115 unless (aio_stat $uniq) {
1995 unless ($self->{deny_activate}) { 2133 unless ($self->{deny_activate}) {
1996 $self->decay_objects; 2134 $self->decay_objects;
1997 $self->fix_auto_apply; 2135 $self->fix_auto_apply;
1998 $self->update_buttons; 2136 $self->update_buttons;
1999 cf::cede_to_tick; 2137 cf::cede_to_tick;
2000 $self->set_darkness_map;
2001 cf::cede_to_tick;
2002 $self->activate; 2138 $self->activate;
2003 } 2139 }
2004 2140
2005 $self->{last_save} = $cf::RUNTIME; 2141 $self->{last_save} = $cf::RUNTIME;
2006 $self->last_access ($cf::RUNTIME); 2142 $self->last_access ($cf::RUNTIME);
2007 2143
2008 $self->in_memory (cf::MAP_IN_MEMORY); 2144 $self->in_memory (cf::MAP_ACTIVE);
2009 } 2145 }
2010 2146
2011 $self->post_load; 2147 $self->post_load;
2012} 2148}
2013 2149
2150# customize the map for a given player, i.e.
2151# return the _real_ map. used by e.g. per-player
2152# maps to change the path to ~playername/mappath
2014sub customise_for { 2153sub customise_for {
2015 my ($self, $ob) = @_; 2154 my ($self, $ob) = @_;
2016 2155
2017 return find "~" . $ob->name . "/" . $self->{path} 2156 return find "~" . $ob->name . "/" . $self->{path}
2018 if $self->per_player; 2157 if $self->per_player;
2034 or next; 2173 or next;
2035 $neigh = find $neigh, $map 2174 $neigh = find $neigh, $map
2036 or next; 2175 or next;
2037 $neigh->load; 2176 $neigh->load;
2038 2177
2178 # now find the diagonal neighbours
2039 push @neigh, 2179 push @neigh,
2040 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2180 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2041 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2181 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2042 } 2182 }
2043 2183
2050} 2190}
2051 2191
2052sub find_sync { 2192sub find_sync {
2053 my ($path, $origin) = @_; 2193 my ($path, $origin) = @_;
2054 2194
2055 cf::sync_job { find $path, $origin } 2195 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2196 if $Coro::current == $Coro::main;
2197
2198 find $path, $origin
2056} 2199}
2057 2200
2058sub do_load_sync { 2201sub do_load_sync {
2059 my ($map) = @_; 2202 my ($map) = @_;
2060 2203
2061 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2204 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2062 if $Coro::current == $Coro::main; 2205 if $Coro::current == $Coro::main;
2063 2206
2064 cf::sync_job { $map->load }; 2207 $map->load;
2065} 2208}
2066 2209
2067our %MAP_PREFETCH; 2210our %MAP_PREFETCH;
2068our $MAP_PREFETCHER = undef; 2211our $MAP_PREFETCHER = undef;
2069 2212
2071 my ($path, $origin, $load) = @_; 2214 my ($path, $origin, $load) = @_;
2072 2215
2073 $path = normalise $path, $origin && $origin->{path}; 2216 $path = normalise $path, $origin && $origin->{path};
2074 2217
2075 if (my $map = $cf::MAP{$path}) { 2218 if (my $map = $cf::MAP{$path}) {
2076 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2219 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2077 } 2220 }
2078 2221
2079 $MAP_PREFETCH{$path} |= $load; 2222 $MAP_PREFETCH{$path} |= $load;
2080 2223
2081 $MAP_PREFETCHER ||= cf::async { 2224 $MAP_PREFETCHER ||= cf::async {
2095 $MAP_PREFETCHER->prio (6); 2238 $MAP_PREFETCHER->prio (6);
2096 2239
2097 () 2240 ()
2098} 2241}
2099 2242
2243# common code, used by both ->save and ->swapout
2100sub save { 2244sub _save {
2101 my ($self) = @_; 2245 my ($self) = @_;
2102
2103 my $lock = cf::lock_acquire "map_data:$self->{path}";
2104 2246
2105 $self->{last_save} = $cf::RUNTIME; 2247 $self->{last_save} = $cf::RUNTIME;
2106 2248
2107 return unless $self->dirty; 2249 return unless $self->dirty;
2108 2250
2117 2259
2118 cf::async { 2260 cf::async {
2119 $Coro::current->{desc} = "map player save"; 2261 $Coro::current->{desc} = "map player save";
2120 $_->contr->save for $self->players; 2262 $_->contr->save for $self->players;
2121 }; 2263 };
2264
2265 cf::get_slot 0.02;
2122 2266
2123 if ($uniq) { 2267 if ($uniq) {
2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2268 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2125 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2269 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2126 } else { 2270 } else {
2127 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2271 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2128 } 2272 }
2129} 2273}
2130 2274
2275sub save {
2276 my ($self) = @_;
2277
2278 my $lock = cf::lock_acquire "map_data:$self->{path}";
2279
2280 $self->_save;
2281}
2282
2131sub swap_out { 2283sub swap_out {
2132 my ($self) = @_; 2284 my ($self) = @_;
2133 2285
2134 # save first because save cedes
2135 $self->save;
2136
2137 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2286 my $lock = cf::lock_acquire "map_data:$self->{path}";
2138 2287
2288 return if $self->in_memory != cf::MAP_ACTIVE;
2289 return if $self->{deny_save};
2139 return if $self->players; 2290 return if $self->players;
2140 return if $self->in_memory != cf::MAP_IN_MEMORY;
2141 return if $self->{deny_save};
2142 2291
2292 # first deactivate the map and "unlink" it from the core
2293 $self->deactivate;
2294 $_->clear_links_to ($self) for values %cf::MAP;
2143 $self->in_memory (cf::MAP_SWAPPED); 2295 $self->in_memory (cf::MAP_SWAPPED);
2296
2297 # then atomically save
2298 $self->_save;
2299
2300 # then free the map
2301 $self->clear;
2302}
2303
2304sub reset_at {
2305 my ($self) = @_;
2306
2307 # TODO: safety, remove and allow resettable per-player maps
2308 return 1e99 if $self->{deny_reset};
2309
2310 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2311 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2312
2313 $time + $to
2314}
2315
2316sub should_reset {
2317 my ($self) = @_;
2318
2319 $self->reset_at <= $cf::RUNTIME
2320}
2321
2322sub reset {
2323 my ($self) = @_;
2324
2325 my $lock = cf::lock_acquire "map_data:$self->{path}";
2326
2327 return if $self->players;
2328
2329 cf::trace "resetting map ", $self->path, "\n";
2330
2331 $self->in_memory (cf::MAP_SWAPPED);
2332
2333 # need to save uniques path
2334 unless ($self->{deny_save}) {
2335 my $uniq = $self->uniq_path; utf8::encode $uniq;
2336
2337 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2338 if $uniq;
2339 }
2340
2341 delete $cf::MAP{$self->path};
2144 2342
2145 $self->deactivate; 2343 $self->deactivate;
2146 $_->clear_links_to ($self) for values %cf::MAP; 2344 $_->clear_links_to ($self) for values %cf::MAP;
2147 $self->clear; 2345 $self->clear;
2148}
2149
2150sub reset_at {
2151 my ($self) = @_;
2152
2153 # TODO: safety, remove and allow resettable per-player maps
2154 return 1e99 if $self->{deny_reset};
2155
2156 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2157 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2158
2159 $time + $to
2160}
2161
2162sub should_reset {
2163 my ($self) = @_;
2164
2165 $self->reset_at <= $cf::RUNTIME
2166}
2167
2168sub reset {
2169 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172
2173 return if $self->players;
2174
2175 warn "resetting map ", $self->path;
2176
2177 $self->in_memory (cf::MAP_SWAPPED);
2178
2179 # need to save uniques path
2180 unless ($self->{deny_save}) {
2181 my $uniq = $self->uniq_path; utf8::encode $uniq;
2182
2183 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2184 if $uniq;
2185 }
2186
2187 delete $cf::MAP{$self->path};
2188
2189 $self->deactivate;
2190 $_->clear_links_to ($self) for values %cf::MAP;
2191 $self->clear;
2192 2346
2193 $self->unlink_save; 2347 $self->unlink_save;
2194 $self->destroy; 2348 $self->destroy;
2195} 2349}
2196 2350
2204 2358
2205 delete $cf::MAP{$self->path}; 2359 delete $cf::MAP{$self->path};
2206 2360
2207 $self->unlink_save; 2361 $self->unlink_save;
2208 2362
2209 bless $self, "cf::map"; 2363 bless $self, "cf::map::wrap";
2210 delete $self->{deny_reset}; 2364 delete $self->{deny_reset};
2211 $self->{deny_save} = 1; 2365 $self->{deny_save} = 1;
2212 $self->reset_timeout (1); 2366 $self->reset_timeout (1);
2213 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2367 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2214 2368
2263 2417
2264sub unique_maps() { 2418sub unique_maps() {
2265 [ 2419 [
2266 map { 2420 map {
2267 utf8::decode $_; 2421 utf8::decode $_;
2268 /\.map$/ 2422 s/\.map$//; # TODO future compatibility hack
2423 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2424 ? ()
2269 ? normalise $_ 2425 : normalise $_
2270 : ()
2271 } @{ aio_readdir $UNIQUEDIR or [] } 2426 } @{ aio_readdir $UNIQUEDIR or [] }
2272 ] 2427 ]
2273} 2428}
2274 2429
2275package cf; 2430=item cf::map::static_maps
2431
2432Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2433file in the shared directory excluding F</styles> and F</editor>). May
2434block.
2435
2436=cut
2437
2438sub static_maps() {
2439 my @dirs = "";
2440 my @maps;
2441
2442 while (@dirs) {
2443 my $dir = shift @dirs;
2444
2445 next if $dir eq "/styles" || $dir eq "/editor";
2446
2447 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2448 or return;
2449
2450 for (@$files) {
2451 s/\.map$// or next;
2452 utf8::decode $_;
2453 push @maps, "$dir/$_";
2454 }
2455
2456 push @dirs, map "$dir/$_", @$dirs;
2457 }
2458
2459 \@maps
2460}
2276 2461
2277=back 2462=back
2278 2463
2279=head3 cf::object 2464=head3 cf::object
2280 2465
2284 2469
2285=over 4 2470=over 4
2286 2471
2287=item $ob->inv_recursive 2472=item $ob->inv_recursive
2288 2473
2289Returns the inventory of the object _and_ their inventories, recursively. 2474Returns the inventory of the object I<and> their inventories, recursively,
2475but I<not> the object itself.
2290 2476
2291=cut 2477=cut
2292 2478
2293sub inv_recursive_; 2479sub inv_recursive_;
2294sub inv_recursive_ { 2480sub inv_recursive_ {
2299 inv_recursive_ inv $_[0] 2485 inv_recursive_ inv $_[0]
2300} 2486}
2301 2487
2302=item $ref = $ob->ref 2488=item $ref = $ob->ref
2303 2489
2304creates and returns a persistent reference to an objetc that can be stored as a string. 2490Creates and returns a persistent reference to an object that can be stored as a string.
2305 2491
2306=item $ob = cf::object::deref ($refstring) 2492=item $ob = cf::object::deref ($refstring)
2307 2493
2308returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2494returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2309even if the object actually exists. May block. 2495even if the object actually exists. May block.
2341can be C<undef>. Does the right thing when the player is currently in a 2527can be C<undef>. Does the right thing when the player is currently in a
2342dialogue with the given NPC character. 2528dialogue with the given NPC character.
2343 2529
2344=cut 2530=cut
2345 2531
2532our $SAY_CHANNEL = {
2533 id => "say",
2534 title => "Map",
2535 reply => "say ",
2536 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2537};
2538
2539our $CHAT_CHANNEL = {
2540 id => "chat",
2541 title => "Chat",
2542 reply => "chat ",
2543 tooltip => "Player chat and shouts, global to the server.",
2544};
2545
2346# rough implementation of a future "reply" method that works 2546# rough implementation of a future "reply" method that works
2347# with dialog boxes. 2547# with dialog boxes.
2348#TODO: the first argument must go, split into a $npc->reply_to ( method 2548#TODO: the first argument must go, split into a $npc->reply_to ( method
2349sub cf::object::player::reply($$$;$) { 2549sub cf::object::player::reply($$$;$) {
2350 my ($self, $npc, $msg, $flags) = @_; 2550 my ($self, $npc, $msg, $flags) = @_;
2361 my $dialog = $pl->{npc_dialog}; 2561 my $dialog = $pl->{npc_dialog};
2362 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2562 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2363 2563
2364 } else { 2564 } else {
2365 $msg = $npc->name . " says: $msg" if $npc; 2565 $msg = $npc->name . " says: $msg" if $npc;
2366 $self->message ($msg, $flags); 2566 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2367 } 2567 }
2368 } 2568 }
2369} 2569}
2370 2570
2371=item $object->send_msg ($channel, $msg, $color, [extra...]) 2571=item $object->send_msg ($channel, $msg, $color, [extra...])
2396 2596
2397=item $player_object->enter_link 2597=item $player_object->enter_link
2398 2598
2399Freezes the player and moves him/her to a special map (C<{link}>). 2599Freezes the player and moves him/her to a special map (C<{link}>).
2400 2600
2401The player should be reasonably safe there for short amounts of time. You 2601The player should be reasonably safe there for short amounts of time (e.g.
2402I<MUST> call C<leave_link> as soon as possible, though. 2602for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2603though, as the player cannot control the character while it is on the link
2604map.
2403 2605
2404Will never block. 2606Will never block.
2405 2607
2406=item $player_object->leave_link ($map, $x, $y) 2608=item $player_object->leave_link ($map, $x, $y)
2407 2609
2427sub cf::object::player::enter_link { 2629sub cf::object::player::enter_link {
2428 my ($self) = @_; 2630 my ($self) = @_;
2429 2631
2430 $self->deactivate_recursive; 2632 $self->deactivate_recursive;
2431 2633
2634 ++$self->{_link_recursion};
2635
2432 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2636 return if UNIVERSAL::isa $self->map, "ext::map_link";
2433 2637
2434 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2638 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2435 if $self->map && $self->map->{path} ne "{link}"; 2639 if $self->map && $self->map->{path} ne "{link}";
2436 2640
2437 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2641 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2438} 2642}
2439 2643
2440sub cf::object::player::leave_link { 2644sub cf::object::player::leave_link {
2441 my ($self, $map, $x, $y) = @_; 2645 my ($self, $map, $x, $y) = @_;
2442 2646
2459 ($x, $y) = (-1, -1) 2663 ($x, $y) = (-1, -1)
2460 unless (defined $x) && (defined $y); 2664 unless (defined $x) && (defined $y);
2461 2665
2462 # use -1 or undef as default coordinates, not 0, 0 2666 # use -1 or undef as default coordinates, not 0, 0
2463 ($x, $y) = ($map->enter_x, $map->enter_y) 2667 ($x, $y) = ($map->enter_x, $map->enter_y)
2464 if $x <=0 && $y <= 0; 2668 if $x <= 0 && $y <= 0;
2465 2669
2466 $map->load; 2670 $map->load;
2467 $map->load_neighbours; 2671 $map->load_neighbours;
2468 2672
2469 return unless $self->contr->active; 2673 return unless $self->contr->active;
2470 $self->activate_recursive;
2471 2674
2472 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2675 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2473 $self->enter_map ($map, $x, $y); 2676 if ($self->enter_map ($map, $x, $y)) {
2474} 2677 # entering was successful
2678 delete $self->{_link_recursion};
2679 # only activate afterwards, to support waiting in hooks
2680 $self->activate_recursive;
2681 }
2475 2682
2683}
2684
2476=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2685=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2477 2686
2478Moves the player to the given map-path and coordinates by first freezing 2687Moves the player to the given map-path and coordinates by first freezing
2479her, loading and preparing them map, calling the provided $check callback 2688her, loading and preparing them map, calling the provided $check callback
2480that has to return the map if sucecssful, and then unfreezes the player on 2689that has to return the map if sucecssful, and then unfreezes the player on
2481the new (success) or old (failed) map position. In either case, $done will 2690the new (success) or old (failed) map position. In either case, $done will
2482be called at the end of this process. 2691be called at the end of this process.
2483 2692
2693Note that $check will be called with a potentially non-loaded map, so if
2694it needs a loaded map it has to call C<< ->load >>.
2695
2484=cut 2696=cut
2485 2697
2486our $GOTOGEN; 2698our $GOTOGEN;
2487 2699
2488sub cf::object::player::goto { 2700sub cf::object::player::goto {
2489 my ($self, $path, $x, $y, $check, $done) = @_; 2701 my ($self, $path, $x, $y, $check, $done) = @_;
2702
2703 if ($self->{_link_recursion} >= $MAX_LINKS) {
2704 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2705 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2706 ($path, $x, $y) = @$EMERGENCY_POSITION;
2707 }
2490 2708
2491 # do generation counting so two concurrent goto's will be executed in-order 2709 # do generation counting so two concurrent goto's will be executed in-order
2492 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2710 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2493 2711
2494 $self->enter_link; 2712 $self->enter_link;
2518 my $map = eval { 2736 my $map = eval {
2519 my $map = defined $path ? cf::map::find $path : undef; 2737 my $map = defined $path ? cf::map::find $path : undef;
2520 2738
2521 if ($map) { 2739 if ($map) {
2522 $map = $map->customise_for ($self); 2740 $map = $map->customise_for ($self);
2523 $map = $check->($map) if $check && $map; 2741 $map = $check->($map, $x, $y, $self) if $check && $map;
2524 } else { 2742 } else {
2525 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2743 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2526 } 2744 }
2527 2745
2528 $map 2746 $map
2536 if ($gen == $self->{_goto_generation}) { 2754 if ($gen == $self->{_goto_generation}) {
2537 delete $self->{_goto_generation}; 2755 delete $self->{_goto_generation};
2538 $self->leave_link ($map, $x, $y); 2756 $self->leave_link ($map, $x, $y);
2539 } 2757 }
2540 2758
2541 $done->() if $done; 2759 $done->($self) if $done;
2542 })->prio (1); 2760 })->prio (1);
2543} 2761}
2544 2762
2545=item $player_object->enter_exit ($exit_object) 2763=item $player_object->enter_exit ($exit_object)
2546 2764
2566} 2784}
2567 2785
2568sub prepare_random_map { 2786sub prepare_random_map {
2569 my ($exit) = @_; 2787 my ($exit) = @_;
2570 2788
2571 my $guard = cf::lock_acquire "exit_prepare:$exit";
2572
2573 # all this does is basically replace the /! path by 2789 # all this does is basically replace the /! path by
2574 # a new random map path (?random/...) with a seed 2790 # a new random map path (?random/...) with a seed
2575 # that depends on the exit object 2791 # that depends on the exit object
2576 2792
2577 my $rmp = parse_random_map_params $exit->msg; 2793 my $rmp = parse_random_map_params $exit->msg;
2579 if ($exit->map) { 2795 if ($exit->map) {
2580 $rmp->{region} = $exit->region->name; 2796 $rmp->{region} = $exit->region->name;
2581 $rmp->{origin_map} = $exit->map->path; 2797 $rmp->{origin_map} = $exit->map->path;
2582 $rmp->{origin_x} = $exit->x; 2798 $rmp->{origin_x} = $exit->x;
2583 $rmp->{origin_y} = $exit->y; 2799 $rmp->{origin_y} = $exit->y;
2800
2801 $exit->map->touch;
2584 } 2802 }
2585 2803
2586 $rmp->{random_seed} ||= $exit->random_seed; 2804 $rmp->{random_seed} ||= $exit->random_seed;
2587 2805
2588 my $data = cf::to_json $rmp; 2806 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2589 my $md5 = Digest::MD5::md5_hex $data; 2807 my $md5 = Digest::MD5::md5_hex $data;
2590 my $meta = "$RANDOMDIR/$md5.meta"; 2808 my $meta = "$RANDOMDIR/$md5.meta";
2591 2809
2592 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2810 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2593 aio_write $fh, 0, (length $data), $data, 0; 2811 aio_write $fh, 0, (length $data), $data, 0;
2594 undef $fh; 2812 undef $fh;
2595 aio_rename "$meta~", $meta; 2813 aio_rename "$meta~", $meta;
2596 2814
2815 my $slaying = "?random/$md5";
2816
2817 if ($exit->valid) {
2597 $exit->slaying ("?random/$md5"); 2818 $exit->slaying ("?random/$md5");
2598 $exit->msg (undef); 2819 $exit->msg (undef);
2820 }
2599 } 2821 }
2600} 2822}
2601 2823
2602sub cf::object::player::enter_exit { 2824sub cf::object::player::enter_exit {
2603 my ($self, $exit) = @_; 2825 my ($self, $exit) = @_;
2604 2826
2605 return unless $self->type == cf::PLAYER; 2827 return unless $self->type == cf::PLAYER;
2606 2828
2607 if ($exit->slaying eq "/!") {
2608 #TODO: this should de-fi-ni-te-ly not be a sync-job
2609 # the problem is that $exit might not survive long enough
2610 # so it needs to be done right now, right here
2611 cf::sync_job { prepare_random_map $exit };
2612 }
2613
2614 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2615 my $hp = $exit->stats->hp;
2616 my $sp = $exit->stats->sp;
2617
2618 $self->enter_link; 2829 $self->enter_link;
2619 2830
2620 # if exit is damned, update players death & WoR home-position
2621 $self->contr->savebed ($slaying, $hp, $sp)
2622 if $exit->flag (FLAG_DAMNED);
2623
2624 (async { 2831 (async {
2625 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2832 $Coro::current->{desc} = "enter_exit";
2626 2833
2627 $self->deactivate_recursive; # just to be sure
2628 unless (eval { 2834 unless (eval {
2835 $self->deactivate_recursive; # just to be sure
2836
2837 # random map handling
2838 {
2839 my $guard = cf::lock_acquire "exit_prepare:$exit";
2840
2841 prepare_random_map $exit
2842 if $exit->slaying eq "/!";
2843 }
2844
2845 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2846 my $x = $exit->stats->hp;
2847 my $y = $exit->stats->sp;
2848
2629 $self->goto ($slaying, $hp, $sp); 2849 $self->goto ($map, $x, $y);
2630 2850
2851 # if exit is damned, update players death & WoR home-position
2852 $self->contr->savebed ($map, $x, $y)
2853 if $exit->flag (cf::FLAG_DAMNED);
2854
2631 1; 2855 1
2632 }) { 2856 }) {
2633 $self->message ("Something went wrong deep within the crossfire server. " 2857 $self->message ("Something went wrong deep within the deliantra server. "
2634 . "I'll try to bring you back to the map you were before. " 2858 . "I'll try to bring you back to the map you were before. "
2635 . "Please report this to the dungeon master!", 2859 . "Please report this to the dungeon master!",
2636 cf::NDI_UNIQUE | cf::NDI_RED); 2860 cf::NDI_UNIQUE | cf::NDI_RED);
2637 2861
2638 warn "ERROR in enter_exit: $@"; 2862 error "ERROR in enter_exit: $@";
2639 $self->leave_link; 2863 $self->leave_link;
2640 } 2864 }
2641 })->prio (1); 2865 })->prio (1);
2642} 2866}
2643 2867
2655sub cf::client::send_drawinfo { 2879sub cf::client::send_drawinfo {
2656 my ($self, $text, $flags) = @_; 2880 my ($self, $text, $flags) = @_;
2657 2881
2658 utf8::encode $text; 2882 utf8::encode $text;
2659 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2883 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2884}
2885
2886=item $client->send_big_packet ($pkt)
2887
2888Like C<send_packet>, but tries to compress large packets, and fragments
2889them as required.
2890
2891=cut
2892
2893our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2894
2895sub cf::client::send_big_packet {
2896 my ($self, $pkt) = @_;
2897
2898 # try lzf for large packets
2899 $pkt = "lzf " . Compress::LZF::compress $pkt
2900 if 1024 <= length $pkt and $self->{can_lzf};
2901
2902 # split very large packets
2903 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2904 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2905 $pkt = "frag";
2906 }
2907
2908 $self->send_packet ($pkt);
2660} 2909}
2661 2910
2662=item $client->send_msg ($channel, $msg, $color, [extra...]) 2911=item $client->send_msg ($channel, $msg, $color, [extra...])
2663 2912
2664Send a drawinfo or msg packet to the client, formatting the msg for the 2913Send a drawinfo or msg packet to the client, formatting the msg for the
2666the message, with C<log> being the default. If C<$color> is negative, suppress 2915the message, with C<log> being the default. If C<$color> is negative, suppress
2667the message unless the client supports the msg packet. 2916the message unless the client supports the msg packet.
2668 2917
2669=cut 2918=cut
2670 2919
2920# non-persistent channels (usually the info channel)
2671our %CHANNEL = ( 2921our %CHANNEL = (
2922 "c/motd" => {
2923 id => "infobox",
2924 title => "MOTD",
2925 reply => undef,
2926 tooltip => "The message of the day",
2927 },
2672 "c/identify" => { 2928 "c/identify" => {
2673 id => "infobox", 2929 id => "infobox",
2674 title => "Identify", 2930 title => "Identify",
2675 reply => undef, 2931 reply => undef,
2676 tooltip => "Items recently identified", 2932 tooltip => "Items recently identified",
2679 id => "infobox", 2935 id => "infobox",
2680 title => "Examine", 2936 title => "Examine",
2681 reply => undef, 2937 reply => undef,
2682 tooltip => "Signs and other items you examined", 2938 tooltip => "Signs and other items you examined",
2683 }, 2939 },
2940 "c/shopinfo" => {
2941 id => "infobox",
2942 title => "Shop Info",
2943 reply => undef,
2944 tooltip => "What your bargaining skill tells you about the shop",
2945 },
2946 "c/book" => {
2947 id => "infobox",
2948 title => "Book",
2949 reply => undef,
2950 tooltip => "The contents of a note or book",
2951 },
2684 "c/lookat" => { 2952 "c/lookat" => {
2685 id => "infobox", 2953 id => "infobox",
2686 title => "Look", 2954 title => "Look",
2687 reply => undef, 2955 reply => undef,
2688 tooltip => "What you saw there", 2956 tooltip => "What you saw there",
2689 }, 2957 },
2958 "c/who" => {
2959 id => "infobox",
2960 title => "Players",
2961 reply => undef,
2962 tooltip => "Shows players who are currently online",
2963 },
2964 "c/body" => {
2965 id => "infobox",
2966 title => "Body Parts",
2967 reply => undef,
2968 tooltip => "Shows which body parts you posess and are available",
2969 },
2970 "c/statistics" => {
2971 id => "infobox",
2972 title => "Statistics",
2973 reply => undef,
2974 tooltip => "Shows your primary statistics",
2975 },
2976 "c/skills" => {
2977 id => "infobox",
2978 title => "Skills",
2979 reply => undef,
2980 tooltip => "Shows your experience per skill and item power",
2981 },
2982 "c/shopitems" => {
2983 id => "infobox",
2984 title => "Shop Items",
2985 reply => undef,
2986 tooltip => "Shows the items currently for sale in this shop",
2987 },
2988 "c/resistances" => {
2989 id => "infobox",
2990 title => "Resistances",
2991 reply => undef,
2992 tooltip => "Shows your resistances",
2993 },
2994 "c/pets" => {
2995 id => "infobox",
2996 title => "Pets",
2997 reply => undef,
2998 tooltip => "Shows information abotu your pets/a specific pet",
2999 },
3000 "c/perceiveself" => {
3001 id => "infobox",
3002 title => "Perceive Self",
3003 reply => undef,
3004 tooltip => "You gained detailed knowledge about yourself",
3005 },
3006 "c/uptime" => {
3007 id => "infobox",
3008 title => "Uptime",
3009 reply => undef,
3010 tooltip => "How long the server has been running since last restart",
3011 },
3012 "c/mapinfo" => {
3013 id => "infobox",
3014 title => "Map Info",
3015 reply => undef,
3016 tooltip => "Information related to the maps",
3017 },
3018 "c/party" => {
3019 id => "party",
3020 title => "Party",
3021 reply => "gsay ",
3022 tooltip => "Messages and chat related to your party",
3023 },
3024 "c/death" => {
3025 id => "death",
3026 title => "Death",
3027 reply => undef,
3028 tooltip => "Reason for and more info about your most recent death",
3029 },
3030 "c/say" => $SAY_CHANNEL,
3031 "c/chat" => $CHAT_CHANNEL,
2690); 3032);
2691 3033
2692sub cf::client::send_msg { 3034sub cf::client::send_msg {
2693 my ($self, $channel, $msg, $color, @extra) = @_; 3035 my ($self, $channel, $msg, $color, @extra) = @_;
2694 3036
2695 $msg = $self->pl->expand_cfpod ($msg); 3037 $msg = $self->pl->expand_cfpod ($msg)
3038 unless $color & cf::NDI_VERBATIM;
2696 3039
2697 $color &= cf::NDI_CLIENT_MASK; # just in case... 3040 $color &= cf::NDI_CLIENT_MASK; # just in case...
2698 3041
2699 # check predefined channels, for the benefit of C 3042 # check predefined channels, for the benefit of C
2700 if ($CHANNEL{$channel}) { 3043 if ($CHANNEL{$channel}) {
2701 $channel = $CHANNEL{$channel}; 3044 $channel = $CHANNEL{$channel};
2702 3045
2703 $self->ext_msg (channel_info => $channel) 3046 $self->ext_msg (channel_info => $channel);
2704 if $self->can_msg;
2705
2706 $channel = $channel->{id}; 3047 $channel = $channel->{id};
2707 3048
2708 } elsif (ref $channel) { 3049 } elsif (ref $channel) {
2709 # send meta info to client, if not yet sent 3050 # send meta info to client, if not yet sent
2710 unless (exists $self->{channel}{$channel->{id}}) { 3051 unless (exists $self->{channel}{$channel->{id}}) {
2711 $self->{channel}{$channel->{id}} = $channel; 3052 $self->{channel}{$channel->{id}} = $channel;
2712 $self->ext_msg (channel_info => $channel) 3053 $self->ext_msg (channel_info => $channel);
2713 if $self->can_msg;
2714 } 3054 }
2715 3055
2716 $channel = $channel->{id}; 3056 $channel = $channel->{id};
2717 } 3057 }
2718 3058
2719 return unless @extra || length $msg; 3059 return unless @extra || length $msg;
2720 3060
2721 if ($self->can_msg) {
2722 # default colour, mask it out 3061 # default colour, mask it out
2723 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3062 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2724 if $color & cf::NDI_DEF; 3063 if $color & cf::NDI_DEF;
2725 3064
2726 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3065 my $pkt = "msg "
3066 . $self->{json_coder}->encode (
2727 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3067 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2728 } else { 3068 );
2729 if ($color >= 0) {
2730 # replace some tags by gcfclient-compatible ones
2731 for ($msg) {
2732 1 while
2733 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2734 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2735 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2736 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2737 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2738 }
2739 3069
2740 $color &= cf::NDI_COLOR_MASK; 3070 $self->send_big_packet ($pkt);
2741
2742 utf8::encode $msg;
2743
2744 if (0 && $msg =~ /\[/) {
2745 # COMMAND/INFO
2746 $self->send_packet ("drawextinfo $color 10 8 $msg")
2747 } else {
2748 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2749 $self->send_packet ("drawinfo $color $msg")
2750 }
2751 }
2752 }
2753} 3071}
2754 3072
2755=item $client->ext_msg ($type, @msg) 3073=item $client->ext_msg ($type, @msg)
2756 3074
2757Sends an ext event to the client. 3075Sends an ext event to the client.
2760 3078
2761sub cf::client::ext_msg($$@) { 3079sub cf::client::ext_msg($$@) {
2762 my ($self, $type, @msg) = @_; 3080 my ($self, $type, @msg) = @_;
2763 3081
2764 if ($self->extcmd == 2) { 3082 if ($self->extcmd == 2) {
2765 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3083 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2766 } elsif ($self->extcmd == 1) { # TODO: remove 3084 } elsif ($self->extcmd == 1) { # TODO: remove
2767 push @msg, msgtype => "event_$type"; 3085 push @msg, msgtype => "event_$type";
2768 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3086 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2769 } 3087 }
2770} 3088}
2771 3089
2772=item $client->ext_reply ($msgid, @msg) 3090=item $client->ext_reply ($msgid, @msg)
2773 3091
2777 3095
2778sub cf::client::ext_reply($$@) { 3096sub cf::client::ext_reply($$@) {
2779 my ($self, $id, @msg) = @_; 3097 my ($self, $id, @msg) = @_;
2780 3098
2781 if ($self->extcmd == 2) { 3099 if ($self->extcmd == 2) {
2782 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3100 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2783 } elsif ($self->extcmd == 1) { 3101 } elsif ($self->extcmd == 1) {
2784 #TODO: version 1, remove 3102 #TODO: version 1, remove
2785 unshift @msg, msgtype => "reply", msgid => $id; 3103 unshift @msg, msgtype => "reply", msgid => $id;
2786 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3104 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2787 } 3105 }
2788} 3106}
2789 3107
2790=item $success = $client->query ($flags, "text", \&cb) 3108=item $success = $client->query ($flags, "text", \&cb)
2791 3109
2862 3180
2863 $ns->ext_reply ($reply, @reply) 3181 $ns->ext_reply ($reply, @reply)
2864 if $reply; 3182 if $reply;
2865 3183
2866 } else { 3184 } else {
2867 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3185 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2868 } 3186 }
2869 3187
2870 cf::override; 3188 cf::override;
2871 }, 3189 },
2872); 3190);
2892 3210
2893 $coro 3211 $coro
2894} 3212}
2895 3213
2896cf::client->attach ( 3214cf::client->attach (
2897 on_destroy => sub { 3215 on_client_destroy => sub {
2898 my ($ns) = @_; 3216 my ($ns) = @_;
2899 3217
2900 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3218 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2901 }, 3219 },
2902); 3220);
2918our $safe_hole = new Safe::Hole; 3236our $safe_hole = new Safe::Hole;
2919 3237
2920$SIG{FPE} = 'IGNORE'; 3238$SIG{FPE} = 'IGNORE';
2921 3239
2922$safe->permit_only (Opcode::opset qw( 3240$safe->permit_only (Opcode::opset qw(
2923 :base_core :base_mem :base_orig :base_math 3241 :base_core :base_mem :base_orig :base_math :base_loop
2924 grepstart grepwhile mapstart mapwhile 3242 grepstart grepwhile mapstart mapwhile
2925 sort time 3243 sort time
2926)); 3244));
2927 3245
2928# here we export the classes and methods available to script code 3246# here we export the classes and methods available to script code
2931 3249
2932The following functions and methods are available within a safe environment: 3250The following functions and methods are available within a safe environment:
2933 3251
2934 cf::object 3252 cf::object
2935 contr pay_amount pay_player map x y force_find force_add destroy 3253 contr pay_amount pay_player map x y force_find force_add destroy
2936 insert remove name archname title slaying race decrease_ob_nr 3254 insert remove name archname title slaying race decrease split
3255 value
2937 3256
2938 cf::object::player 3257 cf::object::player
2939 player 3258 player
2940 3259
2941 cf::player 3260 cf::player
2946 3265
2947=cut 3266=cut
2948 3267
2949for ( 3268for (
2950 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3269 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2951 insert remove inv name archname title slaying race 3270 insert remove inv nrof name archname title slaying race
2952 decrease_ob_nr destroy)], 3271 decrease split destroy change_exp value msg lore send_msg)],
2953 ["cf::object::player" => qw(player)], 3272 ["cf::object::player" => qw(player)],
2954 ["cf::player" => qw(peaceful)], 3273 ["cf::player" => qw(peaceful send_msg)],
2955 ["cf::map" => qw(trigger)], 3274 ["cf::map" => qw(trigger)],
2956) { 3275) {
2957 no strict 'refs';
2958 my ($pkg, @funs) = @$_; 3276 my ($pkg, @funs) = @$_;
2959 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3277 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2960 for @funs; 3278 for @funs;
2961} 3279}
2962 3280
2977 3295
2978 my $qcode = $code; 3296 my $qcode = $code;
2979 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3297 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2980 $qcode =~ s/\n/\\n/g; 3298 $qcode =~ s/\n/\\n/g;
2981 3299
3300 %vars = (_dummy => 0) unless %vars;
3301
3302 my @res;
2982 local $_; 3303 local $_;
2983 local @safe::cf::_safe_eval_args = values %vars;
2984 3304
2985 my $eval = 3305 my $eval =
2986 "do {\n" 3306 "do {\n"
2987 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3307 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2988 . "#line 0 \"{$qcode}\"\n" 3308 . "#line 0 \"{$qcode}\"\n"
2989 . $code 3309 . $code
2990 . "\n}" 3310 . "\n}"
2991 ; 3311 ;
2992 3312
3313 if ($CFG{safe_eval}) {
2993 sub_generation_inc; 3314 sub_generation_inc;
3315 local @safe::cf::_safe_eval_args = values %vars;
2994 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3316 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2995 sub_generation_inc; 3317 sub_generation_inc;
3318 } else {
3319 local @cf::_safe_eval_args = values %vars;
3320 @res = wantarray ? eval eval : scalar eval $eval;
3321 }
2996 3322
2997 if ($@) { 3323 if ($@) {
2998 warn "$@"; 3324 warn "$@",
2999 warn "while executing safe code '$code'\n"; 3325 "while executing safe code '$code'\n",
3000 warn "with arguments " . (join " ", %vars) . "\n"; 3326 "with arguments " . (join " ", %vars) . "\n";
3001 } 3327 }
3002 3328
3003 wantarray ? @res : $res[0] 3329 wantarray ? @res : $res[0]
3004} 3330}
3005 3331
3019=cut 3345=cut
3020 3346
3021sub register_script_function { 3347sub register_script_function {
3022 my ($fun, $cb) = @_; 3348 my ($fun, $cb) = @_;
3023 3349
3024 no strict 'refs'; 3350 $fun = "safe::$fun" if $CFG{safe_eval};
3025 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3351 *$fun = $safe_hole->wrap ($cb);
3026} 3352}
3027 3353
3028=back 3354=back
3029 3355
3030=cut 3356=cut
3039 # for this (global event?) 3365 # for this (global event?)
3040 %ext::player_env::MUSIC_FACE_CACHE = (); 3366 %ext::player_env::MUSIC_FACE_CACHE = ();
3041 3367
3042 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3368 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3043 3369
3044 warn "loading facedata from $path\n"; 3370 trace "loading facedata from $path\n";
3045 3371
3046 my $facedata; 3372 my $facedata;
3047 0 < aio_load $path, $facedata 3373 0 < aio_load $path, $facedata
3048 or die "$path: $!"; 3374 or die "$path: $!";
3049 3375
3051 3377
3052 $facedata->{version} == 2 3378 $facedata->{version} == 2
3053 or cf::cleanup "$path: version mismatch, cannot proceed."; 3379 or cf::cleanup "$path: version mismatch, cannot proceed.";
3054 3380
3055 # patch in the exptable 3381 # patch in the exptable
3382 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3056 $facedata->{resource}{"res/exp_table"} = { 3383 $facedata->{resource}{"res/exp_table"} = {
3057 type => FT_RSRC, 3384 type => FT_RSRC,
3058 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3385 data => $exp_table,
3386 hash => (Digest::MD5::md5 $exp_table),
3059 }; 3387 };
3060 cf::cede_to_tick; 3388 cf::cede_to_tick;
3061 3389
3062 { 3390 {
3063 my $faces = $facedata->{faceinfo}; 3391 my $faces = $facedata->{faceinfo};
3064 3392
3065 while (my ($face, $info) = each %$faces) { 3393 while (my ($face, $info) = each %$faces) {
3066 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3394 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3395
3067 cf::face::set_visibility $idx, $info->{visibility}; 3396 cf::face::set_visibility $idx, $info->{visibility};
3068 cf::face::set_magicmap $idx, $info->{magicmap}; 3397 cf::face::set_magicmap $idx, $info->{magicmap};
3069 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3398 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3070 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3399 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3071 3400
3072 cf::cede_to_tick; 3401 cf::cede_to_tick;
3073 } 3402 }
3074 3403
3075 while (my ($face, $info) = each %$faces) { 3404 while (my ($face, $info) = each %$faces) {
3076 next unless $info->{smooth}; 3405 next unless $info->{smooth};
3406
3077 my $idx = cf::face::find $face 3407 my $idx = cf::face::find $face
3078 or next; 3408 or next;
3409
3079 if (my $smooth = cf::face::find $info->{smooth}) { 3410 if (my $smooth = cf::face::find $info->{smooth}) {
3080 cf::face::set_smooth $idx, $smooth; 3411 cf::face::set_smooth $idx, $smooth;
3081 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3412 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3082 } else { 3413 } else {
3083 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3414 error "smooth face '$info->{smooth}' not found for face '$face'";
3084 } 3415 }
3085 3416
3086 cf::cede_to_tick; 3417 cf::cede_to_tick;
3087 } 3418 }
3088 } 3419 }
3097 3428
3098 cf::anim::invalidate_all; # d'oh 3429 cf::anim::invalidate_all; # d'oh
3099 } 3430 }
3100 3431
3101 { 3432 {
3102 # TODO: for gcfclient pleasure, we should give resources
3103 # that gcfclient doesn't grok a >10000 face index.
3104 my $res = $facedata->{resource}; 3433 my $res = $facedata->{resource};
3105 3434
3106 my $soundconf = delete $res->{"res/sound.conf"};
3107
3108 while (my ($name, $info) = each %$res) { 3435 while (my ($name, $info) = each %$res) {
3436 if (defined $info->{type}) {
3109 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3437 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3110 my $data;
3111 3438
3112 if ($info->{type} & 1) { 3439 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3113 # prepend meta info 3440 cf::face::set_type $idx, $info->{type};
3114
3115 my $meta = $enc->encode ({
3116 name => $name,
3117 %{ $info->{meta} || {} },
3118 });
3119
3120 $data = pack "(w/a*)*", $meta, $info->{data};
3121 } else { 3441 } else {
3122 $data = $info->{data}; 3442 $RESOURCE{$name} = $info; # unused
3123 } 3443 }
3124 3444
3125 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3126 cf::face::set_type $idx, $info->{type};
3127
3128 cf::cede_to_tick; 3445 cf::cede_to_tick;
3129 } 3446 }
3130
3131 if ($soundconf) {
3132 $soundconf = $enc->decode (delete $soundconf->{data});
3133
3134 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3135 my $sound = $soundconf->{compat}[$_]
3136 or next;
3137
3138 my $face = cf::face::find "sound/$sound->[1]";
3139 cf::sound::set $sound->[0] => $face;
3140 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3141 }
3142
3143 while (my ($k, $v) = each %{$soundconf->{event}}) {
3144 my $face = cf::face::find "sound/$v";
3145 cf::sound::set $k => $face;
3146 }
3147 }
3148 } 3447 }
3448
3449 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3149 3450
3150 1 3451 1
3151} 3452}
3152 3453
3153register_exticmd fx_want => sub { 3454register_exticmd fx_want => sub {
3155 3456
3156 while (my ($k, $v) = each %$want) { 3457 while (my ($k, $v) = each %$want) {
3157 $ns->fx_want ($k, $v); 3458 $ns->fx_want ($k, $v);
3158 } 3459 }
3159}; 3460};
3461
3462sub load_resource_file($) {
3463 my $guard = lock_acquire "load_resource_file";
3464
3465 my $status = load_resource_file_ $_[0];
3466 get_slot 0.1, 100;
3467 cf::arch::commit_load;
3468
3469 $status
3470}
3160 3471
3161sub reload_regions { 3472sub reload_regions {
3162 # HACK to clear player env face cache, we need some signal framework 3473 # HACK to clear player env face cache, we need some signal framework
3163 # for this (global event?) 3474 # for this (global event?)
3164 %ext::player_env::MUSIC_FACE_CACHE = (); 3475 %ext::player_env::MUSIC_FACE_CACHE = ();
3178} 3489}
3179 3490
3180sub reload_archetypes { 3491sub reload_archetypes {
3181 load_resource_file "$DATADIR/archetypes" 3492 load_resource_file "$DATADIR/archetypes"
3182 or die "unable to load archetypes\n"; 3493 or die "unable to load archetypes\n";
3183 #d# NEED to laod twice to resolve forward references
3184 # this really needs to be done in an extra post-pass
3185 # (which needs to be synchronous, so solve it differently)
3186 load_resource_file "$DATADIR/archetypes"
3187 or die "unable to load archetypes\n";
3188} 3494}
3189 3495
3190sub reload_treasures { 3496sub reload_treasures {
3191 load_resource_file "$DATADIR/treasures" 3497 load_resource_file "$DATADIR/treasures"
3192 or die "unable to load treasurelists\n"; 3498 or die "unable to load treasurelists\n";
3193} 3499}
3194 3500
3501sub reload_sound {
3502 trace "loading sound config from $DATADIR/sound\n";
3503
3504 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3505 or die "$DATADIR/sound $!";
3506
3507 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3508
3509 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3510 my $sound = $soundconf->{compat}[$_]
3511 or next;
3512
3513 my $face = cf::face::find "sound/$sound->[1]";
3514 cf::sound::set $sound->[0] => $face;
3515 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3516 }
3517
3518 while (my ($k, $v) = each %{$soundconf->{event}}) {
3519 my $face = cf::face::find "sound/$v";
3520 cf::sound::set $k => $face;
3521 }
3522}
3523
3195sub reload_resources { 3524sub reload_resources {
3196 warn "reloading resource files...\n"; 3525 trace "reloading resource files...\n";
3197 3526
3527 reload_facedata;
3528 reload_sound;
3529 reload_archetypes;
3198 reload_regions; 3530 reload_regions;
3199 reload_facedata;
3200 #reload_archetypes;#d#
3201 reload_archetypes;
3202 reload_treasures; 3531 reload_treasures;
3203 3532
3204 warn "finished reloading resource files\n"; 3533 trace "finished reloading resource files\n";
3205}
3206
3207sub init {
3208 reload_resources;
3209} 3534}
3210 3535
3211sub reload_config { 3536sub reload_config {
3537 trace "reloading config file...\n";
3538
3212 open my $fh, "<:utf8", "$CONFDIR/config" 3539 open my $fh, "<:utf8", "$CONFDIR/config"
3213 or return; 3540 or return;
3214 3541
3215 local $/; 3542 local $/;
3216 *CFG = YAML::Syck::Load <$fh>; 3543 *CFG = YAML::XS::Load scalar <$fh>;
3217 3544
3218 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3545 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3219 3546
3220 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3547 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3221 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3548 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3222 3549
3223 if (exists $CFG{mlockall}) { 3550 if (exists $CFG{mlockall}) {
3225 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3552 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3226 and die "WARNING: m(un)lockall failed: $!\n"; 3553 and die "WARNING: m(un)lockall failed: $!\n";
3227 }; 3554 };
3228 warn $@ if $@; 3555 warn $@ if $@;
3229 } 3556 }
3557
3558 trace "finished reloading resource files\n";
3559}
3560
3561sub pidfile() {
3562 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3563 or die "$PIDFILE: $!";
3564 flock $fh, &Fcntl::LOCK_EX
3565 or die "$PIDFILE: flock: $!";
3566 $fh
3567}
3568
3569# make sure only one server instance is running at any one time
3570sub atomic {
3571 my $fh = pidfile;
3572
3573 my $pid = <$fh>;
3574 kill 9, $pid if $pid > 0;
3575
3576 seek $fh, 0, 0;
3577 print $fh $$;
3578}
3579
3580sub main_loop {
3581 trace "EV::loop starting\n";
3582 if (1) {
3583 EV::loop;
3584 }
3585 trace "EV::loop returned\n";
3586 goto &main_loop unless $REALLY_UNLOOP;
3230} 3587}
3231 3588
3232sub main { 3589sub main {
3590 cf::init_globals; # initialise logging
3591
3592 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3593 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3594 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3595 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3596
3597 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3598
3233 # we must not ever block the main coroutine 3599 # we must not ever block the main coroutine
3234 local $Coro::idle = sub { 3600 local $Coro::idle = sub {
3235 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3601 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3236 (async { 3602 (async {
3237 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3603 $Coro::current->{desc} = "IDLE BUG HANDLER";
3238 Event::one_event; 3604 EV::loop EV::LOOP_ONESHOT;
3239 })->prio (Coro::PRIO_MAX); 3605 })->prio (Coro::PRIO_MAX);
3240 }; 3606 };
3241 3607
3608 evthread_start IO::AIO::poll_fileno;
3609
3610 cf::sync_job {
3611 cf::init_experience;
3612 cf::init_anim;
3613 cf::init_attackmess;
3614 cf::init_dynamic;
3615
3616 cf::load_settings;
3617 cf::load_materials;
3618
3619 reload_resources;
3242 reload_config; 3620 reload_config;
3243 db_init; 3621 db_init;
3622
3623 cf::init_uuid;
3624 cf::init_signals;
3625 cf::init_skills;
3626
3627 cf::init_beforeplay;
3628
3629 atomic;
3630
3244 load_extensions; 3631 load_extensions;
3245 3632
3246 $TICK_WATCHER->start; 3633 utime time, time, $RUNTIMEFILE;
3247 Event::loop; 3634
3635 # no (long-running) fork's whatsoever before this point(!)
3636 use POSIX ();
3637 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3638
3639 (pop @POST_INIT)->(0) while @POST_INIT;
3640 };
3641
3642 cf::object::thawer::errors_are_fatal 0;
3643 info "parse errors in files are no longer fatal from this point on.\n";
3644
3645 main_loop;
3248} 3646}
3249 3647
3250############################################################################# 3648#############################################################################
3251# initialisation and cleanup 3649# initialisation and cleanup
3252 3650
3253# install some emergency cleanup handlers 3651# install some emergency cleanup handlers
3254BEGIN { 3652BEGIN {
3653 our %SIGWATCHER = ();
3255 for my $signal (qw(INT HUP TERM)) { 3654 for my $signal (qw(INT HUP TERM)) {
3256 Event->signal ( 3655 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3257 reentrant => 0,
3258 data => WF_AUTOCANCEL,
3259 signal => $signal,
3260 prio => 0,
3261 cb => sub {
3262 cf::cleanup "SIG$signal"; 3656 cf::cleanup "SIG$signal";
3263 },
3264 ); 3657 };
3265 } 3658 }
3266} 3659}
3267 3660
3268sub write_runtime { 3661sub write_runtime_sync {
3269 my $runtime = "$LOCALDIR/runtime"; 3662 my $t0 = AE::time;
3270 3663
3271 # first touch the runtime file to show we are still running: 3664 # first touch the runtime file to show we are still running:
3272 # the fsync below can take a very very long time. 3665 # the fsync below can take a very very long time.
3273 3666
3274 IO::AIO::aio_utime $runtime, undef, undef; 3667 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3275 3668
3276 my $guard = cf::lock_acquire "write_runtime"; 3669 my $guard = cf::lock_acquire "write_runtime";
3277 3670
3278 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3671 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3279 or return; 3672 or return;
3280 3673
3281 my $value = $cf::RUNTIME + 90 + 10; 3674 my $value = $cf::RUNTIME + 90 + 10;
3282 # 10 is the runtime save interval, for a monotonic clock 3675 # 10 is the runtime save interval, for a monotonic clock
3283 # 60 allows for the watchdog to kill the server. 3676 # 60 allows for the watchdog to kill the server.
3293 aio_utime $fh, undef, undef; 3686 aio_utime $fh, undef, undef;
3294 3687
3295 close $fh 3688 close $fh
3296 or return; 3689 or return;
3297 3690
3298 aio_rename "$runtime~", $runtime 3691 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3299 and return; 3692 and return;
3300 3693
3301 warn "runtime file written.\n"; 3694 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3302 3695
3303 1 3696 1
3697}
3698
3699our $uuid_lock;
3700our $uuid_skip;
3701
3702sub write_uuid_sync($) {
3703 $uuid_skip ||= $_[0];
3704
3705 return if $uuid_lock;
3706 local $uuid_lock = 1;
3707
3708 my $uuid = "$LOCALDIR/uuid";
3709
3710 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3711 or return;
3712
3713 my $value = uuid_seq uuid_cur;
3714
3715 unless ($value) {
3716 info "cowardly refusing to write zero uuid value!\n";
3717 return;
3718 }
3719
3720 my $value = uuid_str $value + $uuid_skip;
3721 $uuid_skip = 0;
3722
3723 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3724 and return;
3725
3726 # always fsync - this file is important
3727 aio_fsync $fh
3728 and return;
3729
3730 close $fh
3731 or return;
3732
3733 aio_rename "$uuid~", $uuid
3734 and return;
3735
3736 trace "uuid file written ($value).\n";
3737
3738 1
3739
3740}
3741
3742sub write_uuid($$) {
3743 my ($skip, $sync) = @_;
3744
3745 $sync ? write_uuid_sync $skip
3746 : async { write_uuid_sync $skip };
3304} 3747}
3305 3748
3306sub emergency_save() { 3749sub emergency_save() {
3307 my $freeze_guard = cf::freeze_mainloop; 3750 my $freeze_guard = cf::freeze_mainloop;
3308 3751
3309 warn "enter emergency perl save\n"; 3752 info "emergency_perl_save: enter\n";
3753
3754 # this is a trade-off: we want to be very quick here, so
3755 # save all maps without fsync, and later call a global sync
3756 # (which in turn might be very very slow)
3757 local $USE_FSYNC = 0;
3310 3758
3311 cf::sync_job { 3759 cf::sync_job {
3760 cf::write_runtime_sync; # external watchdog should not bark
3761
3312 # use a peculiar iteration method to avoid tripping on perl 3762 # use a peculiar iteration method to avoid tripping on perl
3313 # refcount bugs in for. also avoids problems with players 3763 # refcount bugs in for. also avoids problems with players
3314 # and maps saved/destroyed asynchronously. 3764 # and maps saved/destroyed asynchronously.
3315 warn "begin emergency player save\n"; 3765 info "emergency_perl_save: begin player save\n";
3316 for my $login (keys %cf::PLAYER) { 3766 for my $login (keys %cf::PLAYER) {
3317 my $pl = $cf::PLAYER{$login} or next; 3767 my $pl = $cf::PLAYER{$login} or next;
3318 $pl->valid or next; 3768 $pl->valid or next;
3319 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3769 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3320 $pl->save; 3770 $pl->save;
3321 } 3771 }
3322 warn "end emergency player save\n"; 3772 info "emergency_perl_save: end player save\n";
3323 3773
3324 warn "begin emergency map save\n"; 3774 cf::write_runtime_sync; # external watchdog should not bark
3775
3776 info "emergency_perl_save: begin map save\n";
3325 for my $path (keys %cf::MAP) { 3777 for my $path (keys %cf::MAP) {
3326 my $map = $cf::MAP{$path} or next; 3778 my $map = $cf::MAP{$path} or next;
3327 $map->valid or next; 3779 $map->valid or next;
3328 $map->save; 3780 $map->save;
3329 } 3781 }
3330 warn "end emergency map save\n"; 3782 info "emergency_perl_save: end map save\n";
3331 3783
3332 warn "begin emergency database checkpoint\n"; 3784 cf::write_runtime_sync; # external watchdog should not bark
3785
3786 info "emergency_perl_save: begin database checkpoint\n";
3333 BDB::db_env_txn_checkpoint $DB_ENV; 3787 BDB::db_env_txn_checkpoint $DB_ENV;
3334 warn "end emergency database checkpoint\n"; 3788 info "emergency_perl_save: end database checkpoint\n";
3789
3790 info "emergency_perl_save: begin write uuid\n";
3791 write_uuid_sync 1;
3792 info "emergency_perl_save: end write uuid\n";
3793
3794 cf::write_runtime_sync; # external watchdog should not bark
3795
3796 trace "emergency_perl_save: syncing database to disk";
3797 BDB::db_env_txn_checkpoint $DB_ENV;
3798
3799 info "emergency_perl_save: starting sync\n";
3800 IO::AIO::aio_sync sub {
3801 info "emergency_perl_save: finished sync\n";
3802 };
3803
3804 cf::write_runtime_sync; # external watchdog should not bark
3805
3806 trace "emergency_perl_save: flushing outstanding aio requests";
3807 while (IO::AIO::nreqs || BDB::nreqs) {
3808 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3809 }
3810
3811 cf::write_runtime_sync; # external watchdog should not bark
3335 }; 3812 };
3336 3813
3337 warn "leave emergency perl save\n"; 3814 info "emergency_perl_save: leave\n";
3338} 3815}
3339 3816
3340sub post_cleanup { 3817sub post_cleanup {
3341 my ($make_core) = @_; 3818 my ($make_core) = @_;
3342 3819
3820 IO::AIO::flush;
3821
3343 warn Carp::longmess "post_cleanup backtrace" 3822 error Carp::longmess "post_cleanup backtrace"
3344 if $make_core; 3823 if $make_core;
3824
3825 my $fh = pidfile;
3826 unlink $PIDFILE if <$fh> == $$;
3827}
3828
3829# a safer delete_package, copied from Symbol
3830sub clear_package($) {
3831 my $pkg = shift;
3832
3833 # expand to full symbol table name if needed
3834 unless ($pkg =~ /^main::.*::$/) {
3835 $pkg = "main$pkg" if $pkg =~ /^::/;
3836 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3837 $pkg .= '::' unless $pkg =~ /::$/;
3838 }
3839
3840 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3841 my $stem_symtab = *{$stem}{HASH};
3842
3843 defined $stem_symtab and exists $stem_symtab->{$leaf}
3844 or return;
3845
3846 # clear all symbols
3847 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3848 for my $name (keys %$leaf_symtab) {
3849 _gv_clear *{"$pkg$name"};
3850# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3851 }
3345} 3852}
3346 3853
3347sub do_reload_perl() { 3854sub do_reload_perl() {
3348 # can/must only be called in main 3855 # can/must only be called in main
3349 if ($Coro::current != $Coro::main) { 3856 if (in_main) {
3350 warn "can only reload from main coroutine"; 3857 error "can only reload from main coroutine";
3351 return; 3858 return;
3352 } 3859 }
3353 3860
3861 return if $RELOAD++;
3862
3863 my $t1 = AE::time;
3864
3865 while ($RELOAD) {
3354 warn "reloading..."; 3866 info "reloading...";
3355 3867
3356 warn "entering sync_job"; 3868 trace "entering sync_job";
3357 3869
3358 cf::sync_job { 3870 cf::sync_job {
3359 cf::write_runtime; # external watchdog should not bark
3360 cf::emergency_save; 3871 cf::emergency_save;
3361 cf::write_runtime; # external watchdog should not bark
3362 3872
3363 warn "syncing database to disk";
3364 BDB::db_env_txn_checkpoint $DB_ENV;
3365
3366 # if anything goes wrong in here, we should simply crash as we already saved
3367
3368 warn "cancelling all WF_AUTOCANCEL watchers";
3369 for (Event::all_watchers) {
3370 $_->cancel if $_->data & WF_AUTOCANCEL;
3371 }
3372
3373 warn "flushing outstanding aio requests";
3374 for (;;) {
3375 BDB::flush;
3376 IO::AIO::flush;
3377 Coro::cede_notself;
3378 last unless IO::AIO::nreqs || BDB::nreqs;
3379 warn "iterate...";
3380 }
3381
3382 ++$RELOAD;
3383
3384 warn "cancelling all extension coros"; 3873 trace "cancelling all extension coros";
3385 $_->cancel for values %EXT_CORO; 3874 $_->cancel for values %EXT_CORO;
3386 %EXT_CORO = (); 3875 %EXT_CORO = ();
3387 3876
3388 warn "removing commands"; 3877 trace "removing commands";
3389 %COMMAND = (); 3878 %COMMAND = ();
3390 3879
3391 warn "removing ext/exti commands"; 3880 trace "removing ext/exti commands";
3392 %EXTCMD = (); 3881 %EXTCMD = ();
3393 %EXTICMD = (); 3882 %EXTICMD = ();
3394 3883
3395 warn "unloading/nuking all extensions"; 3884 trace "unloading/nuking all extensions";
3396 for my $pkg (@EXTS) { 3885 for my $pkg (@EXTS) {
3397 warn "... unloading $pkg"; 3886 trace "... unloading $pkg";
3398 3887
3399 if (my $cb = $pkg->can ("unload")) { 3888 if (my $cb = $pkg->can ("unload")) {
3400 eval { 3889 eval {
3401 $cb->($pkg); 3890 $cb->($pkg);
3402 1 3891 1
3403 } or warn "$pkg unloaded, but with errors: $@"; 3892 } or error "$pkg unloaded, but with errors: $@";
3893 }
3894
3895 trace "... clearing $pkg";
3896 clear_package $pkg;
3404 } 3897 }
3405 3898
3406 warn "... nuking $pkg";
3407 Symbol::delete_package $pkg;
3408 }
3409
3410 warn "unloading all perl modules loaded from $LIBDIR"; 3899 trace "unloading all perl modules loaded from $LIBDIR";
3411 while (my ($k, $v) = each %INC) { 3900 while (my ($k, $v) = each %INC) {
3412 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3901 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3413 3902
3414 warn "... unloading $k"; 3903 trace "... unloading $k";
3415 delete $INC{$k}; 3904 delete $INC{$k};
3416 3905
3417 $k =~ s/\.pm$//; 3906 $k =~ s/\.pm$//;
3418 $k =~ s/\//::/g; 3907 $k =~ s/\//::/g;
3419 3908
3420 if (my $cb = $k->can ("unload_module")) { 3909 if (my $cb = $k->can ("unload_module")) {
3421 $cb->(); 3910 $cb->();
3911 }
3912
3913 clear_package $k;
3422 } 3914 }
3423 3915
3424 Symbol::delete_package $k;
3425 }
3426
3427 warn "getting rid of safe::, as good as possible"; 3916 trace "getting rid of safe::, as good as possible";
3428 Symbol::delete_package "safe::$_" 3917 clear_package "safe::$_"
3429 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3918 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3430 3919
3431 warn "unloading cf.pm \"a bit\""; 3920 trace "unloading cf.pm \"a bit\"";
3432 delete $INC{"cf.pm"}; 3921 delete $INC{"cf.pm"};
3433 delete $INC{"cf/pod.pm"}; 3922 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3434 3923
3435 # don't, removes xs symbols, too, 3924 # don't, removes xs symbols, too,
3436 # and global variables created in xs 3925 # and global variables created in xs
3437 #Symbol::delete_package __PACKAGE__; 3926 #clear_package __PACKAGE__;
3438 3927
3439 warn "unload completed, starting to reload now"; 3928 info "unload completed, starting to reload now";
3440 3929
3441 warn "reloading cf.pm"; 3930 trace "reloading cf.pm";
3442 require cf; 3931 require cf;
3443 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3932 cf::_connect_to_perl_1;
3444 3933
3445 warn "loading config and database again"; 3934 trace "loading config and database again";
3446 cf::reload_config; 3935 cf::reload_config;
3447 3936
3448 warn "loading extensions"; 3937 trace "loading extensions";
3449 cf::load_extensions; 3938 cf::load_extensions;
3450 3939
3940 if ($REATTACH_ON_RELOAD) {
3451 warn "reattaching attachments to objects/players"; 3941 trace "reattaching attachments to objects/players";
3452 _global_reattach; # objects, sockets 3942 _global_reattach; # objects, sockets
3453 warn "reattaching attachments to maps"; 3943 trace "reattaching attachments to maps";
3454 reattach $_ for values %MAP; 3944 reattach $_ for values %MAP;
3455 warn "reattaching attachments to players"; 3945 trace "reattaching attachments to players";
3456 reattach $_ for values %PLAYER; 3946 reattach $_ for values %PLAYER;
3947 }
3457 3948
3949 trace "running post_init jobs";
3950 (pop @POST_INIT)->(1) while @POST_INIT;
3951
3458 warn "leaving sync_job"; 3952 trace "leaving sync_job";
3459 3953
3460 1 3954 1
3461 } or do { 3955 } or do {
3462 warn $@; 3956 error $@;
3463 warn "error while reloading, exiting."; 3957 cf::cleanup "error while reloading, exiting.";
3464 exit 1; 3958 };
3959
3960 info "reloaded";
3961 --$RELOAD;
3465 }; 3962 }
3466 3963
3467 warn "reloaded"; 3964 $t1 = AE::time - $t1;
3965 info "reload completed in ${t1}s\n";
3468}; 3966};
3469 3967
3470our $RELOAD_WATCHER; # used only during reload 3968our $RELOAD_WATCHER; # used only during reload
3471 3969
3472sub reload_perl() { 3970sub reload_perl() {
3473 # doing reload synchronously and two reloads happen back-to-back, 3971 # doing reload synchronously and two reloads happen back-to-back,
3474 # coro crashes during coro_state_free->destroy here. 3972 # coro crashes during coro_state_free->destroy here.
3475 3973
3476 $RELOAD_WATCHER ||= Event->timer ( 3974 $RELOAD_WATCHER ||= cf::async {
3477 reentrant => 0, 3975 Coro::AIO::aio_wait cache_extensions;
3478 after => 0, 3976
3479 data => WF_AUTOCANCEL, 3977 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3480 cb => sub {
3481 do_reload_perl; 3978 do_reload_perl;
3482 undef $RELOAD_WATCHER; 3979 undef $RELOAD_WATCHER;
3483 }, 3980 };
3484 ); 3981 };
3485} 3982}
3486 3983
3487register_command "reload" => sub { 3984register_command "reload" => sub {
3488 my ($who, $arg) = @_; 3985 my ($who, $arg) = @_;
3489 3986
3502 3999
3503our @WAIT_FOR_TICK; 4000our @WAIT_FOR_TICK;
3504our @WAIT_FOR_TICK_BEGIN; 4001our @WAIT_FOR_TICK_BEGIN;
3505 4002
3506sub wait_for_tick { 4003sub wait_for_tick {
3507 return unless $TICK_WATCHER->is_active;
3508 return if $Coro::current == $Coro::main; 4004 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3509 4005
3510 my $signal = new Coro::Signal; 4006 my $signal = new Coro::Signal;
3511 push @WAIT_FOR_TICK, $signal; 4007 push @WAIT_FOR_TICK, $signal;
3512 $signal->wait; 4008 $signal->wait;
3513} 4009}
3514 4010
3515sub wait_for_tick_begin { 4011sub wait_for_tick_begin {
3516 return unless $TICK_WATCHER->is_active;
3517 return if $Coro::current == $Coro::main; 4012 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3518 4013
3519 my $signal = new Coro::Signal; 4014 my $signal = new Coro::Signal;
3520 push @WAIT_FOR_TICK_BEGIN, $signal; 4015 push @WAIT_FOR_TICK_BEGIN, $signal;
3521 $signal->wait; 4016 $signal->wait;
3522} 4017}
3523 4018
3524$TICK_WATCHER = Event->timer ( 4019sub tick {
3525 reentrant => 0,
3526 parked => 1,
3527 prio => 0,
3528 at => $NEXT_TICK || $TICK,
3529 data => WF_AUTOCANCEL,
3530 cb => sub {
3531 if ($Coro::current != $Coro::main) { 4020 if ($Coro::current != $Coro::main) {
3532 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4021 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3533 unless ++$bug_warning > 10; 4022 unless ++$bug_warning > 10;
3534 return; 4023 return;
3535 } 4024 }
3536 4025
3537 $NOW = $tick_start = Event::time;
3538
3539 cf::server_tick; # one server iteration 4026 cf::server_tick; # one server iteration
3540 4027
3541 $RUNTIME += $TICK; 4028 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3542 $NEXT_TICK += $TICK;
3543 4029
3544 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4030 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3545 $NEXT_RUNTIME_WRITE = $NOW + 10; 4031 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3546 Coro::async_pool { 4032 Coro::async_pool {
3547 $Coro::current->{desc} = "runtime saver"; 4033 $Coro::current->{desc} = "runtime saver";
3548 write_runtime 4034 write_runtime_sync
3549 or warn "ERROR: unable to write runtime file: $!"; 4035 or error "ERROR: unable to write runtime file: $!";
3550 };
3551 } 4036 };
4037 }
3552 4038
3553 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4039 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3554 $sig->send; 4040 $sig->send;
3555 } 4041 }
3556 while (my $sig = shift @WAIT_FOR_TICK) { 4042 while (my $sig = shift @WAIT_FOR_TICK) {
3557 $sig->send; 4043 $sig->send;
3558 } 4044 }
3559 4045
3560 $NOW = Event::time; 4046 $LOAD = ($NOW - $TICK_START) / $TICK;
3561
3562 # if we are delayed by four ticks or more, skip them all
3563 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3564
3565 $TICK_WATCHER->at ($NEXT_TICK);
3566 $TICK_WATCHER->start;
3567
3568 $LOAD = ($NOW - $tick_start) / $TICK;
3569 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4047 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3570 4048
3571 _post_tick; 4049 if (0) {
4050 if ($NEXT_TICK) {
4051 my $jitter = $TICK_START - $NEXT_TICK;
4052 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4053 debug "jitter $JITTER\n";#d#
4054 }
3572 }, 4055 }
3573); 4056}
3574 4057
3575{ 4058{
4059 # configure BDB
4060
3576 BDB::min_parallel 8; 4061 BDB::min_parallel 16;
3577 BDB::max_poll_time $TICK * 0.1; 4062 BDB::max_poll_reqs $TICK * 0.1;
3578 $BDB_POLL_WATCHER = Event->io ( 4063 $AnyEvent::BDB::WATCHER->priority (1);
3579 reentrant => 0,
3580 fd => BDB::poll_fileno,
3581 poll => 'r',
3582 prio => 0,
3583 data => WF_AUTOCANCEL,
3584 cb => \&BDB::poll_cb,
3585 );
3586
3587 BDB::set_sync_prepare {
3588 my $status;
3589 my $current = $Coro::current;
3590 (
3591 sub {
3592 $status = $!;
3593 $current->ready; undef $current;
3594 },
3595 sub {
3596 Coro::schedule while defined $current;
3597 $! = $status;
3598 },
3599 )
3600 };
3601 4064
3602 unless ($DB_ENV) { 4065 unless ($DB_ENV) {
3603 $DB_ENV = BDB::db_env_create; 4066 $DB_ENV = BDB::db_env_create;
3604 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4067 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3605 | BDB::LOG_AUTOREMOVE, 1); 4068 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4069 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3606 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4070 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3607 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4071 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3608 4072
3609 cf::sync_job { 4073 cf::sync_job {
3610 eval { 4074 eval {
3620 4084
3621 cf::cleanup "db_env_open(db): $@" if $@; 4085 cf::cleanup "db_env_open(db): $@" if $@;
3622 }; 4086 };
3623 } 4087 }
3624 4088
3625 $BDB_DEADLOCK_WATCHER = Event->timer ( 4089 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3626 after => 3,
3627 interval => 1,
3628 hard => 1,
3629 prio => 0,
3630 data => WF_AUTOCANCEL,
3631 cb => sub {
3632 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4090 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3633 },
3634 ); 4091 };
3635 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4092 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3636 after => 11,
3637 interval => 60,
3638 hard => 1,
3639 prio => 0,
3640 data => WF_AUTOCANCEL,
3641 cb => sub {
3642 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4093 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3643 },
3644 ); 4094 };
3645 $BDB_TRICKLE_WATCHER = Event->timer ( 4095 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3646 after => 5,
3647 interval => 10,
3648 hard => 1,
3649 prio => 0,
3650 data => WF_AUTOCANCEL,
3651 cb => sub {
3652 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4096 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3653 },
3654 ); 4097 };
3655} 4098}
3656 4099
3657{ 4100{
4101 # configure IO::AIO
4102
3658 IO::AIO::min_parallel 8; 4103 IO::AIO::min_parallel 8;
3659
3660 undef $Coro::AIO::WATCHER;
3661 IO::AIO::max_poll_time $TICK * 0.1; 4104 IO::AIO::max_poll_time $TICK * 0.1;
3662 $AIO_POLL_WATCHER = Event->io ( 4105 undef $AnyEvent::AIO::WATCHER;
3663 reentrant => 0,
3664 data => WF_AUTOCANCEL,
3665 fd => IO::AIO::poll_fileno,
3666 poll => 'r',
3667 prio => 0,
3668 cb => \&IO::AIO::poll_cb,
3669 );
3670} 4106}
3671 4107
3672my $_log_backtrace; 4108my $_log_backtrace;
3673 4109
3674sub _log_backtrace { 4110sub _log_backtrace {
3677 $msg =~ s/\n//; 4113 $msg =~ s/\n//;
3678 4114
3679 # limit the # of concurrent backtraces 4115 # limit the # of concurrent backtraces
3680 if ($_log_backtrace < 2) { 4116 if ($_log_backtrace < 2) {
3681 ++$_log_backtrace; 4117 ++$_log_backtrace;
4118 my $perl_bt = Carp::longmess $msg;
3682 async { 4119 async {
3683 $Coro::current->{desc} = "abt $msg"; 4120 $Coro::current->{desc} = "abt $msg";
3684 4121
3685 my @bt = fork_call { 4122 my @bt = fork_call {
3686 @addr = map { sprintf "%x", $_ } @addr; 4123 @addr = map { sprintf "%x", $_ } @addr;
3697 } 4134 }
3698 4135
3699 @funcs 4136 @funcs
3700 }; 4137 };
3701 4138
3702 LOG llevInfo, "[ABT] $msg\n"; 4139 LOG llevInfo, "[ABT] $perl_bt\n";
4140 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3703 LOG llevInfo, "[ABT] $_\n" for @bt; 4141 LOG llevInfo, "[ABT] $_\n" for @bt;
3704 --$_log_backtrace; 4142 --$_log_backtrace;
3705 }; 4143 };
3706 } else { 4144 } else {
3707 LOG llevInfo, "[ABT] $msg\n"; 4145 LOG llevInfo, "[ABT] $msg\n";
3708 LOG llevInfo, "[ABT] [suppressed]\n"; 4146 LOG llevInfo, "[ABT] [suppressed]\n";
3709 } 4147 }
3710} 4148}
3711 4149
3712# load additional modules 4150# load additional modules
3713use cf::pod; 4151require "cf/$_.pm" for @EXTRA_MODULES;
4152cf::_connect_to_perl_2;
3714 4153
3715END { cf::emergency_save } 4154END { cf::emergency_save }
3716 4155
37171 41561
3718 4157

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines