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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines