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.306 by root, Sat Jul 14 14:33:30 2007 UTC vs.
Revision 1.495 by root, Tue Nov 10 04:38:45 2009 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use Storable; 32use EV;
10use Event;
11use Opcode; 33use Opcode;
12use Safe; 34use Safe;
13use Safe::Hole; 35use Safe::Hole;
36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 3.61 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
43use Coro::EV;
18use Coro::Event; 44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
51use Coro::BDB 1.6;
23use Coro::Storable; 52use Coro::Storable;
53use Coro::Util ();
24 54
25use JSON::XS 1.4 (); 55use JSON::XS 2.01 ();
26use BDB (); 56use BDB ();
27use Data::Dumper; 57use Data::Dumper;
28use Digest::MD5; 58use Digest::MD5;
29use Fcntl; 59use Fcntl;
30use YAML::Syck (); 60use YAML::XS ();
31use IO::AIO 2.32 (); 61use IO::AIO ();
32use Time::HiRes; 62use Time::HiRes;
33use Compress::LZF; 63use Compress::LZF;
34use Digest::MD5 (); 64use Digest::MD5 ();
65
66AnyEvent::detect;
35 67
36# configure various modules to our taste 68# configure various modules to our taste
37# 69#
38$Storable::canonical = 1; # reduce rsync transfers 70$Storable::canonical = 1; # reduce rsync transfers
39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 71Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
72
73$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
74
75# make sure c-lzf reinitialises itself
76Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
40Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 77Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
41 78
42$Event::Eval = 1; # no idea why this is required, but it is 79# strictly for debugging
43 80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 81
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 83
51our %COMMAND = (); 84our %COMMAND = ();
52our %COMMAND_TIME = (); 85our %COMMAND_TIME = ();
55our %EXTCMD = (); 88our %EXTCMD = ();
56our %EXTICMD = (); 89our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 90our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 91our %EXT_MAP = (); # pluggable maps
59 92
60our $RELOAD; # number of reloads so far 93our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 94our @EVENT;
95our @REFLECT; # set by XS
96our %REFLECT; # set by us
62 97
63our $CONFDIR = confdir; 98our $CONFDIR = confdir;
64our $DATADIR = datadir; 99our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 103our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 104our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 105our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 106our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 107our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 108our $BDBDIR = "$LOCALDIR/db";
109our $PIDFILE = "$LOCALDIR/pid";
110our $RUNTIMEFILE = "$LOCALDIR/runtime";
111
112our %RESOURCE;
74 113
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 114our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 115our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 116our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 117our $USE_FSYNC = 1; # use fsync to write maps - default on
82 118
119our $BDB_DEADLOCK_WATCHER;
120our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 121our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 122our $DB_ENV;
123
124our @EXTRA_MODULES = qw(pod match mapscript);
85 125
86our %CFG; 126our %CFG;
87 127
88our $UPTIME; $UPTIME ||= time; 128our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 129our $RUNTIME;
130our $NOW;
90 131
91our %PLAYER; # all users 132our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 133our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 134our $LINK_MAP; # the special {link} map, which is always available
94 135
95# used to convert map paths into valid unix filenames by replacing / by ∕ 136# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 137our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 138
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 139our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 140our $LOADAVG; # same thing, but with alpha-smoothing
141our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 142our $TICK_START; # for load detecting purposes
143
144our @POST_INIT;
145
146our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
147our $REALLY_UNLOOP; # never set to true, please :)
101 148
102binmode STDOUT; 149binmode STDOUT;
103binmode STDERR; 150binmode STDERR;
104 151
105# read virtual server time, if available 152# read virtual server time, if available
106unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 153unless ($RUNTIME || !-e $RUNTIMEFILE) {
107 open my $fh, "<", "$LOCALDIR/runtime" 154 open my $fh, "<", $RUNTIMEFILE
108 or die "unable to read runtime file: $!"; 155 or die "unable to read $RUNTIMEFILE file: $!";
109 $RUNTIME = <$fh> + 0.; 156 $RUNTIME = <$fh> + 0.;
110} 157}
158
159eval "sub TICK() { $TICK } 1" or die;
111 160
112mkdir $_ 161mkdir $_
113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 162 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
114 163
115our $EMERGENCY_POSITION; 164our $EMERGENCY_POSITION;
116 165
117sub cf::map::normalise; 166sub cf::map::normalise;
167
168#############################################################################
169
170%REFLECT = ();
171for (@REFLECT) {
172 my $reflect = JSON::XS::decode_json $_;
173 $REFLECT{$reflect->{class}} = $reflect;
174}
175
176# this is decidedly evil
177$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
118 178
119############################################################################# 179#############################################################################
120 180
121=head2 GLOBAL VARIABLES 181=head2 GLOBAL VARIABLES
122 182
158 218
159The raw value load value from the last tick. 219The raw value load value from the last tick.
160 220
161=item %cf::CFG 221=item %cf::CFG
162 222
163Configuration for the server, loaded from C</etc/crossfire/config>, or 223Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 224from wherever your confdir points to.
165 225
166=item cf::wait_for_tick, cf::wait_for_tick_begin 226=item cf::wait_for_tick, cf::wait_for_tick_begin
167 227
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 228These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
169returns directly I<after> the tick processing (and consequently, can only wake one process 229returns directly I<after> the tick processing (and consequently, can only wake one process
170per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 230per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
171 231
232=item @cf::INVOKE_RESULTS
233
234This array contains the results of the last C<invoke ()> call. When
235C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
236that call.
237
238=item %cf::REFLECT
239
240Contains, for each (C++) class name, a hash reference with information
241about object members (methods, scalars, arrays and flags) and other
242metadata, which is useful for introspection.
243
172=back 244=back
173 245
174=cut 246=cut
175 247
176BEGIN { 248$Coro::State::WARNHOOK = sub {
177 *CORE::GLOBAL::warn = sub {
178 my $msg = join "", @_; 249 my $msg = join "", @_;
179 250
180 $msg .= "\n" 251 $msg .= "\n"
181 unless $msg =~ /\n$/; 252 unless $msg =~ /\n$/;
182 253
183 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 254 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
184 255
185 utf8::encode $msg;
186 LOG llevError, $msg; 256 LOG llevError, $msg;
187 }; 257};
188} 258
259$Coro::State::DIEHOOK = sub {
260 return unless $^S eq 0; # "eq", not "=="
261
262 warn Carp::longmess $_[0];
263
264 if ($Coro::current == $Coro::main) {#d#
265 warn "DIEHOOK called in main context, Coro bug?\n";#d#
266 return;#d#
267 }#d#
268
269 # kill coroutine otherwise
270 Coro::terminate
271};
189 272
190@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 273@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
191@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 274@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
192@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 275@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
193@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 276@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
200for my $pkg (qw( 283for my $pkg (qw(
201 cf::global cf::attachable 284 cf::global cf::attachable
202 cf::object cf::object::player 285 cf::object cf::object::player
203 cf::client cf::player 286 cf::client cf::player
204 cf::arch cf::living 287 cf::arch cf::living
288 cf::map cf::mapspace
205 cf::map cf::party cf::region 289 cf::party cf::region
206)) { 290)) {
207 no strict 'refs';
208 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 291 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
209} 292}
210 293
211$Event::DIED = sub { 294$EV::DIED = sub {
212 warn "error in event callback: @_"; 295 Carp::cluck "error in event callback: @_";
213}; 296};
214 297
215############################################################################# 298#############################################################################
216 299
217=head2 UTILITY FUNCTIONS 300=head2 UTILITY FUNCTIONS
239 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 322 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
240 $d 323 $d
241 } || "[unable to dump $_[0]: '$@']"; 324 } || "[unable to dump $_[0]: '$@']";
242} 325}
243 326
244=item $ref = cf::from_json $json 327=item $ref = cf::decode_json $json
245 328
246Converts a JSON string into the corresponding perl data structure. 329Converts a JSON string into the corresponding perl data structure.
247 330
248=item $json = cf::to_json $ref 331=item $json = cf::encode_json $ref
249 332
250Converts a perl data structure into its JSON representation. 333Converts a perl data structure into its JSON representation.
251 334
252=cut 335=cut
253 336
254our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 337our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255 338
256sub to_json ($) { $json_coder->encode ($_[0]) } 339sub encode_json($) { $json_coder->encode ($_[0]) }
257sub from_json ($) { $json_coder->decode ($_[0]) } 340sub decode_json($) { $json_coder->decode ($_[0]) }
341
342=item cf::post_init { BLOCK }
343
344Execute the given codeblock, I<after> all extensions have been (re-)loaded,
345but I<before> the server starts ticking again.
346
347The cdoeblock will have a single boolean argument to indicate whether this
348is a reload or not.
349
350=cut
351
352sub post_init(&) {
353 push @POST_INIT, shift;
354}
258 355
259=item cf::lock_wait $string 356=item cf::lock_wait $string
260 357
261Wait until the given lock is available. See cf::lock_acquire. 358Wait until the given lock is available. See cf::lock_acquire.
262 359
263=item my $lock = cf::lock_acquire $string 360=item my $lock = cf::lock_acquire $string
264 361
265Wait until the given lock is available and then acquires it and returns 362Wait until the given lock is available and then acquires it and returns
266a Coro::guard object. If the guard object gets destroyed (goes out of scope, 363a L<Guard> object. If the guard object gets destroyed (goes out of scope,
267for example when the coroutine gets canceled), the lock is automatically 364for example when the coroutine gets canceled), the lock is automatically
268returned. 365returned.
269 366
367Locks are *not* recursive, locking from the same coro twice results in a
368deadlocked coro.
369
270Lock names should begin with a unique identifier (for example, cf::map::find 370Lock names should begin with a unique identifier (for example, cf::map::find
271uses map_find and cf::map::load uses map_load). 371uses map_find and cf::map::load uses map_load).
272 372
273=item $locked = cf::lock_active $string 373=item $locked = cf::lock_active $string
274 374
275Return true if the lock is currently active, i.e. somebody has locked it. 375Return true if the lock is currently active, i.e. somebody has locked it.
276 376
277=cut 377=cut
278 378
279our %LOCK; 379our $LOCKS = new Coro::SemaphoreSet;
280 380
281sub lock_wait($) { 381sub lock_wait($) {
282 my ($key) = @_; 382 $LOCKS->wait ($_[0]);
283
284 # wait for lock, if any
285 while ($LOCK{$key}) {
286 push @{ $LOCK{$key} }, $Coro::current;
287 Coro::schedule;
288 }
289} 383}
290 384
291sub lock_acquire($) { 385sub lock_acquire($) {
292 my ($key) = @_; 386 $LOCKS->guard ($_[0])
293
294 # wait, to be sure we are not locked
295 lock_wait $key;
296
297 $LOCK{$key} = [];
298
299 Coro::guard {
300 # wake up all waiters, to be on the safe side
301 $_->ready for @{ delete $LOCK{$key} };
302 }
303} 387}
304 388
305sub lock_active($) { 389sub lock_active($) {
306 my ($key) = @_; 390 $LOCKS->count ($_[0]) < 1
307
308 ! ! $LOCK{$key}
309} 391}
310 392
311sub freeze_mainloop { 393sub freeze_mainloop {
312 return unless $TICK_WATCHER->is_active; 394 tick_inhibit_inc;
313 395
314 my $guard = Coro::guard { 396 &Guard::guard (\&tick_inhibit_dec);
315 $TICK_WATCHER->start; 397}
398
399=item cf::periodic $interval, $cb
400
401Like EV::periodic, but randomly selects a starting point so that the actions
402get spread over timer.
403
404=cut
405
406sub periodic($$) {
407 my ($interval, $cb) = @_;
408
409 my $start = rand List::Util::min 180, $interval;
410
411 EV::periodic $start, $interval, 0, $cb
412}
413
414=item cf::get_slot $time[, $priority[, $name]]
415
416Allocate $time seconds of blocking CPU time at priority C<$priority>:
417This call blocks and returns only when you have at least C<$time> seconds
418of cpu time till the next tick. The slot is only valid till the next cede.
419
420The optional C<$name> can be used to identify the job to run. It might be
421used for statistical purposes and should identify the same time-class.
422
423Useful for short background jobs.
424
425=cut
426
427our @SLOT_QUEUE;
428our $SLOT_QUEUE;
429
430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
431$SLOT_QUEUE = Coro::async {
432 $Coro::current->desc ("timeslot manager");
433
434 my $signal = new Coro::Signal;
435
436 while () {
437 next_job:
438 my $avail = cf::till_tick;
439 if ($avail > 0.01) {
440 for (0 .. $#SLOT_QUEUE) {
441 if ($SLOT_QUEUE[$_][0] < $avail) {
442 my $job = splice @SLOT_QUEUE, $_, 1, ();
443 $job->[2]->send;
444 Coro::cede;
445 goto next_job;
446 }
447 }
448 }
449
450 if (@SLOT_QUEUE) {
451 # we do not use wait_for_tick() as it returns immediately when tick is inactive
452 push @cf::WAIT_FOR_TICK, $signal;
453 $signal->wait;
454 } else {
455 Coro::schedule;
456 }
316 }; 457 }
317 $TICK_WATCHER->stop; 458};
318 $guard 459
460sub get_slot($;$$) {
461 return if tick_inhibit || $Coro::current == $Coro::main;
462
463 my ($time, $pri, $name) = @_;
464
465 $time = $TICK * .6 if $time > $TICK * .6;
466 my $sig = new Coro::Signal;
467
468 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
469 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
470 $SLOT_QUEUE->ready;
471 $sig->wait;
319} 472}
320 473
321=item cf::async { BLOCK } 474=item cf::async { BLOCK }
322 475
323Currently the same as Coro::async_pool, meaning you cannot use 476Currently the same as Coro::async_pool, meaning you cannot use
328 481
329BEGIN { *async = \&Coro::async_pool } 482BEGIN { *async = \&Coro::async_pool }
330 483
331=item cf::sync_job { BLOCK } 484=item cf::sync_job { BLOCK }
332 485
333The design of Crossfire TRT requires that the main coroutine ($Coro::main) 486The design of Deliantra requires that the main coroutine ($Coro::main)
334is always able to handle events or runnable, as Crossfire TRT is only 487is always able to handle events or runnable, as Deliantra is only
335partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 488partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
336acceptable. 489acceptable.
337 490
338If it must be done, put the blocking parts into C<sync_job>. This will run 491If it must be done, put the blocking parts into C<sync_job>. This will run
339the given BLOCK in another coroutine while waiting for the result. The 492the given BLOCK in another coroutine while waiting for the result. The
344 497
345sub sync_job(&) { 498sub sync_job(&) {
346 my ($job) = @_; 499 my ($job) = @_;
347 500
348 if ($Coro::current == $Coro::main) { 501 if ($Coro::current == $Coro::main) {
349 my $time = Event::time; 502 my $time = EV::time;
350 503
351 # this is the main coro, too bad, we have to block 504 # this is the main coro, too bad, we have to block
352 # till the operation succeeds, freezing the server :/ 505 # till the operation succeeds, freezing the server :/
353 506
354 # TODO: use suspend/resume instead 507 LOG llevError, Carp::longmess "sync job";#d#
355 # (but this is cancel-safe) 508
356 my $freeze_guard = freeze_mainloop; 509 my $freeze_guard = freeze_mainloop;
357 510
358 my $busy = 1; 511 my $busy = 1;
359 my @res; 512 my @res;
360 513
361 (async { 514 (async {
515 $Coro::current->desc ("sync job coro");
362 @res = eval { $job->() }; 516 @res = eval { $job->() };
363 warn $@ if $@; 517 warn $@ if $@;
364 undef $busy; 518 undef $busy;
365 })->prio (Coro::PRIO_MAX); 519 })->prio (Coro::PRIO_MAX);
366 520
367 while ($busy) { 521 while ($busy) {
368 Coro::cede or Event::one_event; 522 if (Coro::nready) {
523 Coro::cede_notself;
524 } else {
525 EV::loop EV::LOOP_ONESHOT;
369 } 526 }
527 }
370 528
371 $time = Event::time - $time; 529 my $time = EV::time - $time;
372 530
373 LOG llevError | logBacktrace, Carp::longmess "long sync job"
374 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
375
376 $tick_start += $time; # do not account sync jobs to server load 531 $TICK_START += $time; # do not account sync jobs to server load
377 532
378 wantarray ? @res : $res[0] 533 wantarray ? @res : $res[0]
379 } else { 534 } else {
380 # we are in another coroutine, how wonderful, everything just works 535 # we are in another coroutine, how wonderful, everything just works
381 536
406=item fork_call { }, $args 561=item fork_call { }, $args
407 562
408Executes the given code block with the given arguments in a seperate 563Executes the given code block with the given arguments in a seperate
409process, returning the results. Everything must be serialisable with 564process, returning the results. Everything must be serialisable with
410Coro::Storable. May, of course, block. Note that the executed sub may 565Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 566never block itself or use any form of event handling.
412 567
413=cut 568=cut
414
415sub _store_scalar {
416 open my $fh, ">", \my $buf
417 or die "fork_call: cannot open fh-to-buf in child : $!";
418 Storable::store_fd $_[0], $fh;
419 close $fh;
420
421 $buf
422}
423 569
424sub fork_call(&@) { 570sub fork_call(&@) {
425 my ($cb, @args) = @_; 571 my ($cb, @args) = @_;
426 572
427# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 573 # we seemingly have to make a local copy of the whole thing,
428# or die "socketpair: $!"; 574 # otherwise perl prematurely frees the stuff :/
429 pipe my $fh1, my $fh2 575 # TODO: investigate and fix (likely this will be rather laborious)
430 or die "pipe: $!";
431 576
432 if (my $pid = fork) { 577 my @res = Coro::Util::fork_eval {
433 close $fh2;
434
435 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
436 warn "pst<$res>" unless $res =~ /^pst/;
437 $res = Coro::Storable::thaw $res;
438
439 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
440
441 Carp::confess $$res unless "ARRAY" eq ref $res;
442
443 return wantarray ? @$res : $res->[-1];
444 } else {
445 reset_signals; 578 reset_signals;
446 local $SIG{__WARN__}; 579 &$cb
447 local $SIG{__DIE__}; 580 }, @args;
448 # just in case, this hack effectively disables event
449 # in the child. cleaner and slower would be canceling all watchers,
450 # but this works for the time being.
451 local $Coro::idle;
452 $Coro::current->prio (Coro::PRIO_MAX);
453 581
454 eval { 582 wantarray ? @res : $res[-1]
455 close $fh1; 583}
456 584
457 my @res = eval { $cb->(@args) }; 585=item $coin = coin_from_name $name
458 586
459 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 587=cut
460 close $fh2;
461 };
462 588
463 warn $@ if $@; 589our %coin_alias = (
464 _exit 0; 590 "silver" => "silvercoin",
465 } 591 "silvercoin" => "silvercoin",
592 "silvercoins" => "silvercoin",
593 "gold" => "goldcoin",
594 "goldcoin" => "goldcoin",
595 "goldcoins" => "goldcoin",
596 "platinum" => "platinacoin",
597 "platinumcoin" => "platinacoin",
598 "platinumcoins" => "platinacoin",
599 "platina" => "platinacoin",
600 "platinacoin" => "platinacoin",
601 "platinacoins" => "platinacoin",
602 "royalty" => "royalty",
603 "royalties" => "royalty",
604);
605
606sub coin_from_name($) {
607 $coin_alias{$_[0]}
608 ? cf::arch::find $coin_alias{$_[0]}
609 : undef
466} 610}
467 611
468=item $value = cf::db_get $family => $key 612=item $value = cf::db_get $family => $key
469 613
470Returns a single value from the environment database. 614Returns a single value from the environment database.
472=item cf::db_put $family => $key => $value 616=item cf::db_put $family => $key => $value
473 617
474Stores the given C<$value> in the family. It can currently store binary 618Stores the given C<$value> in the family. It can currently store binary
475data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 619data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
476 620
621=item $db = cf::db_table "name"
622
623Create and/or open a new database table. The string must not be "db" and must be unique
624within each server.
625
477=cut 626=cut
627
628sub db_table($) {
629 my ($name) = @_;
630 my $db = BDB::db_create $DB_ENV;
631
632 eval {
633 $db->set_flags (BDB::CHKSUM);
634
635 utf8::encode $name;
636 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
637 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
638 cf::cleanup "db_open(db): $!" if $!;
639 };
640 cf::cleanup "db_open(db): $@" if $@;
641
642 $db
643}
478 644
479our $DB; 645our $DB;
480 646
481sub db_init { 647sub db_init {
482 unless ($DB) {
483 $DB = BDB::db_create $DB_ENV;
484
485 cf::sync_job { 648 cf::sync_job {
486 eval { 649 $DB ||= db_table "db";
487 $DB->set_flags (BDB::CHKSUM);
488
489 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
490 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
491 cf::cleanup "db_open(db): $!" if $!;
492 };
493 cf::cleanup "db_open(db): $@" if $@;
494 };
495 } 650 };
496} 651}
497 652
498sub db_get($$) { 653sub db_get($$) {
499 my $key = "$_[0]/$_[1]"; 654 my $key = "$_[0]/$_[1]";
500 655
550 if (1) { 705 if (1) {
551 $md5 = 706 $md5 =
552 join "\x00", 707 join "\x00",
553 $processversion, 708 $processversion,
554 map { 709 map {
555 Coro::cede; 710 cf::cede_to_tick;
556 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 711 ($src->[$_], Digest::MD5::md5_hex $data[$_])
557 } 0.. $#$src; 712 } 0.. $#$src;
558 713
559 714
560 my $dbmd5 = db_get cache => "$id/md5"; 715 my $dbmd5 = db_get cache => "$id/md5";
598 753
599############################################################################# 754#############################################################################
600 755
601=head2 ATTACHABLE OBJECTS 756=head2 ATTACHABLE OBJECTS
602 757
603Many objects in crossfire are so-called attachable objects. That means you can 758Many objects in deliantra are so-called attachable objects. That means you can
604attach callbacks/event handlers (a collection of which is called an "attachment") 759attach callbacks/event handlers (a collection of which is called an "attachment")
605to it. All such attachable objects support the following methods. 760to it. All such attachable objects support the following methods.
606 761
607In the following description, CLASS can be any of C<global>, C<object> 762In the following description, CLASS can be any of C<global>, C<object>
608C<player>, C<client> or C<map> (i.e. the attachable objects in 763C<player>, C<client> or C<map> (i.e. the attachable objects in
609Crossfire TRT). 764Deliantra).
610 765
611=over 4 766=over 4
612 767
613=item $attachable->attach ($attachment, key => $value...) 768=item $attachable->attach ($attachment, key => $value...)
614 769
658=item cf::CLASS::attachment $name, ... 813=item cf::CLASS::attachment $name, ...
659 814
660Register an attachment by C<$name> through which attachable objects of the 815Register an attachment by C<$name> through which attachable objects of the
661given CLASS can refer to this attachment. 816given CLASS can refer to this attachment.
662 817
663Some classes such as crossfire maps and objects can specify attachments 818Some classes such as deliantra maps and objects can specify attachments
664that are attached at load/instantiate time, thus the need for a name. 819that are attached at load/instantiate time, thus the need for a name.
665 820
666These calls expect any number of the following handler/hook descriptions: 821These calls expect any number of the following handler/hook descriptions:
667 822
668=over 4 823=over 4
866 "; 1021 ";
867 die if $@; 1022 die if $@;
868} 1023}
869 1024
870our $override; 1025our $override;
871our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1026our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
872 1027
873sub override { 1028sub override {
874 $override = 1; 1029 $override = 1;
875 @invoke_results = (); 1030 @INVOKE_RESULTS = (@_);
876} 1031}
877 1032
878sub do_invoke { 1033sub do_invoke {
879 my $event = shift; 1034 my $event = shift;
880 my $callbacks = shift; 1035 my $callbacks = shift;
881 1036
882 @invoke_results = (); 1037 @INVOKE_RESULTS = ();
883 1038
884 local $override; 1039 local $override;
885 1040
886 for (@$callbacks) { 1041 for (@$callbacks) {
887 eval { &{$_->[1]} }; 1042 eval { &{$_->[1]} };
896 } 1051 }
897 1052
898 0 1053 0
899} 1054}
900 1055
901=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1056=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
902 1057
903=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1058=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
904 1059
905Generate an object-specific event with the given arguments. 1060Generate an object-specific event with the given arguments.
906 1061
907This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1062This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
908removed in future versions), and there is no public API to access override 1063removed in future versions), and there is no public API to access override
909results (if you must, access C<@cf::invoke_results> directly). 1064results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910 1065
911=back 1066=back
912 1067
913=cut 1068=cut
914 1069
915############################################################################# 1070#############################################################################
916# object support 1071# object support
1072
1073sub _object_equal($$);
1074sub _object_equal($$) {
1075 my ($a, $b) = @_;
1076
1077 return 0 unless (ref $a) eq (ref $b);
1078
1079 if ("HASH" eq ref $a) {
1080 my @ka = keys %$a;
1081 my @kb = keys %$b;
1082
1083 return 0 if @ka != @kb;
1084
1085 for (0 .. $#ka) {
1086 return 0 unless $ka[$_] eq $kb[$_];
1087 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1088 }
1089
1090 } elsif ("ARRAY" eq ref $a) {
1091
1092 return 0 if @$a != @$b;
1093
1094 for (0 .. $#$a) {
1095 return 0 unless _object_equal $a->[$_], $b->[$_];
1096 }
1097
1098 } elsif ($a ne $b) {
1099 return 0;
1100 }
1101
1102 1
1103}
1104
1105our $SLOW_MERGES;#d#
1106sub _can_merge {
1107 my ($ob1, $ob2) = @_;
1108
1109 ++$SLOW_MERGES;#d#
1110
1111 # we do the slow way here
1112 return _object_equal $ob1, $ob2
1113}
917 1114
918sub reattach { 1115sub reattach {
919 # basically do the same as instantiate, without calling instantiate 1116 # basically do the same as instantiate, without calling instantiate
920 my ($obj) = @_; 1117 my ($obj) = @_;
921 1118
1119 # no longer needed after getting rid of delete_package?
922 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1120 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
923 1121
924 my $registry = $obj->registry; 1122 my $registry = $obj->registry;
925 1123
926 @$registry = (); 1124 @$registry = ();
927 1125
942cf::attachable->attach ( 1140cf::attachable->attach (
943 prio => -1000000, 1141 prio => -1000000,
944 on_instantiate => sub { 1142 on_instantiate => sub {
945 my ($obj, $data) = @_; 1143 my ($obj, $data) = @_;
946 1144
947 $data = from_json $data; 1145 $data = decode_json $data;
948 1146
949 for (@$data) { 1147 for (@$data) {
950 my ($name, $args) = @$_; 1148 my ($name, $args) = @$_;
951 1149
952 $obj->attach ($name, %{$args || {} }); 1150 $obj->attach ($name, %{$args || {} });
968sub object_freezer_save { 1166sub object_freezer_save {
969 my ($filename, $rdata, $objs) = @_; 1167 my ($filename, $rdata, $objs) = @_;
970 1168
971 sync_job { 1169 sync_job {
972 if (length $$rdata) { 1170 if (length $$rdata) {
1171 utf8::decode (my $decname = $filename);
973 warn sprintf "saving %s (%d,%d)\n", 1172 warn sprintf "saving %s (%d,%d)\n",
974 $filename, length $$rdata, scalar @$objs; 1173 $decname, length $$rdata, scalar @$objs;
975 1174
976 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
977 chmod SAVE_MODE, $fh; 1176 aio_chmod $fh, SAVE_MODE;
978 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
979 aio_fsync $fh if $cf::USE_FSYNC; 1178 if ($cf::USE_FSYNC) {
1179 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;
1180 aio_fsync $fh;
1181 }
980 close $fh; 1182 aio_close $fh;
981 1183
982 if (@$objs) { 1184 if (@$objs) {
983 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1185 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
984 chmod SAVE_MODE, $fh; 1186 aio_chmod $fh, SAVE_MODE;
985 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1187 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
986 aio_write $fh, 0, (length $data), $data, 0; 1188 aio_write $fh, 0, (length $data), $data, 0;
987 aio_fsync $fh if $cf::USE_FSYNC; 1189 if ($cf::USE_FSYNC) {
1190 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;
1191 aio_fsync $fh;
1192 }
988 close $fh; 1193 aio_close $fh;
989 aio_rename "$filename.pst~", "$filename.pst"; 1194 aio_rename "$filename.pst~", "$filename.pst";
990 } 1195 }
991 } else { 1196 } else {
992 aio_unlink "$filename.pst"; 1197 aio_unlink "$filename.pst";
993 } 1198 }
994 1199
995 aio_rename "$filename~", $filename; 1200 aio_rename "$filename~", $filename;
1201
1202 $filename =~ s%/[^/]+$%%;
1203 aio_pathsync $filename if $cf::USE_FSYNC;
996 } else { 1204 } else {
997 warn "FATAL: $filename~: $!\n"; 1205 warn "unable to save objects: $filename~: $!\n";
998 } 1206 }
999 } else { 1207 } else {
1000 aio_unlink $filename; 1208 aio_unlink $filename;
1001 aio_unlink "$filename.pst"; 1209 aio_unlink "$filename.pst";
1002 } 1210 }
1003 } 1211 };
1004} 1212}
1005 1213
1006sub object_freezer_as_string { 1214sub object_freezer_as_string {
1007 my ($rdata, $objs) = @_; 1215 my ($rdata, $objs) = @_;
1008 1216
1020 or return; 1228 or return;
1021 1229
1022 unless (aio_stat "$filename.pst") { 1230 unless (aio_stat "$filename.pst") {
1023 (aio_load "$filename.pst", $av) >= 0 1231 (aio_load "$filename.pst", $av) >= 0
1024 or return; 1232 or return;
1233
1025 $av = eval { (Storable::thaw $av)->{objs} }; 1234 my $st = eval { Coro::Storable::thaw $av };
1235 $av = $st->{objs};
1026 } 1236 }
1027 1237
1238 utf8::decode (my $decname = $filename);
1028 warn sprintf "loading %s (%d)\n", 1239 warn sprintf "loading %s (%d,%d)\n",
1029 $filename, length $data, scalar @{$av || []}; 1240 $decname, length $data, scalar @{$av || []};
1241
1030 return ($data, $av); 1242 ($data, $av)
1031} 1243}
1032 1244
1033=head2 COMMAND CALLBACKS 1245=head2 COMMAND CALLBACKS
1034 1246
1035=over 4 1247=over 4
1089 my ($name, $cb) = @_; 1301 my ($name, $cb) = @_;
1090 1302
1091 $EXTICMD{$name} = $cb; 1303 $EXTICMD{$name} = $cb;
1092} 1304}
1093 1305
1306use File::Glob ();
1307
1094cf::player->attach ( 1308cf::player->attach (
1095 on_command => sub { 1309 on_command => sub {
1096 my ($pl, $name, $params) = @_; 1310 my ($pl, $name, $params) = @_;
1097 1311
1098 my $cb = $COMMAND{$name} 1312 my $cb = $COMMAND{$name}
1108 my ($pl, $buf) = @_; 1322 my ($pl, $buf) = @_;
1109 1323
1110 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1324 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111 1325
1112 if (ref $msg) { 1326 if (ref $msg) {
1327 my ($type, $reply, @payload) =
1328 "ARRAY" eq ref $msg
1329 ? @$msg
1330 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1331
1332 my @reply;
1333
1113 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1334 if (my $cb = $EXTCMD{$type}) {
1114 if (my %reply = $cb->($pl, $msg)) { 1335 @reply = $cb->($pl, @payload);
1115 $pl->ext_reply ($msg->{msgid}, %reply);
1116 }
1117 } 1336 }
1337
1338 $pl->ext_reply ($reply, @reply)
1339 if $reply;
1340
1118 } else { 1341 } else {
1119 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1342 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120 } 1343 }
1121 1344
1122 cf::override; 1345 cf::override;
1123 }, 1346 },
1124); 1347);
1348
1349# "readahead" all extensions
1350sub cache_extensions {
1351 my $grp = IO::AIO::aio_group;
1352
1353 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1354 for (grep /\.ext$/, @{$_[0]}) {
1355 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1356 }
1357 };
1358
1359 $grp
1360}
1125 1361
1126sub load_extensions { 1362sub load_extensions {
1127 cf::sync_job { 1363 cf::sync_job {
1128 my %todo; 1364 my %todo;
1129 1365
1149 1385
1150 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1386 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1151 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1387 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1152 1388
1153 $ext{source} = 1389 $ext{source} =
1154 "package $pkg; use strict; use utf8;\n" 1390 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1155 . "#line 1 \"$path\"\n{\n" 1391 . "#line 1 \"$path\"\n{\n"
1156 . $source 1392 . $source
1157 . "\n};\n1"; 1393 . "\n};\n1";
1158 1394
1159 $todo{$base} = \%ext; 1395 $todo{$base} = \%ext;
1175 my $msg = $@ ? "$v->{path}: $@\n" 1411 my $msg = $@ ? "$v->{path}: $@\n"
1176 : "$v->{base}: extension inactive.\n"; 1412 : "$v->{base}: extension inactive.\n";
1177 1413
1178 if (exists $v->{meta}{mandatory}) { 1414 if (exists $v->{meta}{mandatory}) {
1179 warn $msg; 1415 warn $msg;
1180 warn "mandatory extension failed to load, exiting.\n"; 1416 cf::cleanup "mandatory extension failed to load, exiting.";
1181 exit 1;
1182 } 1417 }
1183 1418
1184 warn $msg; 1419 warn $msg;
1185 } 1420 }
1186 1421
1200 1435
1201=back 1436=back
1202 1437
1203=head2 CORE EXTENSIONS 1438=head2 CORE EXTENSIONS
1204 1439
1205Functions and methods that extend core crossfire objects. 1440Functions and methods that extend core deliantra objects.
1206 1441
1207=cut 1442=cut
1208 1443
1209package cf::player; 1444package cf::player;
1210 1445
1211use Coro::AIO; 1446use Coro::AIO;
1212 1447
1213=head3 cf::player 1448=head3 cf::player
1214 1449
1215=over 4 1450=over 4
1451
1452=item cf::player::num_playing
1453
1454Returns the official number of playing players, as per the Crossfire metaserver rules.
1455
1456=cut
1457
1458sub num_playing {
1459 scalar grep
1460 $_->ob->map
1461 && !$_->hidden
1462 && !$_->ob->flag (cf::FLAG_WIZ),
1463 cf::player::list
1464}
1216 1465
1217=item cf::player::find $login 1466=item cf::player::find $login
1218 1467
1219Returns the given player object, loading it if necessary (might block). 1468Returns the given player object, loading it if necessary (might block).
1220 1469
1239 1488
1240sub exists($) { 1489sub exists($) {
1241 my ($login) = @_; 1490 my ($login) = @_;
1242 1491
1243 $cf::PLAYER{$login} 1492 $cf::PLAYER{$login}
1244 or cf::sync_job { !aio_stat path $login } 1493 or !aio_stat path $login
1245} 1494}
1246 1495
1247sub find($) { 1496sub find($) {
1248 return $cf::PLAYER{$_[0]} || do { 1497 return $cf::PLAYER{$_[0]} || do {
1249 my $login = $_[0]; 1498 my $login = $_[0];
1256 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1505 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1257 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1506 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1258 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1507 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1259 aio_unlink +(playerdir $login) . "/$login.pl"; 1508 aio_unlink +(playerdir $login) . "/$login.pl";
1260 1509
1261 my $pl = load_pl path $login 1510 my $f = new_from_file cf::object::thawer path $login
1262 or return; 1511 or return;
1512
1513 my $pl = cf::player::load_pl $f
1514 or return;
1515
1516 local $cf::PLAYER_LOADING{$login} = $pl;
1517 $f->resolve_delayed_derefs;
1263 $cf::PLAYER{$login} = $pl 1518 $cf::PLAYER{$login} = $pl
1264 } 1519 }
1265 } 1520 }
1266} 1521}
1267 1522
1276 return if $pl->{deny_save}; 1531 return if $pl->{deny_save};
1277 1532
1278 aio_mkdir playerdir $pl, 0770; 1533 aio_mkdir playerdir $pl, 0770;
1279 $pl->{last_save} = $cf::RUNTIME; 1534 $pl->{last_save} = $cf::RUNTIME;
1280 1535
1536 cf::get_slot 0.01;
1537
1281 $pl->save_pl ($path); 1538 $pl->save_pl ($path);
1282 Coro::cede; 1539 cf::cede_to_tick;
1283} 1540}
1284 1541
1285sub new($) { 1542sub new($) {
1286 my ($login) = @_; 1543 my ($login) = @_;
1287 1544
1293 $cf::PLAYER{$login} = $self; 1550 $cf::PLAYER{$login} = $self;
1294 1551
1295 $self 1552 $self
1296} 1553}
1297 1554
1555=item $player->send_msg ($channel, $msg, $color, [extra...])
1556
1557=cut
1558
1559sub send_msg {
1560 my $ns = shift->ns
1561 or return;
1562 $ns->send_msg (@_);
1563}
1564
1298=item $pl->quit_character 1565=item $pl->quit_character
1299 1566
1300Nukes the player without looking back. If logged in, the connection will 1567Nukes the player without looking back. If logged in, the connection will
1301be destroyed. May block for a long time. 1568be destroyed. May block for a long time.
1302 1569
1306 my ($pl) = @_; 1573 my ($pl) = @_;
1307 1574
1308 my $name = $pl->ob->name; 1575 my $name = $pl->ob->name;
1309 1576
1310 $pl->{deny_save} = 1; 1577 $pl->{deny_save} = 1;
1311 $pl->password ("*"); # this should lock out the player until we nuked the dir 1578 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1312 1579
1313 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1580 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1314 $pl->deactivate; 1581 $pl->deactivate;
1582 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1583 $pl->ob->check_score;
1315 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1584 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1316 $pl->ns->destroy if $pl->ns; 1585 $pl->ns->destroy if $pl->ns;
1317 1586
1318 my $path = playerdir $pl; 1587 my $path = playerdir $pl;
1319 my $temp = "$path~$cf::RUNTIME~deleting~"; 1588 my $temp = "$path~$cf::RUNTIME~deleting~";
1355 or return []; 1624 or return [];
1356 1625
1357 my @logins; 1626 my @logins;
1358 1627
1359 for my $login (@$dirs) { 1628 for my $login (@$dirs) {
1629 my $path = path $login;
1630
1631 # a .pst is a dead give-away for a valid player
1632 # if no pst file found, open and chekc for blocked users
1633 if (aio_stat "$path.pst") {
1360 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1634 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1361 aio_read $fh, 0, 512, my $buf, 0 or next; 1635 aio_read $fh, 0, 512, my $buf, 0 or next;
1362 $buf !~ /^password -------------$/m or next; # official not-valid tag 1636 $buf !~ /^password -------------$/m or next; # official not-valid tag
1637 }
1363 1638
1364 utf8::decode $login; 1639 utf8::decode $login;
1365 push @logins, $login; 1640 push @logins, $login;
1366 } 1641 }
1367 1642
1394 } 1669 }
1395 1670
1396 \@paths 1671 \@paths
1397} 1672}
1398 1673
1399=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1674=item $protocol_xml = $player->expand_cfpod ($cfpod)
1400 1675
1401Expand crossfire pod fragments into protocol xml. 1676Expand deliantra pod fragments into protocol xml.
1402 1677
1403=cut
1404
1405sub expand_cfpod {
1406 ((my $self), (local $_)) = @_;
1407
1408 # escape & and <
1409 s/&/&amp;/g;
1410 s/(?<![BIUGH])</&lt;/g;
1411
1412 # this is buggy, it needs to properly take care of nested <'s
1413
1414 1 while
1415 # replace B<>, I<>, U<> etc.
1416 s/B<([^\>]*)>/<b>$1<\/b>/
1417 || s/I<([^\>]*)>/<i>$1<\/i>/
1418 || s/U<([^\>]*)>/<u>$1<\/u>/
1419 # replace G<male|female> tags
1420 || s{G<([^>|]*)\|([^>]*)>}{
1421 $self->gender ? $2 : $1
1422 }ge
1423 # replace H<hint text>
1424 || s{H<([^\>]*)>}
1425 {
1426 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1427 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1428 "")
1429 [$self->{hintmode}]
1430 }ge;
1431
1432 # create single paragraphs (very hackish)
1433 s/(?<=\S)\n(?=\w)/ /g;
1434
1435 # compress some whitespace
1436 s/\s+\n/\n/g; # ws line-ends
1437 s/\n\n+/\n/g; # double lines
1438 s/^\n+//; # beginning lines
1439 s/\n+$//; # ending lines
1440
1441 $_
1442}
1443
1444sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode}
1447}
1448
1449=item $player->ext_reply ($msgid, %msg) 1678=item $player->ext_reply ($msgid, @msg)
1450 1679
1451Sends an ext reply to the player. 1680Sends an ext reply to the player.
1452 1681
1453=cut 1682=cut
1454 1683
1455sub ext_reply($$%) { 1684sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1685 my ($self, $id, @msg) = @_;
1457 1686
1458 $msg{msgid} = $id; 1687 $self->ns->ext_reply ($id, @msg)
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460} 1688}
1461 1689
1462=item $player->ext_event ($type, %msg) 1690=item $player->ext_msg ($type, @msg)
1463 1691
1464Sends an ext event to the client. 1692Sends an ext event to the client.
1465 1693
1466=cut 1694=cut
1467 1695
1468sub ext_event($$%) { 1696sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1697 my ($self, $type, @msg) = @_;
1470 1698
1471 $self->ns->ext_event ($type, %msg); 1699 $self->ns->ext_msg ($type, @msg);
1472} 1700}
1473 1701
1474=head3 cf::region 1702=head3 cf::region
1475 1703
1476=over 4 1704=over 4
1520our $MAX_RESET = 3600; 1748our $MAX_RESET = 3600;
1521our $DEFAULT_RESET = 3000; 1749our $DEFAULT_RESET = 3000;
1522 1750
1523sub generate_random_map { 1751sub generate_random_map {
1524 my ($self, $rmp) = @_; 1752 my ($self, $rmp) = @_;
1753
1754 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1755
1525 # mit "rum" bekleckern, nicht 1756 # mit "rum" bekleckern, nicht
1526 $self->_create_random_map ( 1757 $self->_create_random_map (
1527 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1758 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1528 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1759 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1529 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1760 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1619 $self->init; # pass $1 etc. 1850 $self->init; # pass $1 etc.
1620 return $self; 1851 return $self;
1621 } 1852 }
1622 } 1853 }
1623 1854
1624 Carp::carp "unable to resolve path '$path' (base '$base')."; 1855 Carp::cluck "unable to resolve path '$path' (base '$base').";
1625 () 1856 ()
1626} 1857}
1627 1858
1628sub init { 1859sub init {
1629 my ($self) = @_; 1860 my ($self) = @_;
1651 1882
1652# the temporary/swap location 1883# the temporary/swap location
1653sub save_path { 1884sub save_path {
1654 my ($self) = @_; 1885 my ($self) = @_;
1655 1886
1656 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1887 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1657 "$TMPDIR/$path.map" 1888 "$TMPDIR/$path.map"
1658} 1889}
1659 1890
1660# the unique path, undef == no special unique path 1891# the unique path, undef == no special unique path
1661sub uniq_path { 1892sub uniq_path {
1662 my ($self) = @_; 1893 my ($self) = @_;
1663 1894
1664 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1895 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1665 "$UNIQUEDIR/$path" 1896 "$UNIQUEDIR/$path"
1666}
1667
1668# and all this just because we cannot iterate over
1669# all maps in C++...
1670sub change_all_map_light {
1671 my ($change) = @_;
1672
1673 $_->change_map_light ($change)
1674 for grep $_->outdoor, values %cf::MAP;
1675} 1897}
1676 1898
1677sub decay_objects { 1899sub decay_objects {
1678 my ($self) = @_; 1900 my ($self) = @_;
1679 1901
1692 1914
1693sub load_header_from($) { 1915sub load_header_from($) {
1694 my ($self, $path) = @_; 1916 my ($self, $path) = @_;
1695 1917
1696 utf8::encode $path; 1918 utf8::encode $path;
1697 #aio_open $path, O_RDONLY, 0 1919 my $f = new_from_file cf::object::thawer $path
1698 # or return;
1699
1700 $self->_load_header ($path)
1701 or return; 1920 or return;
1921
1922 $self->_load_header ($f)
1923 or return;
1924
1925 local $MAP_LOADING{$self->{path}} = $self;
1926 $f->resolve_delayed_derefs;
1702 1927
1703 $self->{load_path} = $path; 1928 $self->{load_path} = $path;
1704 1929
1705 1 1930 1
1706} 1931}
1760sub find { 1985sub find {
1761 my ($path, $origin) = @_; 1986 my ($path, $origin) = @_;
1762 1987
1763 $path = normalise $path, $origin && $origin->path; 1988 $path = normalise $path, $origin && $origin->path;
1764 1989
1990 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1765 cf::lock_wait "map_find:$path"; 1991 my $guard2 = cf::lock_acquire "map_find:$path";
1766 1992
1767 $cf::MAP{$path} || do { 1993 $cf::MAP{$path} || do {
1768 my $guard = cf::lock_acquire "map_find:$path";
1769 my $map = new_from_path cf::map $path 1994 my $map = new_from_path cf::map $path
1770 or return; 1995 or return;
1771 1996
1772 $map->{last_save} = $cf::RUNTIME; 1997 $map->{last_save} = $cf::RUNTIME;
1773 1998
1775 or return; 2000 or return;
1776 2001
1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2002 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778 # doing this can freeze the server in a sync job, obviously 2003 # doing this can freeze the server in a sync job, obviously
1779 #$cf::WAIT_FOR_TICK->wait; 2004 #$cf::WAIT_FOR_TICK->wait;
2005 undef $guard2;
2006 undef $guard1;
1780 $map->reset; 2007 $map->reset;
1781 undef $guard;
1782 return find $path; 2008 return find $path;
1783 } 2009 }
1784 2010
1785 $cf::MAP{$path} = $map 2011 $cf::MAP{$path} = $map
1786 } 2012 }
1795 local $self->{deny_reset} = 1; # loading can take a long time 2021 local $self->{deny_reset} = 1; # loading can take a long time
1796 2022
1797 my $path = $self->{path}; 2023 my $path = $self->{path};
1798 2024
1799 { 2025 {
1800 my $guard = cf::lock_acquire "map_load:$path"; 2026 my $guard = cf::lock_acquire "map_data:$path";
1801 2027
2028 return unless $self->valid;
1802 return if $self->in_memory != cf::MAP_SWAPPED; 2029 return unless $self->in_memory == cf::MAP_SWAPPED;
1803 2030
1804 $self->in_memory (cf::MAP_LOADING); 2031 $self->in_memory (cf::MAP_LOADING);
1805 2032
1806 $self->alloc; 2033 $self->alloc;
1807 2034
1808 $self->pre_load; 2035 $self->pre_load;
1809 Coro::cede; 2036 cf::cede_to_tick;
1810 2037
2038 my $f = new_from_file cf::object::thawer $self->{load_path};
2039 $f->skip_block;
1811 $self->_load_objects ($self->{load_path}, 1) 2040 $self->_load_objects ($f)
1812 or return; 2041 or return;
1813 2042
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2043 $self->post_load_original
1815 if delete $self->{load_original}; 2044 if delete $self->{load_original};
1816 2045
1817 if (my $uniq = $self->uniq_path) { 2046 if (my $uniq = $self->uniq_path) {
1818 utf8::encode $uniq; 2047 utf8::encode $uniq;
1819 if (aio_open $uniq, O_RDONLY, 0) { 2048 unless (aio_stat $uniq) {
2049 if (my $f = new_from_file cf::object::thawer $uniq) {
1820 $self->clear_unique_items; 2050 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0); 2051 $self->_load_objects ($f);
2052 $f->resolve_delayed_derefs;
2053 }
1822 } 2054 }
1823 } 2055 }
1824 2056
1825 Coro::cede; 2057 $f->resolve_delayed_derefs;
2058
2059 cf::cede_to_tick;
1826 # now do the right thing for maps 2060 # now do the right thing for maps
1827 $self->link_multipart_objects; 2061 $self->link_multipart_objects;
1828 $self->difficulty ($self->estimate_difficulty) 2062 $self->difficulty ($self->estimate_difficulty)
1829 unless $self->difficulty; 2063 unless $self->difficulty;
1830 Coro::cede; 2064 cf::cede_to_tick;
1831 2065
1832 unless ($self->{deny_activate}) { 2066 unless ($self->{deny_activate}) {
1833 $self->decay_objects; 2067 $self->decay_objects;
1834 $self->fix_auto_apply; 2068 $self->fix_auto_apply;
1835 $self->update_buttons; 2069 $self->update_buttons;
1836 Coro::cede; 2070 cf::cede_to_tick;
1837 $self->set_darkness_map;
1838 Coro::cede;
1839 $self->activate; 2071 $self->activate;
1840 } 2072 }
1841 2073
2074 $self->{last_save} = $cf::RUNTIME;
2075 $self->last_access ($cf::RUNTIME);
2076
1842 $self->in_memory (cf::MAP_IN_MEMORY); 2077 $self->in_memory (cf::MAP_ACTIVE);
1843 } 2078 }
1844 2079
1845 $self->post_load; 2080 $self->post_load;
1846} 2081}
1847 2082
1856 2091
1857 $self 2092 $self
1858} 2093}
1859 2094
1860# find and load all maps in the 3x3 area around a map 2095# find and load all maps in the 3x3 area around a map
1861sub load_diag { 2096sub load_neighbours {
1862 my ($map) = @_; 2097 my ($map) = @_;
1863 2098
1864 my @diag; # diagonal neighbours 2099 my @neigh; # diagonal neighbours
1865 2100
1866 for (0 .. 3) { 2101 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_) 2102 my $neigh = $map->tile_path ($_)
1868 or next; 2103 or next;
1869 $neigh = find $neigh, $map 2104 $neigh = find $neigh, $map
1870 or next; 2105 or next;
1871 $neigh->load; 2106 $neigh->load;
1872 2107
2108 push @neigh,
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2109 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2110 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 } 2111 }
1876 2112
1877 for (@diag) { 2113 for (grep defined $_->[0], @neigh) {
2114 my ($path, $origin) = @$_;
1878 my $neigh = find @$_ 2115 my $neigh = find $path, $origin
1879 or next; 2116 or next;
1880 $neigh->load; 2117 $neigh->load;
1881 } 2118 }
1882} 2119}
1883 2120
1888} 2125}
1889 2126
1890sub do_load_sync { 2127sub do_load_sync {
1891 my ($map) = @_; 2128 my ($map) = @_;
1892 2129
2130 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2131 if $Coro::current == $Coro::main;
2132
1893 cf::sync_job { $map->load }; 2133 cf::sync_job { $map->load };
1894} 2134}
1895 2135
1896our %MAP_PREFETCH; 2136our %MAP_PREFETCH;
1897our $MAP_PREFETCHER = undef; 2137our $MAP_PREFETCHER = undef;
1898 2138
1899sub find_async { 2139sub find_async {
1900 my ($path, $origin) = @_; 2140 my ($path, $origin, $load) = @_;
1901 2141
1902 $path = normalise $path, $origin && $origin->{path}; 2142 $path = normalise $path, $origin && $origin->{path};
1903 2143
1904 if (my $map = $cf::MAP{$path}) { 2144 if (my $map = $cf::MAP{$path}) {
1905 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2145 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1906 } 2146 }
1907 2147
1908 undef $MAP_PREFETCH{$path}; 2148 $MAP_PREFETCH{$path} |= $load;
2149
1909 $MAP_PREFETCHER ||= cf::async { 2150 $MAP_PREFETCHER ||= cf::async {
2151 $Coro::current->{desc} = "map prefetcher";
2152
1910 while (%MAP_PREFETCH) { 2153 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 2154 while (my ($k, $v) = each %MAP_PREFETCH) {
1912 my $map = find $path 2155 if (my $map = find $k) {
1913 or next;
1914 $map->load; 2156 $map->load if $v;
2157 }
1915 2158
1916 delete $MAP_PREFETCH{$path}; 2159 delete $MAP_PREFETCH{$k};
1917 } 2160 }
1918 } 2161 }
1919 undef $MAP_PREFETCHER; 2162 undef $MAP_PREFETCHER;
1920 }; 2163 };
1921 $MAP_PREFETCHER->prio (6); 2164 $MAP_PREFETCHER->prio (6);
1924} 2167}
1925 2168
1926sub save { 2169sub save {
1927 my ($self) = @_; 2170 my ($self) = @_;
1928 2171
1929 my $lock = cf::lock_acquire "map_data:" . $self->path; 2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
1930 2173
1931 $self->{last_save} = $cf::RUNTIME; 2174 $self->{last_save} = $cf::RUNTIME;
1932 2175
1933 return unless $self->dirty; 2176 return unless $self->dirty;
1934 2177
1940 return if $self->{deny_save}; 2183 return if $self->{deny_save};
1941 2184
1942 local $self->{last_access} = $self->last_access;#d# 2185 local $self->{last_access} = $self->last_access;#d#
1943 2186
1944 cf::async { 2187 cf::async {
2188 $Coro::current->{desc} = "map player save";
1945 $_->contr->save for $self->players; 2189 $_->contr->save for $self->players;
1946 }; 2190 };
2191
2192 cf::get_slot 0.02;
1947 2193
1948 if ($uniq) { 2194 if ($uniq) {
1949 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2195 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1950 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2196 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1951 } else { 2197 } else {
1957 my ($self) = @_; 2203 my ($self) = @_;
1958 2204
1959 # save first because save cedes 2205 # save first because save cedes
1960 $self->save; 2206 $self->save;
1961 2207
1962 my $lock = cf::lock_acquire "map_data:" . $self->path; 2208 my $lock = cf::lock_acquire "map_data:$self->{path}";
1963 2209
1964 return if $self->players; 2210 return if $self->players;
1965 return if $self->in_memory != cf::MAP_IN_MEMORY; 2211 return if $self->in_memory != cf::MAP_ACTIVE;
1966 return if $self->{deny_save}; 2212 return if $self->{deny_save};
1967 2213
2214 $self->in_memory (cf::MAP_SWAPPED);
2215
2216 $self->deactivate;
2217 $_->clear_links_to ($self) for values %cf::MAP;
1968 $self->clear; 2218 $self->clear;
1969 $self->in_memory (cf::MAP_SWAPPED);
1970} 2219}
1971 2220
1972sub reset_at { 2221sub reset_at {
1973 my ($self) = @_; 2222 my ($self) = @_;
1974 2223
1992 2241
1993 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
1994 2243
1995 return if $self->players; 2244 return if $self->players;
1996 2245
1997 warn "resetting map ", $self->path; 2246 warn "resetting map ", $self->path, "\n";
1998 2247
1999 $self->in_memory (cf::MAP_SWAPPED); 2248 $self->in_memory (cf::MAP_SWAPPED);
2000 2249
2001 # need to save uniques path 2250 # need to save uniques path
2002 unless ($self->{deny_save}) { 2251 unless ($self->{deny_save}) {
2006 if $uniq; 2255 if $uniq;
2007 } 2256 }
2008 2257
2009 delete $cf::MAP{$self->path}; 2258 delete $cf::MAP{$self->path};
2010 2259
2260 $self->deactivate;
2261 $_->clear_links_to ($self) for values %cf::MAP;
2011 $self->clear; 2262 $self->clear;
2012
2013 $_->clear_links_to ($self) for values %cf::MAP;
2014 2263
2015 $self->unlink_save; 2264 $self->unlink_save;
2016 $self->destroy; 2265 $self->destroy;
2017} 2266}
2018 2267
2019my $nuke_counter = "aaaa"; 2268my $nuke_counter = "aaaa";
2020 2269
2021sub nuke { 2270sub nuke {
2022 my ($self) = @_; 2271 my ($self) = @_;
2023 2272
2273 {
2274 my $lock = cf::lock_acquire "map_data:$self->{path}";
2275
2024 delete $cf::MAP{$self->path}; 2276 delete $cf::MAP{$self->path};
2025 2277
2026 $self->unlink_save; 2278 $self->unlink_save;
2027 2279
2028 bless $self, "cf::map"; 2280 bless $self, "cf::map";
2029 delete $self->{deny_reset}; 2281 delete $self->{deny_reset};
2030 $self->{deny_save} = 1; 2282 $self->{deny_save} = 1;
2031 $self->reset_timeout (1); 2283 $self->reset_timeout (1);
2032 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2284 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033 2285
2034 $cf::MAP{$self->path} = $self; 2286 $cf::MAP{$self->path} = $self;
2287 }
2035 2288
2036 $self->reset; # polite request, might not happen 2289 $self->reset; # polite request, might not happen
2037} 2290}
2038 2291
2039=item $maps = cf::map::tmp_maps 2292=item $maps = cf::map::tmp_maps
2081 2334
2082sub unique_maps() { 2335sub unique_maps() {
2083 [ 2336 [
2084 map { 2337 map {
2085 utf8::decode $_; 2338 utf8::decode $_;
2086 /\.map$/ 2339 s/\.map$//; # TODO future compatibility hack
2340 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2341 ? ()
2087 ? normalise $_ 2342 : normalise $_
2088 : ()
2089 } @{ aio_readdir $UNIQUEDIR or [] } 2343 } @{ aio_readdir $UNIQUEDIR or [] }
2090 ] 2344 ]
2091} 2345}
2092 2346
2093package cf; 2347=item cf::map::static_maps
2348
2349Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2350file in the shared directory excluding F</styles> and F</editor>). May
2351block.
2352
2353=cut
2354
2355sub static_maps() {
2356 my @dirs = "";
2357 my @maps;
2358
2359 while (@dirs) {
2360 my $dir = shift @dirs;
2361
2362 next if $dir eq "/styles" || $dir eq "/editor";
2363
2364 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2365 or return;
2366
2367 for (@$files) {
2368 s/\.map$// or next;
2369 utf8::decode $_;
2370 push @maps, "$dir/$_";
2371 }
2372
2373 push @dirs, map "$dir/$_", @$dirs;
2374 }
2375
2376 \@maps
2377}
2094 2378
2095=back 2379=back
2096 2380
2097=head3 cf::object 2381=head3 cf::object
2098 2382
2102 2386
2103=over 4 2387=over 4
2104 2388
2105=item $ob->inv_recursive 2389=item $ob->inv_recursive
2106 2390
2107Returns the inventory of the object _and_ their inventories, recursively. 2391Returns the inventory of the object I<and> their inventories, recursively,
2392but I<not> the object itself.
2108 2393
2109=cut 2394=cut
2110 2395
2111sub inv_recursive_; 2396sub inv_recursive_;
2112sub inv_recursive_ { 2397sub inv_recursive_ {
2115 2400
2116sub inv_recursive { 2401sub inv_recursive {
2117 inv_recursive_ inv $_[0] 2402 inv_recursive_ inv $_[0]
2118} 2403}
2119 2404
2405=item $ref = $ob->ref
2406
2407Creates and returns a persistent reference to an object that can be stored as a string.
2408
2409=item $ob = cf::object::deref ($refstring)
2410
2411returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2412even if the object actually exists. May block.
2413
2414=cut
2415
2416sub deref {
2417 my ($ref) = @_;
2418
2419 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2420 my ($uuid, $name) = ($1, $2);
2421 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2422 or return;
2423 $pl->ob->uuid eq $uuid
2424 or return;
2425
2426 $pl->ob
2427 } else {
2428 warn "$ref: cannot resolve object reference\n";
2429 undef
2430 }
2431}
2432
2120package cf; 2433package cf;
2121 2434
2122=back 2435=back
2123 2436
2124=head3 cf::object::player 2437=head3 cf::object::player
2130Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2443Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2131can be C<undef>. Does the right thing when the player is currently in a 2444can be C<undef>. Does the right thing when the player is currently in a
2132dialogue with the given NPC character. 2445dialogue with the given NPC character.
2133 2446
2134=cut 2447=cut
2448
2449our $SAY_CHANNEL = {
2450 id => "say",
2451 title => "Map",
2452 reply => "say ",
2453 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2454};
2455
2456our $CHAT_CHANNEL = {
2457 id => "chat",
2458 title => "Chat",
2459 reply => "chat ",
2460 tooltip => "Player chat and shouts, global to the server.",
2461};
2135 2462
2136# rough implementation of a future "reply" method that works 2463# rough implementation of a future "reply" method that works
2137# with dialog boxes. 2464# with dialog boxes.
2138#TODO: the first argument must go, split into a $npc->reply_to ( method 2465#TODO: the first argument must go, split into a $npc->reply_to ( method
2139sub cf::object::player::reply($$$;$) { 2466sub cf::object::player::reply($$$;$) {
2146 2473
2147 } else { 2474 } else {
2148 my $pl = $self->contr; 2475 my $pl = $self->contr;
2149 2476
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2477 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2478 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2479 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158 2480
2159 } else { 2481 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2482 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2483 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2162 } 2484 }
2163 } 2485 }
2486}
2487
2488=item $object->send_msg ($channel, $msg, $color, [extra...])
2489
2490=cut
2491
2492sub cf::object::send_msg {
2493 my $pl = shift->contr
2494 or return;
2495 $pl->send_msg (@_);
2164} 2496}
2165 2497
2166=item $player_object->may ("access") 2498=item $player_object->may ("access")
2167 2499
2168Returns wether the given player is authorized to access resource "access" 2500Returns wether the given player is authorized to access resource "access"
2181 2513
2182=item $player_object->enter_link 2514=item $player_object->enter_link
2183 2515
2184Freezes the player and moves him/her to a special map (C<{link}>). 2516Freezes the player and moves him/her to a special map (C<{link}>).
2185 2517
2186The player should be reasonably safe there for short amounts of time. You 2518The player should be reasonably safe there for short amounts of time (e.g.
2187I<MUST> call C<leave_link> as soon as possible, though. 2519for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2520though, as the palyer cannot control the character while it is on the link
2521map.
2188 2522
2189Will never block. 2523Will never block.
2190 2524
2191=item $player_object->leave_link ($map, $x, $y) 2525=item $player_object->leave_link ($map, $x, $y)
2192 2526
2244 ($x, $y) = (-1, -1) 2578 ($x, $y) = (-1, -1)
2245 unless (defined $x) && (defined $y); 2579 unless (defined $x) && (defined $y);
2246 2580
2247 # use -1 or undef as default coordinates, not 0, 0 2581 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2582 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2583 if $x <= 0 && $y <= 0;
2250 2584
2251 $map->load; 2585 $map->load;
2252 $map->load_diag; 2586 $map->load_neighbours;
2253 2587
2254 return unless $self->contr->active; 2588 return unless $self->contr->active;
2255 $self->activate_recursive;
2256 2589
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258 $self->enter_map ($map, $x, $y); 2591 $self->enter_map ($map, $x, $y);
2592
2593 # only activate afterwards, to support waiting in hooks
2594 $self->activate_recursive;
2259} 2595}
2260 2596
2261=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2262 2598
2263Moves the player to the given map-path and coordinates by first freezing 2599Moves the player to the given map-path and coordinates by first freezing
2264her, loading and preparing them map, calling the provided $check callback 2600her, loading and preparing them map, calling the provided $check callback
2265that has to return the map if sucecssful, and then unfreezes the player on 2601that has to return the map if sucecssful, and then unfreezes the player on
2266the new (success) or old (failed) map position. In either case, $done will 2602the new (success) or old (failed) map position. In either case, $done will
2267be called at the end of this process. 2603be called at the end of this process.
2268 2604
2605Note that $check will be called with a potentially non-loaded map, so if
2606it needs a loaded map it has to call C<< ->load >>.
2607
2269=cut 2608=cut
2270 2609
2271our $GOTOGEN; 2610our $GOTOGEN;
2272 2611
2273sub cf::object::player::goto { 2612sub cf::object::player::goto {
2277 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2616 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2278 2617
2279 $self->enter_link; 2618 $self->enter_link;
2280 2619
2281 (async { 2620 (async {
2621 $Coro::current->{desc} = "player::goto $path $x $y";
2622
2623 # *tag paths override both path and x|y
2624 if ($path =~ /^\*(.*)$/) {
2625 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2626 my $ob = $obs[rand @obs];
2627
2628 # see if we actually can go there
2629 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2630 $ob = $obs[rand @obs];
2631 } else {
2632 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2633 }
2634 # else put us there anyways for now #d#
2635
2636 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2637 } else {
2638 ($path, $x, $y) = (undef, undef, undef);
2639 }
2640 }
2641
2282 my $map = eval { 2642 my $map = eval {
2283 my $map = cf::map::find $path; 2643 my $map = defined $path ? cf::map::find $path : undef;
2284 2644
2285 if ($map) { 2645 if ($map) {
2286 $map = $map->customise_for ($self); 2646 $map = $map->customise_for ($self);
2287 $map = $check->($map) if $check && $map; 2647 $map = $check->($map) if $check && $map;
2288 } else { 2648 } else {
2289 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2649 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2290 } 2650 }
2291 2651
2292 $map 2652 $map
2293 }; 2653 };
2294 2654
2330} 2690}
2331 2691
2332sub prepare_random_map { 2692sub prepare_random_map {
2333 my ($exit) = @_; 2693 my ($exit) = @_;
2334 2694
2335 my $guard = cf::lock_acquire "exit_prepare:$exit";
2336
2337 # all this does is basically replace the /! path by 2695 # all this does is basically replace the /! path by
2338 # a new random map path (?random/...) with a seed 2696 # a new random map path (?random/...) with a seed
2339 # that depends on the exit object 2697 # that depends on the exit object
2340 2698
2341 my $rmp = parse_random_map_params $exit->msg; 2699 my $rmp = parse_random_map_params $exit->msg;
2343 if ($exit->map) { 2701 if ($exit->map) {
2344 $rmp->{region} = $exit->region->name; 2702 $rmp->{region} = $exit->region->name;
2345 $rmp->{origin_map} = $exit->map->path; 2703 $rmp->{origin_map} = $exit->map->path;
2346 $rmp->{origin_x} = $exit->x; 2704 $rmp->{origin_x} = $exit->x;
2347 $rmp->{origin_y} = $exit->y; 2705 $rmp->{origin_y} = $exit->y;
2706
2707 $exit->map->touch;
2348 } 2708 }
2349 2709
2350 $rmp->{random_seed} ||= $exit->random_seed; 2710 $rmp->{random_seed} ||= $exit->random_seed;
2351 2711
2352 my $data = cf::to_json $rmp; 2712 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2353 my $md5 = Digest::MD5::md5_hex $data; 2713 my $md5 = Digest::MD5::md5_hex $data;
2354 my $meta = "$RANDOMDIR/$md5.meta"; 2714 my $meta = "$RANDOMDIR/$md5.meta";
2355 2715
2356 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2716 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2357 aio_write $fh, 0, (length $data), $data, 0; 2717 aio_write $fh, 0, (length $data), $data, 0;
2358 undef $fh; 2718 undef $fh;
2359 aio_rename "$meta~", $meta; 2719 aio_rename "$meta~", $meta;
2360 2720
2721 my $slaying = "?random/$md5";
2722
2723 if ($exit->valid) {
2361 $exit->slaying ("?random/$md5"); 2724 $exit->slaying ("?random/$md5");
2362 $exit->msg (undef); 2725 $exit->msg (undef);
2726 }
2363 } 2727 }
2364} 2728}
2365 2729
2366sub cf::object::player::enter_exit { 2730sub cf::object::player::enter_exit {
2367 my ($self, $exit) = @_; 2731 my ($self, $exit) = @_;
2368 2732
2369 return unless $self->type == cf::PLAYER; 2733 return unless $self->type == cf::PLAYER;
2370 2734
2371 if ($exit->slaying eq "/!") {
2372 #TODO: this should de-fi-ni-te-ly not be a sync-job
2373 # the problem is that $exit might not survive long enough
2374 # so it needs to be done right now, right here
2375 cf::sync_job { prepare_random_map $exit };
2376 }
2377
2378 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2379 my $hp = $exit->stats->hp;
2380 my $sp = $exit->stats->sp;
2381
2382 $self->enter_link; 2735 $self->enter_link;
2383 2736
2384 # if exit is damned, update players death & WoR home-position
2385 $self->contr->savebed ($slaying, $hp, $sp)
2386 if $exit->flag (FLAG_DAMNED);
2387
2388 (async { 2737 (async {
2389 $self->deactivate_recursive; # just to be sure 2738 $Coro::current->{desc} = "enter_exit";
2739
2390 unless (eval { 2740 unless (eval {
2741 $self->deactivate_recursive; # just to be sure
2742
2743 # random map handling
2744 {
2745 my $guard = cf::lock_acquire "exit_prepare:$exit";
2746
2747 prepare_random_map $exit
2748 if $exit->slaying eq "/!";
2749 }
2750
2751 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2752 my $x = $exit->stats->hp;
2753 my $y = $exit->stats->sp;
2754
2391 $self->goto ($slaying, $hp, $sp); 2755 $self->goto ($map, $x, $y);
2392 2756
2757 # if exit is damned, update players death & WoR home-position
2758 $self->contr->savebed ($map, $x, $y)
2759 if $exit->flag (cf::FLAG_DAMNED);
2760
2393 1; 2761 1
2394 }) { 2762 }) {
2395 $self->message ("Something went wrong deep within the crossfire server. " 2763 $self->message ("Something went wrong deep within the deliantra server. "
2396 . "I'll try to bring you back to the map you were before. " 2764 . "I'll try to bring you back to the map you were before. "
2397 . "Please report this to the dungeon master!", 2765 . "Please report this to the dungeon master!",
2398 cf::NDI_UNIQUE | cf::NDI_RED); 2766 cf::NDI_UNIQUE | cf::NDI_RED);
2399 2767
2400 warn "ERROR in enter_exit: $@"; 2768 warn "ERROR in enter_exit: $@";
2419 2787
2420 utf8::encode $text; 2788 utf8::encode $text;
2421 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2789 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2422} 2790}
2423 2791
2792=item $client->send_big_packet ($pkt)
2793
2794Like C<send_packet>, but tries to compress large packets, and fragments
2795them as required.
2796
2797=cut
2798
2799our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2800
2801sub cf::client::send_big_packet {
2802 my ($self, $pkt) = @_;
2803
2804 # try lzf for large packets
2805 $pkt = "lzf " . Compress::LZF::compress $pkt
2806 if 1024 <= length $pkt and $self->{can_lzf};
2807
2808 # split very large packets
2809 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2810 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2811 $pkt = "frag";
2812 }
2813
2814 $self->send_packet ($pkt);
2815}
2816
2424=item $client->send_msg ($color, $type, $msg, [extra...]) 2817=item $client->send_msg ($channel, $msg, $color, [extra...])
2425 2818
2426Send a drawinfo or msg packet to the client, formatting the msg for the 2819Send a drawinfo or msg packet to the client, formatting the msg for the
2427client if neccessary. C<$type> should be a string identifying the type of 2820client if neccessary. C<$type> should be a string identifying the type of
2428the message, with C<log> being the default. If C<$color> is negative, suppress 2821the message, with C<log> being the default. If C<$color> is negative, suppress
2429the message unless the client supports the msg packet. 2822the message unless the client supports the msg packet.
2430 2823
2431=cut 2824=cut
2432 2825
2826# non-persistent channels (usually the info channel)
2827our %CHANNEL = (
2828 "c/motd" => {
2829 id => "infobox",
2830 title => "MOTD",
2831 reply => undef,
2832 tooltip => "The message of the day",
2833 },
2834 "c/identify" => {
2835 id => "infobox",
2836 title => "Identify",
2837 reply => undef,
2838 tooltip => "Items recently identified",
2839 },
2840 "c/examine" => {
2841 id => "infobox",
2842 title => "Examine",
2843 reply => undef,
2844 tooltip => "Signs and other items you examined",
2845 },
2846 "c/shopinfo" => {
2847 id => "infobox",
2848 title => "Shop Info",
2849 reply => undef,
2850 tooltip => "What your bargaining skill tells you about the shop",
2851 },
2852 "c/book" => {
2853 id => "infobox",
2854 title => "Book",
2855 reply => undef,
2856 tooltip => "The contents of a note or book",
2857 },
2858 "c/lookat" => {
2859 id => "infobox",
2860 title => "Look",
2861 reply => undef,
2862 tooltip => "What you saw there",
2863 },
2864 "c/who" => {
2865 id => "infobox",
2866 title => "Players",
2867 reply => undef,
2868 tooltip => "Shows players who are currently online",
2869 },
2870 "c/body" => {
2871 id => "infobox",
2872 title => "Body Parts",
2873 reply => undef,
2874 tooltip => "Shows which body parts you posess and are available",
2875 },
2876 "c/statistics" => {
2877 id => "infobox",
2878 title => "Statistics",
2879 reply => undef,
2880 tooltip => "Shows your primary statistics",
2881 },
2882 "c/skills" => {
2883 id => "infobox",
2884 title => "Skills",
2885 reply => undef,
2886 tooltip => "Shows your experience per skill and item power",
2887 },
2888 "c/shopitems" => {
2889 id => "infobox",
2890 title => "Shop Items",
2891 reply => undef,
2892 tooltip => "Shows the items currently for sale in this shop",
2893 },
2894 "c/resistances" => {
2895 id => "infobox",
2896 title => "Resistances",
2897 reply => undef,
2898 tooltip => "Shows your resistances",
2899 },
2900 "c/pets" => {
2901 id => "infobox",
2902 title => "Pets",
2903 reply => undef,
2904 tooltip => "Shows information abotu your pets/a specific pet",
2905 },
2906 "c/perceiveself" => {
2907 id => "infobox",
2908 title => "Perceive Self",
2909 reply => undef,
2910 tooltip => "You gained detailed knowledge about yourself",
2911 },
2912 "c/uptime" => {
2913 id => "infobox",
2914 title => "Uptime",
2915 reply => undef,
2916 tooltip => "How long the server has been running since last restart",
2917 },
2918 "c/mapinfo" => {
2919 id => "infobox",
2920 title => "Map Info",
2921 reply => undef,
2922 tooltip => "Information related to the maps",
2923 },
2924 "c/party" => {
2925 id => "party",
2926 title => "Party",
2927 reply => "gsay ",
2928 tooltip => "Messages and chat related to your party",
2929 },
2930 "c/death" => {
2931 id => "death",
2932 title => "Death",
2933 reply => undef,
2934 tooltip => "Reason for and more info about your most recent death",
2935 },
2936 "c/say" => $SAY_CHANNEL,
2937 "c/chat" => $CHAT_CHANNEL,
2938);
2939
2433sub cf::client::send_msg { 2940sub cf::client::send_msg {
2434 my ($self, $color, $type, $msg, @extra) = @_; 2941 my ($self, $channel, $msg, $color, @extra) = @_;
2435 2942
2436 $msg = $self->pl->expand_cfpod ($msg); 2943 $msg = $self->pl->expand_cfpod ($msg)
2944 unless $color & cf::NDI_VERBATIM;
2945
2946 $color &= cf::NDI_CLIENT_MASK; # just in case...
2947
2948 # check predefined channels, for the benefit of C
2949 if ($CHANNEL{$channel}) {
2950 $channel = $CHANNEL{$channel};
2951
2952 $self->ext_msg (channel_info => $channel);
2953 $channel = $channel->{id};
2954
2955 } elsif (ref $channel) {
2956 # send meta info to client, if not yet sent
2957 unless (exists $self->{channel}{$channel->{id}}) {
2958 $self->{channel}{$channel->{id}} = $channel;
2959 $self->ext_msg (channel_info => $channel);
2960 }
2961
2962 $channel = $channel->{id};
2963 }
2437 2964
2438 return unless @extra || length $msg; 2965 return unless @extra || length $msg;
2439 2966
2440 if ($self->can_msg) { 2967 # default colour, mask it out
2441 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2968 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2442 } else { 2969 if $color & cf::NDI_DEF;
2443 # replace some tags by gcfclient-compatible ones
2444 for ($msg) {
2445 1 while
2446 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2447 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2448 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2449 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2450 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2451 }
2452 2970
2453 if ($color >= 0) { 2971 my $pkt = "msg "
2454 if (0 && $msg =~ /\[/) { 2972 . $self->{json_coder}->encode (
2455 $self->send_packet ("drawextinfo $color 4 0 $msg") 2973 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2456 } else { 2974 );
2457 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2458 $self->send_packet ("drawinfo $color $msg")
2459 }
2460 }
2461 }
2462}
2463 2975
2976 $self->send_big_packet ($pkt);
2977}
2978
2464=item $client->ext_event ($type, %msg) 2979=item $client->ext_msg ($type, @msg)
2465 2980
2466Sends an ext event to the client. 2981Sends an ext event to the client.
2467 2982
2468=cut 2983=cut
2469 2984
2470sub cf::client::ext_event($$%) { 2985sub cf::client::ext_msg($$@) {
2471 my ($self, $type, %msg) = @_; 2986 my ($self, $type, @msg) = @_;
2472 2987
2473 return unless $self->extcmd; 2988 if ($self->extcmd == 2) {
2474 2989 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2990 } elsif ($self->extcmd == 1) { # TODO: remove
2475 $msg{msgtype} = "event_$type"; 2991 push @msg, msgtype => "event_$type";
2476 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2992 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2993 }
2994}
2995
2996=item $client->ext_reply ($msgid, @msg)
2997
2998Sends an ext reply to the client.
2999
3000=cut
3001
3002sub cf::client::ext_reply($$@) {
3003 my ($self, $id, @msg) = @_;
3004
3005 if ($self->extcmd == 2) {
3006 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3007 } elsif ($self->extcmd == 1) {
3008 #TODO: version 1, remove
3009 unshift @msg, msgtype => "reply", msgid => $id;
3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3011 }
2477} 3012}
2478 3013
2479=item $success = $client->query ($flags, "text", \&cb) 3014=item $success = $client->query ($flags, "text", \&cb)
2480 3015
2481Queues a query to the client, calling the given callback with 3016Queues a query to the client, calling the given callback with
2536 my ($ns, $buf) = @_; 3071 my ($ns, $buf) = @_;
2537 3072
2538 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3073 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2539 3074
2540 if (ref $msg) { 3075 if (ref $msg) {
3076 my ($type, $reply, @payload) =
3077 "ARRAY" eq ref $msg
3078 ? @$msg
3079 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3080
3081 my @reply;
3082
2541 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3083 if (my $cb = $EXTICMD{$type}) {
2542 if (my %reply = $cb->($ns, $msg)) { 3084 @reply = $cb->($ns, @payload);
2543 $reply{msgid} = $msg->{msgid};
2544 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2545 }
2546 } 3085 }
3086
3087 $ns->ext_reply ($reply, @reply)
3088 if $reply;
3089
2547 } else { 3090 } else {
2548 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3091 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2549 } 3092 }
2550 3093
2551 cf::override; 3094 cf::override;
2598our $safe = new Safe "safe"; 3141our $safe = new Safe "safe";
2599our $safe_hole = new Safe::Hole; 3142our $safe_hole = new Safe::Hole;
2600 3143
2601$SIG{FPE} = 'IGNORE'; 3144$SIG{FPE} = 'IGNORE';
2602 3145
2603$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3146$safe->permit_only (Opcode::opset qw(
3147 :base_core :base_mem :base_orig :base_math
3148 grepstart grepwhile mapstart mapwhile
3149 sort time
3150));
2604 3151
2605# here we export the classes and methods available to script code 3152# here we export the classes and methods available to script code
2606 3153
2607=pod 3154=pod
2608 3155
2609The following functions and methods are available within a safe environment: 3156The following functions and methods are available within a safe environment:
2610 3157
2611 cf::object 3158 cf::object
2612 contr pay_amount pay_player map x y force_find force_add 3159 contr pay_amount pay_player map x y force_find force_add destroy
2613 insert remove 3160 insert remove name archname title slaying race decrease split
3161 value
2614 3162
2615 cf::object::player 3163 cf::object::player
2616 player 3164 player
2617 3165
2618 cf::player 3166 cf::player
2623 3171
2624=cut 3172=cut
2625 3173
2626for ( 3174for (
2627 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3175 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2628 insert remove)], 3176 insert remove inv nrof name archname title slaying race
3177 decrease split destroy change_exp value msg lore send_msg)],
2629 ["cf::object::player" => qw(player)], 3178 ["cf::object::player" => qw(player)],
2630 ["cf::player" => qw(peaceful)], 3179 ["cf::player" => qw(peaceful send_msg)],
2631 ["cf::map" => qw(trigger)], 3180 ["cf::map" => qw(trigger)],
2632) { 3181) {
2633 no strict 'refs'; 3182 no strict 'refs';
2634 my ($pkg, @funs) = @$_; 3183 my ($pkg, @funs) = @$_;
2635 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3184 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2652 my ($code, %vars) = @_; 3201 my ($code, %vars) = @_;
2653 3202
2654 my $qcode = $code; 3203 my $qcode = $code;
2655 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3204 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2656 $qcode =~ s/\n/\\n/g; 3205 $qcode =~ s/\n/\\n/g;
3206
3207 %vars = (_dummy => 0) unless %vars;
2657 3208
2658 local $_; 3209 local $_;
2659 local @safe::cf::_safe_eval_args = values %vars; 3210 local @safe::cf::_safe_eval_args = values %vars;
2660 3211
2661 my $eval = 3212 my $eval =
2709# the server's init and main functions 3260# the server's init and main functions
2710 3261
2711sub load_facedata($) { 3262sub load_facedata($) {
2712 my ($path) = @_; 3263 my ($path) = @_;
2713 3264
3265 # HACK to clear player env face cache, we need some signal framework
3266 # for this (global event?)
3267 %ext::player_env::MUSIC_FACE_CACHE = ();
3268
3269 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3270
2714 warn "loading facedata from $path\n"; 3271 warn "loading facedata from $path\n";
2715 3272
2716 my $facedata; 3273 my $facedata;
2717 0 < aio_load $path, $facedata 3274 0 < aio_load $path, $facedata
2718 or die "$path: $!"; 3275 or die "$path: $!";
2720 $facedata = Coro::Storable::thaw $facedata; 3277 $facedata = Coro::Storable::thaw $facedata;
2721 3278
2722 $facedata->{version} == 2 3279 $facedata->{version} == 2
2723 or cf::cleanup "$path: version mismatch, cannot proceed."; 3280 or cf::cleanup "$path: version mismatch, cannot proceed.";
2724 3281
3282 # patch in the exptable
3283 $facedata->{resource}{"res/exp_table"} = {
3284 type => FT_RSRC,
3285 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3286 };
3287 cf::cede_to_tick;
3288
2725 { 3289 {
2726 my $faces = $facedata->{faceinfo}; 3290 my $faces = $facedata->{faceinfo};
2727 3291
2728 while (my ($face, $info) = each %$faces) { 3292 while (my ($face, $info) = each %$faces) {
2729 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3293 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3294
2730 cf::face::set_visibility $idx, $info->{visibility}; 3295 cf::face::set_visibility $idx, $info->{visibility};
2731 cf::face::set_magicmap $idx, $info->{magicmap}; 3296 cf::face::set_magicmap $idx, $info->{magicmap};
2732 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3297 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2733 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3298 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2734 3299
2735 cf::cede_to_tick; 3300 cf::cede_to_tick;
2736 } 3301 }
2737 3302
2738 while (my ($face, $info) = each %$faces) { 3303 while (my ($face, $info) = each %$faces) {
2739 next unless $info->{smooth}; 3304 next unless $info->{smooth};
3305
2740 my $idx = cf::face::find $face 3306 my $idx = cf::face::find $face
2741 or next; 3307 or next;
3308
2742 if (my $smooth = cf::face::find $info->{smooth}) { 3309 if (my $smooth = cf::face::find $info->{smooth}) {
2743 cf::face::set_smooth $idx, $smooth; 3310 cf::face::set_smooth $idx, $smooth;
2744 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3311 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2745 } else { 3312 } else {
2746 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3313 warn "smooth face '$info->{smooth}' not found for face '$face'";
2763 3330
2764 { 3331 {
2765 # TODO: for gcfclient pleasure, we should give resources 3332 # TODO: for gcfclient pleasure, we should give resources
2766 # that gcfclient doesn't grok a >10000 face index. 3333 # that gcfclient doesn't grok a >10000 face index.
2767 my $res = $facedata->{resource}; 3334 my $res = $facedata->{resource};
2768 my $enc = JSON::XS->new->utf8->canonical;
2769 3335
2770 while (my ($name, $info) = each %$res) { 3336 while (my ($name, $info) = each %$res) {
2771 my $meta = $enc->encode ({ 3337 if (defined $info->{type}) {
2772 name => $name,
2773 type => $info->{type},
2774 copyright => $info->{copyright}, #TODO#
2775 });
2776 my $data = pack "(w/a*)*", $meta, $info->{data};
2777 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2778
2779 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3338 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3339 my $data;
3340
3341 if ($info->{type} & 1) {
3342 # prepend meta info
3343
3344 my $meta = $enc->encode ({
3345 name => $name,
3346 %{ $info->{meta} || {} },
3347 });
3348
3349 $data = pack "(w/a*)*", $meta, $info->{data};
3350 } else {
3351 $data = $info->{data};
3352 }
3353
3354 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2780 cf::face::set_type $idx, 1; 3355 cf::face::set_type $idx, $info->{type};
2781 cf::face::set_data $idx, 0, $data, $chk; 3356 } else {
3357 $RESOURCE{$name} = $info;
3358 }
2782 3359
2783 cf::cede_to_tick; 3360 cf::cede_to_tick;
2784 } 3361 }
2785 } 3362 }
2786 3363
3364 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3365
2787 1 3366 1
2788} 3367}
2789 3368
3369cf::global->attach (on_resource_update => sub {
3370 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3371 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3372
3373 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3374 my $sound = $soundconf->{compat}[$_]
3375 or next;
3376
3377 my $face = cf::face::find "sound/$sound->[1]";
3378 cf::sound::set $sound->[0] => $face;
3379 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3380 }
3381
3382 while (my ($k, $v) = each %{$soundconf->{event}}) {
3383 my $face = cf::face::find "sound/$v";
3384 cf::sound::set $k => $face;
3385 }
3386 }
3387});
3388
3389register_exticmd fx_want => sub {
3390 my ($ns, $want) = @_;
3391
3392 while (my ($k, $v) = each %$want) {
3393 $ns->fx_want ($k, $v);
3394 }
3395};
3396
3397sub load_resource_file($) {
3398 my $guard = lock_acquire "load_resource_file";
3399
3400 my $status = load_resource_file_ $_[0];
3401 get_slot 0.1, 100;
3402 cf::arch::commit_load;
3403
3404 $status
3405}
3406
2790sub reload_regions { 3407sub reload_regions {
3408 # HACK to clear player env face cache, we need some signal framework
3409 # for this (global event?)
3410 %ext::player_env::MUSIC_FACE_CACHE = ();
3411
2791 load_resource_file "$MAPDIR/regions" 3412 load_resource_file "$MAPDIR/regions"
2792 or die "unable to load regions file\n"; 3413 or die "unable to load regions file\n";
2793 3414
2794 for (cf::region::list) { 3415 for (cf::region::list) {
2795 $_->{match} = qr/$_->{match}/ 3416 $_->{match} = qr/$_->{match}/
2803} 3424}
2804 3425
2805sub reload_archetypes { 3426sub reload_archetypes {
2806 load_resource_file "$DATADIR/archetypes" 3427 load_resource_file "$DATADIR/archetypes"
2807 or die "unable to load archetypes\n"; 3428 or die "unable to load archetypes\n";
2808 #d# NEED to laod twice to resolve forward references
2809 # this really needs to be done in an extra post-pass
2810 # (which needs to be synchronous, so solve it differently)
2811 load_resource_file "$DATADIR/archetypes"
2812 or die "unable to load archetypes\n";
2813} 3429}
2814 3430
2815sub reload_treasures { 3431sub reload_treasures {
2816 load_resource_file "$DATADIR/treasures" 3432 load_resource_file "$DATADIR/treasures"
2817 or die "unable to load treasurelists\n"; 3433 or die "unable to load treasurelists\n";
2818} 3434}
2819 3435
2820sub reload_resources { 3436sub reload_resources {
2821 warn "reloading resource files...\n"; 3437 warn "reloading resource files...\n";
2822 3438
3439 reload_facedata;
3440 reload_archetypes;
2823 reload_regions; 3441 reload_regions;
2824 reload_facedata;
2825 #reload_archetypes;#d#
2826 reload_archetypes;
2827 reload_treasures; 3442 reload_treasures;
2828 3443
2829 warn "finished reloading resource files\n"; 3444 warn "finished reloading resource files\n";
2830} 3445}
2831 3446
2832sub init { 3447sub reload_config {
2833 reload_resources; 3448 warn "reloading config file...\n";
2834}
2835 3449
2836sub cfg_load {
2837 open my $fh, "<:utf8", "$CONFDIR/config" 3450 open my $fh, "<:utf8", "$CONFDIR/config"
2838 or return; 3451 or return;
2839 3452
2840 local $/; 3453 local $/;
2841 *CFG = YAML::Syck::Load <$fh>; 3454 *CFG = YAML::XS::Load scalar <$fh>;
2842 3455
2843 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3456 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2844 3457
2845 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3458 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2846 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3459 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2850 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3463 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2851 and die "WARNING: m(un)lockall failed: $!\n"; 3464 and die "WARNING: m(un)lockall failed: $!\n";
2852 }; 3465 };
2853 warn $@ if $@; 3466 warn $@ if $@;
2854 } 3467 }
3468
3469 warn "finished reloading resource files\n";
3470}
3471
3472sub pidfile() {
3473 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3474 or die "$PIDFILE: $!";
3475 flock $fh, &Fcntl::LOCK_EX
3476 or die "$PIDFILE: flock: $!";
3477 $fh
3478}
3479
3480# make sure only one server instance is running at any one time
3481sub atomic {
3482 my $fh = pidfile;
3483
3484 my $pid = <$fh>;
3485 kill 9, $pid if $pid > 0;
3486
3487 seek $fh, 0, 0;
3488 print $fh $$;
3489}
3490
3491sub main_loop {
3492 warn "EV::loop starting\n";
3493 if (1) {
3494 EV::loop;
3495 }
3496 warn "EV::loop returned\n";
3497 goto &main_loop unless $REALLY_UNLOOP;
2855} 3498}
2856 3499
2857sub main { 3500sub main {
3501 cf::init_globals; # initialise logging
3502
3503 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3504 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3505 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3506 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3507
3508 cf::init_experience;
3509 cf::init_anim;
3510 cf::init_attackmess;
3511 cf::init_dynamic;
3512
3513 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3514
2858 # we must not ever block the main coroutine 3515 # we must not ever block the main coroutine
2859 local $Coro::idle = sub { 3516 local $Coro::idle = sub {
2860 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3517 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2861 (async { 3518 (async {
2862 Event::one_event; 3519 $Coro::current->{desc} = "IDLE BUG HANDLER";
3520 EV::loop EV::LOOP_ONESHOT;
2863 })->prio (Coro::PRIO_MAX); 3521 })->prio (Coro::PRIO_MAX);
2864 }; 3522 };
2865 3523
2866 cfg_load; 3524 evthread_start IO::AIO::poll_fileno;
3525
3526 cf::sync_job {
3527 cf::load_settings;
3528 cf::load_materials;
3529
3530 reload_resources;
3531 reload_config;
2867 db_init; 3532 db_init;
3533
3534 cf::init_uuid;
3535 cf::init_signals;
3536 cf::init_commands;
3537 cf::init_skills;
3538
3539 cf::init_beforeplay;
3540
3541 atomic;
3542
2868 load_extensions; 3543 load_extensions;
2869 3544
2870 $TICK_WATCHER->start; 3545 utime time, time, $RUNTIMEFILE;
2871 Event::loop; 3546
3547 # no (long-running) fork's whatsoever before this point(!)
3548 use POSIX ();
3549 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3550
3551 (pop @POST_INIT)->(0) while @POST_INIT;
3552 };
3553
3554 main_loop;
2872} 3555}
2873 3556
2874############################################################################# 3557#############################################################################
2875# initialisation and cleanup 3558# initialisation and cleanup
2876 3559
2877# install some emergency cleanup handlers 3560# install some emergency cleanup handlers
2878BEGIN { 3561BEGIN {
3562 our %SIGWATCHER = ();
2879 for my $signal (qw(INT HUP TERM)) { 3563 for my $signal (qw(INT HUP TERM)) {
2880 Event->signal ( 3564 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2881 reentrant => 0,
2882 data => WF_AUTOCANCEL,
2883 signal => $signal,
2884 prio => 0,
2885 cb => sub {
2886 cf::cleanup "SIG$signal"; 3565 cf::cleanup "SIG$signal";
2887 },
2888 ); 3566 };
2889 } 3567 }
2890} 3568}
2891 3569
2892sub write_runtime { 3570sub write_runtime_sync {
2893 my $runtime = "$LOCALDIR/runtime";
2894
2895 # first touch the runtime file to show we are still running: 3571 # first touch the runtime file to show we are still running:
2896 # the fsync below can take a very very long time. 3572 # the fsync below can take a very very long time.
2897 3573
2898 IO::AIO::aio_utime $runtime, undef, undef; 3574 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2899 3575
2900 my $guard = cf::lock_acquire "write_runtime"; 3576 my $guard = cf::lock_acquire "write_runtime";
2901 3577
2902 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3578 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2903 or return; 3579 or return;
2904 3580
2905 my $value = $cf::RUNTIME + 90 + 10; 3581 my $value = $cf::RUNTIME + 90 + 10;
2906 # 10 is the runtime save interval, for a monotonic clock 3582 # 10 is the runtime save interval, for a monotonic clock
2907 # 60 allows for the watchdog to kill the server. 3583 # 60 allows for the watchdog to kill the server.
2917 aio_utime $fh, undef, undef; 3593 aio_utime $fh, undef, undef;
2918 3594
2919 close $fh 3595 close $fh
2920 or return; 3596 or return;
2921 3597
2922 aio_rename "$runtime~", $runtime 3598 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2923 and return; 3599 and return;
2924 3600
2925 warn "runtime file written.\n"; 3601 warn "runtime file written.\n";
2926 3602
2927 1 3603 1
3604}
3605
3606our $uuid_lock;
3607our $uuid_skip;
3608
3609sub write_uuid_sync($) {
3610 $uuid_skip ||= $_[0];
3611
3612 return if $uuid_lock;
3613 local $uuid_lock = 1;
3614
3615 my $uuid = "$LOCALDIR/uuid";
3616
3617 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3618 or return;
3619
3620 my $value = uuid_seq uuid_cur;
3621
3622 unless ($value) {
3623 warn "cowardly refusing to write zero uuid value!\n";
3624 return;
3625 }
3626
3627 my $value = uuid_str $value + $uuid_skip;
3628 $uuid_skip = 0;
3629
3630 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3631 and return;
3632
3633 # always fsync - this file is important
3634 aio_fsync $fh
3635 and return;
3636
3637 close $fh
3638 or return;
3639
3640 aio_rename "$uuid~", $uuid
3641 and return;
3642
3643 warn "uuid file written ($value).\n";
3644
3645 1
3646
3647}
3648
3649sub write_uuid($$) {
3650 my ($skip, $sync) = @_;
3651
3652 $sync ? write_uuid_sync $skip
3653 : async { write_uuid_sync $skip };
2928} 3654}
2929 3655
2930sub emergency_save() { 3656sub emergency_save() {
2931 my $freeze_guard = cf::freeze_mainloop; 3657 my $freeze_guard = cf::freeze_mainloop;
2932 3658
2933 warn "enter emergency perl save\n"; 3659 warn "emergency_perl_save: enter\n";
2934 3660
2935 cf::sync_job { 3661 cf::sync_job {
3662 # this is a trade-off: we want to be very quick here, so
3663 # save all maps without fsync, and later call a global sync
3664 # (which in turn might be very very slow)
3665 local $USE_FSYNC = 0;
3666
2936 # use a peculiar iteration method to avoid tripping on perl 3667 # use a peculiar iteration method to avoid tripping on perl
2937 # refcount bugs in for. also avoids problems with players 3668 # refcount bugs in for. also avoids problems with players
2938 # and maps saved/destroyed asynchronously. 3669 # and maps saved/destroyed asynchronously.
2939 warn "begin emergency player save\n"; 3670 warn "emergency_perl_save: begin player save\n";
2940 for my $login (keys %cf::PLAYER) { 3671 for my $login (keys %cf::PLAYER) {
2941 my $pl = $cf::PLAYER{$login} or next; 3672 my $pl = $cf::PLAYER{$login} or next;
2942 $pl->valid or next; 3673 $pl->valid or next;
3674 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2943 $pl->save; 3675 $pl->save;
2944 } 3676 }
2945 warn "end emergency player save\n"; 3677 warn "emergency_perl_save: end player save\n";
2946 3678
2947 warn "begin emergency map save\n"; 3679 warn "emergency_perl_save: begin map save\n";
2948 for my $path (keys %cf::MAP) { 3680 for my $path (keys %cf::MAP) {
2949 my $map = $cf::MAP{$path} or next; 3681 my $map = $cf::MAP{$path} or next;
2950 $map->valid or next; 3682 $map->valid or next;
2951 $map->save; 3683 $map->save;
2952 } 3684 }
2953 warn "end emergency map save\n"; 3685 warn "emergency_perl_save: end map save\n";
2954 3686
2955 warn "begin emergency database checkpoint\n"; 3687 warn "emergency_perl_save: begin database checkpoint\n";
2956 BDB::db_env_txn_checkpoint $DB_ENV; 3688 BDB::db_env_txn_checkpoint $DB_ENV;
2957 warn "end emergency database checkpoint\n"; 3689 warn "emergency_perl_save: end database checkpoint\n";
3690
3691 warn "emergency_perl_save: begin write uuid\n";
3692 write_uuid_sync 1;
3693 warn "emergency_perl_save: end write uuid\n";
2958 }; 3694 };
2959 3695
3696 warn "emergency_perl_save: starting sync()\n";
3697 IO::AIO::aio_sync sub {
3698 warn "emergency_perl_save: finished sync()\n";
3699 };
3700
2960 warn "leave emergency perl save\n"; 3701 warn "emergency_perl_save: leave\n";
2961} 3702}
2962 3703
2963sub post_cleanup { 3704sub post_cleanup {
2964 my ($make_core) = @_; 3705 my ($make_core) = @_;
2965 3706
2966 warn Carp::longmess "post_cleanup backtrace" 3707 warn Carp::longmess "post_cleanup backtrace"
2967 if $make_core; 3708 if $make_core;
3709
3710 my $fh = pidfile;
3711 unlink $PIDFILE if <$fh> == $$;
3712}
3713
3714# a safer delete_package, copied from Symbol
3715sub clear_package($) {
3716 my $pkg = shift;
3717
3718 # expand to full symbol table name if needed
3719 unless ($pkg =~ /^main::.*::$/) {
3720 $pkg = "main$pkg" if $pkg =~ /^::/;
3721 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3722 $pkg .= '::' unless $pkg =~ /::$/;
3723 }
3724
3725 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3726 my $stem_symtab = *{$stem}{HASH};
3727
3728 defined $stem_symtab and exists $stem_symtab->{$leaf}
3729 or return;
3730
3731 # clear all symbols
3732 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3733 for my $name (keys %$leaf_symtab) {
3734 _gv_clear *{"$pkg$name"};
3735# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3736 }
3737 warn "cleared package $pkg\n";#d#
2968} 3738}
2969 3739
2970sub do_reload_perl() { 3740sub do_reload_perl() {
2971 # can/must only be called in main 3741 # can/must only be called in main
2972 if ($Coro::current != $Coro::main) { 3742 if ($Coro::current != $Coro::main) {
2973 warn "can only reload from main coroutine"; 3743 warn "can only reload from main coroutine";
2974 return; 3744 return;
2975 } 3745 }
2976 3746
3747 return if $RELOAD++;
3748
3749 my $t1 = EV::time;
3750
3751 while ($RELOAD) {
2977 warn "reloading..."; 3752 warn "reloading...";
2978 3753
2979 warn "entering sync_job"; 3754 warn "entering sync_job";
2980 3755
2981 cf::sync_job { 3756 cf::sync_job {
2982 cf::write_runtime; # external watchdog should not bark 3757 cf::write_runtime_sync; # external watchdog should not bark
2983 cf::emergency_save; 3758 cf::emergency_save;
2984 cf::write_runtime; # external watchdog should not bark 3759 cf::write_runtime_sync; # external watchdog should not bark
2985 3760
2986 warn "syncing database to disk"; 3761 warn "syncing database to disk";
2987 BDB::db_env_txn_checkpoint $DB_ENV; 3762 BDB::db_env_txn_checkpoint $DB_ENV;
2988 3763
2989 # if anything goes wrong in here, we should simply crash as we already saved 3764 # if anything goes wrong in here, we should simply crash as we already saved
2990 3765
2991 warn "cancelling all WF_AUTOCANCEL watchers";
2992 for (Event::all_watchers) {
2993 $_->cancel if $_->data & WF_AUTOCANCEL;
2994 }
2995
2996 warn "flushing outstanding aio requests"; 3766 warn "flushing outstanding aio requests";
2997 for (;;) {
2998 BDB::flush;
2999 IO::AIO::flush;
3000 Coro::cede;
3001 last unless IO::AIO::nreqs || BDB::nreqs; 3767 while (IO::AIO::nreqs || BDB::nreqs) {
3002 warn "iterate..."; 3768 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3003 }
3004
3005 ++$RELOAD;
3006
3007 warn "cancelling all extension coros";
3008 $_->cancel for values %EXT_CORO;
3009 %EXT_CORO = ();
3010
3011 warn "removing commands";
3012 %COMMAND = ();
3013
3014 warn "removing ext/exti commands";
3015 %EXTCMD = ();
3016 %EXTICMD = ();
3017
3018 warn "unloading/nuking all extensions";
3019 for my $pkg (@EXTS) {
3020 warn "... unloading $pkg";
3021
3022 if (my $cb = $pkg->can ("unload")) {
3023 eval {
3024 $cb->($pkg);
3025 1
3026 } or warn "$pkg unloaded, but with errors: $@";
3027 } 3769 }
3028 3770
3029 warn "... nuking $pkg"; 3771 warn "cancelling all extension coros";
3030 Symbol::delete_package $pkg; 3772 $_->cancel for values %EXT_CORO;
3031 } 3773 %EXT_CORO = ();
3032 3774
3033 warn "unloading all perl modules loaded from $LIBDIR"; 3775 warn "removing commands";
3034 while (my ($k, $v) = each %INC) { 3776 %COMMAND = ();
3035 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3036 3777
3778 warn "removing ext/exti commands";
3779 %EXTCMD = ();
3780 %EXTICMD = ();
3781
3782 warn "unloading/nuking all extensions";
3783 for my $pkg (@EXTS) {
3037 warn "... unloading $k"; 3784 warn "... unloading $pkg";
3038 delete $INC{$k};
3039 3785
3040 $k =~ s/\.pm$//;
3041 $k =~ s/\//::/g;
3042
3043 if (my $cb = $k->can ("unload_module")) { 3786 if (my $cb = $pkg->can ("unload")) {
3787 eval {
3044 $cb->(); 3788 $cb->($pkg);
3789 1
3790 } or warn "$pkg unloaded, but with errors: $@";
3791 }
3792
3793 warn "... clearing $pkg";
3794 clear_package $pkg;
3045 } 3795 }
3046 3796
3047 Symbol::delete_package $k; 3797 warn "unloading all perl modules loaded from $LIBDIR";
3798 while (my ($k, $v) = each %INC) {
3799 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3800
3801 warn "... unloading $k";
3802 delete $INC{$k};
3803
3804 $k =~ s/\.pm$//;
3805 $k =~ s/\//::/g;
3806
3807 if (my $cb = $k->can ("unload_module")) {
3808 $cb->();
3809 }
3810
3811 clear_package $k;
3048 } 3812 }
3049 3813
3050 warn "getting rid of safe::, as good as possible"; 3814 warn "getting rid of safe::, as good as possible";
3051 Symbol::delete_package "safe::$_" 3815 clear_package "safe::$_"
3052 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3816 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3053 3817
3054 warn "unloading cf.pm \"a bit\""; 3818 warn "unloading cf.pm \"a bit\"";
3055 delete $INC{"cf.pm"}; 3819 delete $INC{"cf.pm"};
3056 delete $INC{"cf/pod.pm"}; 3820 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3057 3821
3058 # don't, removes xs symbols, too, 3822 # don't, removes xs symbols, too,
3059 # and global variables created in xs 3823 # and global variables created in xs
3060 #Symbol::delete_package __PACKAGE__; 3824 #clear_package __PACKAGE__;
3061 3825
3062 warn "unload completed, starting to reload now"; 3826 warn "unload completed, starting to reload now";
3063 3827
3064 warn "reloading cf.pm"; 3828 warn "reloading cf.pm";
3065 require cf; 3829 require cf;
3066 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3830 cf::_connect_to_perl_1;
3067 3831
3068 warn "loading config and database again"; 3832 warn "loading config and database again";
3069 cf::cfg_load; 3833 cf::reload_config;
3070 3834
3071 warn "loading extensions"; 3835 warn "loading extensions";
3072 cf::load_extensions; 3836 cf::load_extensions;
3073 3837
3838 if ($REATTACH_ON_RELOAD) {
3074 warn "reattaching attachments to objects/players"; 3839 warn "reattaching attachments to objects/players";
3075 _global_reattach; # objects, sockets 3840 _global_reattach; # objects, sockets
3076 warn "reattaching attachments to maps"; 3841 warn "reattaching attachments to maps";
3077 reattach $_ for values %MAP; 3842 reattach $_ for values %MAP;
3078 warn "reattaching attachments to players"; 3843 warn "reattaching attachments to players";
3079 reattach $_ for values %PLAYER; 3844 reattach $_ for values %PLAYER;
3845 }
3080 3846
3847 warn "running post_init jobs";
3848 (pop @POST_INIT)->(1) while @POST_INIT;
3849
3081 warn "leaving sync_job"; 3850 warn "leaving sync_job";
3082 3851
3083 1 3852 1
3084 } or do { 3853 } or do {
3085 warn $@; 3854 warn $@;
3086 warn "error while reloading, exiting."; 3855 cf::cleanup "error while reloading, exiting.";
3087 exit 1;
3088 }; 3856 };
3089 3857
3090 warn "reloaded"; 3858 warn "reloaded";
3859 --$RELOAD;
3860 }
3861
3862 $t1 = EV::time - $t1;
3863 warn "reload completed in ${t1}s\n";
3091}; 3864};
3092 3865
3093our $RELOAD_WATCHER; # used only during reload 3866our $RELOAD_WATCHER; # used only during reload
3094 3867
3095sub reload_perl() { 3868sub reload_perl() {
3096 # doing reload synchronously and two reloads happen back-to-back, 3869 # doing reload synchronously and two reloads happen back-to-back,
3097 # coro crashes during coro_state_free->destroy here. 3870 # coro crashes during coro_state_free->destroy here.
3098 3871
3099 $RELOAD_WATCHER ||= Event->timer ( 3872 $RELOAD_WATCHER ||= cf::async {
3100 reentrant => 0, 3873 Coro::AIO::aio_wait cache_extensions;
3101 after => 0, 3874
3102 data => WF_AUTOCANCEL, 3875 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3103 cb => sub {
3104 do_reload_perl; 3876 do_reload_perl;
3105 undef $RELOAD_WATCHER; 3877 undef $RELOAD_WATCHER;
3106 }, 3878 };
3107 ); 3879 };
3108} 3880}
3109 3881
3110register_command "reload" => sub { 3882register_command "reload" => sub {
3111 my ($who, $arg) = @_; 3883 my ($who, $arg) = @_;
3112 3884
3113 if ($who->flag (FLAG_WIZ)) { 3885 if ($who->flag (FLAG_WIZ)) {
3114 $who->message ("reloading server."); 3886 $who->message ("reloading server.");
3887 async {
3888 $Coro::current->{desc} = "perl_reload";
3115 async { reload_perl }; 3889 reload_perl;
3890 };
3116 } 3891 }
3117}; 3892};
3118 3893
3119unshift @INC, $LIBDIR; 3894unshift @INC, $LIBDIR;
3120 3895
3122 3897
3123our @WAIT_FOR_TICK; 3898our @WAIT_FOR_TICK;
3124our @WAIT_FOR_TICK_BEGIN; 3899our @WAIT_FOR_TICK_BEGIN;
3125 3900
3126sub wait_for_tick { 3901sub wait_for_tick {
3127 return unless $TICK_WATCHER->is_active;
3128 return if $Coro::current == $Coro::main; 3902 return if tick_inhibit || $Coro::current == $Coro::main;
3129 3903
3130 my $signal = new Coro::Signal; 3904 my $signal = new Coro::Signal;
3131 push @WAIT_FOR_TICK, $signal; 3905 push @WAIT_FOR_TICK, $signal;
3132 $signal->wait; 3906 $signal->wait;
3133} 3907}
3134 3908
3135sub wait_for_tick_begin { 3909sub wait_for_tick_begin {
3136 return unless $TICK_WATCHER->is_active;
3137 return if $Coro::current == $Coro::main; 3910 return if tick_inhibit || $Coro::current == $Coro::main;
3138 3911
3139 my $signal = new Coro::Signal; 3912 my $signal = new Coro::Signal;
3140 push @WAIT_FOR_TICK_BEGIN, $signal; 3913 push @WAIT_FOR_TICK_BEGIN, $signal;
3141 $signal->wait; 3914 $signal->wait;
3142} 3915}
3143 3916
3144 my $min = 1e6;#d# 3917sub tick {
3145 my $avg = 10;
3146$TICK_WATCHER = Event->timer (
3147 reentrant => 0,
3148 parked => 1,
3149 prio => 0,
3150 at => $NEXT_TICK || $TICK,
3151 data => WF_AUTOCANCEL,
3152 cb => sub {
3153 if ($Coro::current != $Coro::main) { 3918 if ($Coro::current != $Coro::main) {
3154 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3919 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3155 unless ++$bug_warning > 10; 3920 unless ++$bug_warning > 10;
3156 return; 3921 return;
3157 } 3922 }
3158 3923
3159 $NOW = $tick_start = Event::time;
3160
3161 cf::server_tick; # one server iteration 3924 cf::server_tick; # one server iteration
3162 3925
3163 0 && sync_job {#d# 3926 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3164 for(1..10) { 3927 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3165 my $t = Event::time; 3928 Coro::async_pool {
3166 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3929 $Coro::current->{desc} = "runtime saver";
3167 or die; 3930 write_runtime_sync
3168 3931 or warn "ERROR: unable to write runtime file: $!";
3169 $map->width (50);
3170 $map->height (50);
3171 $map->alloc;
3172 $map->_load_objects ("/tmp/x.map", 1);
3173 my $t = Event::time - $t;
3174
3175 #next unless $t < 0.0013;#d#
3176 if ($t < $min) {
3177 $min = $t;
3178 }
3179 $avg = $avg * 0.99 + $t * 0.01;
3180 }
3181 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3182 exit 0;
3183 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3184 }; 3932 };
3933 }
3185 3934
3186 $RUNTIME += $TICK;
3187 $NEXT_TICK += $TICK;
3188
3189 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3190 $NEXT_RUNTIME_WRITE = $NOW + 10;
3191 Coro::async_pool {
3192 write_runtime
3193 or warn "ERROR: unable to write runtime file: $!";
3194 };
3195 }
3196
3197# my $AFTER = Event::time;
3198# warn $AFTER - $NOW;#d#
3199
3200 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3935 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3201 $sig->send; 3936 $sig->send;
3202 } 3937 }
3203 while (my $sig = shift @WAIT_FOR_TICK) { 3938 while (my $sig = shift @WAIT_FOR_TICK) {
3204 $sig->send; 3939 $sig->send;
3205 } 3940 }
3206 3941
3207 $NOW = Event::time; 3942 $LOAD = ($NOW - $TICK_START) / $TICK;
3208
3209 # if we are delayed by four ticks or more, skip them all
3210 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3211
3212 $TICK_WATCHER->at ($NEXT_TICK);
3213 $TICK_WATCHER->start;
3214
3215 $LOAD = ($NOW - $tick_start) / $TICK;
3216 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3943 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3217 3944
3218 _post_tick; 3945 if (0) {
3219 3946 if ($NEXT_TICK) {
3220 3947 my $jitter = $TICK_START - $NEXT_TICK;
3948 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3949 warn "jitter $JITTER\n";#d#
3950 }
3221 }, 3951 }
3222); 3952}
3223 3953
3224{ 3954{
3225 BDB::max_poll_time $TICK * 0.1; 3955 # configure BDB
3226 $BDB_POLL_WATCHER = Event->io ( 3956
3227 reentrant => 0,
3228 fd => BDB::poll_fileno,
3229 poll => 'r',
3230 prio => 0,
3231 data => WF_AUTOCANCEL,
3232 cb => \&BDB::poll_cb,
3233 );
3234 BDB::min_parallel 8; 3957 BDB::min_parallel 8;
3235 3958 BDB::max_poll_reqs $TICK * 0.1;
3236 BDB::set_sync_prepare { 3959 $AnyEvent::BDB::WATCHER->priority (1);
3237 my $status;
3238 my $current = $Coro::current;
3239 (
3240 sub {
3241 $status = $!;
3242 $current->ready; undef $current;
3243 },
3244 sub {
3245 Coro::schedule while defined $current;
3246 $! = $status;
3247 },
3248 )
3249 };
3250 3960
3251 unless ($DB_ENV) { 3961 unless ($DB_ENV) {
3252 $DB_ENV = BDB::db_env_create; 3962 $DB_ENV = BDB::db_env_create;
3963 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3964 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3965 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3966 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3967 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3253 3968
3254 cf::sync_job { 3969 cf::sync_job {
3255 eval { 3970 eval {
3256 BDB::db_env_open 3971 BDB::db_env_open
3257 $DB_ENV, 3972 $DB_ENV,
3259 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3974 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3260 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3975 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3261 0666; 3976 0666;
3262 3977
3263 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3978 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3264
3265 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3266 $DB_ENV->set_lk_detect;
3267 }; 3979 };
3268 3980
3269 cf::cleanup "db_env_open(db): $@" if $@; 3981 cf::cleanup "db_env_open(db): $@" if $@;
3270 }; 3982 };
3271 } 3983 }
3984
3985 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3986 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3987 };
3988 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3989 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3990 };
3991 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3992 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3993 };
3272} 3994}
3273 3995
3274{ 3996{
3997 # configure IO::AIO
3998
3275 IO::AIO::min_parallel 8; 3999 IO::AIO::min_parallel 8;
3276
3277 undef $Coro::AIO::WATCHER;
3278 IO::AIO::max_poll_time $TICK * 0.1; 4000 IO::AIO::max_poll_time $TICK * 0.1;
3279 $AIO_POLL_WATCHER = Event->io ( 4001 undef $AnyEvent::AIO::WATCHER;
3280 reentrant => 0,
3281 data => WF_AUTOCANCEL,
3282 fd => IO::AIO::poll_fileno,
3283 poll => 'r',
3284 prio => 6,
3285 cb => \&IO::AIO::poll_cb,
3286 );
3287} 4002}
3288 4003
3289my $_log_backtrace; 4004my $_log_backtrace;
3290 4005
3291sub _log_backtrace { 4006sub _log_backtrace {
3294 $msg =~ s/\n//; 4009 $msg =~ s/\n//;
3295 4010
3296 # limit the # of concurrent backtraces 4011 # limit the # of concurrent backtraces
3297 if ($_log_backtrace < 2) { 4012 if ($_log_backtrace < 2) {
3298 ++$_log_backtrace; 4013 ++$_log_backtrace;
4014 my $perl_bt = Carp::longmess $msg;
3299 async { 4015 async {
4016 $Coro::current->{desc} = "abt $msg";
4017
3300 my @bt = fork_call { 4018 my @bt = fork_call {
3301 @addr = map { sprintf "%x", $_ } @addr; 4019 @addr = map { sprintf "%x", $_ } @addr;
3302 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4020 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3303 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4021 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3304 or die "addr2line: $!"; 4022 or die "addr2line: $!";
3312 } 4030 }
3313 4031
3314 @funcs 4032 @funcs
3315 }; 4033 };
3316 4034
3317 LOG llevInfo, "[ABT] $msg\n"; 4035 LOG llevInfo, "[ABT] $perl_bt\n";
4036 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3318 LOG llevInfo, "[ABT] $_\n" for @bt; 4037 LOG llevInfo, "[ABT] $_\n" for @bt;
3319 --$_log_backtrace; 4038 --$_log_backtrace;
3320 }; 4039 };
3321 } else { 4040 } else {
3322 LOG llevInfo, "[ABT] $msg\n"; 4041 LOG llevInfo, "[ABT] $msg\n";
3323 LOG llevInfo, "[ABT] [suppressed]\n"; 4042 LOG llevInfo, "[ABT] [suppressed]\n";
3324 } 4043 }
3325} 4044}
3326 4045
3327# load additional modules 4046# load additional modules
3328use cf::pod; 4047require "cf/$_.pm" for @EXTRA_MODULES;
4048cf::_connect_to_perl_2;
3329 4049
3330END { cf::emergency_save } 4050END { cf::emergency_save }
3331 4051
33321 40521
3333 4053

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines