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.342 by root, Sun Aug 26 15:31:02 2007 UTC vs.
Revision 1.510 by root, Tue Apr 6 22:59:28 2010 UTC

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

Diff Legend

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