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.315 by root, Mon Jul 23 17:53:55 2007 UTC vs.
Revision 1.494 by root, Mon Oct 26 05:18:00 2009 UTC

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

Diff Legend

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