ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.290 by root, Mon Jul 2 03:15:30 2007 UTC vs.
Revision 1.578 by root, Wed Jan 4 02:48:57 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines