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.386 by root, Mon Oct 15 17:50:27 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 Coro::cede or Event::one_event; 542 if (Coro::nready) {
543 Coro::cede_notself;
544 } else {
545 EV::loop EV::LOOP_ONESHOT;
450 } 546 }
547 }
451 548
452 $time = Event::time - $time; 549 my $time = AE::time - $time;
453 550
454 LOG llevError | logBacktrace, Carp::longmess "long sync job"
455 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
456
457 $tick_start += $time; # do not account sync jobs to server load 551 $TICK_START += $time; # do not account sync jobs to server load
458 552
459 wantarray ? @res : $res[0] 553 wantarray ? @res : $res[0]
460 } else { 554 } else {
461 # we are in another coroutine, how wonderful, everything just works 555 # we are in another coroutine, how wonderful, everything just works
462 556
487=item fork_call { }, $args 581=item fork_call { }, $args
488 582
489Executes the given code block with the given arguments in a seperate 583Executes the given code block with the given arguments in a seperate
490process, returning the results. Everything must be serialisable with 584process, returning the results. Everything must be serialisable with
491Coro::Storable. May, of course, block. Note that the executed sub may 585Coro::Storable. May, of course, block. Note that the executed sub may
492never block itself or use any form of Event handling. 586never block itself or use any form of event handling.
493 587
494=cut 588=cut
495 589
496sub fork_call(&@) { 590sub fork_call(&@) {
497 my ($cb, @args) = @_; 591 my ($cb, @args) = @_;
506 }, @args; 600 }, @args;
507 601
508 wantarray ? @res : $res[-1] 602 wantarray ? @res : $res[-1]
509} 603}
510 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
511=item $value = cf::db_get $family => $key 643=item $value = cf::db_get $family => $key
512 644
513Returns a single value from the environment database. 645Returns a single value from the environment database.
514 646
515=item cf::db_put $family => $key => $value 647=item cf::db_put $family => $key => $value
523within each server. 655within each server.
524 656
525=cut 657=cut
526 658
527sub db_table($) { 659sub db_table($) {
660 cf::error "db_get called from main context"
661 if $Coro::current == $Coro::main;
662
528 my ($name) = @_; 663 my ($name) = @_;
529 my $db = BDB::db_create $DB_ENV; 664 my $db = BDB::db_create $DB_ENV;
530 665
531 eval { 666 eval {
532 $db->set_flags (BDB::CHKSUM); 667 $db->set_flags (BDB::CHKSUM);
542} 677}
543 678
544our $DB; 679our $DB;
545 680
546sub db_init { 681sub db_init {
547 cf::sync_job {
548 $DB ||= db_table "db"; 682 $DB ||= db_table "db";
549 };
550} 683}
551 684
552sub db_get($$) { 685sub db_get($$) {
553 my $key = "$_[0]/$_[1]"; 686 my $key = "$_[0]/$_[1]";
554 687
555 cf::sync_job { 688 cf::error "db_get called from main context"
689 if $Coro::current == $Coro::main;
690
556 BDB::db_get $DB, undef, $key, my $data; 691 BDB::db_get $DB, undef, $key, my $data;
557 692
558 $! ? () 693 $! ? ()
559 : $data 694 : $data
560 }
561} 695}
562 696
563sub db_put($$$) { 697sub db_put($$$) {
564 BDB::dbreq_pri 4; 698 BDB::dbreq_pri 4;
565 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 699 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
621 755
622 my $t1 = Time::HiRes::time; 756 my $t1 = Time::HiRes::time;
623 my $data = $process->(\@data); 757 my $data = $process->(\@data);
624 my $t2 = Time::HiRes::time; 758 my $t2 = Time::HiRes::time;
625 759
626 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 760 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
627 761
628 db_put cache => "$id/data", $data; 762 db_put cache => "$id/data", $data;
629 db_put cache => "$id/md5" , $md5; 763 db_put cache => "$id/md5" , $md5;
630 db_put cache => "$id/meta", $meta; 764 db_put cache => "$id/meta", $meta;
631 765
641 775
642=cut 776=cut
643 777
644sub datalog($@) { 778sub datalog($@) {
645 my ($type, %kv) = @_; 779 my ($type, %kv) = @_;
646 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 780 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
647} 781}
648 782
649=back 783=back
650 784
651=cut 785=cut
652 786
653############################################################################# 787#############################################################################
654 788
655=head2 ATTACHABLE OBJECTS 789=head2 ATTACHABLE OBJECTS
656 790
657Many 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
658attach callbacks/event handlers (a collection of which is called an "attachment") 792attach callbacks/event handlers (a collection of which is called an "attachment")
659to it. All such attachable objects support the following methods. 793to it. All such attachable objects support the following methods.
660 794
661In 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>
662C<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
663Crossfire TRT). 797Deliantra).
664 798
665=over 4 799=over 4
666 800
667=item $attachable->attach ($attachment, key => $value...) 801=item $attachable->attach ($attachment, key => $value...)
668 802
712=item cf::CLASS::attachment $name, ... 846=item cf::CLASS::attachment $name, ...
713 847
714Register an attachment by C<$name> through which attachable objects of the 848Register an attachment by C<$name> through which attachable objects of the
715given CLASS can refer to this attachment. 849given CLASS can refer to this attachment.
716 850
717Some classes such as crossfire maps and objects can specify attachments 851Some classes such as deliantra maps and objects can specify attachments
718that 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.
719 853
720These calls expect any number of the following handler/hook descriptions: 854These calls expect any number of the following handler/hook descriptions:
721 855
722=over 4 856=over 4
846 980
847 } elsif (exists $cb_id{$type}) { 981 } elsif (exists $cb_id{$type}) {
848 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 982 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
849 983
850 } elsif (ref $type) { 984 } elsif (ref $type) {
851 warn "attaching objects not supported, ignoring.\n"; 985 error "attaching objects not supported, ignoring.\n";
852 986
853 } else { 987 } else {
854 shift @arg; 988 shift @arg;
855 warn "attach argument '$type' not supported, ignoring.\n"; 989 error "attach argument '$type' not supported, ignoring.\n";
856 } 990 }
857 } 991 }
858} 992}
859 993
860sub _object_attach { 994sub _object_attach {
870 _attach $registry, $klass, @attach; 1004 _attach $registry, $klass, @attach;
871 } 1005 }
872 1006
873 $obj->{$name} = \%arg; 1007 $obj->{$name} = \%arg;
874 } else { 1008 } else {
875 warn "object uses attachment '$name' which is not available, postponing.\n"; 1009 info "object uses attachment '$name' which is not available, postponing.\n";
876 } 1010 }
877 1011
878 $obj->{_attachment}{$name} = undef; 1012 $obj->{_attachment}{$name} = undef;
879} 1013}
880 1014
939 1073
940 for (@$callbacks) { 1074 for (@$callbacks) {
941 eval { &{$_->[1]} }; 1075 eval { &{$_->[1]} };
942 1076
943 if ($@) { 1077 if ($@) {
944 warn "$@";
945 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1078 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
946 override; 1079 override;
947 } 1080 }
948 1081
949 return 1 if $override; 1082 return 1 if $override;
950 } 1083 }
951 1084
952 0 1085 0
953} 1086}
954 1087
955=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1088=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
956 1089
957=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1090=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
958 1091
959Generate an object-specific event with the given arguments. 1092Generate an object-specific event with the given arguments.
960 1093
1013 1146
1014sub reattach { 1147sub reattach {
1015 # basically do the same as instantiate, without calling instantiate 1148 # basically do the same as instantiate, without calling instantiate
1016 my ($obj) = @_; 1149 my ($obj) = @_;
1017 1150
1151 # no longer needed after getting rid of delete_package?
1018 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
1019 1153
1020 my $registry = $obj->registry; 1154 my $registry = $obj->registry;
1021 1155
1022 @$registry = (); 1156 @$registry = ();
1023 1157
1028 for (@$attach) { 1162 for (@$attach) {
1029 my ($klass, @attach) = @$_; 1163 my ($klass, @attach) = @$_;
1030 _attach $registry, $klass, @attach; 1164 _attach $registry, $klass, @attach;
1031 } 1165 }
1032 } else { 1166 } else {
1033 warn "object uses attachment '$name' that is not available, postponing.\n"; 1167 info "object uses attachment '$name' that is not available, postponing.\n";
1034 } 1168 }
1035 } 1169 }
1036} 1170}
1037 1171
1038cf::attachable->attach ( 1172cf::attachable->attach (
1039 prio => -1000000, 1173 prio => -1000000,
1040 on_instantiate => sub { 1174 on_instantiate => sub {
1041 my ($obj, $data) = @_; 1175 my ($obj, $data) = @_;
1042 1176
1043 $data = from_json $data; 1177 $data = decode_json $data;
1044 1178
1045 for (@$data) { 1179 for (@$data) {
1046 my ($name, $args) = @$_; 1180 my ($name, $args) = @$_;
1047 1181
1048 $obj->attach ($name, %{$args || {} }); 1182 $obj->attach ($name, %{$args || {} });
1065 my ($filename, $rdata, $objs) = @_; 1199 my ($filename, $rdata, $objs) = @_;
1066 1200
1067 sync_job { 1201 sync_job {
1068 if (length $$rdata) { 1202 if (length $$rdata) {
1069 utf8::decode (my $decname = $filename); 1203 utf8::decode (my $decname = $filename);
1070 warn sprintf "saving %s (%d,%d)\n", 1204 trace sprintf "saving %s (%d,%d)\n",
1071 $decname, length $$rdata, scalar @$objs; 1205 $decname, length $$rdata, scalar @$objs
1206 if $VERBOSE_IO;
1072 1207
1073 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1208 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1074 chmod SAVE_MODE, $fh; 1209 aio_chmod $fh, SAVE_MODE;
1075 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1210 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1076 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 }
1077 close $fh; 1215 aio_close $fh;
1078 1216
1079 if (@$objs) { 1217 if (@$objs) {
1080 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) {
1081 chmod SAVE_MODE, $fh; 1219 aio_chmod $fh, SAVE_MODE;
1082 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs }; 1220 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1083 aio_write $fh, 0, (length $data), $data, 0; 1221 aio_write $fh, 0, (length $data), $data, 0;
1084 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 }
1085 close $fh; 1226 aio_close $fh;
1086 aio_rename "$filename.pst~", "$filename.pst"; 1227 aio_rename "$filename.pst~", "$filename.pst";
1087 } 1228 }
1088 } else { 1229 } else {
1089 aio_unlink "$filename.pst"; 1230 aio_unlink "$filename.pst";
1090 } 1231 }
1091 1232
1092 aio_rename "$filename~", $filename; 1233 aio_rename "$filename~", $filename;
1234
1235 $filename =~ s%/[^/]+$%%;
1236 aio_pathsync $filename if $cf::USE_FSYNC;
1093 } else { 1237 } else {
1094 warn "FATAL: $filename~: $!\n"; 1238 error "unable to save objects: $filename~: $!\n";
1095 } 1239 }
1096 } else { 1240 } else {
1097 aio_unlink $filename; 1241 aio_unlink $filename;
1098 aio_unlink "$filename.pst"; 1242 aio_unlink "$filename.pst";
1099 } 1243 }
1118 1262
1119 unless (aio_stat "$filename.pst") { 1263 unless (aio_stat "$filename.pst") {
1120 (aio_load "$filename.pst", $av) >= 0 1264 (aio_load "$filename.pst", $av) >= 0
1121 or return; 1265 or return;
1122 1266
1123 my $st = eval { Coro::Storable::thaw $av } 1267 my $st = eval { Coro::Storable::thaw $av };
1124 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1125 $av = $st->{objs}; 1268 $av = $st->{objs};
1126 } 1269 }
1127 1270
1128 utf8::decode (my $decname = $filename); 1271 utf8::decode (my $decname = $filename);
1129 warn sprintf "loading %s (%d,%d)\n", 1272 trace sprintf "loading %s (%d,%d)\n",
1130 $decname, length $data, scalar @{$av || []}; 1273 $decname, length $data, scalar @{$av || []}
1274 if $VERBOSE_IO;
1131 1275
1132 ($data, $av) 1276 ($data, $av)
1133} 1277}
1134 1278
1135=head2 COMMAND CALLBACKS 1279=head2 COMMAND CALLBACKS
1191 my ($name, $cb) = @_; 1335 my ($name, $cb) = @_;
1192 1336
1193 $EXTICMD{$name} = $cb; 1337 $EXTICMD{$name} = $cb;
1194} 1338}
1195 1339
1340use File::Glob ();
1341
1196cf::player->attach ( 1342cf::player->attach (
1197 on_command => sub { 1343 on_unknown_command => sub {
1198 my ($pl, $name, $params) = @_; 1344 my ($pl, $name, $params) = @_;
1199 1345
1200 my $cb = $COMMAND{$name} 1346 my $cb = $COMMAND{$name}
1201 or return; 1347 or return;
1202 1348
1225 1371
1226 $pl->ext_reply ($reply, @reply) 1372 $pl->ext_reply ($reply, @reply)
1227 if $reply; 1373 if $reply;
1228 1374
1229 } else { 1375 } else {
1230 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1376 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1231 } 1377 }
1232 1378
1233 cf::override; 1379 cf::override;
1234 }, 1380 },
1235); 1381);
1236 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
1237sub load_extensions { 1396sub load_extensions {
1397 info "loading extensions...";
1398
1238 cf::sync_job { 1399 cf::sync_job {
1239 my %todo; 1400 my %todo;
1240 1401
1241 for my $path (<$LIBDIR/*.ext>) { 1402 for my $path (<$LIBDIR/*.ext>) {
1242 next unless -r $path; 1403 next unless -r $path;
1260 1421
1261 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1422 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1262 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1423 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1263 1424
1264 $ext{source} = 1425 $ext{source} =
1265 "package $pkg; use strict; use utf8;\n" 1426 "package $pkg; use common::sense;\n"
1266 . "#line 1 \"$path\"\n{\n" 1427 . "#line 1 \"$path\"\n{\n"
1267 . $source 1428 . $source
1268 . "\n};\n1"; 1429 . "\n};\n1";
1269 1430
1270 $todo{$base} = \%ext; 1431 $todo{$base} = \%ext;
1271 } 1432 }
1272 1433
1434 my $pass = 0;
1273 my %done; 1435 my %done;
1274 while (%todo) { 1436 while (%todo) {
1275 my $progress; 1437 my $progress;
1276 1438
1439 ++$pass;
1440
1441 ext:
1277 while (my ($k, $v) = each %todo) { 1442 while (my ($k, $v) = each %todo) {
1278 for (split /,\s*/, $v->{meta}{depends}) { 1443 for (split /,\s*/, $v->{meta}{depends}) {
1279 goto skip 1444 next ext
1280 unless exists $done{$_}; 1445 unless exists $done{$_};
1281 } 1446 }
1282 1447
1283 warn "... loading '$k' into '$v->{pkg}'\n"; 1448 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1284 1449
1285 unless (eval $v->{source}) { 1450 my $active = eval $v->{source};
1451
1452 if (length $@) {
1286 my $msg = $@ ? "$v->{path}: $@\n" 1453 error "$v->{path}: $@\n";
1287 : "$v->{base}: extension inactive.\n"; 1454 undef $@; # work around perl 5.10.0 utf-8 caching bug
1288 1455
1456 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1289 if (exists $v->{meta}{mandatory}) { 1457 if exists $v->{meta}{mandatory};
1290 warn $msg; 1458
1291 warn "mandatory extension failed to load, exiting.\n"; 1459 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1292 exit 1; 1460 delete $todo{$k};
1293 } 1461 } else {
1294 1462 $done{$k} = delete $todo{$k};
1295 warn $msg; 1463 push @EXTS, $v->{pkg};
1464 $progress = 1;
1465
1466 info "$v->{base}: extension inactive.\n"
1467 unless $active;
1296 } 1468 }
1297
1298 $done{$k} = delete $todo{$k};
1299 push @EXTS, $v->{pkg};
1300 $progress = 1;
1301 } 1469 }
1302 1470
1303 skip: 1471 unless ($progress) {
1304 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1472 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1305 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 }
1306 } 1479 }
1307 }; 1480 };
1308} 1481}
1309 1482
1310############################################################################# 1483#############################################################################
1311 1484
1312=back 1485=back
1313 1486
1314=head2 CORE EXTENSIONS 1487=head2 CORE EXTENSIONS
1315 1488
1316Functions and methods that extend core crossfire objects. 1489Functions and methods that extend core deliantra objects.
1317 1490
1318=cut 1491=cut
1319 1492
1320package cf::player; 1493package cf::player;
1321 1494
1364 1537
1365sub exists($) { 1538sub exists($) {
1366 my ($login) = @_; 1539 my ($login) = @_;
1367 1540
1368 $cf::PLAYER{$login} 1541 $cf::PLAYER{$login}
1369 or cf::sync_job { !aio_stat path $login } 1542 or !aio_stat path $login
1370} 1543}
1371 1544
1372sub find($) { 1545sub find($) {
1373 return $cf::PLAYER{$_[0]} || do { 1546 return $cf::PLAYER{$_[0]} || do {
1374 my $login = $_[0]; 1547 my $login = $_[0];
1386 my $f = new_from_file cf::object::thawer path $login 1559 my $f = new_from_file cf::object::thawer path $login
1387 or return; 1560 or return;
1388 1561
1389 my $pl = cf::player::load_pl $f 1562 my $pl = cf::player::load_pl $f
1390 or return; 1563 or return;
1564
1391 local $cf::PLAYER_LOADING{$login} = $pl; 1565 local $cf::PLAYER_LOADING{$login} = $pl;
1392 $f->resolve_delayed_derefs; 1566 $f->resolve_delayed_derefs;
1393 $cf::PLAYER{$login} = $pl 1567 $cf::PLAYER{$login} = $pl
1394 } 1568 }
1395 } 1569 }
1396} 1570}
1397 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
1398sub save($) { 1585sub save($) {
1399 my ($pl) = @_; 1586 my ($pl) = @_;
1400 1587
1401 return if $pl->{deny_save}; 1588 return if $pl->{deny_save};
1402 1589
1405 1592
1406 return if $pl->{deny_save}; 1593 return if $pl->{deny_save};
1407 1594
1408 aio_mkdir playerdir $pl, 0770; 1595 aio_mkdir playerdir $pl, 0770;
1409 $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];
1410 1602
1411 $pl->save_pl ($path); 1603 $pl->save_pl ($path);
1412 cf::cede_to_tick; 1604 cf::cede_to_tick;
1413} 1605}
1414 1606
1446 my ($pl) = @_; 1638 my ($pl) = @_;
1447 1639
1448 my $name = $pl->ob->name; 1640 my $name = $pl->ob->name;
1449 1641
1450 $pl->{deny_save} = 1; 1642 $pl->{deny_save} = 1;
1451 $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
1452 1644
1453 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1645 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1454 $pl->deactivate; 1646 $pl->deactivate;
1647 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1455 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1648 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1456 $pl->ns->destroy if $pl->ns; 1649 $pl->ns->destroy if $pl->ns;
1457 1650
1458 my $path = playerdir $pl; 1651 my $path = playerdir $pl;
1459 my $temp = "$path~$cf::RUNTIME~deleting~"; 1652 my $temp = "$path~$cf::RUNTIME~deleting~";
1498 1691
1499 for my $login (@$dirs) { 1692 for my $login (@$dirs) {
1500 my $path = path $login; 1693 my $path = path $login;
1501 1694
1502 # a .pst is a dead give-away for a valid player 1695 # a .pst is a dead give-away for a valid player
1503 unless (-e "$path.pst") { 1696 # if no pst file found, open and chekc for blocked users
1697 if (aio_stat "$path.pst") {
1504 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1698 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1505 aio_read $fh, 0, 512, my $buf, 0 or next; 1699 aio_read $fh, 0, 512, my $buf, 0 or next;
1506 $buf !~ /^password -------------$/m or next; # official not-valid tag 1700 $buf !~ /^password -------------$/m or next; # official not-valid tag
1507 } 1701 }
1508 1702
1512 1706
1513 \@logins 1707 \@logins
1514} 1708}
1515 1709
1516=item $player->maps 1710=item $player->maps
1711
1712=item cf::player::maps $login
1517 1713
1518Returns an arrayref of map paths that are private for this 1714Returns an arrayref of map paths that are private for this
1519player. May block. 1715player. May block.
1520 1716
1521=cut 1717=cut
1539 } 1735 }
1540 1736
1541 \@paths 1737 \@paths
1542} 1738}
1543 1739
1544=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1740=item $protocol_xml = $player->expand_cfpod ($cfpod)
1545 1741
1546Expand crossfire pod fragments into protocol xml. 1742Expand deliantra pod fragments into protocol xml.
1547
1548=cut
1549
1550sub expand_cfpod {
1551 ((my $self), (local $_)) = @_;
1552
1553 # escape & and <
1554 s/&/&amp;/g;
1555 s/(?<![BIUGHT])</&lt;/g;
1556
1557 # this is buggy, it needs to properly take care of nested <'s
1558
1559 1 while
1560 # replace B<>, I<>, U<> etc.
1561 s/B<([^\>]*)>/<b>$1<\/b>/
1562 || s/I<([^\>]*)>/<i>$1<\/i>/
1563 || s/U<([^\>]*)>/<u>$1<\/u>/
1564 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1565 # replace G<male|female> tags
1566 || s{G<([^>|]*)\|([^>]*)>}{
1567 $self->gender ? $2 : $1
1568 }ge
1569 # replace H<hint text>
1570 || s{H<([^\>]*)>}
1571 {
1572 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1573 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1574 "")
1575 [$self->{hintmode}]
1576 }ge;
1577
1578 # create single paragraphs (very hackish)
1579 s/(?<=\S)\n(?=\w)/ /g;
1580
1581 # compress some whitespace
1582 s/\s+\n/\n/g; # ws line-ends
1583 s/\n\n+/\n/g; # double lines
1584 s/^\n+//; # beginning lines
1585 s/\n+$//; # ending lines
1586
1587 $_
1588}
1589
1590sub hintmode {
1591 $_[0]{hintmode} = $_[1] if @_ > 1;
1592 $_[0]{hintmode}
1593}
1594 1743
1595=item $player->ext_reply ($msgid, @msg) 1744=item $player->ext_reply ($msgid, @msg)
1596 1745
1597Sends an ext reply to the player. 1746Sends an ext reply to the player.
1598 1747
1630 1779
1631=cut 1780=cut
1632 1781
1633sub find_by_path($) { 1782sub find_by_path($) {
1634 my ($path) = @_; 1783 my ($path) = @_;
1784
1785 $path =~ s/^~[^\/]*//; # skip ~login
1635 1786
1636 my ($match, $specificity); 1787 my ($match, $specificity);
1637 1788
1638 for my $region (list) { 1789 for my $region (list) {
1639 if ($region->{match} && $path =~ $region->{match}) { 1790 if ($region->{match} && $path =~ $region->{match}) {
1665our $MAX_RESET = 3600; 1816our $MAX_RESET = 3600;
1666our $DEFAULT_RESET = 3000; 1817our $DEFAULT_RESET = 3000;
1667 1818
1668sub generate_random_map { 1819sub generate_random_map {
1669 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
1670 # mit "rum" bekleckern, nicht 1824 # mit "rum" bekleckern, nicht
1671 $self->_create_random_map ( 1825 $self->_create_random_map (
1672 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1826 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1673 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1827 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1674 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1828 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1675 $rmp->{exit_on_final_map}, 1829 $rmp->{exit_on_final_map},
1676 $rmp->{xsize}, $rmp->{ysize}, 1830 $rmp->{xsize}, $rmp->{ysize},
1677 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1831 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1678 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1832 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1693 1847
1694sub register { 1848sub register {
1695 my (undef, $regex, $prio) = @_; 1849 my (undef, $regex, $prio) = @_;
1696 my $pkg = caller; 1850 my $pkg = caller;
1697 1851
1698 no strict;
1699 push @{"$pkg\::ISA"}, __PACKAGE__; 1852 push @{"$pkg\::ISA"}, __PACKAGE__;
1700 1853
1701 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1854 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1702} 1855}
1703 1856
1704# also paths starting with '/' 1857# also paths starting with '/'
1705$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1858$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1706 1859
1707sub thawer_merge { 1860sub thawer_merge {
1708 my ($self, $merge) = @_; 1861 my ($self, $merge) = @_;
1709 1862
1710 # we have to keep some variables in memory intact 1863 # we have to keep some variables in memory intact
1796 1949
1797# the temporary/swap location 1950# the temporary/swap location
1798sub save_path { 1951sub save_path {
1799 my ($self) = @_; 1952 my ($self) = @_;
1800 1953
1801 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1954 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1802 "$TMPDIR/$path.map" 1955 "$TMPDIR/$path.map"
1803} 1956}
1804 1957
1805# the unique path, undef == no special unique path 1958# the unique path, undef == no special unique path
1806sub uniq_path { 1959sub uniq_path {
1807 my ($self) = @_; 1960 my ($self) = @_;
1808 1961
1809 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1962 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1810 "$UNIQUEDIR/$path" 1963 "$UNIQUEDIR/$path"
1811}
1812
1813# and all this just because we cannot iterate over
1814# all maps in C++...
1815sub change_all_map_light {
1816 my ($change) = @_;
1817
1818 $_->change_map_light ($change)
1819 for grep $_->outdoor, values %cf::MAP;
1820} 1964}
1821 1965
1822sub decay_objects { 1966sub decay_objects {
1823 my ($self) = @_; 1967 my ($self) = @_;
1824 1968
1908sub find { 2052sub find {
1909 my ($path, $origin) = @_; 2053 my ($path, $origin) = @_;
1910 2054
1911 $path = normalise $path, $origin && $origin->path; 2055 $path = normalise $path, $origin && $origin->path;
1912 2056
1913 cf::lock_wait "map_data:$path";#d#remove 2057 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1914 cf::lock_wait "map_find:$path"; 2058 my $guard2 = cf::lock_acquire "map_find:$path";
1915 2059
1916 $cf::MAP{$path} || do { 2060 $cf::MAP{$path} || do {
1917 my $guard1 = cf::lock_acquire "map_find:$path";
1918 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1919
1920 my $map = new_from_path cf::map $path 2061 my $map = new_from_path cf::map $path
1921 or return; 2062 or return;
1922 2063
1923 $map->{last_save} = $cf::RUNTIME; 2064 $map->{last_save} = $cf::RUNTIME;
1924 2065
1926 or return; 2067 or return;
1927 2068
1928 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2069 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1929 # doing this can freeze the server in a sync job, obviously 2070 # doing this can freeze the server in a sync job, obviously
1930 #$cf::WAIT_FOR_TICK->wait; 2071 #$cf::WAIT_FOR_TICK->wait;
2072 undef $guard2;
1931 undef $guard1; 2073 undef $guard1;
1932 undef $guard2;
1933 $map->reset; 2074 $map->reset;
1934 return find $path; 2075 return find $path;
1935 } 2076 }
1936 2077
1937 $cf::MAP{$path} = $map 2078 $cf::MAP{$path} = $map
1938 } 2079 }
1939} 2080}
1940 2081
1941sub pre_load { } 2082sub pre_load { }
1942sub post_load { } 2083#sub post_load { } # XS
1943 2084
1944sub load { 2085sub load {
1945 my ($self) = @_; 2086 my ($self) = @_;
1946 2087
1947 local $self->{deny_reset} = 1; # loading can take a long time 2088 local $self->{deny_reset} = 1; # loading can take a long time
1964 my $f = new_from_file cf::object::thawer $self->{load_path}; 2105 my $f = new_from_file cf::object::thawer $self->{load_path};
1965 $f->skip_block; 2106 $f->skip_block;
1966 $self->_load_objects ($f) 2107 $self->_load_objects ($f)
1967 or return; 2108 or return;
1968 2109
1969 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2110 $self->post_load_original
1970 if delete $self->{load_original}; 2111 if delete $self->{load_original};
1971 2112
1972 if (my $uniq = $self->uniq_path) { 2113 if (my $uniq = $self->uniq_path) {
1973 utf8::encode $uniq; 2114 utf8::encode $uniq;
1974 unless (aio_stat $uniq) { 2115 unless (aio_stat $uniq) {
1992 unless ($self->{deny_activate}) { 2133 unless ($self->{deny_activate}) {
1993 $self->decay_objects; 2134 $self->decay_objects;
1994 $self->fix_auto_apply; 2135 $self->fix_auto_apply;
1995 $self->update_buttons; 2136 $self->update_buttons;
1996 cf::cede_to_tick; 2137 cf::cede_to_tick;
1997 $self->set_darkness_map;
1998 cf::cede_to_tick;
1999 $self->activate; 2138 $self->activate;
2000 } 2139 }
2001 2140
2002 $self->{last_save} = $cf::RUNTIME; 2141 $self->{last_save} = $cf::RUNTIME;
2003 $self->last_access ($cf::RUNTIME); 2142 $self->last_access ($cf::RUNTIME);
2004 2143
2005 $self->in_memory (cf::MAP_IN_MEMORY); 2144 $self->in_memory (cf::MAP_ACTIVE);
2006 } 2145 }
2007 2146
2008 $self->post_load; 2147 $self->post_load;
2009} 2148}
2010 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
2011sub customise_for { 2153sub customise_for {
2012 my ($self, $ob) = @_; 2154 my ($self, $ob) = @_;
2013 2155
2014 return find "~" . $ob->name . "/" . $self->{path} 2156 return find "~" . $ob->name . "/" . $self->{path}
2015 if $self->per_player; 2157 if $self->per_player;
2031 or next; 2173 or next;
2032 $neigh = find $neigh, $map 2174 $neigh = find $neigh, $map
2033 or next; 2175 or next;
2034 $neigh->load; 2176 $neigh->load;
2035 2177
2178 # now find the diagonal neighbours
2036 push @neigh, 2179 push @neigh,
2037 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2180 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2038 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2181 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2039 } 2182 }
2040 2183
2047} 2190}
2048 2191
2049sub find_sync { 2192sub find_sync {
2050 my ($path, $origin) = @_; 2193 my ($path, $origin) = @_;
2051 2194
2052 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
2053} 2199}
2054 2200
2055sub do_load_sync { 2201sub do_load_sync {
2056 my ($map) = @_; 2202 my ($map) = @_;
2057 2203
2058 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2204 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2059 if $Coro::current == $Coro::main; 2205 if $Coro::current == $Coro::main;
2060 2206
2061 cf::sync_job { $map->load }; 2207 $map->load;
2062} 2208}
2063 2209
2064our %MAP_PREFETCH; 2210our %MAP_PREFETCH;
2065our $MAP_PREFETCHER = undef; 2211our $MAP_PREFETCHER = undef;
2066 2212
2068 my ($path, $origin, $load) = @_; 2214 my ($path, $origin, $load) = @_;
2069 2215
2070 $path = normalise $path, $origin && $origin->{path}; 2216 $path = normalise $path, $origin && $origin->{path};
2071 2217
2072 if (my $map = $cf::MAP{$path}) { 2218 if (my $map = $cf::MAP{$path}) {
2073 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2219 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2074 } 2220 }
2075 2221
2076 $MAP_PREFETCH{$path} |= $load; 2222 $MAP_PREFETCH{$path} |= $load;
2077 2223
2078 $MAP_PREFETCHER ||= cf::async { 2224 $MAP_PREFETCHER ||= cf::async {
2092 $MAP_PREFETCHER->prio (6); 2238 $MAP_PREFETCHER->prio (6);
2093 2239
2094 () 2240 ()
2095} 2241}
2096 2242
2243# common code, used by both ->save and ->swapout
2097sub save { 2244sub _save {
2098 my ($self) = @_; 2245 my ($self) = @_;
2099
2100 my $lock = cf::lock_acquire "map_data:$self->{path}";
2101 2246
2102 $self->{last_save} = $cf::RUNTIME; 2247 $self->{last_save} = $cf::RUNTIME;
2103 2248
2104 return unless $self->dirty; 2249 return unless $self->dirty;
2105 2250
2114 2259
2115 cf::async { 2260 cf::async {
2116 $Coro::current->{desc} = "map player save"; 2261 $Coro::current->{desc} = "map player save";
2117 $_->contr->save for $self->players; 2262 $_->contr->save for $self->players;
2118 }; 2263 };
2264
2265 cf::get_slot 0.02;
2119 2266
2120 if ($uniq) { 2267 if ($uniq) {
2121 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2268 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2122 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2269 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2123 } else { 2270 } else {
2124 $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);
2125 } 2272 }
2126} 2273}
2127 2274
2275sub save {
2276 my ($self) = @_;
2277
2278 my $lock = cf::lock_acquire "map_data:$self->{path}";
2279
2280 $self->_save;
2281}
2282
2128sub swap_out { 2283sub swap_out {
2129 my ($self) = @_; 2284 my ($self) = @_;
2130 2285
2131 # save first because save cedes
2132 $self->save;
2133
2134 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2286 my $lock = cf::lock_acquire "map_data:$self->{path}";
2135 2287
2288 return if $self->in_memory != cf::MAP_ACTIVE;
2289 return if $self->{deny_save};
2136 return if $self->players; 2290 return if $self->players;
2137 return if $self->in_memory != cf::MAP_IN_MEMORY;
2138 return if $self->{deny_save};
2139 2291
2292 # first deactivate the map and "unlink" it from the core
2293 $self->deactivate;
2294 $_->clear_links_to ($self) for values %cf::MAP;
2140 $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};
2141 2342
2142 $self->deactivate; 2343 $self->deactivate;
2143 $_->clear_links_to ($self) for values %cf::MAP; 2344 $_->clear_links_to ($self) for values %cf::MAP;
2144 $self->clear; 2345 $self->clear;
2145}
2146
2147sub reset_at {
2148 my ($self) = @_;
2149
2150 # TODO: safety, remove and allow resettable per-player maps
2151 return 1e99 if $self->{deny_reset};
2152
2153 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2154 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2155
2156 $time + $to
2157}
2158
2159sub should_reset {
2160 my ($self) = @_;
2161
2162 $self->reset_at <= $cf::RUNTIME
2163}
2164
2165sub reset {
2166 my ($self) = @_;
2167
2168 my $lock = cf::lock_acquire "map_data:$self->{path}";
2169
2170 return if $self->players;
2171
2172 warn "resetting map ", $self->path;
2173
2174 $self->in_memory (cf::MAP_SWAPPED);
2175
2176 # need to save uniques path
2177 unless ($self->{deny_save}) {
2178 my $uniq = $self->uniq_path; utf8::encode $uniq;
2179
2180 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2181 if $uniq;
2182 }
2183
2184 delete $cf::MAP{$self->path};
2185
2186 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP;
2188 $self->clear;
2189 2346
2190 $self->unlink_save; 2347 $self->unlink_save;
2191 $self->destroy; 2348 $self->destroy;
2192} 2349}
2193 2350
2201 2358
2202 delete $cf::MAP{$self->path}; 2359 delete $cf::MAP{$self->path};
2203 2360
2204 $self->unlink_save; 2361 $self->unlink_save;
2205 2362
2206 bless $self, "cf::map"; 2363 bless $self, "cf::map::wrap";
2207 delete $self->{deny_reset}; 2364 delete $self->{deny_reset};
2208 $self->{deny_save} = 1; 2365 $self->{deny_save} = 1;
2209 $self->reset_timeout (1); 2366 $self->reset_timeout (1);
2210 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2367 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2211 2368
2260 2417
2261sub unique_maps() { 2418sub unique_maps() {
2262 [ 2419 [
2263 map { 2420 map {
2264 utf8::decode $_; 2421 utf8::decode $_;
2265 /\.map$/ 2422 s/\.map$//; # TODO future compatibility hack
2423 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2424 ? ()
2266 ? normalise $_ 2425 : normalise $_
2267 : ()
2268 } @{ aio_readdir $UNIQUEDIR or [] } 2426 } @{ aio_readdir $UNIQUEDIR or [] }
2269 ] 2427 ]
2270} 2428}
2271 2429
2272package 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}
2273 2461
2274=back 2462=back
2275 2463
2276=head3 cf::object 2464=head3 cf::object
2277 2465
2281 2469
2282=over 4 2470=over 4
2283 2471
2284=item $ob->inv_recursive 2472=item $ob->inv_recursive
2285 2473
2286Returns 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.
2287 2476
2288=cut 2477=cut
2289 2478
2290sub inv_recursive_; 2479sub inv_recursive_;
2291sub inv_recursive_ { 2480sub inv_recursive_ {
2296 inv_recursive_ inv $_[0] 2485 inv_recursive_ inv $_[0]
2297} 2486}
2298 2487
2299=item $ref = $ob->ref 2488=item $ref = $ob->ref
2300 2489
2301creates 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.
2302 2491
2303=item $ob = cf::object::deref ($refstring) 2492=item $ob = cf::object::deref ($refstring)
2304 2493
2305returns 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,
2306even if the object actually exists. May block. 2495even if the object actually exists. May block.
2338can 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
2339dialogue with the given NPC character. 2528dialogue with the given NPC character.
2340 2529
2341=cut 2530=cut
2342 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
2343# rough implementation of a future "reply" method that works 2546# rough implementation of a future "reply" method that works
2344# with dialog boxes. 2547# with dialog boxes.
2345#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
2346sub cf::object::player::reply($$$;$) { 2549sub cf::object::player::reply($$$;$) {
2347 my ($self, $npc, $msg, $flags) = @_; 2550 my ($self, $npc, $msg, $flags) = @_;
2358 my $dialog = $pl->{npc_dialog}; 2561 my $dialog = $pl->{npc_dialog};
2359 $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));
2360 2563
2361 } else { 2564 } else {
2362 $msg = $npc->name . " says: $msg" if $npc; 2565 $msg = $npc->name . " says: $msg" if $npc;
2363 $self->message ($msg, $flags); 2566 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2364 } 2567 }
2365 } 2568 }
2366} 2569}
2367 2570
2368=item $object->send_msg ($channel, $msg, $color, [extra...]) 2571=item $object->send_msg ($channel, $msg, $color, [extra...])
2393 2596
2394=item $player_object->enter_link 2597=item $player_object->enter_link
2395 2598
2396Freezes 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}>).
2397 2600
2398The 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.
2399I<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.
2400 2605
2401Will never block. 2606Will never block.
2402 2607
2403=item $player_object->leave_link ($map, $x, $y) 2608=item $player_object->leave_link ($map, $x, $y)
2404 2609
2424sub cf::object::player::enter_link { 2629sub cf::object::player::enter_link {
2425 my ($self) = @_; 2630 my ($self) = @_;
2426 2631
2427 $self->deactivate_recursive; 2632 $self->deactivate_recursive;
2428 2633
2634 ++$self->{_link_recursion};
2635
2429 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2636 return if UNIVERSAL::isa $self->map, "ext::map_link";
2430 2637
2431 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2638 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2432 if $self->map && $self->map->{path} ne "{link}"; 2639 if $self->map && $self->map->{path} ne "{link}";
2433 2640
2434 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2641 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2435} 2642}
2436 2643
2437sub cf::object::player::leave_link { 2644sub cf::object::player::leave_link {
2438 my ($self, $map, $x, $y) = @_; 2645 my ($self, $map, $x, $y) = @_;
2439 2646
2456 ($x, $y) = (-1, -1) 2663 ($x, $y) = (-1, -1)
2457 unless (defined $x) && (defined $y); 2664 unless (defined $x) && (defined $y);
2458 2665
2459 # use -1 or undef as default coordinates, not 0, 0 2666 # use -1 or undef as default coordinates, not 0, 0
2460 ($x, $y) = ($map->enter_x, $map->enter_y) 2667 ($x, $y) = ($map->enter_x, $map->enter_y)
2461 if $x <=0 && $y <= 0; 2668 if $x <= 0 && $y <= 0;
2462 2669
2463 $map->load; 2670 $map->load;
2464 $map->load_neighbours; 2671 $map->load_neighbours;
2465 2672
2466 return unless $self->contr->active; 2673 return unless $self->contr->active;
2467 $self->activate_recursive;
2468 2674
2469 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2675 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2470 $self->enter_map ($map, $x, $y); 2676 if ($self->enter_map ($map, $x, $y)) {
2471} 2677 # entering was successful
2678 delete $self->{_link_recursion};
2679 # only activate afterwards, to support waiting in hooks
2680 $self->activate_recursive;
2681 }
2472 2682
2683}
2684
2473=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)]])
2474 2686
2475Moves 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
2476her, loading and preparing them map, calling the provided $check callback 2688her, loading and preparing them map, calling the provided $check callback
2477that 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
2478the 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
2479be called at the end of this process. 2691be called at the end of this process.
2480 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
2481=cut 2696=cut
2482 2697
2483our $GOTOGEN; 2698our $GOTOGEN;
2484 2699
2485sub cf::object::player::goto { 2700sub cf::object::player::goto {
2486 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 }
2487 2708
2488 # 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
2489 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2710 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2490 2711
2491 $self->enter_link; 2712 $self->enter_link;
2515 my $map = eval { 2736 my $map = eval {
2516 my $map = defined $path ? cf::map::find $path : undef; 2737 my $map = defined $path ? cf::map::find $path : undef;
2517 2738
2518 if ($map) { 2739 if ($map) {
2519 $map = $map->customise_for ($self); 2740 $map = $map->customise_for ($self);
2520 $map = $check->($map) if $check && $map; 2741 $map = $check->($map, $x, $y, $self) if $check && $map;
2521 } else { 2742 } else {
2522 $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);
2523 } 2744 }
2524 2745
2525 $map 2746 $map
2533 if ($gen == $self->{_goto_generation}) { 2754 if ($gen == $self->{_goto_generation}) {
2534 delete $self->{_goto_generation}; 2755 delete $self->{_goto_generation};
2535 $self->leave_link ($map, $x, $y); 2756 $self->leave_link ($map, $x, $y);
2536 } 2757 }
2537 2758
2538 $done->() if $done; 2759 $done->($self) if $done;
2539 })->prio (1); 2760 })->prio (1);
2540} 2761}
2541 2762
2542=item $player_object->enter_exit ($exit_object) 2763=item $player_object->enter_exit ($exit_object)
2543 2764
2563} 2784}
2564 2785
2565sub prepare_random_map { 2786sub prepare_random_map {
2566 my ($exit) = @_; 2787 my ($exit) = @_;
2567 2788
2568 my $guard = cf::lock_acquire "exit_prepare:$exit";
2569
2570 # all this does is basically replace the /! path by 2789 # all this does is basically replace the /! path by
2571 # a new random map path (?random/...) with a seed 2790 # a new random map path (?random/...) with a seed
2572 # that depends on the exit object 2791 # that depends on the exit object
2573 2792
2574 my $rmp = parse_random_map_params $exit->msg; 2793 my $rmp = parse_random_map_params $exit->msg;
2576 if ($exit->map) { 2795 if ($exit->map) {
2577 $rmp->{region} = $exit->region->name; 2796 $rmp->{region} = $exit->region->name;
2578 $rmp->{origin_map} = $exit->map->path; 2797 $rmp->{origin_map} = $exit->map->path;
2579 $rmp->{origin_x} = $exit->x; 2798 $rmp->{origin_x} = $exit->x;
2580 $rmp->{origin_y} = $exit->y; 2799 $rmp->{origin_y} = $exit->y;
2800
2801 $exit->map->touch;
2581 } 2802 }
2582 2803
2583 $rmp->{random_seed} ||= $exit->random_seed; 2804 $rmp->{random_seed} ||= $exit->random_seed;
2584 2805
2585 my $data = cf::to_json $rmp; 2806 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2586 my $md5 = Digest::MD5::md5_hex $data; 2807 my $md5 = Digest::MD5::md5_hex $data;
2587 my $meta = "$RANDOMDIR/$md5.meta"; 2808 my $meta = "$RANDOMDIR/$md5.meta";
2588 2809
2589 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2810 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2590 aio_write $fh, 0, (length $data), $data, 0; 2811 aio_write $fh, 0, (length $data), $data, 0;
2591 undef $fh; 2812 undef $fh;
2592 aio_rename "$meta~", $meta; 2813 aio_rename "$meta~", $meta;
2593 2814
2815 my $slaying = "?random/$md5";
2816
2817 if ($exit->valid) {
2594 $exit->slaying ("?random/$md5"); 2818 $exit->slaying ("?random/$md5");
2595 $exit->msg (undef); 2819 $exit->msg (undef);
2820 }
2596 } 2821 }
2597} 2822}
2598 2823
2599sub cf::object::player::enter_exit { 2824sub cf::object::player::enter_exit {
2600 my ($self, $exit) = @_; 2825 my ($self, $exit) = @_;
2601 2826
2602 return unless $self->type == cf::PLAYER; 2827 return unless $self->type == cf::PLAYER;
2603 2828
2604 if ($exit->slaying eq "/!") {
2605 #TODO: this should de-fi-ni-te-ly not be a sync-job
2606 # the problem is that $exit might not survive long enough
2607 # so it needs to be done right now, right here
2608 cf::sync_job { prepare_random_map $exit };
2609 }
2610
2611 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2612 my $hp = $exit->stats->hp;
2613 my $sp = $exit->stats->sp;
2614
2615 $self->enter_link; 2829 $self->enter_link;
2616 2830
2617 # if exit is damned, update players death & WoR home-position
2618 $self->contr->savebed ($slaying, $hp, $sp)
2619 if $exit->flag (FLAG_DAMNED);
2620
2621 (async { 2831 (async {
2622 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2832 $Coro::current->{desc} = "enter_exit";
2623 2833
2624 $self->deactivate_recursive; # just to be sure
2625 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
2626 $self->goto ($slaying, $hp, $sp); 2849 $self->goto ($map, $x, $y);
2627 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
2628 1; 2855 1
2629 }) { 2856 }) {
2630 $self->message ("Something went wrong deep within the crossfire server. " 2857 $self->message ("Something went wrong deep within the deliantra server. "
2631 . "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. "
2632 . "Please report this to the dungeon master!", 2859 . "Please report this to the dungeon master!",
2633 cf::NDI_UNIQUE | cf::NDI_RED); 2860 cf::NDI_UNIQUE | cf::NDI_RED);
2634 2861
2635 warn "ERROR in enter_exit: $@"; 2862 error "ERROR in enter_exit: $@";
2636 $self->leave_link; 2863 $self->leave_link;
2637 } 2864 }
2638 })->prio (1); 2865 })->prio (1);
2639} 2866}
2640 2867
2652sub cf::client::send_drawinfo { 2879sub cf::client::send_drawinfo {
2653 my ($self, $text, $flags) = @_; 2880 my ($self, $text, $flags) = @_;
2654 2881
2655 utf8::encode $text; 2882 utf8::encode $text;
2656 $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);
2657} 2909}
2658 2910
2659=item $client->send_msg ($channel, $msg, $color, [extra...]) 2911=item $client->send_msg ($channel, $msg, $color, [extra...])
2660 2912
2661Send 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
2663the 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
2664the message unless the client supports the msg packet. 2916the message unless the client supports the msg packet.
2665 2917
2666=cut 2918=cut
2667 2919
2920# non-persistent channels (usually the info channel)
2668our %CHANNEL = ( 2921our %CHANNEL = (
2922 "c/motd" => {
2923 id => "infobox",
2924 title => "MOTD",
2925 reply => undef,
2926 tooltip => "The message of the day",
2927 },
2669 "c/identify" => { 2928 "c/identify" => {
2670 id => "infobox", 2929 id => "infobox",
2671 title => "Identify", 2930 title => "Identify",
2672 reply => undef, 2931 reply => undef,
2673 tooltip => "Items recently identified", 2932 tooltip => "Items recently identified",
2676 id => "infobox", 2935 id => "infobox",
2677 title => "Examine", 2936 title => "Examine",
2678 reply => undef, 2937 reply => undef,
2679 tooltip => "Signs and other items you examined", 2938 tooltip => "Signs and other items you examined",
2680 }, 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 },
2681 "c/lookat" => { 2952 "c/lookat" => {
2682 id => "infobox", 2953 id => "infobox",
2683 title => "Look", 2954 title => "Look",
2684 reply => undef, 2955 reply => undef,
2685 tooltip => "What you saw there", 2956 tooltip => "What you saw there",
2686 }, 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,
2687); 3032);
2688 3033
2689sub cf::client::send_msg { 3034sub cf::client::send_msg {
2690 my ($self, $channel, $msg, $color, @extra) = @_; 3035 my ($self, $channel, $msg, $color, @extra) = @_;
2691 3036
2692 $msg = $self->pl->expand_cfpod ($msg); 3037 $msg = $self->pl->expand_cfpod ($msg)
3038 unless $color & cf::NDI_VERBATIM;
2693 3039
2694 $color &= cf::NDI_CLIENT_MASK; # just in case... 3040 $color &= cf::NDI_CLIENT_MASK; # just in case...
2695 3041
2696 # check predefined channels, for the benefit of C 3042 # check predefined channels, for the benefit of C
2697 if ($CHANNEL{$channel}) { 3043 if ($CHANNEL{$channel}) {
2698 $channel = $CHANNEL{$channel}; 3044 $channel = $CHANNEL{$channel};
2699 3045
2700 $self->ext_msg (channel_info => $channel) 3046 $self->ext_msg (channel_info => $channel);
2701 if $self->can_msg;
2702
2703 $channel = $channel->{id}; 3047 $channel = $channel->{id};
2704 3048
2705 } elsif (ref $channel) { 3049 } elsif (ref $channel) {
2706 # send meta info to client, if not yet sent 3050 # send meta info to client, if not yet sent
2707 unless (exists $self->{channel}{$channel->{id}}) { 3051 unless (exists $self->{channel}{$channel->{id}}) {
2708 $self->{channel}{$channel->{id}} = $channel; 3052 $self->{channel}{$channel->{id}} = $channel;
2709 $self->ext_msg (channel_info => $channel) 3053 $self->ext_msg (channel_info => $channel);
2710 if $self->can_msg;
2711 } 3054 }
2712 3055
2713 $channel = $channel->{id}; 3056 $channel = $channel->{id};
2714 } 3057 }
2715 3058
2716 return unless @extra || length $msg; 3059 return unless @extra || length $msg;
2717 3060
2718 if ($self->can_msg) {
2719 # default colour, mask it out 3061 # default colour, mask it out
2720 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3062 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2721 if $color & cf::NDI_DEF; 3063 if $color & cf::NDI_DEF;
2722 3064
2723 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3065 my $pkt = "msg "
3066 . $self->{json_coder}->encode (
2724 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3067 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2725 } else { 3068 );
2726 if ($color >= 0) {
2727 # replace some tags by gcfclient-compatible ones
2728 for ($msg) {
2729 1 while
2730 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2731 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2732 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2733 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2734 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2735 }
2736 3069
2737 $color &= cf::NDI_COLOR_MASK; 3070 $self->send_big_packet ($pkt);
2738
2739 utf8::encode $msg;
2740
2741 if (0 && $msg =~ /\[/) {
2742 # COMMAND/INFO
2743 $self->send_packet ("drawextinfo $color 10 8 $msg")
2744 } else {
2745 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2746 $self->send_packet ("drawinfo $color $msg")
2747 }
2748 }
2749 }
2750} 3071}
2751 3072
2752=item $client->ext_msg ($type, @msg) 3073=item $client->ext_msg ($type, @msg)
2753 3074
2754Sends an ext event to the client. 3075Sends an ext event to the client.
2757 3078
2758sub cf::client::ext_msg($$@) { 3079sub cf::client::ext_msg($$@) {
2759 my ($self, $type, @msg) = @_; 3080 my ($self, $type, @msg) = @_;
2760 3081
2761 if ($self->extcmd == 2) { 3082 if ($self->extcmd == 2) {
2762 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3083 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2763 } elsif ($self->extcmd == 1) { # TODO: remove 3084 } elsif ($self->extcmd == 1) { # TODO: remove
2764 push @msg, msgtype => "event_$type"; 3085 push @msg, msgtype => "event_$type";
2765 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3086 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2766 } 3087 }
2767} 3088}
2768 3089
2769=item $client->ext_reply ($msgid, @msg) 3090=item $client->ext_reply ($msgid, @msg)
2770 3091
2774 3095
2775sub cf::client::ext_reply($$@) { 3096sub cf::client::ext_reply($$@) {
2776 my ($self, $id, @msg) = @_; 3097 my ($self, $id, @msg) = @_;
2777 3098
2778 if ($self->extcmd == 2) { 3099 if ($self->extcmd == 2) {
2779 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3100 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2780 } elsif ($self->extcmd == 1) { 3101 } elsif ($self->extcmd == 1) {
2781 #TODO: version 1, remove 3102 #TODO: version 1, remove
2782 unshift @msg, msgtype => "reply", msgid => $id; 3103 unshift @msg, msgtype => "reply", msgid => $id;
2783 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3104 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2784 } 3105 }
2785} 3106}
2786 3107
2787=item $success = $client->query ($flags, "text", \&cb) 3108=item $success = $client->query ($flags, "text", \&cb)
2788 3109
2859 3180
2860 $ns->ext_reply ($reply, @reply) 3181 $ns->ext_reply ($reply, @reply)
2861 if $reply; 3182 if $reply;
2862 3183
2863 } else { 3184 } else {
2864 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";
2865 } 3186 }
2866 3187
2867 cf::override; 3188 cf::override;
2868 }, 3189 },
2869); 3190);
2889 3210
2890 $coro 3211 $coro
2891} 3212}
2892 3213
2893cf::client->attach ( 3214cf::client->attach (
2894 on_destroy => sub { 3215 on_client_destroy => sub {
2895 my ($ns) = @_; 3216 my ($ns) = @_;
2896 3217
2897 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3218 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2898 }, 3219 },
2899); 3220);
2915our $safe_hole = new Safe::Hole; 3236our $safe_hole = new Safe::Hole;
2916 3237
2917$SIG{FPE} = 'IGNORE'; 3238$SIG{FPE} = 'IGNORE';
2918 3239
2919$safe->permit_only (Opcode::opset qw( 3240$safe->permit_only (Opcode::opset qw(
2920 :base_core :base_mem :base_orig :base_math 3241 :base_core :base_mem :base_orig :base_math :base_loop
2921 grepstart grepwhile mapstart mapwhile 3242 grepstart grepwhile mapstart mapwhile
2922 sort time 3243 sort time
2923)); 3244));
2924 3245
2925# here we export the classes and methods available to script code 3246# here we export the classes and methods available to script code
2928 3249
2929The following functions and methods are available within a safe environment: 3250The following functions and methods are available within a safe environment:
2930 3251
2931 cf::object 3252 cf::object
2932 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
2933 insert remove name archname title slaying race decrease_ob_nr 3254 insert remove name archname title slaying race decrease split
3255 value
2934 3256
2935 cf::object::player 3257 cf::object::player
2936 player 3258 player
2937 3259
2938 cf::player 3260 cf::player
2943 3265
2944=cut 3266=cut
2945 3267
2946for ( 3268for (
2947 ["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
2948 insert remove inv name archname title slaying race 3270 insert remove inv nrof name archname title slaying race
2949 decrease_ob_nr destroy)], 3271 decrease split destroy change_exp value msg lore send_msg)],
2950 ["cf::object::player" => qw(player)], 3272 ["cf::object::player" => qw(player)],
2951 ["cf::player" => qw(peaceful)], 3273 ["cf::player" => qw(peaceful send_msg)],
2952 ["cf::map" => qw(trigger)], 3274 ["cf::map" => qw(trigger)],
2953) { 3275) {
2954 no strict 'refs';
2955 my ($pkg, @funs) = @$_; 3276 my ($pkg, @funs) = @$_;
2956 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3277 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2957 for @funs; 3278 for @funs;
2958} 3279}
2959 3280
2974 3295
2975 my $qcode = $code; 3296 my $qcode = $code;
2976 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3297 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2977 $qcode =~ s/\n/\\n/g; 3298 $qcode =~ s/\n/\\n/g;
2978 3299
3300 %vars = (_dummy => 0) unless %vars;
3301
3302 my @res;
2979 local $_; 3303 local $_;
2980 local @safe::cf::_safe_eval_args = values %vars;
2981 3304
2982 my $eval = 3305 my $eval =
2983 "do {\n" 3306 "do {\n"
2984 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3307 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2985 . "#line 0 \"{$qcode}\"\n" 3308 . "#line 0 \"{$qcode}\"\n"
2986 . $code 3309 . $code
2987 . "\n}" 3310 . "\n}"
2988 ; 3311 ;
2989 3312
3313 if ($CFG{safe_eval}) {
2990 sub_generation_inc; 3314 sub_generation_inc;
3315 local @safe::cf::_safe_eval_args = values %vars;
2991 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3316 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2992 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 }
2993 3322
2994 if ($@) { 3323 if ($@) {
2995 warn "$@"; 3324 warn "$@",
2996 warn "while executing safe code '$code'\n"; 3325 "while executing safe code '$code'\n",
2997 warn "with arguments " . (join " ", %vars) . "\n"; 3326 "with arguments " . (join " ", %vars) . "\n";
2998 } 3327 }
2999 3328
3000 wantarray ? @res : $res[0] 3329 wantarray ? @res : $res[0]
3001} 3330}
3002 3331
3016=cut 3345=cut
3017 3346
3018sub register_script_function { 3347sub register_script_function {
3019 my ($fun, $cb) = @_; 3348 my ($fun, $cb) = @_;
3020 3349
3021 no strict 'refs'; 3350 $fun = "safe::$fun" if $CFG{safe_eval};
3022 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3351 *$fun = $safe_hole->wrap ($cb);
3023} 3352}
3024 3353
3025=back 3354=back
3026 3355
3027=cut 3356=cut
3036 # for this (global event?) 3365 # for this (global event?)
3037 %ext::player_env::MUSIC_FACE_CACHE = (); 3366 %ext::player_env::MUSIC_FACE_CACHE = ();
3038 3367
3039 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3368 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3040 3369
3041 warn "loading facedata from $path\n"; 3370 trace "loading facedata from $path\n";
3042 3371
3043 my $facedata; 3372 my $facedata;
3044 0 < aio_load $path, $facedata 3373 0 < aio_load $path, $facedata
3045 or die "$path: $!"; 3374 or die "$path: $!";
3046 3375
3048 3377
3049 $facedata->{version} == 2 3378 $facedata->{version} == 2
3050 or cf::cleanup "$path: version mismatch, cannot proceed."; 3379 or cf::cleanup "$path: version mismatch, cannot proceed.";
3051 3380
3052 # 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]);
3053 $facedata->{resource}{"res/exp_table"} = { 3383 $facedata->{resource}{"res/exp_table"} = {
3054 type => FT_RSRC, 3384 type => FT_RSRC,
3055 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),
3056 }; 3387 };
3057 cf::cede_to_tick; 3388 cf::cede_to_tick;
3058 3389
3059 { 3390 {
3060 my $faces = $facedata->{faceinfo}; 3391 my $faces = $facedata->{faceinfo};
3061 3392
3062 while (my ($face, $info) = each %$faces) { 3393 while (my ($face, $info) = each %$faces) {
3063 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3394 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3395
3064 cf::face::set_visibility $idx, $info->{visibility}; 3396 cf::face::set_visibility $idx, $info->{visibility};
3065 cf::face::set_magicmap $idx, $info->{magicmap}; 3397 cf::face::set_magicmap $idx, $info->{magicmap};
3066 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3398 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3067 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3399 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3068 3400
3069 cf::cede_to_tick; 3401 cf::cede_to_tick;
3070 } 3402 }
3071 3403
3072 while (my ($face, $info) = each %$faces) { 3404 while (my ($face, $info) = each %$faces) {
3073 next unless $info->{smooth}; 3405 next unless $info->{smooth};
3406
3074 my $idx = cf::face::find $face 3407 my $idx = cf::face::find $face
3075 or next; 3408 or next;
3409
3076 if (my $smooth = cf::face::find $info->{smooth}) { 3410 if (my $smooth = cf::face::find $info->{smooth}) {
3077 cf::face::set_smooth $idx, $smooth; 3411 cf::face::set_smooth $idx, $smooth;
3078 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3412 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3079 } else { 3413 } else {
3080 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3414 error "smooth face '$info->{smooth}' not found for face '$face'";
3081 } 3415 }
3082 3416
3083 cf::cede_to_tick; 3417 cf::cede_to_tick;
3084 } 3418 }
3085 } 3419 }
3094 3428
3095 cf::anim::invalidate_all; # d'oh 3429 cf::anim::invalidate_all; # d'oh
3096 } 3430 }
3097 3431
3098 { 3432 {
3099 # TODO: for gcfclient pleasure, we should give resources
3100 # that gcfclient doesn't grok a >10000 face index.
3101 my $res = $facedata->{resource}; 3433 my $res = $facedata->{resource};
3102 3434
3103 my $soundconf = delete $res->{"res/sound.conf"};
3104
3105 while (my ($name, $info) = each %$res) { 3435 while (my ($name, $info) = each %$res) {
3436 if (defined $info->{type}) {
3106 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3437 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3107 my $data;
3108 3438
3109 if ($info->{type} & 1) { 3439 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3110 # prepend meta info 3440 cf::face::set_type $idx, $info->{type};
3111
3112 my $meta = $enc->encode ({
3113 name => $name,
3114 %{ $info->{meta} || {} },
3115 });
3116
3117 $data = pack "(w/a*)*", $meta, $info->{data};
3118 } else { 3441 } else {
3119 $data = $info->{data}; 3442 $RESOURCE{$name} = $info; # unused
3120 } 3443 }
3121 3444
3122 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3123 cf::face::set_type $idx, $info->{type};
3124
3125 cf::cede_to_tick; 3445 cf::cede_to_tick;
3126 } 3446 }
3127
3128 if ($soundconf) {
3129 $soundconf = $enc->decode (delete $soundconf->{data});
3130
3131 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3132 my $sound = $soundconf->{compat}[$_]
3133 or next;
3134
3135 my $face = cf::face::find "sound/$sound->[1]";
3136 cf::sound::set $sound->[0] => $face;
3137 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3138 }
3139
3140 while (my ($k, $v) = each %{$soundconf->{event}}) {
3141 my $face = cf::face::find "sound/$v";
3142 cf::sound::set $k => $face;
3143 }
3144 }
3145 } 3447 }
3448
3449 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3146 3450
3147 1 3451 1
3148} 3452}
3149 3453
3150register_exticmd fx_want => sub { 3454register_exticmd fx_want => sub {
3152 3456
3153 while (my ($k, $v) = each %$want) { 3457 while (my ($k, $v) = each %$want) {
3154 $ns->fx_want ($k, $v); 3458 $ns->fx_want ($k, $v);
3155 } 3459 }
3156}; 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}
3157 3471
3158sub reload_regions { 3472sub reload_regions {
3159 # 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
3160 # for this (global event?) 3474 # for this (global event?)
3161 %ext::player_env::MUSIC_FACE_CACHE = (); 3475 %ext::player_env::MUSIC_FACE_CACHE = ();
3175} 3489}
3176 3490
3177sub reload_archetypes { 3491sub reload_archetypes {
3178 load_resource_file "$DATADIR/archetypes" 3492 load_resource_file "$DATADIR/archetypes"
3179 or die "unable to load archetypes\n"; 3493 or die "unable to load archetypes\n";
3180 #d# NEED to laod twice to resolve forward references
3181 # this really needs to be done in an extra post-pass
3182 # (which needs to be synchronous, so solve it differently)
3183 load_resource_file "$DATADIR/archetypes"
3184 or die "unable to load archetypes\n";
3185} 3494}
3186 3495
3187sub reload_treasures { 3496sub reload_treasures {
3188 load_resource_file "$DATADIR/treasures" 3497 load_resource_file "$DATADIR/treasures"
3189 or die "unable to load treasurelists\n"; 3498 or die "unable to load treasurelists\n";
3190} 3499}
3191 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
3192sub reload_resources { 3524sub reload_resources {
3193 warn "reloading resource files...\n"; 3525 trace "reloading resource files...\n";
3194 3526
3527 reload_facedata;
3528 reload_sound;
3529 reload_archetypes;
3195 reload_regions; 3530 reload_regions;
3196 reload_facedata;
3197 #reload_archetypes;#d#
3198 reload_archetypes;
3199 reload_treasures; 3531 reload_treasures;
3200 3532
3201 warn "finished reloading resource files\n"; 3533 trace "finished reloading resource files\n";
3202}
3203
3204sub init {
3205 reload_resources;
3206} 3534}
3207 3535
3208sub reload_config { 3536sub reload_config {
3537 trace "reloading config file...\n";
3538
3209 open my $fh, "<:utf8", "$CONFDIR/config" 3539 open my $fh, "<:utf8", "$CONFDIR/config"
3210 or return; 3540 or return;
3211 3541
3212 local $/; 3542 local $/;
3213 *CFG = YAML::Syck::Load <$fh>; 3543 *CFG = YAML::XS::Load scalar <$fh>;
3214 3544
3215 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3545 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3216 3546
3217 $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};
3218 $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};
3219 3549
3220 if (exists $CFG{mlockall}) { 3550 if (exists $CFG{mlockall}) {
3222 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3552 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3223 and die "WARNING: m(un)lockall failed: $!\n"; 3553 and die "WARNING: m(un)lockall failed: $!\n";
3224 }; 3554 };
3225 warn $@ if $@; 3555 warn $@ if $@;
3226 } 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;
3227} 3587}
3228 3588
3229sub 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
3230 # we must not ever block the main coroutine 3599 # we must not ever block the main coroutine
3231 local $Coro::idle = sub { 3600 local $Coro::idle = sub {
3232 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#
3233 (async { 3602 (async {
3234 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3603 $Coro::current->{desc} = "IDLE BUG HANDLER";
3235 Event::one_event; 3604 EV::loop EV::LOOP_ONESHOT;
3236 })->prio (Coro::PRIO_MAX); 3605 })->prio (Coro::PRIO_MAX);
3237 }; 3606 };
3238 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;
3239 reload_config; 3620 reload_config;
3240 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
3241 load_extensions; 3631 load_extensions;
3242 3632
3243 $TICK_WATCHER->start; 3633 utime time, time, $RUNTIMEFILE;
3244 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;
3245} 3646}
3246 3647
3247############################################################################# 3648#############################################################################
3248# initialisation and cleanup 3649# initialisation and cleanup
3249 3650
3250# install some emergency cleanup handlers 3651# install some emergency cleanup handlers
3251BEGIN { 3652BEGIN {
3653 our %SIGWATCHER = ();
3252 for my $signal (qw(INT HUP TERM)) { 3654 for my $signal (qw(INT HUP TERM)) {
3253 Event->signal ( 3655 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3254 reentrant => 0,
3255 data => WF_AUTOCANCEL,
3256 signal => $signal,
3257 prio => 0,
3258 cb => sub {
3259 cf::cleanup "SIG$signal"; 3656 cf::cleanup "SIG$signal";
3260 },
3261 ); 3657 };
3262 } 3658 }
3263} 3659}
3264 3660
3265sub write_runtime { 3661sub write_runtime_sync {
3266 my $runtime = "$LOCALDIR/runtime"; 3662 my $t0 = AE::time;
3267 3663
3268 # first touch the runtime file to show we are still running: 3664 # first touch the runtime file to show we are still running:
3269 # the fsync below can take a very very long time. 3665 # the fsync below can take a very very long time.
3270 3666
3271 IO::AIO::aio_utime $runtime, undef, undef; 3667 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3272 3668
3273 my $guard = cf::lock_acquire "write_runtime"; 3669 my $guard = cf::lock_acquire "write_runtime";
3274 3670
3275 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3671 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3276 or return; 3672 or return;
3277 3673
3278 my $value = $cf::RUNTIME + 90 + 10; 3674 my $value = $cf::RUNTIME + 90 + 10;
3279 # 10 is the runtime save interval, for a monotonic clock 3675 # 10 is the runtime save interval, for a monotonic clock
3280 # 60 allows for the watchdog to kill the server. 3676 # 60 allows for the watchdog to kill the server.
3290 aio_utime $fh, undef, undef; 3686 aio_utime $fh, undef, undef;
3291 3687
3292 close $fh 3688 close $fh
3293 or return; 3689 or return;
3294 3690
3295 aio_rename "$runtime~", $runtime 3691 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3296 and return; 3692 and return;
3297 3693
3298 warn "runtime file written.\n"; 3694 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3299 3695
3300 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 };
3301} 3747}
3302 3748
3303sub emergency_save() { 3749sub emergency_save() {
3304 my $freeze_guard = cf::freeze_mainloop; 3750 my $freeze_guard = cf::freeze_mainloop;
3305 3751
3306 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;
3307 3758
3308 cf::sync_job { 3759 cf::sync_job {
3760 cf::write_runtime_sync; # external watchdog should not bark
3761
3309 # use a peculiar iteration method to avoid tripping on perl 3762 # use a peculiar iteration method to avoid tripping on perl
3310 # refcount bugs in for. also avoids problems with players 3763 # refcount bugs in for. also avoids problems with players
3311 # and maps saved/destroyed asynchronously. 3764 # and maps saved/destroyed asynchronously.
3312 warn "begin emergency player save\n"; 3765 info "emergency_perl_save: begin player save\n";
3313 for my $login (keys %cf::PLAYER) { 3766 for my $login (keys %cf::PLAYER) {
3314 my $pl = $cf::PLAYER{$login} or next; 3767 my $pl = $cf::PLAYER{$login} or next;
3315 $pl->valid or next; 3768 $pl->valid or next;
3316 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3769 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3317 $pl->save; 3770 $pl->save;
3318 } 3771 }
3319 warn "end emergency player save\n"; 3772 info "emergency_perl_save: end player save\n";
3320 3773
3321 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";
3322 for my $path (keys %cf::MAP) { 3777 for my $path (keys %cf::MAP) {
3323 my $map = $cf::MAP{$path} or next; 3778 my $map = $cf::MAP{$path} or next;
3324 $map->valid or next; 3779 $map->valid or next;
3325 $map->save; 3780 $map->save;
3326 } 3781 }
3327 warn "end emergency map save\n"; 3782 info "emergency_perl_save: end map save\n";
3328 3783
3329 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";
3330 BDB::db_env_txn_checkpoint $DB_ENV; 3787 BDB::db_env_txn_checkpoint $DB_ENV;
3331 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
3332 }; 3812 };
3333 3813
3334 warn "leave emergency perl save\n"; 3814 info "emergency_perl_save: leave\n";
3335} 3815}
3336 3816
3337sub post_cleanup { 3817sub post_cleanup {
3338 my ($make_core) = @_; 3818 my ($make_core) = @_;
3339 3819
3820 IO::AIO::flush;
3821
3340 warn Carp::longmess "post_cleanup backtrace" 3822 error Carp::longmess "post_cleanup backtrace"
3341 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 }
3342} 3852}
3343 3853
3344sub do_reload_perl() { 3854sub do_reload_perl() {
3345 # can/must only be called in main 3855 # can/must only be called in main
3346 if ($Coro::current != $Coro::main) { 3856 if (in_main) {
3347 warn "can only reload from main coroutine"; 3857 error "can only reload from main coroutine";
3348 return; 3858 return;
3349 } 3859 }
3350 3860
3861 return if $RELOAD++;
3862
3863 my $t1 = AE::time;
3864
3865 while ($RELOAD) {
3351 warn "reloading..."; 3866 info "reloading...";
3352 3867
3353 warn "entering sync_job"; 3868 trace "entering sync_job";
3354 3869
3355 cf::sync_job { 3870 cf::sync_job {
3356 cf::write_runtime; # external watchdog should not bark
3357 cf::emergency_save; 3871 cf::emergency_save;
3358 cf::write_runtime; # external watchdog should not bark
3359 3872
3360 warn "syncing database to disk";
3361 BDB::db_env_txn_checkpoint $DB_ENV;
3362
3363 # if anything goes wrong in here, we should simply crash as we already saved
3364
3365 warn "cancelling all WF_AUTOCANCEL watchers";
3366 for (Event::all_watchers) {
3367 $_->cancel if $_->data & WF_AUTOCANCEL;
3368 }
3369
3370 warn "flushing outstanding aio requests";
3371 for (;;) {
3372 BDB::flush;
3373 IO::AIO::flush;
3374 Coro::cede;
3375 last unless IO::AIO::nreqs || BDB::nreqs;
3376 warn "iterate...";
3377 }
3378
3379 ++$RELOAD;
3380
3381 warn "cancelling all extension coros"; 3873 trace "cancelling all extension coros";
3382 $_->cancel for values %EXT_CORO; 3874 $_->cancel for values %EXT_CORO;
3383 %EXT_CORO = (); 3875 %EXT_CORO = ();
3384 3876
3385 warn "removing commands"; 3877 trace "removing commands";
3386 %COMMAND = (); 3878 %COMMAND = ();
3387 3879
3388 warn "removing ext/exti commands"; 3880 trace "removing ext/exti commands";
3389 %EXTCMD = (); 3881 %EXTCMD = ();
3390 %EXTICMD = (); 3882 %EXTICMD = ();
3391 3883
3392 warn "unloading/nuking all extensions"; 3884 trace "unloading/nuking all extensions";
3393 for my $pkg (@EXTS) { 3885 for my $pkg (@EXTS) {
3394 warn "... unloading $pkg"; 3886 trace "... unloading $pkg";
3395 3887
3396 if (my $cb = $pkg->can ("unload")) { 3888 if (my $cb = $pkg->can ("unload")) {
3397 eval { 3889 eval {
3398 $cb->($pkg); 3890 $cb->($pkg);
3399 1 3891 1
3400 } 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;
3401 } 3897 }
3402 3898
3403 warn "... nuking $pkg";
3404 Symbol::delete_package $pkg;
3405 }
3406
3407 warn "unloading all perl modules loaded from $LIBDIR"; 3899 trace "unloading all perl modules loaded from $LIBDIR";
3408 while (my ($k, $v) = each %INC) { 3900 while (my ($k, $v) = each %INC) {
3409 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3901 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3410 3902
3411 warn "... unloading $k"; 3903 trace "... unloading $k";
3412 delete $INC{$k}; 3904 delete $INC{$k};
3413 3905
3414 $k =~ s/\.pm$//; 3906 $k =~ s/\.pm$//;
3415 $k =~ s/\//::/g; 3907 $k =~ s/\//::/g;
3416 3908
3417 if (my $cb = $k->can ("unload_module")) { 3909 if (my $cb = $k->can ("unload_module")) {
3418 $cb->(); 3910 $cb->();
3911 }
3912
3913 clear_package $k;
3419 } 3914 }
3420 3915
3421 Symbol::delete_package $k;
3422 }
3423
3424 warn "getting rid of safe::, as good as possible"; 3916 trace "getting rid of safe::, as good as possible";
3425 Symbol::delete_package "safe::$_" 3917 clear_package "safe::$_"
3426 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);
3427 3919
3428 warn "unloading cf.pm \"a bit\""; 3920 trace "unloading cf.pm \"a bit\"";
3429 delete $INC{"cf.pm"}; 3921 delete $INC{"cf.pm"};
3430 delete $INC{"cf/pod.pm"}; 3922 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3431 3923
3432 # don't, removes xs symbols, too, 3924 # don't, removes xs symbols, too,
3433 # and global variables created in xs 3925 # and global variables created in xs
3434 #Symbol::delete_package __PACKAGE__; 3926 #clear_package __PACKAGE__;
3435 3927
3436 warn "unload completed, starting to reload now"; 3928 info "unload completed, starting to reload now";
3437 3929
3438 warn "reloading cf.pm"; 3930 trace "reloading cf.pm";
3439 require cf; 3931 require cf;
3440 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3932 cf::_connect_to_perl_1;
3441 3933
3442 warn "loading config and database again"; 3934 trace "loading config and database again";
3443 cf::reload_config; 3935 cf::reload_config;
3444 3936
3445 warn "loading extensions"; 3937 trace "loading extensions";
3446 cf::load_extensions; 3938 cf::load_extensions;
3447 3939
3940 if ($REATTACH_ON_RELOAD) {
3448 warn "reattaching attachments to objects/players"; 3941 trace "reattaching attachments to objects/players";
3449 _global_reattach; # objects, sockets 3942 _global_reattach; # objects, sockets
3450 warn "reattaching attachments to maps"; 3943 trace "reattaching attachments to maps";
3451 reattach $_ for values %MAP; 3944 reattach $_ for values %MAP;
3452 warn "reattaching attachments to players"; 3945 trace "reattaching attachments to players";
3453 reattach $_ for values %PLAYER; 3946 reattach $_ for values %PLAYER;
3947 }
3454 3948
3949 trace "running post_init jobs";
3950 (pop @POST_INIT)->(1) while @POST_INIT;
3951
3455 warn "leaving sync_job"; 3952 trace "leaving sync_job";
3456 3953
3457 1 3954 1
3458 } or do { 3955 } or do {
3459 warn $@; 3956 error $@;
3460 warn "error while reloading, exiting."; 3957 cf::cleanup "error while reloading, exiting.";
3461 exit 1; 3958 };
3959
3960 info "reloaded";
3961 --$RELOAD;
3462 }; 3962 }
3463 3963
3464 warn "reloaded"; 3964 $t1 = AE::time - $t1;
3965 info "reload completed in ${t1}s\n";
3465}; 3966};
3466 3967
3467our $RELOAD_WATCHER; # used only during reload 3968our $RELOAD_WATCHER; # used only during reload
3468 3969
3469sub reload_perl() { 3970sub reload_perl() {
3470 # doing reload synchronously and two reloads happen back-to-back, 3971 # doing reload synchronously and two reloads happen back-to-back,
3471 # coro crashes during coro_state_free->destroy here. 3972 # coro crashes during coro_state_free->destroy here.
3472 3973
3473 $RELOAD_WATCHER ||= Event->timer ( 3974 $RELOAD_WATCHER ||= cf::async {
3474 reentrant => 0, 3975 Coro::AIO::aio_wait cache_extensions;
3475 after => 0, 3976
3476 data => WF_AUTOCANCEL, 3977 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3477 cb => sub {
3478 do_reload_perl; 3978 do_reload_perl;
3479 undef $RELOAD_WATCHER; 3979 undef $RELOAD_WATCHER;
3480 }, 3980 };
3481 ); 3981 };
3482} 3982}
3483 3983
3484register_command "reload" => sub { 3984register_command "reload" => sub {
3485 my ($who, $arg) = @_; 3985 my ($who, $arg) = @_;
3486 3986
3499 3999
3500our @WAIT_FOR_TICK; 4000our @WAIT_FOR_TICK;
3501our @WAIT_FOR_TICK_BEGIN; 4001our @WAIT_FOR_TICK_BEGIN;
3502 4002
3503sub wait_for_tick { 4003sub wait_for_tick {
3504 return unless $TICK_WATCHER->is_active;
3505 return if $Coro::current == $Coro::main; 4004 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3506 4005
3507 my $signal = new Coro::Signal; 4006 my $signal = new Coro::Signal;
3508 push @WAIT_FOR_TICK, $signal; 4007 push @WAIT_FOR_TICK, $signal;
3509 $signal->wait; 4008 $signal->wait;
3510} 4009}
3511 4010
3512sub wait_for_tick_begin { 4011sub wait_for_tick_begin {
3513 return unless $TICK_WATCHER->is_active;
3514 return if $Coro::current == $Coro::main; 4012 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3515 4013
3516 my $signal = new Coro::Signal; 4014 my $signal = new Coro::Signal;
3517 push @WAIT_FOR_TICK_BEGIN, $signal; 4015 push @WAIT_FOR_TICK_BEGIN, $signal;
3518 $signal->wait; 4016 $signal->wait;
3519} 4017}
3520 4018
3521$TICK_WATCHER = Event->timer ( 4019sub tick {
3522 reentrant => 0,
3523 parked => 1,
3524 prio => 0,
3525 at => $NEXT_TICK || $TICK,
3526 data => WF_AUTOCANCEL,
3527 cb => sub {
3528 if ($Coro::current != $Coro::main) { 4020 if ($Coro::current != $Coro::main) {
3529 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"
3530 unless ++$bug_warning > 10; 4022 unless ++$bug_warning > 10;
3531 return; 4023 return;
3532 } 4024 }
3533 4025
3534 $NOW = $tick_start = Event::time;
3535
3536 cf::server_tick; # one server iteration 4026 cf::server_tick; # one server iteration
3537 4027
3538 $RUNTIME += $TICK; 4028 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3539 $NEXT_TICK += $TICK;
3540 4029
3541 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4030 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3542 $NEXT_RUNTIME_WRITE = $NOW + 10; 4031 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3543 Coro::async_pool { 4032 Coro::async_pool {
3544 $Coro::current->{desc} = "runtime saver"; 4033 $Coro::current->{desc} = "runtime saver";
3545 write_runtime 4034 write_runtime_sync
3546 or warn "ERROR: unable to write runtime file: $!"; 4035 or error "ERROR: unable to write runtime file: $!";
3547 };
3548 } 4036 };
4037 }
3549 4038
3550 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4039 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3551 $sig->send; 4040 $sig->send;
3552 } 4041 }
3553 while (my $sig = shift @WAIT_FOR_TICK) { 4042 while (my $sig = shift @WAIT_FOR_TICK) {
3554 $sig->send; 4043 $sig->send;
3555 } 4044 }
3556 4045
3557 $NOW = Event::time; 4046 $LOAD = ($NOW - $TICK_START) / $TICK;
3558
3559 # if we are delayed by four ticks or more, skip them all
3560 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3561
3562 $TICK_WATCHER->at ($NEXT_TICK);
3563 $TICK_WATCHER->start;
3564
3565 $LOAD = ($NOW - $tick_start) / $TICK;
3566 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4047 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3567 4048
3568 _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 }
3569 }, 4055 }
3570); 4056}
3571 4057
3572{ 4058{
4059 # configure BDB
4060
3573 BDB::min_parallel 8; 4061 BDB::min_parallel 16;
3574 BDB::max_poll_time $TICK * 0.1; 4062 BDB::max_poll_reqs $TICK * 0.1;
3575 $BDB_POLL_WATCHER = Event->io ( 4063 $AnyEvent::BDB::WATCHER->priority (1);
3576 reentrant => 0,
3577 fd => BDB::poll_fileno,
3578 poll => 'r',
3579 prio => 0,
3580 data => WF_AUTOCANCEL,
3581 cb => \&BDB::poll_cb,
3582 );
3583
3584 BDB::set_sync_prepare {
3585 my $status;
3586 my $current = $Coro::current;
3587 (
3588 sub {
3589 $status = $!;
3590 $current->ready; undef $current;
3591 },
3592 sub {
3593 Coro::schedule while defined $current;
3594 $! = $status;
3595 },
3596 )
3597 };
3598 4064
3599 unless ($DB_ENV) { 4065 unless ($DB_ENV) {
3600 $DB_ENV = BDB::db_env_create; 4066 $DB_ENV = BDB::db_env_create;
3601 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4067 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3602 | 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;
3603 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4070 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3604 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4071 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3605 4072
3606 cf::sync_job { 4073 cf::sync_job {
3607 eval { 4074 eval {
3617 4084
3618 cf::cleanup "db_env_open(db): $@" if $@; 4085 cf::cleanup "db_env_open(db): $@" if $@;
3619 }; 4086 };
3620 } 4087 }
3621 4088
3622 $BDB_DEADLOCK_WATCHER = Event->timer ( 4089 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3623 after => 3,
3624 interval => 1,
3625 hard => 1,
3626 prio => 0,
3627 data => WF_AUTOCANCEL,
3628 cb => sub {
3629 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 { };
3630 },
3631 ); 4091 };
3632 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4092 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3633 after => 11,
3634 interval => 60,
3635 hard => 1,
3636 prio => 0,
3637 data => WF_AUTOCANCEL,
3638 cb => sub {
3639 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4093 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3640 },
3641 ); 4094 };
3642 $BDB_TRICKLE_WATCHER = Event->timer ( 4095 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3643 after => 5,
3644 interval => 10,
3645 hard => 1,
3646 prio => 0,
3647 data => WF_AUTOCANCEL,
3648 cb => sub {
3649 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4096 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3650 },
3651 ); 4097 };
3652} 4098}
3653 4099
3654{ 4100{
4101 # configure IO::AIO
4102
3655 IO::AIO::min_parallel 8; 4103 IO::AIO::min_parallel 8;
3656
3657 undef $Coro::AIO::WATCHER;
3658 IO::AIO::max_poll_time $TICK * 0.1; 4104 IO::AIO::max_poll_time $TICK * 0.1;
3659 $AIO_POLL_WATCHER = Event->io ( 4105 undef $AnyEvent::AIO::WATCHER;
3660 reentrant => 0,
3661 data => WF_AUTOCANCEL,
3662 fd => IO::AIO::poll_fileno,
3663 poll => 'r',
3664 prio => 0,
3665 cb => \&IO::AIO::poll_cb,
3666 );
3667} 4106}
3668 4107
3669my $_log_backtrace; 4108my $_log_backtrace;
3670 4109
3671sub _log_backtrace { 4110sub _log_backtrace {
3674 $msg =~ s/\n//; 4113 $msg =~ s/\n//;
3675 4114
3676 # limit the # of concurrent backtraces 4115 # limit the # of concurrent backtraces
3677 if ($_log_backtrace < 2) { 4116 if ($_log_backtrace < 2) {
3678 ++$_log_backtrace; 4117 ++$_log_backtrace;
4118 my $perl_bt = Carp::longmess $msg;
3679 async { 4119 async {
3680 $Coro::current->{desc} = "abt $msg"; 4120 $Coro::current->{desc} = "abt $msg";
3681 4121
3682 my @bt = fork_call { 4122 my @bt = fork_call {
3683 @addr = map { sprintf "%x", $_ } @addr; 4123 @addr = map { sprintf "%x", $_ } @addr;
3694 } 4134 }
3695 4135
3696 @funcs 4136 @funcs
3697 }; 4137 };
3698 4138
3699 LOG llevInfo, "[ABT] $msg\n"; 4139 LOG llevInfo, "[ABT] $perl_bt\n";
4140 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3700 LOG llevInfo, "[ABT] $_\n" for @bt; 4141 LOG llevInfo, "[ABT] $_\n" for @bt;
3701 --$_log_backtrace; 4142 --$_log_backtrace;
3702 }; 4143 };
3703 } else { 4144 } else {
3704 LOG llevInfo, "[ABT] $msg\n"; 4145 LOG llevInfo, "[ABT] $msg\n";
3705 LOG llevInfo, "[ABT] [suppressed]\n"; 4146 LOG llevInfo, "[ABT] [suppressed]\n";
3706 } 4147 }
3707} 4148}
3708 4149
3709# load additional modules 4150# load additional modules
3710use cf::pod; 4151require "cf/$_.pm" for @EXTRA_MODULES;
4152cf::_connect_to_perl_2;
3711 4153
3712END { cf::emergency_save } 4154END { cf::emergency_save }
3713 4155
37141 41561
3715 4157

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines