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.287 by root, Mon Jun 25 05:43:45 2007 UTC vs.
Revision 1.574 by root, Sun May 8 21:51:27 2011 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010,2011 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 Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 3.61 (); 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;
51use Coro::Util ();
24 52
53use JSON::XS 2.01 ();
25use BDB (); 54use BDB ();
26use Data::Dumper; 55use Data::Dumper;
27use Digest::MD5;
28use Fcntl; 56use Fcntl;
29use YAML::Syck (); 57use YAML::XS ();
30use IO::AIO 2.32 (); 58use IO::AIO ();
31use Time::HiRes; 59use Time::HiRes;
32use Compress::LZF; 60use Compress::LZF;
61use Digest::MD5 ();
62
63AnyEvent::detect;
33 64
34# configure various modules to our taste 65# configure various modules to our taste
35# 66#
36$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
37Coro::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";
38Compress::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
39 75
40$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
41 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1;
44
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 78
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
48 82
49our %COMMAND = (); 83our %COMMAND = ();
50our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
51 85
52our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 87our %EXTCMD = ();
54our %EXTICMD = (); 88our %EXTICMD = ();
55our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
56our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
57 91
58our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
59our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
60 96
61our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
62our $DATADIR = datadir; 99our $DATADIR = datadir;
63our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
64our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
65our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
66our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
67our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
68our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
69our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
70our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
71our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
72 120
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER;
75our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 123our $NEXT_TICK;
124our $USE_FSYNC = 1; # use fsync to write maps - default on
125
126our $BDB_DEADLOCK_WATCHER;
127our $BDB_CHECKPOINT_WATCHER;
128our $BDB_TRICKLE_WATCHER;
129our $DB_ENV;
130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
133our %CFG;
134
135our $UPTIME; $UPTIME ||= time;
136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
78our $NOW; 138our $NOW;
79our $USE_FSYNC = 1; # use fsync to write maps - default off
80 139
81our $BDB_POLL_WATCHER; 140our (%PLAYER, %PLAYER_LOADING); # all users
82our $DB_ENV; 141our (%MAP, %MAP_LOADING ); # all maps
83
84our %CFG;
85
86our $UPTIME; $UPTIME ||= time;
87our $RUNTIME;
88
89our %PLAYER; # all users
90our %MAP; # all maps
91our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
92 143
93# used to convert map paths into valid unix filenames by replacing / by ∕ 144# used to convert map paths into valid unix filenames by replacing / by ∕
94our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 145our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
95 146
96our $LOAD; # a number between 0 (idle) and 1 (too many objects) 147our $LOAD; # a number between 0 (idle) and 1 (too many objects)
97our $LOADAVG; # same thing, but with alpha-smoothing 148our $LOADAVG; # same thing, but with alpha-smoothing
149our $JITTER; # average jitter
98our $tick_start; # for load detecting purposes 150our $TICK_START; # for load detecting purposes
151
152our @POST_INIT;
153
154our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
155our $REALLY_UNLOOP; # never set to true, please :)
156
157our $WAIT_FOR_TICK = new Coro::Signal;
158our @WAIT_FOR_TICK_BEGIN;
99 159
100binmode STDOUT; 160binmode STDOUT;
101binmode STDERR; 161binmode STDERR;
102 162
103# read virtual server time, if available 163# read virtual server time, if available
104unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 164unless ($RUNTIME || !-e $RUNTIMEFILE) {
105 open my $fh, "<", "$LOCALDIR/runtime" 165 open my $fh, "<", $RUNTIMEFILE
106 or die "unable to read runtime file: $!"; 166 or die "unable to read $RUNTIMEFILE file: $!";
107 $RUNTIME = <$fh> + 0.; 167 $RUNTIME = <$fh> + 0.;
108} 168}
169
170eval "sub TICK() { $TICK } 1" or die;
109 171
110mkdir $_ 172mkdir $_
111 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 173 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
112 174
113our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
114 176
115sub cf::map::normalise; 177sub cf::map::normalise;
116 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
117############################################################################# 183#############################################################################
118 184
185%REFLECT = ();
186for (@REFLECT) {
187 my $reflect = JSON::XS::decode_json $_;
188 $REFLECT{$reflect->{class}} = $reflect;
189}
190
191# this is decidedly evil
192$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
193
194#############################################################################
195
119=head2 GLOBAL VARIABLES 196=head2 GLOBAL VARIABLES
120 197
121=over 4 198=over 4
122 199
123=item $cf::UPTIME 200=item $cf::UPTIME
124 201
125The timestamp of the server start (so not actually an uptime). 202The timestamp of the server start (so not actually an "uptime").
203
204=item $cf::SERVER_TICK
205
206An unsigned integer that starts at zero when the server is started and is
207incremented on every tick.
208
209=item $cf::NOW
210
211The (real) time of the last (current) server tick - updated before and
212after tick processing, so this is useful only as a rough "what time is it
213now" estimate.
214
215=item $cf::TICK
216
217The interval between each server tick, in seconds.
126 218
127=item $cf::RUNTIME 219=item $cf::RUNTIME
128 220
129The time this server has run, starts at 0 and is increased by $cf::TICK on 221The time this server has run, starts at 0 and is increased by $cf::TICK on
130every server tick. 222every server tick.
136Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
137directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
138unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
139database environment. 231database environment.
140 232
141=item $cf::NOW
142
143The time of the last (current) server tick.
144
145=item $cf::TICK
146
147The interval between server ticks, in seconds.
148
149=item $cf::LOADAVG 233=item $cf::LOADAVG
150 234
151The current CPU load on the server (alpha-smoothed), as a value between 0 235The current CPU load on the server (alpha-smoothed), as a value between 0
152(none) and 1 (overloaded), indicating how much time is spent on processing 236(none) and 1 (overloaded), indicating how much time is spent on processing
153objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
156 240
157The raw value load value from the last tick. 241The raw value load value from the last tick.
158 242
159=item %cf::CFG 243=item %cf::CFG
160 244
161Configuration for the server, loaded from C</etc/crossfire/config>, or 245Configuration for the server, loaded from C</etc/deliantra-server/config>, or
162from wherever your confdir points to. 246from wherever your confdir points to.
163 247
164=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
165 249
166These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 250These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
167returns directly I<after> the tick processing (and consequently, can only wake one process 251returns directly I<after> the tick processing (and consequently, can only wake one thread
168per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 252per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
169 253
254Note that cf::Wait_for_tick will immediately return when the server is not
255ticking, making it suitable for small pauses in threads that need to run
256when the server is paused. If that is not applicable (i.e. you I<really>
257want to wait, use C<$cf::WAIT_FOR_TICK>).
258
259=item $cf::WAIT_FOR_TICK
260
261Note that C<cf::wait_for_tick> is probably the correct thing to use. This
262variable contains a L<Coro::Signal> that is broadcats after every server
263tick. Calling C<< ->wait >> on it will suspend the caller until after the
264next server tick.
265
266=cut
267
268sub wait_for_tick();
269sub wait_for_tick_begin();
270
271=item @cf::INVOKE_RESULTS
272
273This array contains the results of the last C<invoke ()> call. When
274C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
275that call.
276
277=item %cf::REFLECT
278
279Contains, for each (C++) class name, a hash reference with information
280about object members (methods, scalars, arrays and flags) and other
281metadata, which is useful for introspection.
282
170=back 283=back
171 284
172=cut 285=cut
173 286
174BEGIN { 287sub error(@) { LOG llevError, join "", @_ }
175 *CORE::GLOBAL::warn = sub { 288sub warn (@) { LOG llevWarn , join "", @_ }
289sub info (@) { LOG llevInfo , join "", @_ }
290sub debug(@) { LOG llevDebug, join "", @_ }
291sub trace(@) { LOG llevTrace, join "", @_ }
292
293$Coro::State::WARNHOOK = sub {
176 my $msg = join "", @_; 294 my $msg = join "", @_;
177 295
178 $msg .= "\n" 296 $msg .= "\n"
179 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
180 298
181 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 299 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
182 300
183 utf8::encode $msg;
184 LOG llevError, $msg; 301 LOG llevWarn, $msg;
185 }; 302};
186} 303
304$Coro::State::DIEHOOK = sub {
305 return unless $^S eq 0; # "eq", not "=="
306
307 error Carp::longmess $_[0];
308
309 if (in_main) {#d#
310 error "DIEHOOK called in main context, Coro bug?\n";#d#
311 return;#d#
312 }#d#
313
314 # kill coroutine otherwise
315 Coro::terminate
316};
187 317
188@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 318@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
189@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 319@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
190@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 320@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
191@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 321@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
198for my $pkg (qw( 328for my $pkg (qw(
199 cf::global cf::attachable 329 cf::global cf::attachable
200 cf::object cf::object::player 330 cf::object cf::object::player
201 cf::client cf::player 331 cf::client cf::player
202 cf::arch cf::living 332 cf::arch cf::living
333 cf::map cf::mapspace
203 cf::map cf::party cf::region 334 cf::party cf::region
204)) { 335)) {
205 no strict 'refs';
206 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
207} 337}
208 338
209$Event::DIED = sub { 339$EV::DIED = sub {
210 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
211}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
212 347
213############################################################################# 348#############################################################################
214 349
215=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
216 351
237 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 372 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
238 $d 373 $d
239 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
240} 375}
241 376
242use JSON::XS (); 377=item $scalar = load_file $path
243 378
379Loads the given file from path and returns its contents. Croaks on error
380and can block.
381
382=cut
383
384sub load_file($) {
385 0 <= aio_load $_[0], my $data
386 or Carp::croak "$_[0]: $!";
387
388 $data
389}
390
244=item $ref = cf::from_json $json 391=item $ref = cf::decode_json $json
245 392
246Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
247 394
248=item $json = cf::to_json $ref 395=item $json = cf::encode_json $ref
249 396
250Converts a perl data structure into its JSON representation. 397Converts a perl data structure into its JSON representation.
251 398
252=cut 399=cut
253 400
254our $json_coder = JSON::XS->new->convert_blessed->utf8; 401our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255 402
256sub to_json ($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
257sub from_json ($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
405
406=item $ref = cf::decode_storable $scalar
407
408Same as Coro::Storable::thaw, so blocks.
409
410=cut
411
412BEGIN { *decode_storable = \&Coro::Storable::thaw }
413
414=item $ref = cf::decode_yaml $scalar
415
416Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
417
418=cut
419
420sub decode_yaml($) {
421 fork_call { YAML::XS::Load $_[0] } @_
422}
423
424=item $scalar = cf::unlzf $scalar
425
426Same as Compress::LZF::compress, but takes server ticks into account, so
427blocks.
428
429=cut
430
431sub unlzf($) {
432 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
433 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
434 Compress::LZF::decompress $_[0]
435}
436
437=item cf::post_init { BLOCK }
438
439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
440but I<before> the server starts ticking again.
441
442The codeblock will have a single boolean argument to indicate whether this
443is a reload or not.
444
445=cut
446
447sub post_init(&) {
448 push @POST_INIT, shift;
449}
450
451sub _post_init {
452 trace "running post_init jobs";
453
454 # run them in parallel...
455
456 my @join;
457
458 while () {
459 push @join, map &Coro::async ($_, 0), @POST_INIT;
460 @POST_INIT = ();
461
462 @join or last;
463
464 (pop @join)->join;
465 }
466}
258 467
259=item cf::lock_wait $string 468=item cf::lock_wait $string
260 469
261Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
262 471
263=item my $lock = cf::lock_acquire $string 472=item my $lock = cf::lock_acquire $string
264 473
265Wait until the given lock is available and then acquires it and returns 474Wait until the given lock is available and then acquires it and returns
266a Coro::guard object. If the guard object gets destroyed (goes out of scope, 475a L<Guard> object. If the guard object gets destroyed (goes out of scope,
267for example when the coroutine gets canceled), the lock is automatically 476for example when the coroutine gets canceled), the lock is automatically
268returned. 477returned.
269 478
479Locks are *not* recursive, locking from the same coro twice results in a
480deadlocked coro.
481
270Lock names should begin with a unique identifier (for example, cf::map::find 482Lock names should begin with a unique identifier (for example, cf::map::find
271uses map_find and cf::map::load uses map_load). 483uses map_find and cf::map::load uses map_load).
272 484
273=item $locked = cf::lock_active $string 485=item $locked = cf::lock_active $string
274 486
275Return true if the lock is currently active, i.e. somebody has locked it. 487Return true if the lock is currently active, i.e. somebody has locked it.
276 488
277=cut 489=cut
278 490
279our %LOCK; 491our $LOCKS = new Coro::SemaphoreSet;
280 492
281sub lock_wait($) { 493sub lock_wait($) {
282 my ($key) = @_; 494 $LOCKS->wait ($_[0]);
283
284 # wait for lock, if any
285 while ($LOCK{$key}) {
286 push @{ $LOCK{$key} }, $Coro::current;
287 Coro::schedule;
288 }
289} 495}
290 496
291sub lock_acquire($) { 497sub lock_acquire($) {
292 my ($key) = @_; 498 $LOCKS->guard ($_[0])
293
294 # wait, to be sure we are not locked
295 lock_wait $key;
296
297 $LOCK{$key} = [];
298
299 Coro::guard {
300 # wake up all waiters, to be on the safe side
301 $_->ready for @{ delete $LOCK{$key} };
302 }
303} 499}
304 500
305sub lock_active($) { 501sub lock_active($) {
306 my ($key) = @_; 502 $LOCKS->count ($_[0]) < 1
307
308 ! ! $LOCK{$key}
309} 503}
310 504
311sub freeze_mainloop { 505sub freeze_mainloop {
312 return unless $TICK_WATCHER->is_active; 506 tick_inhibit_inc;
313 507
314 my $guard = Coro::guard { 508 &Guard::guard (\&tick_inhibit_dec);
315 $TICK_WATCHER->start; 509}
510
511=item cf::periodic $interval, $cb
512
513Like EV::periodic, but randomly selects a starting point so that the actions
514get spread over time.
515
516=cut
517
518sub periodic($$) {
519 my ($interval, $cb) = @_;
520
521 my $start = rand List::Util::min 180, $interval;
522
523 EV::periodic $start, $interval, 0, $cb
524}
525
526=item cf::get_slot $time[, $priority[, $name]]
527
528Allocate $time seconds of blocking CPU time at priority C<$priority>
529(default: 0): This call blocks and returns only when you have at least
530C<$time> seconds of cpu time till the next tick. The slot is only valid
531till the next cede.
532
533Background jobs should use a priority les than zero, interactive jobs
534should use 100 or more.
535
536The optional C<$name> can be used to identify the job to run. It might be
537used for statistical purposes and should identify the same time-class.
538
539Useful for short background jobs.
540
541=cut
542
543our @SLOT_QUEUE;
544our $SLOT_QUEUE;
545our $SLOT_DECAY = 0.9;
546
547$SLOT_QUEUE->cancel if $SLOT_QUEUE;
548$SLOT_QUEUE = Coro::async {
549 $Coro::current->desc ("timeslot manager");
550
551 my $signal = new Coro::Signal;
552 my $busy;
553
554 while () {
555 next_job:
556
557 my $avail = cf::till_tick;
558
559 for (0 .. $#SLOT_QUEUE) {
560 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0;
562 my $job = splice @SLOT_QUEUE, $_, 1, ();
563 $job->[2]->send;
564 Coro::cede;
565 goto next_job;
566 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
568 }
569 }
570
571 if (@SLOT_QUEUE) {
572 # we do not use wait_for_tick() as it returns immediately when tick is inactive
573 $WAIT_FOR_TICK->wait;
574 } else {
575 $busy = 0;
576 Coro::schedule;
577 }
316 }; 578 }
317 $TICK_WATCHER->stop; 579};
318 $guard 580
581sub get_slot($;$$) {
582 return if tick_inhibit || $Coro::current == $Coro::main;
583
584 my ($time, $pri, $name) = @_;
585
586 $time = clamp $time, 0.01, $TICK * .6;
587
588 my $sig = new Coro::Signal;
589
590 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
591 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
592 $SLOT_QUEUE->ready;
593 $sig->wait;
319} 594}
320 595
321=item cf::async { BLOCK } 596=item cf::async { BLOCK }
322 597
323Currently the same as Coro::async_pool, meaning you cannot use 598Currently the same as Coro::async_pool, meaning you cannot use
328 603
329BEGIN { *async = \&Coro::async_pool } 604BEGIN { *async = \&Coro::async_pool }
330 605
331=item cf::sync_job { BLOCK } 606=item cf::sync_job { BLOCK }
332 607
333The design of Crossfire TRT requires that the main coroutine ($Coro::main) 608The design of Deliantra requires that the main coroutine ($Coro::main)
334is always able to handle events or runnable, as Crossfire TRT is only 609is always able to handle events or runnable, as Deliantra is only
335partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 610partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
336acceptable. 611acceptable.
337 612
338If it must be done, put the blocking parts into C<sync_job>. This will run 613If it must be done, put the blocking parts into C<sync_job>. This will run
339the given BLOCK in another coroutine while waiting for the result. The 614the given BLOCK in another coroutine while waiting for the result. The
343=cut 618=cut
344 619
345sub sync_job(&) { 620sub sync_job(&) {
346 my ($job) = @_; 621 my ($job) = @_;
347 622
348 if ($Coro::current == $Coro::main) { 623 if (in_main) {
349 my $time = Event::time; 624 my $time = AE::time;
350 625
351 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
352 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
353 628
354 # TODO: use suspend/resume instead 629 #LOG llevError, Carp::longmess "sync job";#d#
355 # (but this is cancel-safe) 630
356 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
357 632
358 my $busy = 1; 633 my $busy = 1;
359 my @res; 634 my @res;
360 635
361 (async { 636 (async {
637 $Coro::current->desc ("sync job coro");
362 @res = eval { $job->() }; 638 @res = eval { $job->() };
363 warn $@ if $@; 639 error $@ if $@;
364 undef $busy; 640 undef $busy;
365 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
366 642
367 while ($busy) { 643 while ($busy) {
368 Coro::cede or Event::one_event; 644 if (Coro::nready) {
645 Coro::cede_notself;
646 } else {
647 EV::loop EV::LOOP_ONESHOT;
369 } 648 }
649 }
370 650
371 $time = Event::time - $time; 651 my $time = AE::time - $time;
372 652
373 LOG llevError | logBacktrace, Carp::longmess "long sync job"
374 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
375
376 $tick_start += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
377 654
378 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
379 } else { 656 } else {
380 # we are in another coroutine, how wonderful, everything just works 657 # we are in another coroutine, how wonderful, everything just works
381 658
401 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
402 679
403 $coro 680 $coro
404} 681}
405 682
406=item fork_call { }, $args 683=item fork_call { }, @args
407 684
408Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
409process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
410Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 688never block itself or use any form of event handling.
412 689
413=cut 690=cut
691
692sub post_fork {
693 reset_signals;
694}
414 695
415sub fork_call(&@) { 696sub fork_call(&@) {
416 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
417 698
418# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 699 # we seemingly have to make a local copy of the whole thing,
419# or die "socketpair: $!"; 700 # otherwise perl prematurely frees the stuff :/
420 pipe my $fh1, my $fh2 701 # TODO: investigate and fix (likely this will be rather laborious)
421 or die "pipe: $!";
422 702
423 if (my $pid = fork) { 703 my @res = Coro::Util::fork_eval {
424 close $fh2; 704 cf::post_fork;
705 &$cb
706 } @args;
425 707
426 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 708 wantarray ? @res : $res[-1]
427 $res = Coro::Storable::thaw $res; 709}
428 710
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave 711sub objinfo {
430
431 die $$res unless "ARRAY" eq ref $res;
432
433 return wantarray ? @$res : $res->[-1];
434 } else {
435 reset_signals;
436 local $SIG{__WARN__};
437 local $SIG{__DIE__};
438 eval {
439 close $fh1;
440
441 my @res = eval { $cb->(@args) };
442 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
443 };
444
445 warn $@ if $@;
446 _exit 0;
447 } 712 (
713 "counter value" => cf::object::object_count,
714 "objects created" => cf::object::create_count,
715 "objects destroyed" => cf::object::destroy_count,
716 "freelist size" => cf::object::free_count,
717 "allocated objects" => cf::object::objects_size,
718 "active objects" => cf::object::actives_size,
719 )
720}
721
722=item $coin = coin_from_name $name
723
724=cut
725
726our %coin_alias = (
727 "silver" => "silvercoin",
728 "silvercoin" => "silvercoin",
729 "silvercoins" => "silvercoin",
730 "gold" => "goldcoin",
731 "goldcoin" => "goldcoin",
732 "goldcoins" => "goldcoin",
733 "platinum" => "platinacoin",
734 "platinumcoin" => "platinacoin",
735 "platinumcoins" => "platinacoin",
736 "platina" => "platinacoin",
737 "platinacoin" => "platinacoin",
738 "platinacoins" => "platinacoin",
739 "royalty" => "royalty",
740 "royalties" => "royalty",
741);
742
743sub coin_from_name($) {
744 $coin_alias{$_[0]}
745 ? cf::arch::find $coin_alias{$_[0]}
746 : undef
448} 747}
449 748
450=item $value = cf::db_get $family => $key 749=item $value = cf::db_get $family => $key
451 750
452Returns a single value from the environment database. 751Returns a single value from the environment database.
454=item cf::db_put $family => $key => $value 753=item cf::db_put $family => $key => $value
455 754
456Stores the given C<$value> in the family. It can currently store binary 755Stores the given C<$value> in the family. It can currently store binary
457data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 756data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
458 757
758=item $db = cf::db_table "name"
759
760Create and/or open a new database table. The string must not be "db" and must be unique
761within each server.
762
459=cut 763=cut
764
765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
769 my ($name) = @_;
770 my $db = BDB::db_create $DB_ENV;
771
772 eval {
773 $db->set_flags (BDB::CHKSUM);
774
775 utf8::encode $name;
776 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
777 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
778 cf::cleanup "db_open(db): $!" if $!;
779 };
780 cf::cleanup "db_open(db): $@" if $@;
781
782 $db
783}
460 784
461our $DB; 785our $DB;
462 786
463sub db_init { 787sub db_init {
464 unless ($DB) { 788 $DB ||= db_table "db";
465 $DB = BDB::db_create $DB_ENV;
466
467 cf::sync_job {
468 eval {
469 $DB->set_flags (BDB::CHKSUM);
470
471 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
472 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
473 cf::cleanup "db_open(db): $!" if $!;
474 };
475 cf::cleanup "db_open(db): $@" if $@;
476 };
477 }
478} 789}
479 790
480sub db_get($$) { 791sub db_get($$) {
481 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
482 793
483 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
484 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
485 798
486 $! ? () 799 $! ? ()
487 : $data 800 : $data
488 }
489} 801}
490 802
491sub db_put($$$) { 803sub db_put($$$) {
492 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
493 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
521 833
522 my @data; 834 my @data;
523 my $md5; 835 my $md5;
524 836
525 for (0 .. $#$src) { 837 for (0 .. $#$src) {
526 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
527 or Carp::croak "$src->[$_]: $!";
528 } 839 }
529 840
530 # if processing is expensive, check 841 # if processing is expensive, check
531 # checksum first 842 # checksum first
532 if (1) { 843 if (1) {
533 $md5 = 844 $md5 =
534 join "\x00", 845 join "\x00",
535 $processversion, 846 $processversion,
536 map { 847 map {
537 Coro::cede; 848 cf::cede_to_tick;
538 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 849 ($src->[$_], Digest::MD5::md5_hex $data[$_])
539 } 0.. $#$src; 850 } 0.. $#$src;
540 851
541 852
542 my $dbmd5 = db_get cache => "$id/md5"; 853 my $dbmd5 = db_get cache => "$id/md5";
549 860
550 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
551 my $data = $process->(\@data); 862 my $data = $process->(\@data);
552 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
553 864
554 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
555 866
556 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
557 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
558 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
559 870
569 880
570=cut 881=cut
571 882
572sub datalog($@) { 883sub datalog($@) {
573 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
574 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
575} 886}
576 887
577=back 888=back
578 889
579=cut 890=cut
580 891
581############################################################################# 892#############################################################################
582 893
583=head2 ATTACHABLE OBJECTS 894=head2 ATTACHABLE OBJECTS
584 895
585Many objects in crossfire are so-called attachable objects. That means you can 896Many objects in deliantra are so-called attachable objects. That means you can
586attach callbacks/event handlers (a collection of which is called an "attachment") 897attach callbacks/event handlers (a collection of which is called an "attachment")
587to it. All such attachable objects support the following methods. 898to it. All such attachable objects support the following methods.
588 899
589In the following description, CLASS can be any of C<global>, C<object> 900In the following description, CLASS can be any of C<global>, C<object>
590C<player>, C<client> or C<map> (i.e. the attachable objects in 901C<player>, C<client> or C<map> (i.e. the attachable objects in
591Crossfire TRT). 902Deliantra).
592 903
593=over 4 904=over 4
594 905
595=item $attachable->attach ($attachment, key => $value...) 906=item $attachable->attach ($attachment, key => $value...)
596 907
640=item cf::CLASS::attachment $name, ... 951=item cf::CLASS::attachment $name, ...
641 952
642Register an attachment by C<$name> through which attachable objects of the 953Register an attachment by C<$name> through which attachable objects of the
643given CLASS can refer to this attachment. 954given CLASS can refer to this attachment.
644 955
645Some classes such as crossfire maps and objects can specify attachments 956Some classes such as deliantra maps and objects can specify attachments
646that are attached at load/instantiate time, thus the need for a name. 957that are attached at load/instantiate time, thus the need for a name.
647 958
648These calls expect any number of the following handler/hook descriptions: 959These calls expect any number of the following handler/hook descriptions:
649 960
650=over 4 961=over 4
774 1085
775 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
776 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
777 1088
778 } elsif (ref $type) { 1089 } elsif (ref $type) {
779 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
780 1091
781 } else { 1092 } else {
782 shift @arg; 1093 shift @arg;
783 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
784 } 1095 }
785 } 1096 }
786} 1097}
787 1098
788sub _object_attach { 1099sub _object_attach {
798 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
799 } 1110 }
800 1111
801 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
802 } else { 1113 } else {
803 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
804 } 1115 }
805 1116
806 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
807} 1118}
808 1119
848 "; 1159 ";
849 die if $@; 1160 die if $@;
850} 1161}
851 1162
852our $override; 1163our $override;
853our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1164our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
854 1165
855sub override { 1166sub override {
856 $override = 1; 1167 $override = 1;
857 @invoke_results = (); 1168 @INVOKE_RESULTS = (@_);
858} 1169}
859 1170
860sub do_invoke { 1171sub do_invoke {
861 my $event = shift; 1172 my $event = shift;
862 my $callbacks = shift; 1173 my $callbacks = shift;
863 1174
864 @invoke_results = (); 1175 @INVOKE_RESULTS = ();
865 1176
866 local $override; 1177 local $override;
867 1178
868 for (@$callbacks) { 1179 for (@$callbacks) {
869 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
870 1181
871 if ($@) { 1182 if ($@) {
872 warn "$@";
873 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
874 override; 1184 override;
875 } 1185 }
876 1186
877 return 1 if $override; 1187 return 1 if $override;
878 } 1188 }
879 1189
880 0 1190 0
881} 1191}
882 1192
883=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1193=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
884 1194
885=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1195=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
886 1196
887Generate an object-specific event with the given arguments. 1197Generate an object-specific event with the given arguments.
888 1198
889This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1199This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
890removed in future versions), and there is no public API to access override 1200removed in future versions), and there is no public API to access override
891results (if you must, access C<@cf::invoke_results> directly). 1201results (if you must, access C<@cf::INVOKE_RESULTS> directly).
892 1202
893=back 1203=back
894 1204
895=cut 1205=cut
896 1206
897############################################################################# 1207#############################################################################
898# object support 1208# object support
1209
1210sub _object_equal($$);
1211sub _object_equal($$) {
1212 my ($a, $b) = @_;
1213
1214 return 0 unless (ref $a) eq (ref $b);
1215
1216 if ("HASH" eq ref $a) {
1217 my @ka = keys %$a;
1218 my @kb = keys %$b;
1219
1220 return 0 if @ka != @kb;
1221
1222 for (0 .. $#ka) {
1223 return 0 unless $ka[$_] eq $kb[$_];
1224 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1225 }
1226
1227 } elsif ("ARRAY" eq ref $a) {
1228
1229 return 0 if @$a != @$b;
1230
1231 for (0 .. $#$a) {
1232 return 0 unless _object_equal $a->[$_], $b->[$_];
1233 }
1234
1235 } elsif ($a ne $b) {
1236 return 0;
1237 }
1238
1239 1
1240}
1241
1242our $SLOW_MERGES;#d#
1243sub _can_merge {
1244 my ($ob1, $ob2) = @_;
1245
1246 ++$SLOW_MERGES;#d#
1247
1248 # we do the slow way here
1249 return _object_equal $ob1, $ob2
1250}
899 1251
900sub reattach { 1252sub reattach {
901 # basically do the same as instantiate, without calling instantiate 1253 # basically do the same as instantiate, without calling instantiate
902 my ($obj) = @_; 1254 my ($obj) = @_;
903 1255
1256 # no longer needed after getting rid of delete_package?
904 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1257 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
905 1258
906 my $registry = $obj->registry; 1259 my $registry = $obj->registry;
907 1260
908 @$registry = (); 1261 @$registry = ();
909 1262
914 for (@$attach) { 1267 for (@$attach) {
915 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
916 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
917 } 1270 }
918 } else { 1271 } else {
919 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
920 } 1273 }
921 } 1274 }
922} 1275}
923 1276
924cf::attachable->attach ( 1277cf::attachable->attach (
925 prio => -1000000, 1278 prio => -1000000,
926 on_instantiate => sub { 1279 on_instantiate => sub {
927 my ($obj, $data) = @_; 1280 my ($obj, $data) = @_;
928 1281
929 $data = from_json $data; 1282 $data = decode_json $data;
930 1283
931 for (@$data) { 1284 for (@$data) {
932 my ($name, $args) = @$_; 1285 my ($name, $args) = @$_;
933 1286
934 $obj->attach ($name, %{$args || {} }); 1287 $obj->attach ($name, %{$args || {} });
950sub object_freezer_save { 1303sub object_freezer_save {
951 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
952 1305
953 sync_job { 1306 sync_job {
954 if (length $$rdata) { 1307 if (length $$rdata) {
1308 utf8::decode (my $decname = $filename);
955 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
956 $filename, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
957 1312
958 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
959 chmod SAVE_MODE, $fh; 1314 aio_chmod $fh, SAVE_MODE;
960 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1316 if ($cf::USE_FSYNC) {
1317 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;
1318 aio_fsync $fh;
1319 }
962 close $fh; 1320 aio_close $fh;
963 1321
964 if (@$objs) { 1322 if (@$objs) {
965 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1323 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
966 chmod SAVE_MODE, $fh; 1324 aio_chmod $fh, SAVE_MODE;
967 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1325 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
968 aio_write $fh, 0, (length $data), $data, 0; 1326 aio_write $fh, 0, (length $data), $data, 0;
969 aio_fsync $fh if $cf::USE_FSYNC; 1327 if ($cf::USE_FSYNC) {
1328 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;
1329 aio_fsync $fh;
1330 }
970 close $fh; 1331 aio_close $fh;
971 aio_rename "$filename.pst~", "$filename.pst"; 1332 aio_rename "$filename.pst~", "$filename.pst";
972 } 1333 }
973 } else { 1334 } else {
974 aio_unlink "$filename.pst"; 1335 aio_unlink "$filename.pst";
975 } 1336 }
976 1337
977 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1339
1340 $filename =~ s%/[^/]+$%%;
1341 aio_pathsync $filename if $cf::USE_FSYNC;
978 } else { 1342 } else {
979 warn "FATAL: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
980 } 1344 }
981 } else { 1345 } else {
982 aio_unlink $filename; 1346 aio_unlink $filename;
983 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
984 } 1348 }
985 } 1349 };
986} 1350}
987 1351
988sub object_freezer_as_string { 1352sub object_freezer_as_string {
989 my ($rdata, $objs) = @_; 1353 my ($rdata, $objs) = @_;
990 1354
1002 or return; 1366 or return;
1003 1367
1004 unless (aio_stat "$filename.pst") { 1368 unless (aio_stat "$filename.pst") {
1005 (aio_load "$filename.pst", $av) >= 0 1369 (aio_load "$filename.pst", $av) >= 0
1006 or return; 1370 or return;
1371
1007 $av = eval { (Storable::thaw $av)->{objs} }; 1372 my $st = eval { Coro::Storable::thaw $av };
1373 $av = $st->{objs};
1008 } 1374 }
1009 1375
1376 utf8::decode (my $decname = $filename);
1010 warn sprintf "loading %s (%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1011 $filename, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1380
1012 return ($data, $av); 1381 ($data, $av)
1013} 1382}
1014 1383
1015=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1016 1385
1017=over 4 1386=over 4
1071 my ($name, $cb) = @_; 1440 my ($name, $cb) = @_;
1072 1441
1073 $EXTICMD{$name} = $cb; 1442 $EXTICMD{$name} = $cb;
1074} 1443}
1075 1444
1445use File::Glob ();
1446
1076cf::player->attach ( 1447cf::player->attach (
1077 on_command => sub { 1448 on_unknown_command => sub {
1078 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1079 1450
1080 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1081 or return; 1452 or return;
1082 1453
1087 cf::override; 1458 cf::override;
1088 }, 1459 },
1089 on_extcmd => sub { 1460 on_extcmd => sub {
1090 my ($pl, $buf) = @_; 1461 my ($pl, $buf) = @_;
1091 1462
1092 my $msg = eval { from_json $buf }; 1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1093 1464
1094 if (ref $msg) { 1465 if (ref $msg) {
1466 my ($type, $reply, @payload) =
1467 "ARRAY" eq ref $msg
1468 ? @$msg
1469 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1470
1471 my @reply;
1472
1095 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1473 if (my $cb = $EXTCMD{$type}) {
1096 if (my %reply = $cb->($pl, $msg)) { 1474 @reply = $cb->($pl, @payload);
1097 $pl->ext_reply ($msg->{msgid}, %reply);
1098 }
1099 } 1475 }
1476
1477 $pl->ext_reply ($reply, @reply)
1478 if $reply;
1479
1100 } else { 1480 } else {
1101 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1481 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1102 } 1482 }
1103 1483
1104 cf::override; 1484 cf::override;
1105 }, 1485 },
1106); 1486);
1107 1487
1488# "readahead" all extensions
1489sub cache_extensions {
1490 my $grp = IO::AIO::aio_group;
1491
1492 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1493 for (grep /\.ext$/, @{$_[0]}) {
1494 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1495 }
1496 };
1497
1498 $grp
1499}
1500
1108sub load_extensions { 1501sub load_extensions {
1502 info "loading extensions...";
1503
1109 cf::sync_job { 1504 cf::sync_job {
1110 my %todo; 1505 my %todo;
1111 1506
1112 for my $path (<$LIBDIR/*.ext>) { 1507 for my $path (<$LIBDIR/*.ext>) {
1113 next unless -r $path; 1508 next unless -r $path;
1131 1526
1132 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1527 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1133 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1528 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1134 1529
1135 $ext{source} = 1530 $ext{source} =
1136 "package $pkg; use strict; use utf8;\n" 1531 "package $pkg; use common::sense;\n"
1137 . "#line 1 \"$path\"\n{\n" 1532 . "#line 1 \"$path\"\n{\n"
1138 . $source 1533 . $source
1139 . "\n};\n1"; 1534 . "\n};\n1";
1140 1535
1141 $todo{$base} = \%ext; 1536 $todo{$base} = \%ext;
1142 } 1537 }
1143 1538
1539 my $pass = 0;
1144 my %done; 1540 my %done;
1145 while (%todo) { 1541 while (%todo) {
1146 my $progress; 1542 my $progress;
1147 1543
1544 ++$pass;
1545
1546 ext:
1148 while (my ($k, $v) = each %todo) { 1547 while (my ($k, $v) = each %todo) {
1149 for (split /,\s*/, $v->{meta}{depends}) { 1548 for (split /,\s*/, $v->{meta}{depends}) {
1150 goto skip 1549 next ext
1151 unless exists $done{$_}; 1550 unless exists $done{$_};
1152 } 1551 }
1153 1552
1154 warn "... loading '$k' into '$v->{pkg}'\n"; 1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1155 1554
1156 unless (eval $v->{source}) { 1555 my $active = eval $v->{source};
1556
1557 if (length $@) {
1157 my $msg = $@ ? "$v->{path}: $@\n" 1558 error "$v->{path}: $@\n";
1158 : "$v->{base}: extension inactive.\n";
1159 1559
1560 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1160 if (exists $v->{meta}{mandatory}) { 1561 if exists $v->{meta}{mandatory};
1161 warn $msg; 1562
1162 warn "mandatory extension failed to load, exiting.\n"; 1563 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1163 exit 1; 1564 delete $todo{$k};
1164 } 1565 } else {
1165 1566 $done{$k} = delete $todo{$k};
1166 warn $msg; 1567 push @EXTS, $v->{pkg};
1568 $progress = 1;
1569
1570 info "$v->{base}: extension inactive.\n"
1571 unless $active;
1167 } 1572 }
1168
1169 $done{$k} = delete $todo{$k};
1170 push @EXTS, $v->{pkg};
1171 $progress = 1;
1172 } 1573 }
1173 1574
1174 skip: 1575 unless ($progress) {
1175 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1576 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1176 unless $progress; 1577
1578 while (my ($k, $v) = each %todo) {
1579 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1580 if exists $v->{meta}{mandatory};
1581 }
1582
1583 last;
1584 }
1177 } 1585 }
1178 }; 1586 };
1179} 1587}
1180 1588
1181############################################################################# 1589#############################################################################
1182 1590
1183=back 1591=back
1184 1592
1185=head2 CORE EXTENSIONS 1593=head2 CORE EXTENSIONS
1186 1594
1187Functions and methods that extend core crossfire objects. 1595Functions and methods that extend core deliantra objects.
1188 1596
1189=cut 1597=cut
1190 1598
1191package cf::player; 1599package cf::player;
1192 1600
1193use Coro::AIO; 1601use Coro::AIO;
1194 1602
1195=head3 cf::player 1603=head3 cf::player
1196 1604
1197=over 4 1605=over 4
1606
1607=item cf::player::num_playing
1608
1609Returns the official number of playing players, as per the Crossfire metaserver rules.
1610
1611=cut
1612
1613sub num_playing {
1614 scalar grep
1615 $_->ob->map
1616 && !$_->hidden
1617 && !$_->ob->flag (cf::FLAG_WIZ),
1618 cf::player::list
1619}
1198 1620
1199=item cf::player::find $login 1621=item cf::player::find $login
1200 1622
1201Returns the given player object, loading it if necessary (might block). 1623Returns the given player object, loading it if necessary (might block).
1202 1624
1221 1643
1222sub exists($) { 1644sub exists($) {
1223 my ($login) = @_; 1645 my ($login) = @_;
1224 1646
1225 $cf::PLAYER{$login} 1647 $cf::PLAYER{$login}
1226 or cf::sync_job { !aio_stat path $login } 1648 or !aio_stat path $login
1227} 1649}
1228 1650
1229sub find($) { 1651sub find($) {
1230 return $cf::PLAYER{$_[0]} || do { 1652 return $cf::PLAYER{$_[0]} || do {
1231 my $login = $_[0]; 1653 my $login = $_[0];
1238 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1660 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1239 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1661 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1240 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1662 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1241 aio_unlink +(playerdir $login) . "/$login.pl"; 1663 aio_unlink +(playerdir $login) . "/$login.pl";
1242 1664
1243 my $pl = load_pl path $login 1665 my $f = new_from_file cf::object::thawer path $login
1244 or return; 1666 or return;
1667
1668 my $pl = cf::player::load_pl $f
1669 or return;
1670
1671 local $cf::PLAYER_LOADING{$login} = $pl;
1672 $f->resolve_delayed_derefs;
1245 $cf::PLAYER{$login} = $pl 1673 $cf::PLAYER{$login} = $pl
1246 } 1674 }
1247 } 1675 }
1248} 1676}
1677
1678cf::player->attach (
1679 on_load => sub {
1680 my ($pl, $path) = @_;
1681
1682 # restore slots saved in save, below
1683 my $slots = delete $pl->{_slots};
1684
1685 $pl->ob->current_weapon ($slots->[0]);
1686 $pl->combat_ob ($slots->[1]);
1687 $pl->ranged_ob ($slots->[2]);
1688 },
1689);
1249 1690
1250sub save($) { 1691sub save($) {
1251 my ($pl) = @_; 1692 my ($pl) = @_;
1252 1693
1253 return if $pl->{deny_save}; 1694 return if $pl->{deny_save};
1258 return if $pl->{deny_save}; 1699 return if $pl->{deny_save};
1259 1700
1260 aio_mkdir playerdir $pl, 0770; 1701 aio_mkdir playerdir $pl, 0770;
1261 $pl->{last_save} = $cf::RUNTIME; 1702 $pl->{last_save} = $cf::RUNTIME;
1262 1703
1704 cf::get_slot 0.01;
1705
1706 # save slots, to be restored later
1707 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1708
1263 $pl->save_pl ($path); 1709 $pl->save_pl ($path);
1264 Coro::cede; 1710 cf::cede_to_tick;
1265} 1711}
1266 1712
1267sub new($) { 1713sub new($) {
1268 my ($login) = @_; 1714 my ($login) = @_;
1269 1715
1275 $cf::PLAYER{$login} = $self; 1721 $cf::PLAYER{$login} = $self;
1276 1722
1277 $self 1723 $self
1278} 1724}
1279 1725
1726=item $player->send_msg ($channel, $msg, $color, [extra...])
1727
1728=cut
1729
1730sub send_msg {
1731 my $ns = shift->ns
1732 or return;
1733 $ns->send_msg (@_);
1734}
1735
1280=item $pl->quit_character 1736=item $pl->quit_character
1281 1737
1282Nukes the player without looking back. If logged in, the connection will 1738Nukes the player without looking back. If logged in, the connection will
1283be destroyed. May block for a long time. 1739be destroyed. May block for a long time.
1284 1740
1288 my ($pl) = @_; 1744 my ($pl) = @_;
1289 1745
1290 my $name = $pl->ob->name; 1746 my $name = $pl->ob->name;
1291 1747
1292 $pl->{deny_save} = 1; 1748 $pl->{deny_save} = 1;
1293 $pl->password ("*"); # this should lock out the player until we nuked the dir 1749 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1294 1750
1295 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1751 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1296 $pl->deactivate; 1752 $pl->deactivate;
1753
1754 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1297 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1755 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1756 ext::highscore::check ($pl->ob);
1757
1298 $pl->ns->destroy if $pl->ns; 1758 $pl->ns->destroy if $pl->ns;
1299 1759
1300 my $path = playerdir $pl; 1760 my $path = playerdir $pl;
1301 my $temp = "$path~$cf::RUNTIME~deleting~"; 1761 my $temp = "$path~$cf::RUNTIME~deleting~";
1302 aio_rename $path, $temp; 1762 aio_rename $path, $temp;
1337 or return []; 1797 or return [];
1338 1798
1339 my @logins; 1799 my @logins;
1340 1800
1341 for my $login (@$dirs) { 1801 for my $login (@$dirs) {
1802 my $path = path $login;
1803
1804 # a .pst is a dead give-away for a valid player
1805 # if no pst file found, open and chekc for blocked users
1806 if (aio_stat "$path.pst") {
1342 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1807 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1343 aio_read $fh, 0, 512, my $buf, 0 or next; 1808 aio_read $fh, 0, 512, my $buf, 0 or next;
1344 $buf !~ /^password -------------$/m or next; # official not-valid tag 1809 $buf !~ /^password -------------$/m or next; # official not-valid tag
1810 }
1345 1811
1346 utf8::decode $login; 1812 utf8::decode $login;
1347 push @logins, $login; 1813 push @logins, $login;
1348 } 1814 }
1349 1815
1350 \@logins 1816 \@logins
1351} 1817}
1352 1818
1353=item $player->maps 1819=item $player->maps
1820
1821=item cf::player::maps $login
1354 1822
1355Returns an arrayref of map paths that are private for this 1823Returns an arrayref of map paths that are private for this
1356player. May block. 1824player. May block.
1357 1825
1358=cut 1826=cut
1376 } 1844 }
1377 1845
1378 \@paths 1846 \@paths
1379} 1847}
1380 1848
1381=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1849=item $protocol_xml = $player->expand_cfpod ($cfpod)
1382 1850
1383Expand crossfire pod fragments into protocol xml. 1851Expand deliantra pod fragments into protocol xml.
1384 1852
1385=cut
1386
1387sub expand_cfpod {
1388 ((my $self), (local $_)) = @_;
1389
1390 # escape & and <
1391 s/&/&amp;/g;
1392 s/(?<![BIUGH])</&lt;/g;
1393
1394 # this is buggy, it needs to properly take care of nested <'s
1395
1396 1 while
1397 # replace B<>, I<>, U<> etc.
1398 s/B<([^\>]*)>/<b>$1<\/b>/
1399 || s/I<([^\>]*)>/<i>$1<\/i>/
1400 || s/U<([^\>]*)>/<u>$1<\/u>/
1401 # replace G<male|female> tags
1402 || s{G<([^>|]*)\|([^>]*)>}{
1403 $self->gender ? $2 : $1
1404 }ge
1405 # replace H<hint text>
1406 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1407
1408 # create single paragraphs (very hackish)
1409 s/(?<=\S)\n(?=\w)/ /g;
1410
1411 $_
1412}
1413
1414=item $player->ext_reply ($msgid, %msg) 1853=item $player->ext_reply ($msgid, @msg)
1415 1854
1416Sends an ext reply to the player. 1855Sends an ext reply to the player.
1417 1856
1418=cut 1857=cut
1419 1858
1420sub ext_reply($$%) { 1859sub ext_reply($$@) {
1421 my ($self, $id, %msg) = @_; 1860 my ($self, $id, @msg) = @_;
1422 1861
1423 $msg{msgid} = $id; 1862 $self->ns->ext_reply ($id, @msg)
1424 $self->send ("ext " . cf::to_json \%msg);
1425} 1863}
1426 1864
1427=item $player->ext_event ($type, %msg) 1865=item $player->ext_msg ($type, @msg)
1428 1866
1429Sends an ext event to the client. 1867Sends an ext event to the client.
1430 1868
1431=cut 1869=cut
1432 1870
1433sub ext_event($$%) { 1871sub ext_msg($$@) {
1434 my ($self, $type, %msg) = @_; 1872 my ($self, $type, @msg) = @_;
1435 1873
1436 $self->ns->ext_event ($type, %msg); 1874 $self->ns->ext_msg ($type, @msg);
1437} 1875}
1438 1876
1439=head3 cf::region 1877=head3 cf::region
1440 1878
1441=over 4 1879=over 4
1451=cut 1889=cut
1452 1890
1453sub find_by_path($) { 1891sub find_by_path($) {
1454 my ($path) = @_; 1892 my ($path) = @_;
1455 1893
1894 $path =~ s/^~[^\/]*//; # skip ~login
1895
1456 my ($match, $specificity); 1896 my ($match, $specificity);
1457 1897
1458 for my $region (list) { 1898 for my $region (list) {
1459 if ($region->match && $path =~ $region->match) { 1899 if ($region->{match} && $path =~ $region->{match}) {
1460 ($match, $specificity) = ($region, $region->specificity) 1900 ($match, $specificity) = ($region, $region->specificity)
1461 if $region->specificity > $specificity; 1901 if $region->specificity > $specificity;
1462 } 1902 }
1463 } 1903 }
1464 1904
1485our $MAX_RESET = 3600; 1925our $MAX_RESET = 3600;
1486our $DEFAULT_RESET = 3000; 1926our $DEFAULT_RESET = 3000;
1487 1927
1488sub generate_random_map { 1928sub generate_random_map {
1489 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1490 # mit "rum" bekleckern, nicht 1930
1931 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1932
1491 $self->_create_random_map ( 1933 $self->_create_random_map ($rmp);
1492 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1493 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1494 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1495 $rmp->{exit_on_final_map},
1496 $rmp->{xsize}, $rmp->{ysize},
1497 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1498 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1499 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1500 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1501 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1502 (cf::region::find $rmp->{region}), $rmp->{custom}
1503 )
1504} 1934}
1505 1935
1506=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1507 1937
1508Register a handler for the map path matching the given regex at the 1938Register a handler for the map path matching the given regex at the
1513 1943
1514sub register { 1944sub register {
1515 my (undef, $regex, $prio) = @_; 1945 my (undef, $regex, $prio) = @_;
1516 my $pkg = caller; 1946 my $pkg = caller;
1517 1947
1518 no strict;
1519 push @{"$pkg\::ISA"}, __PACKAGE__; 1948 push @{"$pkg\::ISA"}, __PACKAGE__;
1520 1949
1521 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1950 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1522} 1951}
1523 1952
1524# also paths starting with '/' 1953# also paths starting with '/'
1525$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1954$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1526 1955
1527sub thawer_merge { 1956sub thawer_merge {
1528 my ($self, $merge) = @_; 1957 my ($self, $merge) = @_;
1529 1958
1530 # we have to keep some variables in memory intact 1959 # we have to keep some variables in memory intact
1535} 1964}
1536 1965
1537sub normalise { 1966sub normalise {
1538 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1539 1968
1540 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1541 1970
1542 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1543 1972
1544 # map plan: 1973 # map plan:
1545 # 1974 #
1560 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1561 $path = "$base/$path"; 1990 $path = "$base/$path";
1562 } 1991 }
1563 1992
1564 for ($path) { 1993 for ($path) {
1565 redo if s{//}{/};
1566 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1567 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1568 } 1996 }
1569 1997
1570 $path 1998 $path
1584 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1585 return $self; 2013 return $self;
1586 } 2014 }
1587 } 2015 }
1588 2016
1589 Carp::carp "unable to resolve path '$path' (base '$base')."; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1590 () 2018 ()
1591} 2019}
1592 2020
2021# may re-bless or do other evil things
1593sub init { 2022sub init {
1594 my ($self) = @_; 2023 my ($self) = @_;
1595 2024
1596 $self 2025 $self
1597} 2026}
1616 2045
1617# the temporary/swap location 2046# the temporary/swap location
1618sub save_path { 2047sub save_path {
1619 my ($self) = @_; 2048 my ($self) = @_;
1620 2049
1621 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2050 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1622 "$TMPDIR/$path.map" 2051 "$TMPDIR/$path.map"
1623} 2052}
1624 2053
1625# the unique path, undef == no special unique path 2054# the unique path, undef == no special unique path
1626sub uniq_path { 2055sub uniq_path {
1627 my ($self) = @_; 2056 my ($self) = @_;
1628 2057
1629 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2058 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1630 "$UNIQUEDIR/$path" 2059 "$UNIQUEDIR/$path"
1631}
1632
1633# and all this just because we cannot iterate over
1634# all maps in C++...
1635sub change_all_map_light {
1636 my ($change) = @_;
1637
1638 $_->change_map_light ($change)
1639 for grep $_->outdoor, values %cf::MAP;
1640} 2060}
1641 2061
1642sub decay_objects { 2062sub decay_objects {
1643 my ($self) = @_; 2063 my ($self) = @_;
1644 2064
1657 2077
1658sub load_header_from($) { 2078sub load_header_from($) {
1659 my ($self, $path) = @_; 2079 my ($self, $path) = @_;
1660 2080
1661 utf8::encode $path; 2081 utf8::encode $path;
1662 #aio_open $path, O_RDONLY, 0 2082 my $f = new_from_file cf::object::thawer $path
1663 # or return;
1664
1665 $self->_load_header ($path)
1666 or return; 2083 or return;
1667 2084
2085 $self->_load_header ($f)
2086 or return;
2087
2088 local $MAP_LOADING{$self->{path}} = $self;
2089 $f->resolve_delayed_derefs;
2090
1668 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1669 2092
1670 1 2093 1
1671} 2094}
1672 2095
2096# used to laod the header of an original map
1673sub load_header_orig { 2097sub load_header_orig {
1674 my ($self) = @_; 2098 my ($self) = @_;
1675 2099
1676 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
1677} 2101}
1678 2102
2103# used to laod the header of an instantiated map
1679sub load_header_temp { 2104sub load_header_temp {
1680 my ($self) = @_; 2105 my ($self) = @_;
1681 2106
1682 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
1683} 2108}
1684 2109
2110# called after loading the header from an instantiated map
1685sub prepare_temp { 2111sub prepare_temp {
1686 my ($self) = @_; 2112 my ($self) = @_;
1687 2113
1688 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
1689 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
1690 # safety 2116 # safety
1691 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
1692 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
1693} 2119}
1694 2120
2121# called after loading the header from an original map
1695sub prepare_orig { 2122sub prepare_orig {
1696 my ($self) = @_; 2123 my ($self) = @_;
1697 2124
1698 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
1699 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
1723 2150
1724sub find; 2151sub find;
1725sub find { 2152sub find {
1726 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
1727 2154
2155 cf::cede_to_tick;
2156
1728 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
1729 2158
2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1730 cf::lock_wait "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
1731 2161
1732 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
1733 my $guard = cf::lock_acquire "map_find:$path";
1734 my $map = new_from_path cf::map $path 2163 my $map = new_from_path cf::map $path
1735 or return; 2164 or return;
1736 2165
1737 $map->{last_save} = $cf::RUNTIME; 2166 $map->{last_save} = $cf::RUNTIME;
1738 2167
1740 or return; 2169 or return;
1741 2170
1742 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2171 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1743 # doing this can freeze the server in a sync job, obviously 2172 # doing this can freeze the server in a sync job, obviously
1744 #$cf::WAIT_FOR_TICK->wait; 2173 #$cf::WAIT_FOR_TICK->wait;
2174 undef $guard2;
2175 undef $guard1;
1745 $map->reset; 2176 $map->reset;
1746 undef $guard;
1747 return find $path; 2177 return find $path;
1748 } 2178 }
1749 2179
1750 $cf::MAP{$path} = $map 2180 $cf::MAP{$path} = $map
1751 } 2181 }
1752} 2182}
1753 2183
1754sub pre_load { } 2184sub pre_load { }
1755sub post_load { } 2185#sub post_load { } # XS
1756 2186
1757sub load { 2187sub load {
1758 my ($self) = @_; 2188 my ($self) = @_;
1759 2189
1760 local $self->{deny_reset} = 1; # loading can take a long time 2190 local $self->{deny_reset} = 1; # loading can take a long time
1761 2191
1762 my $path = $self->{path}; 2192 my $path = $self->{path};
1763 2193
1764 { 2194 {
1765 my $guard = cf::lock_acquire "map_load:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
1766 2196
2197 return unless $self->valid;
1767 return if $self->in_memory != cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
1768
1769 $self->in_memory (cf::MAP_LOADING);
1770 2199
1771 $self->alloc; 2200 $self->alloc;
1772 2201
1773 $self->pre_load; 2202 $self->pre_load;
1774 Coro::cede; 2203 cf::cede_to_tick;
1775 2204
1776 $self->_load_objects ($self->{load_path}, 1) 2205 if (exists $self->{load_path}) {
2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2207 $f->skip_block;
2208 $self->_load_objects ($f)
1777 or return; 2209 or return;
1778 2210
1779 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2211 $self->post_load_original
1780 if delete $self->{load_original}; 2212 if delete $self->{load_original};
1781 2213
1782 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
1783 utf8::encode $uniq; 2215 utf8::encode $uniq;
1784 if (aio_open $uniq, O_RDONLY, 0) { 2216 unless (aio_stat $uniq) {
2217 if (my $f = new_from_file cf::object::thawer $uniq) {
1785 $self->clear_unique_items; 2218 $self->clear_unique_items;
1786 $self->_load_objects ($uniq, 0); 2219 $self->_load_objects ($f);
2220 $f->resolve_delayed_derefs;
2221 }
2222 }
1787 } 2223 }
1788 }
1789 2224
1790 Coro::cede; 2225 $f->resolve_delayed_derefs;
2226 } else {
2227 $self->post_load_original
2228 if delete $self->{load_original};
2229 }
2230
2231 $self->state (cf::MAP_INACTIVE);
2232
2233 cf::cede_to_tick;
1791 # now do the right thing for maps 2234 # now do the right thing for maps
1792 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
1793 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
1794 unless $self->difficulty; 2237 unless $self->difficulty;
1795 Coro::cede; 2238 cf::cede_to_tick;
1796 2239
1797 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
1798 $self->decay_objects; 2241 $self->decay_objects;
1799 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
1800 $self->update_buttons; 2243 $self->update_buttons;
1801 Coro::cede; 2244 cf::cede_to_tick;
1802 $self->set_darkness_map; 2245 #$self->activate; # no longer activate maps automatically
1803 Coro::cede;
1804 $self->activate;
1805 } 2246 }
1806 2247
1807 $self->in_memory (cf::MAP_IN_MEMORY); 2248 $self->{last_save} = $cf::RUNTIME;
2249 $self->last_access ($cf::RUNTIME);
1808 } 2250 }
1809 2251
1810 $self->post_load; 2252 $self->post_load;
1811}
1812 2253
2254 1
2255}
2256
2257# customize the map for a given player, i.e.
2258# return the _real_ map. used by e.g. per-player
2259# maps to change the path to ~playername/mappath
1813sub customise_for { 2260sub customise_for {
1814 my ($self, $ob) = @_; 2261 my ($self, $ob) = @_;
1815 2262
1816 return find "~" . $ob->name . "/" . $self->{path} 2263 return find "~" . $ob->name . "/" . $self->{path}
1817 if $self->per_player; 2264 if $self->per_player;
1820# if $self->per_party; 2267# if $self->per_party;
1821 2268
1822 $self 2269 $self
1823} 2270}
1824 2271
1825# find and load all maps in the 3x3 area around a map
1826sub load_diag {
1827 my ($map) = @_;
1828
1829 my @diag; # diagonal neighbours
1830
1831 for (0 .. 3) {
1832 my $neigh = $map->tile_path ($_)
1833 or next;
1834 $neigh = find $neigh, $map
1835 or next;
1836 $neigh->load;
1837
1838 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1839 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1840 }
1841
1842 for (@diag) {
1843 my $neigh = find @$_
1844 or next;
1845 $neigh->load;
1846 }
1847}
1848
1849sub find_sync { 2272sub find_sync {
1850 my ($path, $origin) = @_; 2273 my ($path, $origin) = @_;
1851 2274
1852 cf::sync_job { find $path, $origin } 2275 # it's a bug to call this from the main context
2276 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2277 if $Coro::current == $Coro::main;
2278
2279 find $path, $origin
1853} 2280}
1854 2281
1855sub do_load_sync { 2282sub do_load_sync {
1856 my ($map) = @_; 2283 my ($map) = @_;
1857 2284
1858 cf::sync_job { $map->load }; 2285 # it's a bug to call this from the main context
2286 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2287 if $Coro::current == $Coro::main;
2288
2289 $map->load;
1859} 2290}
1860 2291
1861our %MAP_PREFETCH; 2292our %MAP_PREFETCH;
1862our $MAP_PREFETCHER = undef; 2293our $MAP_PREFETCHER = undef;
1863 2294
1864sub find_async { 2295sub find_async {
1865 my ($path, $origin) = @_; 2296 my ($path, $origin, $load) = @_;
1866 2297
1867 $path = normalise $path, $origin && $origin->{path}; 2298 $path = normalise $path, $origin;
1868 2299
1869 if (my $map = $cf::MAP{$path}) { 2300 if (my $map = $cf::MAP{$path}) {
1870 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2301 return $map if !$load || $map->linkable;
1871 } 2302 }
1872 2303
1873 undef $MAP_PREFETCH{$path}; 2304 $MAP_PREFETCH{$path} |= $load;
2305
1874 $MAP_PREFETCHER ||= cf::async { 2306 $MAP_PREFETCHER ||= cf::async {
2307 $Coro::current->{desc} = "map prefetcher";
2308
1875 while (%MAP_PREFETCH) { 2309 while (%MAP_PREFETCH) {
1876 for my $path (keys %MAP_PREFETCH) { 2310 while (my ($k, $v) = each %MAP_PREFETCH) {
1877 my $map = find $path 2311 if (my $map = find $k) {
1878 or next;
1879 $map->load; 2312 $map->load if $v;
2313 }
1880 2314
1881 delete $MAP_PREFETCH{$path}; 2315 delete $MAP_PREFETCH{$k};
1882 } 2316 }
1883 } 2317 }
1884 undef $MAP_PREFETCHER; 2318 undef $MAP_PREFETCHER;
1885 }; 2319 };
1886 $MAP_PREFETCHER->prio (6); 2320 $MAP_PREFETCHER->prio (6);
1887 2321
1888 () 2322 ()
1889} 2323}
1890 2324
2325# common code, used by both ->save and ->swapout
1891sub save { 2326sub _save {
1892 my ($self) = @_; 2327 my ($self) = @_;
1893
1894 my $lock = cf::lock_acquire "map_data:" . $self->path;
1895 2328
1896 $self->{last_save} = $cf::RUNTIME; 2329 $self->{last_save} = $cf::RUNTIME;
1897 2330
1898 return unless $self->dirty; 2331 return unless $self->dirty;
1899 2332
1905 return if $self->{deny_save}; 2338 return if $self->{deny_save};
1906 2339
1907 local $self->{last_access} = $self->last_access;#d# 2340 local $self->{last_access} = $self->last_access;#d#
1908 2341
1909 cf::async { 2342 cf::async {
2343 $Coro::current->{desc} = "map player save";
1910 $_->contr->save for $self->players; 2344 $_->contr->save for $self->players;
1911 }; 2345 };
2346
2347 cf::get_slot 0.02;
1912 2348
1913 if ($uniq) { 2349 if ($uniq) {
1914 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2350 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1915 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2351 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1916 } else { 2352 } else {
1917 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2353 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1918 } 2354 }
1919} 2355}
1920 2356
2357sub save {
2358 my ($self) = @_;
2359
2360 my $lock = cf::lock_acquire "map_data:$self->{path}";
2361
2362 $self->_save;
2363}
2364
1921sub swap_out { 2365sub swap_out {
1922 my ($self) = @_; 2366 my ($self) = @_;
1923 2367
1924 # save first because save cedes
1925 $self->save;
1926
1927 my $lock = cf::lock_acquire "map_data:" . $self->path; 2368 my $lock = cf::lock_acquire "map_data:$self->{path}";
1928 2369
2370 return if !$self->linkable;
2371 return if $self->{deny_save};
1929 return if $self->players; 2372 return if $self->players;
1930 return if $self->in_memory != cf::MAP_IN_MEMORY;
1931 return if $self->{deny_save};
1932 2373
2374 # first deactivate the map and "unlink" it from the core
2375 $self->deactivate;
2376 $_->clear_links_to ($self) for values %cf::MAP;
2377 $self->state (cf::MAP_SWAPPED);
2378
2379 # then atomically save
2380 $self->_save;
2381
2382 # then free the map
1933 $self->clear; 2383 $self->clear;
1934 $self->in_memory (cf::MAP_SWAPPED);
1935} 2384}
1936 2385
1937sub reset_at { 2386sub reset_at {
1938 my ($self) = @_; 2387 my ($self) = @_;
1939 2388
1957 2406
1958 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2407 my $lock = cf::lock_acquire "map_data:$self->{path}";
1959 2408
1960 return if $self->players; 2409 return if $self->players;
1961 2410
1962 warn "resetting map ", $self->path; 2411 cf::trace "resetting map ", $self->path, "\n";
1963 2412
1964 $self->in_memory (cf::MAP_SWAPPED); 2413 $self->state (cf::MAP_SWAPPED);
1965 2414
1966 # need to save uniques path 2415 # need to save uniques path
1967 unless ($self->{deny_save}) { 2416 unless ($self->{deny_save}) {
1968 my $uniq = $self->uniq_path; utf8::encode $uniq; 2417 my $uniq = $self->uniq_path; utf8::encode $uniq;
1969 2418
1971 if $uniq; 2420 if $uniq;
1972 } 2421 }
1973 2422
1974 delete $cf::MAP{$self->path}; 2423 delete $cf::MAP{$self->path};
1975 2424
2425 $self->deactivate;
2426 $_->clear_links_to ($self) for values %cf::MAP;
1976 $self->clear; 2427 $self->clear;
1977
1978 $_->clear_links_to ($self) for values %cf::MAP;
1979 2428
1980 $self->unlink_save; 2429 $self->unlink_save;
1981 $self->destroy; 2430 $self->destroy;
1982} 2431}
1983 2432
1984my $nuke_counter = "aaaa"; 2433my $nuke_counter = "aaaa";
1985 2434
1986sub nuke { 2435sub nuke {
1987 my ($self) = @_; 2436 my ($self) = @_;
1988 2437
2438 {
2439 my $lock = cf::lock_acquire "map_data:$self->{path}";
2440
1989 delete $cf::MAP{$self->path}; 2441 delete $cf::MAP{$self->path};
1990 2442
1991 $self->unlink_save; 2443 $self->unlink_save;
1992 2444
1993 bless $self, "cf::map"; 2445 bless $self, "cf::map::wrap";
1994 delete $self->{deny_reset}; 2446 delete $self->{deny_reset};
1995 $self->{deny_save} = 1; 2447 $self->{deny_save} = 1;
1996 $self->reset_timeout (1); 2448 $self->reset_timeout (1);
1997 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2449 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1998 2450
1999 $cf::MAP{$self->path} = $self; 2451 $cf::MAP{$self->path} = $self;
2452 }
2000 2453
2001 $self->reset; # polite request, might not happen 2454 $self->reset; # polite request, might not happen
2002} 2455}
2003 2456
2004=item $maps = cf::map::tmp_maps 2457=item $maps = cf::map::tmp_maps
2046 2499
2047sub unique_maps() { 2500sub unique_maps() {
2048 [ 2501 [
2049 map { 2502 map {
2050 utf8::decode $_; 2503 utf8::decode $_;
2051 /\.map$/ 2504 s/\.map$//; # TODO future compatibility hack
2505 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2506 ? ()
2052 ? normalise $_ 2507 : normalise $_
2053 : ()
2054 } @{ aio_readdir $UNIQUEDIR or [] } 2508 } @{ aio_readdir $UNIQUEDIR or [] }
2055 ] 2509 ]
2056} 2510}
2057 2511
2058package cf; 2512=item cf::map::static_maps
2513
2514Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2515file in the shared directory excluding F</styles> and F</editor>). May
2516block.
2517
2518=cut
2519
2520sub static_maps() {
2521 my @dirs = "";
2522 my @maps;
2523
2524 while (@dirs) {
2525 my $dir = shift @dirs;
2526
2527 next if $dir eq "/styles" || $dir eq "/editor";
2528
2529 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2530 or return;
2531
2532 for (@$files) {
2533 s/\.map$// or next;
2534 utf8::decode $_;
2535 push @maps, "$dir/$_";
2536 }
2537
2538 push @dirs, map "$dir/$_", @$dirs;
2539 }
2540
2541 \@maps
2542}
2059 2543
2060=back 2544=back
2061 2545
2062=head3 cf::object 2546=head3 cf::object
2063 2547
2067 2551
2068=over 4 2552=over 4
2069 2553
2070=item $ob->inv_recursive 2554=item $ob->inv_recursive
2071 2555
2072Returns the inventory of the object _and_ their inventories, recursively. 2556Returns the inventory of the object I<and> their inventories, recursively,
2557but I<not> the object itself.
2073 2558
2074=cut 2559=cut
2075 2560
2076sub inv_recursive_; 2561sub inv_recursive_;
2077sub inv_recursive_ { 2562sub inv_recursive_ {
2080 2565
2081sub inv_recursive { 2566sub inv_recursive {
2082 inv_recursive_ inv $_[0] 2567 inv_recursive_ inv $_[0]
2083} 2568}
2084 2569
2570=item $ref = $ob->ref
2571
2572Creates and returns a persistent reference to an object that can be stored as a string.
2573
2574=item $ob = cf::object::deref ($refstring)
2575
2576returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2577even if the object actually exists. May block.
2578
2579=cut
2580
2581sub deref {
2582 my ($ref) = @_;
2583
2584 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2585 my ($uuid, $name) = ($1, $2);
2586 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2587 or return;
2588 $pl->ob->uuid eq $uuid
2589 or return;
2590
2591 $pl->ob
2592 } else {
2593 warn "$ref: cannot resolve object reference\n";
2594 undef
2595 }
2596}
2597
2085package cf; 2598package cf;
2086 2599
2087=back 2600=back
2088 2601
2089=head3 cf::object::player 2602=head3 cf::object::player
2095Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2608Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2096can be C<undef>. Does the right thing when the player is currently in a 2609can be C<undef>. Does the right thing when the player is currently in a
2097dialogue with the given NPC character. 2610dialogue with the given NPC character.
2098 2611
2099=cut 2612=cut
2613
2614our $SAY_CHANNEL = {
2615 id => "say",
2616 title => "Map",
2617 reply => "say ",
2618 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2619};
2620
2621our $CHAT_CHANNEL = {
2622 id => "chat",
2623 title => "Chat",
2624 reply => "chat ",
2625 tooltip => "Player chat and shouts, global to the server.",
2626};
2100 2627
2101# rough implementation of a future "reply" method that works 2628# rough implementation of a future "reply" method that works
2102# with dialog boxes. 2629# with dialog boxes.
2103#TODO: the first argument must go, split into a $npc->reply_to ( method 2630#TODO: the first argument must go, split into a $npc->reply_to ( method
2104sub cf::object::player::reply($$$;$) { 2631sub cf::object::player::reply($$$;$) {
2111 2638
2112 } else { 2639 } else {
2113 my $pl = $self->contr; 2640 my $pl = $self->contr;
2114 2641
2115 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2642 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2116 my $diag = $pl->{npc_dialog}; 2643 my $dialog = $pl->{npc_dialog};
2117 $diag->{pl}->ext_reply ( 2644 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2118 $diag->{id},
2119 msgtype => "reply",
2120 msg => $diag->{pl}->expand_cfpod ($msg),
2121 add_topics => []
2122 );
2123 2645
2124 } else { 2646 } else {
2125 $msg = $npc->name . " says: $msg" if $npc; 2647 $msg = $npc->name . " says: $msg" if $npc;
2126 $self->message ($msg, $flags); 2648 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2127 } 2649 }
2128 } 2650 }
2651}
2652
2653=item $object->send_msg ($channel, $msg, $color, [extra...])
2654
2655=cut
2656
2657sub cf::object::send_msg {
2658 my $pl = shift->contr
2659 or return;
2660 $pl->send_msg (@_);
2129} 2661}
2130 2662
2131=item $player_object->may ("access") 2663=item $player_object->may ("access")
2132 2664
2133Returns wether the given player is authorized to access resource "access" 2665Returns wether the given player is authorized to access resource "access"
2146 2678
2147=item $player_object->enter_link 2679=item $player_object->enter_link
2148 2680
2149Freezes the player and moves him/her to a special map (C<{link}>). 2681Freezes the player and moves him/her to a special map (C<{link}>).
2150 2682
2151The player should be reasonably safe there for short amounts of time. You 2683The player should be reasonably safe there for short amounts of time (e.g.
2152I<MUST> call C<leave_link> as soon as possible, though. 2684for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2685though, as the player cannot control the character while it is on the link
2686map.
2153 2687
2154Will never block. 2688Will never block.
2155 2689
2156=item $player_object->leave_link ($map, $x, $y) 2690=item $player_object->leave_link ($map, $x, $y)
2157 2691
2177sub cf::object::player::enter_link { 2711sub cf::object::player::enter_link {
2178 my ($self) = @_; 2712 my ($self) = @_;
2179 2713
2180 $self->deactivate_recursive; 2714 $self->deactivate_recursive;
2181 2715
2716 ++$self->{_link_recursion};
2717
2182 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2718 return if UNIVERSAL::isa $self->map, "ext::map_link";
2183 2719
2184 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2720 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2185 if $self->map && $self->map->{path} ne "{link}"; 2721 if $self->map && $self->map->{path} ne "{link}";
2186 2722
2187 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2723 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2188} 2724}
2189 2725
2190sub cf::object::player::leave_link { 2726sub cf::object::player::leave_link {
2191 my ($self, $map, $x, $y) = @_; 2727 my ($self, $map, $x, $y) = @_;
2192 2728
2209 ($x, $y) = (-1, -1) 2745 ($x, $y) = (-1, -1)
2210 unless (defined $x) && (defined $y); 2746 unless (defined $x) && (defined $y);
2211 2747
2212 # use -1 or undef as default coordinates, not 0, 0 2748 # use -1 or undef as default coordinates, not 0, 0
2213 ($x, $y) = ($map->enter_x, $map->enter_y) 2749 ($x, $y) = ($map->enter_x, $map->enter_y)
2214 if $x <=0 && $y <= 0; 2750 if $x <= 0 && $y <= 0;
2215 2751
2216 $map->load; 2752 $map->load;
2217 $map->load_diag;
2218 2753
2219 return unless $self->contr->active; 2754 return unless $self->contr->active;
2220 $self->activate_recursive;
2221 2755
2222 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2756 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2223 $self->enter_map ($map, $x, $y); 2757 if ($self->enter_map ($map, $x, $y)) {
2224} 2758 # entering was successful
2759 delete $self->{_link_recursion};
2760 # only activate afterwards, to support waiting in hooks
2761 $self->activate_recursive;
2762 }
2225 2763
2764}
2765
2226=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2766=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2227 2767
2228Moves the player to the given map-path and coordinates by first freezing 2768Moves the player to the given map-path and coordinates by first freezing
2229her, loading and preparing them map, calling the provided $check callback 2769her, loading and preparing them map, calling the provided $check callback
2230that has to return the map if sucecssful, and then unfreezes the player on 2770that has to return the map if sucecssful, and then unfreezes the player on
2231the new (success) or old (failed) map position. 2771the new (success) or old (failed) map position. In either case, $done will
2772be called at the end of this process.
2773
2774Note that $check will be called with a potentially non-loaded map, so if
2775it needs a loaded map it has to call C<< ->load >>.
2232 2776
2233=cut 2777=cut
2234 2778
2235our $GOTOGEN; 2779our $GOTOGEN;
2236 2780
2237sub cf::object::player::goto { 2781sub cf::object::player::goto {
2238 my ($self, $path, $x, $y, $check) = @_; 2782 my ($self, $path, $x, $y, $check, $done) = @_;
2783
2784 if ($self->{_link_recursion} >= $MAX_LINKS) {
2785 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2786 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2787 ($path, $x, $y) = @$EMERGENCY_POSITION;
2788 }
2239 2789
2240 # do generation counting so two concurrent goto's will be executed in-order 2790 # do generation counting so two concurrent goto's will be executed in-order
2241 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2791 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2242 2792
2243 $self->enter_link; 2793 $self->enter_link;
2244 2794
2245 (async { 2795 (async {
2796 $Coro::current->{desc} = "player::goto $path $x $y";
2797
2798 # *tag paths override both path and x|y
2799 if ($path =~ /^\*(.*)$/) {
2800 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2801 my $ob = $obs[rand @obs];
2802
2803 # see if we actually can go there
2804 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2805 $ob = $obs[rand @obs];
2806 } else {
2807 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2808 }
2809 # else put us there anyways for now #d#
2810
2811 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2812 } else {
2813 ($path, $x, $y) = (undef, undef, undef);
2814 }
2815 }
2816
2246 my $map = eval { 2817 my $map = eval {
2247 my $map = cf::map::find $path; 2818 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2248 2819
2249 if ($map) { 2820 if ($map) {
2250 $map = $map->customise_for ($self); 2821 $map = $map->customise_for ($self);
2251 $map = $check->($map) if $check && $map; 2822 $map = $check->($map, $x, $y, $self) if $check && $map;
2252 } else { 2823 } else {
2253 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2824 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2254 } 2825 }
2255 2826
2256 $map 2827 $map
2257 }; 2828 };
2258 2829
2263 2834
2264 if ($gen == $self->{_goto_generation}) { 2835 if ($gen == $self->{_goto_generation}) {
2265 delete $self->{_goto_generation}; 2836 delete $self->{_goto_generation};
2266 $self->leave_link ($map, $x, $y); 2837 $self->leave_link ($map, $x, $y);
2267 } 2838 }
2839
2840 $done->($self) if $done;
2268 })->prio (1); 2841 })->prio (1);
2269} 2842}
2270 2843
2271=item $player_object->enter_exit ($exit_object) 2844=item $player_object->enter_exit ($exit_object)
2272 2845
2292} 2865}
2293 2866
2294sub prepare_random_map { 2867sub prepare_random_map {
2295 my ($exit) = @_; 2868 my ($exit) = @_;
2296 2869
2297 my $guard = cf::lock_acquire "exit_prepare:$exit";
2298
2299 # all this does is basically replace the /! path by 2870 # all this does is basically replace the /! path by
2300 # a new random map path (?random/...) with a seed 2871 # a new random map path (?random/...) with a seed
2301 # that depends on the exit object 2872 # that depends on the exit object
2302 2873
2303 my $rmp = parse_random_map_params $exit->msg; 2874 my $rmp = parse_random_map_params $exit->msg;
2305 if ($exit->map) { 2876 if ($exit->map) {
2306 $rmp->{region} = $exit->region->name; 2877 $rmp->{region} = $exit->region->name;
2307 $rmp->{origin_map} = $exit->map->path; 2878 $rmp->{origin_map} = $exit->map->path;
2308 $rmp->{origin_x} = $exit->x; 2879 $rmp->{origin_x} = $exit->x;
2309 $rmp->{origin_y} = $exit->y; 2880 $rmp->{origin_y} = $exit->y;
2881
2882 $exit->map->touch;
2310 } 2883 }
2311 2884
2312 $rmp->{random_seed} ||= $exit->random_seed; 2885 $rmp->{random_seed} ||= $exit->random_seed;
2313 2886
2314 my $data = cf::to_json $rmp; 2887 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2315 my $md5 = Digest::MD5::md5_hex $data; 2888 my $md5 = Digest::MD5::md5_hex $data;
2316 my $meta = "$RANDOMDIR/$md5.meta"; 2889 my $meta = "$RANDOMDIR/$md5.meta";
2317 2890
2318 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2891 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2319 aio_write $fh, 0, (length $data), $data, 0; 2892 aio_write $fh, 0, (length $data), $data, 0;
2320 undef $fh; 2893 undef $fh;
2321 aio_rename "$meta~", $meta; 2894 aio_rename "$meta~", $meta;
2322 2895
2896 my $slaying = "?random/$md5";
2897
2898 if ($exit->valid) {
2323 $exit->slaying ("?random/$md5"); 2899 $exit->slaying ("?random/$md5");
2324 $exit->msg (undef); 2900 $exit->msg (undef);
2901 }
2325 } 2902 }
2326} 2903}
2327 2904
2328sub cf::object::player::enter_exit { 2905sub cf::object::player::enter_exit {
2329 my ($self, $exit) = @_; 2906 my ($self, $exit) = @_;
2330 2907
2331 return unless $self->type == cf::PLAYER; 2908 return unless $self->type == cf::PLAYER;
2332 2909
2333 if ($exit->slaying eq "/!") {
2334 #TODO: this should de-fi-ni-te-ly not be a sync-job
2335 # the problem is that $exit might not survive long enough
2336 # so it needs to be done right now, right here
2337 cf::sync_job { prepare_random_map $exit };
2338 }
2339
2340 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2341 my $hp = $exit->stats->hp;
2342 my $sp = $exit->stats->sp;
2343
2344 $self->enter_link; 2910 $self->enter_link;
2345 2911
2346 (async { 2912 (async {
2347 $self->deactivate_recursive; # just to be sure 2913 $Coro::current->{desc} = "enter_exit";
2914
2348 unless (eval { 2915 unless (eval {
2916 $self->deactivate_recursive; # just to be sure
2917
2918 my $map = cf::map::normalise $exit->slaying, $exit->map;
2919 my $x = $exit->stats->hp;
2920 my $y = $exit->stats->sp;
2921
2922 # special map handling
2923 my $slaying = $exit->slaying;
2924
2925 # special map handling
2926 if ($slaying eq "/!") {
2927 my $guard = cf::lock_acquire "exit_prepare:$exit";
2928
2929 prepare_random_map $exit
2930 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2931
2932 $map = $exit->slaying;
2933
2934 } elsif ($slaying eq '!up') {
2935 $map = $exit->map->tile_path (cf::TILE_UP);
2936 $x = $exit->x;
2937 $y = $exit->y;
2938
2939 } elsif ($slaying eq '!down') {
2940 $map = $exit->map->tile_path (cf::TILE_DOWN);
2941 $x = $exit->x;
2942 $y = $exit->y;
2943 }
2944
2349 $self->goto ($slaying, $hp, $sp); 2945 $self->goto ($map, $x, $y);
2350 2946
2947 # if exit is damned, update players death & WoR home-position
2948 $self->contr->savebed ($map, $x, $y)
2949 if $exit->flag (cf::FLAG_DAMNED);
2950
2351 1; 2951 1
2352 }) { 2952 }) {
2353 $self->message ("Something went wrong deep within the crossfire server. " 2953 $self->message ("Something went wrong deep within the deliantra server. "
2354 . "I'll try to bring you back to the map you were before. " 2954 . "I'll try to bring you back to the map you were before. "
2355 . "Please report this to the dungeon master!", 2955 . "Please report this to the dungeon master!",
2356 cf::NDI_UNIQUE | cf::NDI_RED); 2956 cf::NDI_UNIQUE | cf::NDI_RED);
2357 2957
2358 warn "ERROR in enter_exit: $@"; 2958 error "ERROR in enter_exit: $@";
2359 $self->leave_link; 2959 $self->leave_link;
2360 } 2960 }
2361 })->prio (1); 2961 })->prio (1);
2362} 2962}
2363 2963
2377 2977
2378 utf8::encode $text; 2978 utf8::encode $text;
2379 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2979 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2380} 2980}
2381 2981
2982=item $client->send_big_packet ($pkt)
2983
2984Like C<send_packet>, but tries to compress large packets, and fragments
2985them as required.
2986
2987=cut
2988
2989our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2990
2991sub cf::client::send_big_packet {
2992 my ($self, $pkt) = @_;
2993
2994 # try lzf for large packets
2995 $pkt = "lzf " . Compress::LZF::compress $pkt
2996 if 1024 <= length $pkt and $self->{can_lzf};
2997
2998 # split very large packets
2999 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3000 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3001 $pkt = "frag";
3002 }
3003
3004 $self->send_packet ($pkt);
3005}
3006
2382=item $client->send_msg ($color, $type, $msg, [extra...]) 3007=item $client->send_msg ($channel, $msg, $color, [extra...])
2383 3008
2384Send a drawinfo or msg packet to the client, formatting the msg for the 3009Send a drawinfo or msg packet to the client, formatting the msg for the
2385client if neccessary. C<$type> should be a string identifying the type of 3010client if neccessary. C<$type> should be a string identifying the type of
2386the message, with C<log> being the default. If C<$color> is negative, suppress 3011the message, with C<log> being the default. If C<$color> is negative, suppress
2387the message unless the client supports the msg packet. 3012the message unless the client supports the msg packet.
2388 3013
2389=cut 3014=cut
2390 3015
3016# non-persistent channels (usually the info channel)
3017our %CHANNEL = (
3018 "c/motd" => {
3019 id => "infobox",
3020 title => "MOTD",
3021 reply => undef,
3022 tooltip => "The message of the day",
3023 },
3024 "c/identify" => {
3025 id => "infobox",
3026 title => "Identify",
3027 reply => undef,
3028 tooltip => "Items recently identified",
3029 },
3030 "c/examine" => {
3031 id => "infobox",
3032 title => "Examine",
3033 reply => undef,
3034 tooltip => "Signs and other items you examined",
3035 },
3036 "c/shopinfo" => {
3037 id => "infobox",
3038 title => "Shop Info",
3039 reply => undef,
3040 tooltip => "What your bargaining skill tells you about the shop",
3041 },
3042 "c/book" => {
3043 id => "infobox",
3044 title => "Book",
3045 reply => undef,
3046 tooltip => "The contents of a note or book",
3047 },
3048 "c/lookat" => {
3049 id => "infobox",
3050 title => "Look",
3051 reply => undef,
3052 tooltip => "What you saw there",
3053 },
3054 "c/who" => {
3055 id => "infobox",
3056 title => "Players",
3057 reply => undef,
3058 tooltip => "Shows players who are currently online",
3059 },
3060 "c/body" => {
3061 id => "infobox",
3062 title => "Body Parts",
3063 reply => undef,
3064 tooltip => "Shows which body parts you posess and are available",
3065 },
3066 "c/statistics" => {
3067 id => "infobox",
3068 title => "Statistics",
3069 reply => undef,
3070 tooltip => "Shows your primary statistics",
3071 },
3072 "c/skills" => {
3073 id => "infobox",
3074 title => "Skills",
3075 reply => undef,
3076 tooltip => "Shows your experience per skill and item power",
3077 },
3078 "c/shopitems" => {
3079 id => "infobox",
3080 title => "Shop Items",
3081 reply => undef,
3082 tooltip => "Shows the items currently for sale in this shop",
3083 },
3084 "c/resistances" => {
3085 id => "infobox",
3086 title => "Resistances",
3087 reply => undef,
3088 tooltip => "Shows your resistances",
3089 },
3090 "c/pets" => {
3091 id => "infobox",
3092 title => "Pets",
3093 reply => undef,
3094 tooltip => "Shows information abotu your pets/a specific pet",
3095 },
3096 "c/perceiveself" => {
3097 id => "infobox",
3098 title => "Perceive Self",
3099 reply => undef,
3100 tooltip => "You gained detailed knowledge about yourself",
3101 },
3102 "c/uptime" => {
3103 id => "infobox",
3104 title => "Uptime",
3105 reply => undef,
3106 tooltip => "How long the server has been running since last restart",
3107 },
3108 "c/mapinfo" => {
3109 id => "infobox",
3110 title => "Map Info",
3111 reply => undef,
3112 tooltip => "Information related to the maps",
3113 },
3114 "c/party" => {
3115 id => "party",
3116 title => "Party",
3117 reply => "gsay ",
3118 tooltip => "Messages and chat related to your party",
3119 },
3120 "c/death" => {
3121 id => "death",
3122 title => "Death",
3123 reply => undef,
3124 tooltip => "Reason for and more info about your most recent death",
3125 },
3126 "c/say" => $SAY_CHANNEL,
3127 "c/chat" => $CHAT_CHANNEL,
3128);
3129
2391sub cf::client::send_msg { 3130sub cf::client::send_msg {
2392 my ($self, $color, $type, $msg, @extra) = @_; 3131 my ($self, $channel, $msg, $color, @extra) = @_;
2393 3132
2394 $msg = $self->pl->expand_cfpod ($msg); 3133 $msg = $self->pl->expand_cfpod ($msg)
3134 unless $color & cf::NDI_VERBATIM;
2395 3135
2396 if ($self->can_msg) { 3136 $color &= cf::NDI_CLIENT_MASK; # just in case...
2397 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);
2398 } else {
2399 # replace some tags by gcfclient-compatible ones
2400 for ($msg) {
2401 1 while
2402 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2403 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2404 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2405 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2406 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2407 }
2408 3137
2409 if ($color >= 0) { 3138 # check predefined channels, for the benefit of C
2410 if (0 && $msg =~ /\[/) { 3139 if ($CHANNEL{$channel}) {
2411 $self->send_packet ("drawextinfo $color 4 0 $msg") 3140 $channel = $CHANNEL{$channel};
2412 } else { 3141
2413 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 3142 $self->ext_msg (channel_info => $channel);
2414 $self->send_packet ("drawinfo $color $msg") 3143 $channel = $channel->{id};
3144
3145 } elsif (ref $channel) {
3146 # send meta info to client, if not yet sent
3147 unless (exists $self->{channel}{$channel->{id}}) {
3148 $self->{channel}{$channel->{id}} = $channel;
3149 $self->ext_msg (channel_info => $channel);
2415 } 3150 }
2416 }
2417 }
2418}
2419 3151
3152 $channel = $channel->{id};
3153 }
3154
3155 return unless @extra || length $msg;
3156
3157 # default colour, mask it out
3158 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
3159 if $color & cf::NDI_DEF;
3160
3161 my $pkt = "msg "
3162 . $self->{json_coder}->encode (
3163 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
3164 );
3165
3166 $self->send_big_packet ($pkt);
3167}
3168
2420=item $client->ext_event ($type, %msg) 3169=item $client->ext_msg ($type, @msg)
2421 3170
2422Sends an ext event to the client. 3171Sends an ext event to the client.
2423 3172
2424=cut 3173=cut
2425 3174
2426sub cf::client::ext_event($$%) { 3175sub cf::client::ext_msg($$@) {
2427 my ($self, $type, %msg) = @_; 3176 my ($self, $type, @msg) = @_;
2428 3177
3178 if ($self->extcmd == 2) {
3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3180 } elsif ($self->extcmd == 1) { # TODO: remove
2429 $msg{msgtype} = "event_$type"; 3181 push @msg, msgtype => "event_$type";
2430 $self->send_packet ("ext " . cf::to_json \%msg); 3182 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3183 }
3184}
3185
3186=item $client->ext_reply ($msgid, @msg)
3187
3188Sends an ext reply to the client.
3189
3190=cut
3191
3192sub cf::client::ext_reply($$@) {
3193 my ($self, $id, @msg) = @_;
3194
3195 if ($self->extcmd == 2) {
3196 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3197 } elsif ($self->extcmd == 1) {
3198 #TODO: version 1, remove
3199 unshift @msg, msgtype => "reply", msgid => $id;
3200 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3201 }
2431} 3202}
2432 3203
2433=item $success = $client->query ($flags, "text", \&cb) 3204=item $success = $client->query ($flags, "text", \&cb)
2434 3205
2435Queues a query to the client, calling the given callback with 3206Queues a query to the client, calling the given callback with
2458 3229
2459 1 3230 1
2460} 3231}
2461 3232
2462cf::client->attach ( 3233cf::client->attach (
3234 on_connect => sub {
3235 my ($ns) = @_;
3236
3237 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
3238 },
2463 on_reply => sub { 3239 on_reply => sub {
2464 my ($ns, $msg) = @_; 3240 my ($ns, $msg) = @_;
2465 3241
2466 # this weird shuffling is so that direct followup queries 3242 # this weird shuffling is so that direct followup queries
2467 # get handled first 3243 # get handled first
2482 } 3258 }
2483 }, 3259 },
2484 on_exticmd => sub { 3260 on_exticmd => sub {
2485 my ($ns, $buf) = @_; 3261 my ($ns, $buf) = @_;
2486 3262
2487 my $msg = eval { from_json $buf }; 3263 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2488 3264
2489 if (ref $msg) { 3265 if (ref $msg) {
3266 my ($type, $reply, @payload) =
3267 "ARRAY" eq ref $msg
3268 ? @$msg
3269 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3270
3271 my @reply;
3272
2490 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3273 if (my $cb = $EXTICMD{$type}) {
2491 if (my %reply = $cb->($ns, $msg)) { 3274 @reply = $cb->($ns, @payload);
2492 $reply{msgid} = $msg->{msgid};
2493 $ns->send ("ext " . cf::to_json \%reply);
2494 }
2495 } 3275 }
3276
3277 $ns->ext_reply ($reply, @reply)
3278 if $reply;
3279
2496 } else { 3280 } else {
2497 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3281 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2498 } 3282 }
2499 3283
2500 cf::override; 3284 cf::override;
2501 }, 3285 },
2502); 3286);
2522 3306
2523 $coro 3307 $coro
2524} 3308}
2525 3309
2526cf::client->attach ( 3310cf::client->attach (
2527 on_destroy => sub { 3311 on_client_destroy => sub {
2528 my ($ns) = @_; 3312 my ($ns) = @_;
2529 3313
2530 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3314 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2531 }, 3315 },
2532); 3316);
2547our $safe = new Safe "safe"; 3331our $safe = new Safe "safe";
2548our $safe_hole = new Safe::Hole; 3332our $safe_hole = new Safe::Hole;
2549 3333
2550$SIG{FPE} = 'IGNORE'; 3334$SIG{FPE} = 'IGNORE';
2551 3335
2552$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3336$safe->permit_only (Opcode::opset qw(
3337 :base_core :base_mem :base_orig :base_math :base_loop
3338 grepstart grepwhile mapstart mapwhile
3339 sort time
3340));
2553 3341
2554# here we export the classes and methods available to script code 3342# here we export the classes and methods available to script code
2555 3343
2556=pod 3344=pod
2557 3345
2558The following functions and methods are available within a safe environment: 3346The following functions and methods are available within a safe environment:
2559 3347
2560 cf::object contr pay_amount pay_player map 3348 cf::object
3349 contr pay_amount pay_player map x y force_find force_add destroy
3350 insert remove name archname title slaying race decrease split
3351 value
3352
2561 cf::object::player player 3353 cf::object::player
2562 cf::player peaceful 3354 player
2563 cf::map trigger 3355
3356 cf::player
3357 peaceful
3358
3359 cf::map
3360 trigger
2564 3361
2565=cut 3362=cut
2566 3363
2567for ( 3364for (
2568 ["cf::object" => qw(contr pay_amount pay_player map)], 3365 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3366 insert remove inv nrof name archname title slaying race
3367 decrease split destroy change_exp value msg lore send_msg)],
2569 ["cf::object::player" => qw(player)], 3368 ["cf::object::player" => qw(player)],
2570 ["cf::player" => qw(peaceful)], 3369 ["cf::player" => qw(peaceful send_msg)],
2571 ["cf::map" => qw(trigger)], 3370 ["cf::map" => qw(trigger)],
2572) { 3371) {
2573 no strict 'refs';
2574 my ($pkg, @funs) = @$_; 3372 my ($pkg, @funs) = @$_;
2575 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3373 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2576 for @funs; 3374 for @funs;
2577} 3375}
2578 3376
2593 3391
2594 my $qcode = $code; 3392 my $qcode = $code;
2595 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3393 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2596 $qcode =~ s/\n/\\n/g; 3394 $qcode =~ s/\n/\\n/g;
2597 3395
3396 %vars = (_dummy => 0) unless %vars;
3397
3398 my @res;
2598 local $_; 3399 local $_;
2599 local @safe::cf::_safe_eval_args = values %vars;
2600 3400
2601 my $eval = 3401 my $eval =
2602 "do {\n" 3402 "do {\n"
2603 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3403 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2604 . "#line 0 \"{$qcode}\"\n" 3404 . "#line 0 \"{$qcode}\"\n"
2605 . $code 3405 . $code
2606 . "\n}" 3406 . "\n}"
2607 ; 3407 ;
2608 3408
3409 if ($CFG{safe_eval}) {
2609 sub_generation_inc; 3410 sub_generation_inc;
3411 local @safe::cf::_safe_eval_args = values %vars;
2610 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3412 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2611 sub_generation_inc; 3413 sub_generation_inc;
3414 } else {
3415 local @cf::_safe_eval_args = values %vars;
3416 @res = wantarray ? eval eval : scalar eval $eval;
3417 }
2612 3418
2613 if ($@) { 3419 if ($@) {
2614 warn "$@"; 3420 warn "$@",
2615 warn "while executing safe code '$code'\n"; 3421 "while executing safe code '$code'\n",
2616 warn "with arguments " . (join " ", %vars) . "\n"; 3422 "with arguments " . (join " ", %vars) . "\n";
2617 } 3423 }
2618 3424
2619 wantarray ? @res : $res[0] 3425 wantarray ? @res : $res[0]
2620} 3426}
2621 3427
2635=cut 3441=cut
2636 3442
2637sub register_script_function { 3443sub register_script_function {
2638 my ($fun, $cb) = @_; 3444 my ($fun, $cb) = @_;
2639 3445
2640 no strict 'refs'; 3446 $fun = "safe::$fun" if $CFG{safe_eval};
2641 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3447 *$fun = $safe_hole->wrap ($cb);
2642} 3448}
2643 3449
2644=back 3450=back
2645 3451
2646=cut 3452=cut
2649# the server's init and main functions 3455# the server's init and main functions
2650 3456
2651sub load_facedata($) { 3457sub load_facedata($) {
2652 my ($path) = @_; 3458 my ($path) = @_;
2653 3459
3460 # HACK to clear player env face cache, we need some signal framework
3461 # for this (global event?)
3462 %ext::player_env::MUSIC_FACE_CACHE = ();
3463
3464 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3465
2654 warn "loading facedata from $path\n"; 3466 trace "loading facedata from $path\n";
2655 3467
2656 my $facedata; 3468 my $facedata = decode_storable load_file $path;
2657 0 < aio_load $path, $facedata
2658 or die "$path: $!";
2659
2660 $facedata = Coro::Storable::thaw $facedata;
2661 3469
2662 $facedata->{version} == 2 3470 $facedata->{version} == 2
2663 or cf::cleanup "$path: version mismatch, cannot proceed."; 3471 or cf::cleanup "$path: version mismatch, cannot proceed.";
2664 3472
3473 # patch in the exptable
3474 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3475 $facedata->{resource}{"res/exp_table"} = {
3476 type => FT_RSRC,
3477 data => $exp_table,
3478 hash => (Digest::MD5::md5 $exp_table),
3479 };
3480 cf::cede_to_tick;
3481
2665 { 3482 {
2666 my $faces = $facedata->{faceinfo}; 3483 my $faces = $facedata->{faceinfo};
2667 3484
2668 while (my ($face, $info) = each %$faces) { 3485 while (my ($face, $info) = each %$faces) {
2669 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3486 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3487
2670 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3488 cf::face::set_visibility $idx, $info->{visibility};
3489 cf::face::set_magicmap $idx, $info->{magicmap};
2671 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3490 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2672 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3491 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2673 Coro::cede; 3492 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3493
3494 cf::cede_to_tick;
2674 } 3495 }
2675 3496
2676 while (my ($face, $info) = each %$faces) { 3497 while (my ($face, $info) = each %$faces) {
2677 next unless $info->{smooth}; 3498 next unless $info->{smooth};
3499
2678 my $idx = cf::face::find $face 3500 my $idx = cf::face::find $face
2679 or next; 3501 or next;
3502
2680 if (my $smooth = cf::face::find $info->{smooth}) { 3503 if (my $smooth = cf::face::find $info->{smooth}) {
3504 cf::face::set_smooth $idx, $smooth;
2681 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3505 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2682 } else { 3506 } else {
2683 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3507 error "smooth face '$info->{smooth}' not found for face '$face'";
2684 } 3508 }
2685 Coro::cede; 3509
3510 cf::cede_to_tick;
2686 } 3511 }
2687 } 3512 }
2688 3513
2689 { 3514 {
2690 my $anims = $facedata->{animinfo}; 3515 my $anims = $facedata->{animinfo};
2691 3516
2692 while (my ($anim, $info) = each %$anims) { 3517 while (my ($anim, $info) = each %$anims) {
2693 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3518 cf::anim::set $anim, $info->{frames}, $info->{facings};
2694 Coro::cede; 3519 cf::cede_to_tick;
2695 } 3520 }
2696 3521
2697 cf::anim::invalidate_all; # d'oh 3522 cf::anim::invalidate_all; # d'oh
2698 } 3523 }
2699 3524
3525 {
3526 my $res = $facedata->{resource};
3527
3528 while (my ($name, $info) = each %$res) {
3529 if (defined $info->{type}) {
3530 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3531
3532 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3533 cf::face::set_type $idx, $info->{type};
3534 } else {
3535 $RESOURCE{$name} = $info; # unused
3536 }
3537
3538 cf::cede_to_tick;
3539 }
3540 }
3541
3542 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3543
2700 1 3544 1
2701} 3545}
2702 3546
3547register_exticmd fx_want => sub {
3548 my ($ns, $want) = @_;
3549
3550 while (my ($k, $v) = each %$want) {
3551 $ns->fx_want ($k, $v);
3552 }
3553};
3554
3555sub load_resource_file($) {
3556 my $guard = lock_acquire "load_resource_file";
3557
3558 my $status = load_resource_file_ $_[0];
3559 get_slot 0.1, 100;
3560 cf::arch::commit_load;
3561
3562 $status
3563}
3564
2703sub reload_regions { 3565sub reload_regions {
3566 # HACK to clear player env face cache, we need some signal framework
3567 # for this (global event?)
3568 %ext::player_env::MUSIC_FACE_CACHE = ();
3569
2704 load_resource_file "$MAPDIR/regions" 3570 load_resource_file "$MAPDIR/regions"
2705 or die "unable to load regions file\n"; 3571 or die "unable to load regions file\n";
3572
3573 for (cf::region::list) {
3574 $_->{match} = qr/$_->{match}/
3575 if exists $_->{match};
3576 }
2706} 3577}
2707 3578
2708sub reload_facedata { 3579sub reload_facedata {
2709 load_facedata "$DATADIR/facedata" 3580 load_facedata "$DATADIR/facedata"
2710 or die "unable to load facedata\n"; 3581 or die "unable to load facedata\n";
2718sub reload_treasures { 3589sub reload_treasures {
2719 load_resource_file "$DATADIR/treasures" 3590 load_resource_file "$DATADIR/treasures"
2720 or die "unable to load treasurelists\n"; 3591 or die "unable to load treasurelists\n";
2721} 3592}
2722 3593
3594sub reload_sound {
3595 trace "loading sound config from $DATADIR/sound\n";
3596
3597 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3598
3599 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3600 my $sound = $soundconf->{compat}[$_]
3601 or next;
3602
3603 my $face = cf::face::find "sound/$sound->[1]";
3604 cf::sound::set $sound->[0] => $face;
3605 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3606 }
3607
3608 while (my ($k, $v) = each %{$soundconf->{event}}) {
3609 my $face = cf::face::find "sound/$v";
3610 cf::sound::set $k => $face;
3611 }
3612}
3613
2723sub reload_resources { 3614sub reload_resources {
2724 warn "reloading resource files...\n"; 3615 trace "reloading resource files...\n";
2725 3616
3617 reload_exp_table;
3618 reload_materials;
3619 reload_facedata;
3620 reload_sound;
3621 reload_archetypes;
2726 reload_regions; 3622 reload_regions;
2727 reload_facedata;
2728 #reload_archetypes;#d#
2729 reload_archetypes;
2730 reload_treasures; 3623 reload_treasures;
2731 3624
2732 warn "finished reloading resource files\n"; 3625 trace "finished reloading resource files\n";
2733} 3626}
2734 3627
2735sub init { 3628sub reload_config {
2736 reload_resources; 3629 trace "reloading config file...\n";
2737}
2738 3630
2739sub cfg_load { 3631 my $config = load_file "$CONFDIR/config";
2740 open my $fh, "<:utf8", "$CONFDIR/config" 3632 utf8::decode $config;
2741 or return; 3633 *CFG = decode_yaml $config;
2742 3634
2743 local $/;
2744 *CFG = YAML::Syck::Load <$fh>;
2745
2746 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3635 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2747 3636
2748 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3637 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2749 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3638 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2750 3639
2751 if (exists $CFG{mlockall}) { 3640 if (exists $CFG{mlockall}) {
2755 }; 3644 };
2756 warn $@ if $@; 3645 warn $@ if $@;
2757 } 3646 }
2758} 3647}
2759 3648
3649sub pidfile() {
3650 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3651 or die "$PIDFILE: $!";
3652 flock $fh, &Fcntl::LOCK_EX
3653 or die "$PIDFILE: flock: $!";
3654 $fh
3655}
3656
3657# make sure only one server instance is running at any one time
3658sub atomic {
3659 my $fh = pidfile;
3660
3661 my $pid = <$fh>;
3662 kill 9, $pid if $pid > 0;
3663
3664 seek $fh, 0, 0;
3665 print $fh $$;
3666}
3667
3668sub main_loop {
3669 trace "EV::loop starting\n";
3670 if (1) {
3671 EV::loop;
3672 }
3673 trace "EV::loop returned\n";
3674 goto &main_loop unless $REALLY_UNLOOP;
3675}
3676
2760sub main { 3677sub main {
3678 cf::init_globals; # initialise logging
3679
3680 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3681 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3682 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3683 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3684
3685 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3686
2761 # we must not ever block the main coroutine 3687 # we must not ever block the main coroutine
2762 local $Coro::idle = sub { 3688 local $Coro::idle = sub {
2763 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3689 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2764 (async { 3690 (async {
2765 Event::one_event; 3691 $Coro::current->{desc} = "IDLE BUG HANDLER";
3692 EV::loop EV::LOOP_ONESHOT;
2766 })->prio (Coro::PRIO_MAX); 3693 })->prio (Coro::PRIO_MAX);
2767 }; 3694 };
2768 3695
2769 cfg_load; 3696 evthread_start IO::AIO::poll_fileno;
3697
3698 cf::sync_job {
3699 cf::incloader::init ();
3700
3701 cf::init_anim;
3702 cf::init_attackmess;
3703 cf::init_dynamic;
3704
3705 cf::load_settings;
3706
3707 reload_resources;
3708 reload_config;
2770 db_init; 3709 db_init;
3710
3711 cf::init_uuid;
3712 cf::init_signals;
3713 cf::init_skills;
3714
3715 cf::init_beforeplay;
3716
3717 atomic;
3718
2771 load_extensions; 3719 load_extensions;
2772 3720
2773 $TICK_WATCHER->start; 3721 utime time, time, $RUNTIMEFILE;
2774 Event::loop; 3722
3723 # no (long-running) fork's whatsoever before this point(!)
3724 use POSIX ();
3725 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3726
3727 cf::_post_init 0;
3728 };
3729
3730 cf::object::thawer::errors_are_fatal 0;
3731 info "parse errors in files are no longer fatal from this point on.\n";
3732
3733 my $free_main; $free_main = EV::idle sub {
3734 undef $free_main;
3735 undef &main; # free gobs of memory :)
3736 };
3737
3738 goto &main_loop;
2775} 3739}
2776 3740
2777############################################################################# 3741#############################################################################
2778# initialisation and cleanup 3742# initialisation and cleanup
2779 3743
2780# install some emergency cleanup handlers 3744# install some emergency cleanup handlers
2781BEGIN { 3745BEGIN {
3746 our %SIGWATCHER = ();
2782 for my $signal (qw(INT HUP TERM)) { 3747 for my $signal (qw(INT HUP TERM)) {
2783 Event->signal ( 3748 $SIGWATCHER{$signal} = AE::signal $signal, sub {
2784 reentrant => 0,
2785 data => WF_AUTOCANCEL,
2786 signal => $signal,
2787 prio => 0,
2788 cb => sub {
2789 cf::cleanup "SIG$signal"; 3749 cf::cleanup "SIG$signal";
2790 },
2791 ); 3750 };
2792 } 3751 }
2793} 3752}
2794 3753
2795sub write_runtime { 3754sub write_runtime_sync {
2796 my $runtime = "$LOCALDIR/runtime"; 3755 my $t0 = AE::time;
2797 3756
2798 # first touch the runtime file to show we are still running: 3757 # first touch the runtime file to show we are still running:
2799 # the fsync below can take a very very long time. 3758 # the fsync below can take a very very long time.
2800 3759
2801 IO::AIO::aio_utime $runtime, undef, undef; 3760 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2802 3761
2803 my $guard = cf::lock_acquire "write_runtime"; 3762 my $guard = cf::lock_acquire "write_runtime";
2804 3763
2805 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3764 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
2806 or return; 3765 or return;
2807 3766
2808 my $value = $cf::RUNTIME + 90 + 10; 3767 my $value = $cf::RUNTIME + 90 + 10;
2809 # 10 is the runtime save interval, for a monotonic clock 3768 # 10 is the runtime save interval, for a monotonic clock
2810 # 60 allows for the watchdog to kill the server. 3769 # 60 allows for the watchdog to kill the server.
2820 aio_utime $fh, undef, undef; 3779 aio_utime $fh, undef, undef;
2821 3780
2822 close $fh 3781 close $fh
2823 or return; 3782 or return;
2824 3783
2825 aio_rename "$runtime~", $runtime 3784 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2826 and return; 3785 and return;
2827 3786
2828 warn "runtime file written.\n"; 3787 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
2829 3788
2830 1 3789 1
3790}
3791
3792our $uuid_lock;
3793our $uuid_skip;
3794
3795sub write_uuid_sync($) {
3796 $uuid_skip ||= $_[0];
3797
3798 return if $uuid_lock;
3799 local $uuid_lock = 1;
3800
3801 my $uuid = "$LOCALDIR/uuid";
3802
3803 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3804 or return;
3805
3806 my $value = uuid_seq uuid_cur;
3807
3808 unless ($value) {
3809 info "cowardly refusing to write zero uuid value!\n";
3810 return;
3811 }
3812
3813 my $value = uuid_str $value + $uuid_skip;
3814 $uuid_skip = 0;
3815
3816 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3817 and return;
3818
3819 # always fsync - this file is important
3820 aio_fsync $fh
3821 and return;
3822
3823 close $fh
3824 or return;
3825
3826 aio_rename "$uuid~", $uuid
3827 and return;
3828
3829 trace "uuid file written ($value).\n";
3830
3831 1
3832
3833}
3834
3835sub write_uuid($$) {
3836 my ($skip, $sync) = @_;
3837
3838 $sync ? write_uuid_sync $skip
3839 : async { write_uuid_sync $skip };
2831} 3840}
2832 3841
2833sub emergency_save() { 3842sub emergency_save() {
2834 my $freeze_guard = cf::freeze_mainloop; 3843 my $freeze_guard = cf::freeze_mainloop;
2835 3844
2836 warn "enter emergency perl save\n"; 3845 info "emergency_perl_save: enter\n";
3846
3847 # this is a trade-off: we want to be very quick here, so
3848 # save all maps without fsync, and later call a global sync
3849 # (which in turn might be very very slow)
3850 local $USE_FSYNC = 0;
2837 3851
2838 cf::sync_job { 3852 cf::sync_job {
3853 cf::write_runtime_sync; # external watchdog should not bark
3854
2839 # use a peculiar iteration method to avoid tripping on perl 3855 # use a peculiar iteration method to avoid tripping on perl
2840 # refcount bugs in for. also avoids problems with players 3856 # refcount bugs in for. also avoids problems with players
2841 # and maps saved/destroyed asynchronously. 3857 # and maps saved/destroyed asynchronously.
2842 warn "begin emergency player save\n"; 3858 info "emergency_perl_save: begin player save\n";
2843 for my $login (keys %cf::PLAYER) { 3859 for my $login (keys %cf::PLAYER) {
2844 my $pl = $cf::PLAYER{$login} or next; 3860 my $pl = $cf::PLAYER{$login} or next;
2845 $pl->valid or next; 3861 $pl->valid or next;
3862 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2846 $pl->save; 3863 $pl->save;
2847 } 3864 }
2848 warn "end emergency player save\n"; 3865 info "emergency_perl_save: end player save\n";
2849 3866
2850 warn "begin emergency map save\n"; 3867 cf::write_runtime_sync; # external watchdog should not bark
3868
3869 info "emergency_perl_save: begin map save\n";
2851 for my $path (keys %cf::MAP) { 3870 for my $path (keys %cf::MAP) {
2852 my $map = $cf::MAP{$path} or next; 3871 my $map = $cf::MAP{$path} or next;
2853 $map->valid or next; 3872 $map->valid or next;
2854 $map->save; 3873 $map->save;
2855 } 3874 }
2856 warn "end emergency map save\n"; 3875 info "emergency_perl_save: end map save\n";
2857 3876
2858 warn "begin emergency database checkpoint\n"; 3877 cf::write_runtime_sync; # external watchdog should not bark
3878
3879 info "emergency_perl_save: begin database checkpoint\n";
2859 BDB::db_env_txn_checkpoint $DB_ENV; 3880 BDB::db_env_txn_checkpoint $DB_ENV;
2860 warn "end emergency database checkpoint\n"; 3881 info "emergency_perl_save: end database checkpoint\n";
3882
3883 info "emergency_perl_save: begin write uuid\n";
3884 write_uuid_sync 1;
3885 info "emergency_perl_save: end write uuid\n";
3886
3887 cf::write_runtime_sync; # external watchdog should not bark
3888
3889 trace "emergency_perl_save: syncing database to disk";
3890 BDB::db_env_txn_checkpoint $DB_ENV;
3891
3892 info "emergency_perl_save: starting sync\n";
3893 IO::AIO::aio_sync sub {
3894 info "emergency_perl_save: finished sync\n";
3895 };
3896
3897 cf::write_runtime_sync; # external watchdog should not bark
3898
3899 trace "emergency_perl_save: flushing outstanding aio requests";
3900 while (IO::AIO::nreqs || BDB::nreqs) {
3901 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3902 }
3903
3904 cf::write_runtime_sync; # external watchdog should not bark
2861 }; 3905 };
2862 3906
2863 warn "leave emergency perl save\n"; 3907 info "emergency_perl_save: leave\n";
2864} 3908}
2865 3909
2866sub post_cleanup { 3910sub post_cleanup {
2867 my ($make_core) = @_; 3911 my ($make_core) = @_;
2868 3912
3913 IO::AIO::flush;
3914
2869 warn Carp::longmess "post_cleanup backtrace" 3915 error Carp::longmess "post_cleanup backtrace"
2870 if $make_core; 3916 if $make_core;
3917
3918 my $fh = pidfile;
3919 unlink $PIDFILE if <$fh> == $$;
3920}
3921
3922# a safer delete_package, copied from Symbol
3923sub clear_package($) {
3924 my $pkg = shift;
3925
3926 # expand to full symbol table name if needed
3927 unless ($pkg =~ /^main::.*::$/) {
3928 $pkg = "main$pkg" if $pkg =~ /^::/;
3929 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3930 $pkg .= '::' unless $pkg =~ /::$/;
3931 }
3932
3933 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3934 my $stem_symtab = *{$stem}{HASH};
3935
3936 defined $stem_symtab and exists $stem_symtab->{$leaf}
3937 or return;
3938
3939 # clear all symbols
3940 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3941 for my $name (keys %$leaf_symtab) {
3942 _gv_clear *{"$pkg$name"};
3943# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3944 }
2871} 3945}
2872 3946
2873sub do_reload_perl() { 3947sub do_reload_perl() {
2874 # can/must only be called in main 3948 # can/must only be called in main
2875 if ($Coro::current != $Coro::main) { 3949 unless (in_main) {
2876 warn "can only reload from main coroutine"; 3950 error "can only reload from main coroutine";
2877 return; 3951 return;
2878 } 3952 }
2879 3953
2880 warn "reloading..."; 3954 return if $RELOAD++;
2881 3955
2882 warn "entering sync_job"; 3956 my $t1 = AE::time;
2883 3957
3958 while ($RELOAD) {
3959 cf::get_slot 0.1, -1, "reload_perl";
3960 info "perl_reload: reloading...";
3961
3962 trace "perl_reload: entering sync_job";
3963
2884 cf::sync_job { 3964 cf::sync_job {
2885 cf::write_runtime; # external watchdog should not bark
2886 cf::emergency_save; 3965 #cf::emergency_save;
2887 cf::write_runtime; # external watchdog should not bark
2888 3966
2889 warn "syncing database to disk";
2890 BDB::db_env_txn_checkpoint $DB_ENV;
2891
2892 # if anything goes wrong in here, we should simply crash as we already saved
2893
2894 warn "cancelling all WF_AUTOCANCEL watchers";
2895 for (Event::all_watchers) {
2896 $_->cancel if $_->data & WF_AUTOCANCEL;
2897 }
2898
2899 warn "flushing outstanding aio requests";
2900 for (;;) {
2901 BDB::flush;
2902 IO::AIO::flush;
2903 Coro::cede;
2904 last unless IO::AIO::nreqs || BDB::nreqs;
2905 warn "iterate...";
2906 }
2907
2908 ++$RELOAD;
2909
2910 warn "cancelling all extension coros"; 3967 trace "perl_reload: cancelling all extension coros";
2911 $_->cancel for values %EXT_CORO; 3968 $_->cancel for values %EXT_CORO;
2912 %EXT_CORO = (); 3969 %EXT_CORO = ();
2913 3970
2914 warn "removing commands"; 3971 trace "perl_reload: removing commands";
2915 %COMMAND = (); 3972 %COMMAND = ();
2916 3973
2917 warn "removing ext/exti commands"; 3974 trace "perl_reload: removing ext/exti commands";
2918 %EXTCMD = (); 3975 %EXTCMD = ();
2919 %EXTICMD = (); 3976 %EXTICMD = ();
2920 3977
2921 warn "unloading/nuking all extensions"; 3978 trace "perl_reload: unloading/nuking all extensions";
2922 for my $pkg (@EXTS) { 3979 for my $pkg (@EXTS) {
2923 warn "... unloading $pkg"; 3980 trace "... unloading $pkg";
2924 3981
2925 if (my $cb = $pkg->can ("unload")) { 3982 if (my $cb = $pkg->can ("unload")) {
2926 eval { 3983 eval {
2927 $cb->($pkg); 3984 $cb->($pkg);
2928 1 3985 1
2929 } or warn "$pkg unloaded, but with errors: $@"; 3986 } or error "$pkg unloaded, but with errors: $@";
3987 }
3988
3989 trace "... clearing $pkg";
3990 clear_package $pkg;
2930 } 3991 }
2931 3992
2932 warn "... nuking $pkg";
2933 Symbol::delete_package $pkg;
2934 }
2935
2936 warn "unloading all perl modules loaded from $LIBDIR"; 3993 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
2937 while (my ($k, $v) = each %INC) { 3994 while (my ($k, $v) = each %INC) {
2938 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3995 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2939 3996
2940 warn "... unloading $k"; 3997 trace "... unloading $k";
2941 delete $INC{$k}; 3998 delete $INC{$k};
2942 3999
2943 $k =~ s/\.pm$//; 4000 $k =~ s/\.pm$//;
2944 $k =~ s/\//::/g; 4001 $k =~ s/\//::/g;
2945 4002
2946 if (my $cb = $k->can ("unload_module")) { 4003 if (my $cb = $k->can ("unload_module")) {
2947 $cb->(); 4004 $cb->();
4005 }
4006
4007 clear_package $k;
2948 } 4008 }
2949 4009
2950 Symbol::delete_package $k;
2951 }
2952
2953 warn "getting rid of safe::, as good as possible"; 4010 trace "perl_reload: getting rid of safe::, as good as possible";
2954 Symbol::delete_package "safe::$_" 4011 clear_package "safe::$_"
2955 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4012 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2956 4013
2957 warn "unloading cf.pm \"a bit\""; 4014 trace "perl_reload: unloading cf.pm \"a bit\"";
2958 delete $INC{"cf.pm"}; 4015 delete $INC{"cf.pm"};
2959 delete $INC{"cf/pod.pm"}; 4016 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
2960 4017
2961 # don't, removes xs symbols, too, 4018 # don't, removes xs symbols, too,
2962 # and global variables created in xs 4019 # and global variables created in xs
2963 #Symbol::delete_package __PACKAGE__; 4020 #clear_package __PACKAGE__;
2964 4021
2965 warn "unload completed, starting to reload now"; 4022 info "perl_reload: unload completed, starting to reload now";
2966 4023
2967 warn "reloading cf.pm"; 4024 trace "perl_reload: reloading cf.pm";
2968 require cf; 4025 require cf;
2969 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4026 cf::_connect_to_perl_1;
2970 4027
2971 warn "loading config and database again"; 4028 trace "perl_reload: loading config and database again";
2972 cf::cfg_load; 4029 cf::reload_config;
2973 4030
2974 warn "loading extensions"; 4031 trace "perl_reload: loading extensions";
2975 cf::load_extensions; 4032 cf::load_extensions;
2976 4033
4034 if ($REATTACH_ON_RELOAD) {
2977 warn "reattaching attachments to objects/players"; 4035 trace "perl_reload: reattaching attachments to objects/players";
2978 _global_reattach; # objects, sockets 4036 _global_reattach; # objects, sockets
2979 warn "reattaching attachments to maps"; 4037 trace "perl_reload: reattaching attachments to maps";
2980 reattach $_ for values %MAP; 4038 reattach $_ for values %MAP;
2981 warn "reattaching attachments to players"; 4039 trace "perl_reload: reattaching attachments to players";
2982 reattach $_ for values %PLAYER; 4040 reattach $_ for values %PLAYER;
4041 }
2983 4042
2984 warn "leaving sync_job"; 4043 cf::_post_init 1;
2985 4044
4045 trace "perl_reload: leaving sync_job";
4046
2986 1 4047 1
2987 } or do { 4048 } or do {
2988 warn $@; 4049 error $@;
2989 warn "error while reloading, exiting."; 4050 cf::cleanup "perl_reload: error, exiting.";
2990 exit 1; 4051 };
4052
4053 --$RELOAD;
2991 }; 4054 }
2992 4055
2993 warn "reloaded"; 4056 $t1 = AE::time - $t1;
4057 info "perl_reload: completed in ${t1}s\n";
2994}; 4058};
2995 4059
2996our $RELOAD_WATCHER; # used only during reload 4060our $RELOAD_WATCHER; # used only during reload
2997 4061
2998sub reload_perl() { 4062sub reload_perl() {
2999 # doing reload synchronously and two reloads happen back-to-back, 4063 # doing reload synchronously and two reloads happen back-to-back,
3000 # coro crashes during coro_state_free->destroy here. 4064 # coro crashes during coro_state_free->destroy here.
3001 4065
3002 $RELOAD_WATCHER ||= Event->timer ( 4066 $RELOAD_WATCHER ||= cf::async {
3003 reentrant => 0, 4067 Coro::AIO::aio_wait cache_extensions;
3004 after => 0, 4068
3005 data => WF_AUTOCANCEL, 4069 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3006 cb => sub {
3007 do_reload_perl; 4070 do_reload_perl;
3008 undef $RELOAD_WATCHER; 4071 undef $RELOAD_WATCHER;
3009 }, 4072 };
3010 ); 4073 };
3011} 4074}
3012 4075
3013register_command "reload" => sub { 4076register_command "reload" => sub {
3014 my ($who, $arg) = @_; 4077 my ($who, $arg) = @_;
3015 4078
3016 if ($who->flag (FLAG_WIZ)) { 4079 if ($who->flag (FLAG_WIZ)) {
3017 $who->message ("reloading server."); 4080 $who->message ("reloading server.");
4081 async {
4082 $Coro::current->{desc} = "perl_reload";
3018 async { reload_perl }; 4083 reload_perl;
4084 };
3019 } 4085 }
3020}; 4086};
3021 4087
3022unshift @INC, $LIBDIR; 4088#############################################################################
3023 4089
3024my $bug_warning = 0; 4090my $bug_warning = 0;
3025 4091
3026our @WAIT_FOR_TICK;
3027our @WAIT_FOR_TICK_BEGIN;
3028
3029sub wait_for_tick { 4092sub wait_for_tick() {
3030 return unless $TICK_WATCHER->is_active; 4093 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3031 return if $Coro::current == $Coro::main;
3032 4094
3033 my $signal = new Coro::Signal; 4095 $WAIT_FOR_TICK->wait;
3034 push @WAIT_FOR_TICK, $signal;
3035 $signal->wait;
3036} 4096}
3037 4097
3038sub wait_for_tick_begin { 4098sub wait_for_tick_begin() {
3039 return unless $TICK_WATCHER->is_active; 4099 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3040 return if $Coro::current == $Coro::main;
3041 4100
3042 my $signal = new Coro::Signal; 4101 my $signal = new Coro::Signal;
3043 push @WAIT_FOR_TICK_BEGIN, $signal; 4102 push @WAIT_FOR_TICK_BEGIN, $signal;
3044 $signal->wait; 4103 $signal->wait;
3045} 4104}
3046 4105
3047 my $min = 1e6;#d# 4106sub tick {
3048 my $avg = 10;
3049$TICK_WATCHER = Event->timer (
3050 reentrant => 0,
3051 parked => 1,
3052 prio => 0,
3053 at => $NEXT_TICK || $TICK,
3054 data => WF_AUTOCANCEL,
3055 cb => sub {
3056 if ($Coro::current != $Coro::main) { 4107 if ($Coro::current != $Coro::main) {
3057 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4108 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3058 unless ++$bug_warning > 10; 4109 unless ++$bug_warning > 10;
3059 return; 4110 return;
3060 } 4111 }
3061 4112
3062 $NOW = $tick_start = Event::time; 4113 cf::one_tick; # one server iteration
3063 4114
3064 cf::server_tick; # one server iteration 4115 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3065 4116
3066 0 && sync_job {#d# 4117 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3067 for(1..10) { 4118 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3068 my $t = Event::time; 4119 Coro::async_pool {
3069 my $map = my $map = new_from_path cf::map "/tmp/x.map" 4120 $Coro::current->{desc} = "runtime saver";
3070 or die; 4121 write_runtime_sync
3071 4122 or error "ERROR: unable to write runtime file: $!";
3072 $map->width (50);
3073 $map->height (50);
3074 $map->alloc;
3075 $map->_load_objects ("/tmp/x.map", 1);
3076 my $t = Event::time - $t;
3077
3078 #next unless $t < 0.0013;#d#
3079 if ($t < $min) {
3080 $min = $t;
3081 }
3082 $avg = $avg * 0.99 + $t * 0.01;
3083 }
3084 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3085 exit 0;
3086 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3087 }; 4123 };
4124 }
3088 4125
3089 $RUNTIME += $TICK;
3090 $NEXT_TICK += $TICK;
3091
3092 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3093 $NEXT_RUNTIME_WRITE = $NOW + 10;
3094 Coro::async_pool {
3095 write_runtime
3096 or warn "ERROR: unable to write runtime file: $!";
3097 };
3098 }
3099
3100# my $AFTER = Event::time;
3101# warn $AFTER - $NOW;#d#
3102
3103 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4126 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3104 $sig->send; 4127 $sig->send;
3105 } 4128 }
3106 while (my $sig = shift @WAIT_FOR_TICK) { 4129 $WAIT_FOR_TICK->broadcast;
3107 $sig->send;
3108 }
3109 4130
3110 $NOW = Event::time; 4131 $LOAD = ($NOW - $TICK_START) / $TICK;
3111
3112 # if we are delayed by four ticks or more, skip them all
3113 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3114
3115 $TICK_WATCHER->at ($NEXT_TICK);
3116 $TICK_WATCHER->start;
3117
3118 $LOAD = ($NOW - $tick_start) / $TICK;
3119 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4132 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3120 4133
3121 _post_tick; 4134 if (0) {
3122 4135 if ($NEXT_TICK) {
3123 4136 my $jitter = $TICK_START - $NEXT_TICK;
4137 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4138 debug "jitter $JITTER\n";#d#
4139 }
3124 }, 4140 }
3125); 4141}
3126 4142
3127{ 4143{
3128 BDB::max_poll_time $TICK * 0.1; 4144 # configure BDB
3129 $BDB_POLL_WATCHER = Event->io ( 4145
3130 reentrant => 0,
3131 fd => BDB::poll_fileno,
3132 poll => 'r',
3133 prio => 0,
3134 data => WF_AUTOCANCEL,
3135 cb => \&BDB::poll_cb,
3136 );
3137 BDB::min_parallel 8; 4146 BDB::min_parallel 16;
3138 4147 BDB::max_poll_reqs $TICK * 0.1;
3139 BDB::set_sync_prepare { 4148 $AnyEvent::BDB::WATCHER->priority (1);
3140 my $status;
3141 my $current = $Coro::current;
3142 (
3143 sub {
3144 $status = $!;
3145 $current->ready; undef $current;
3146 },
3147 sub {
3148 Coro::schedule while defined $current;
3149 $! = $status;
3150 },
3151 )
3152 };
3153 4149
3154 unless ($DB_ENV) { 4150 unless ($DB_ENV) {
3155 $DB_ENV = BDB::db_env_create; 4151 $DB_ENV = BDB::db_env_create;
4152 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4153 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4154 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4155 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4156 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3156 4157
3157 cf::sync_job { 4158 cf::sync_job {
3158 eval { 4159 eval {
3159 BDB::db_env_open 4160 BDB::db_env_open
3160 $DB_ENV, 4161 $DB_ENV,
3162 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4163 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3163 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4164 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3164 0666; 4165 0666;
3165 4166
3166 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4167 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3167
3168 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3169 $DB_ENV->set_lk_detect;
3170 }; 4168 };
3171 4169
3172 cf::cleanup "db_env_open(db): $@" if $@; 4170 cf::cleanup "db_env_open(db): $@" if $@;
3173 }; 4171 };
3174 } 4172 }
4173
4174 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4175 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4176 };
4177 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4178 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4179 };
4180 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4181 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4182 };
3175} 4183}
3176 4184
3177{ 4185{
4186 # configure IO::AIO
4187
3178 IO::AIO::min_parallel 8; 4188 IO::AIO::min_parallel 8;
3179
3180 undef $Coro::AIO::WATCHER;
3181 IO::AIO::max_poll_time $TICK * 0.1; 4189 IO::AIO::max_poll_time $TICK * 0.1;
3182 $AIO_POLL_WATCHER = Event->io ( 4190 undef $AnyEvent::AIO::WATCHER;
3183 reentrant => 0,
3184 data => WF_AUTOCANCEL,
3185 fd => IO::AIO::poll_fileno,
3186 poll => 'r',
3187 prio => 6,
3188 cb => \&IO::AIO::poll_cb,
3189 );
3190} 4191}
3191 4192
3192my $_log_backtrace; 4193our $_log_backtrace;
4194our $_log_backtrace_last;
3193 4195
3194sub _log_backtrace { 4196sub _log_backtrace {
3195 my ($msg, @addr) = @_; 4197 my ($msg, @addr) = @_;
3196 4198
3197 $msg =~ s/\n//; 4199 $msg =~ s/\n$//;
3198 4200
4201 if ($_log_backtrace_last eq $msg) {
4202 LOG llevInfo, "[ABT] $msg\n";
4203 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3199 # limit the # of concurrent backtraces 4204 # limit the # of concurrent backtraces
3200 if ($_log_backtrace < 2) { 4205 } elsif ($_log_backtrace < 2) {
4206 $_log_backtrace_last = $msg;
3201 ++$_log_backtrace; 4207 ++$_log_backtrace;
4208 my $perl_bt = Carp::longmess $msg;
3202 async { 4209 async {
4210 $Coro::current->{desc} = "abt $msg";
4211
3203 my @bt = fork_call { 4212 my @bt = fork_call {
3204 @addr = map { sprintf "%x", $_ } @addr; 4213 @addr = map { sprintf "%x", $_ } @addr;
3205 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4214 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3206 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4215 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3207 or die "addr2line: $!"; 4216 or die "addr2line: $!";
3215 } 4224 }
3216 4225
3217 @funcs 4226 @funcs
3218 }; 4227 };
3219 4228
3220 LOG llevInfo, "[ABT] $msg\n"; 4229 LOG llevInfo, "[ABT] $perl_bt\n";
4230 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3221 LOG llevInfo, "[ABT] $_\n" for @bt; 4231 LOG llevInfo, "[ABT] $_\n" for @bt;
3222 --$_log_backtrace; 4232 --$_log_backtrace;
3223 }; 4233 };
3224 } else { 4234 } else {
3225 LOG llevInfo, "[ABT] $msg\n"; 4235 LOG llevInfo, "[ABT] $msg\n";
3226 LOG llevInfo, "[ABT] [suppressed]\n"; 4236 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3227 } 4237 }
3228} 4238}
3229 4239
3230# load additional modules 4240# load additional modules
3231use cf::pod; 4241require "cf/$_.pm" for @EXTRA_MODULES;
4242cf::_connect_to_perl_2;
3232 4243
3233END { cf::emergency_save } 4244END { cf::emergency_save }
3234 4245
32351 42461
3236 4247

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines