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.353 by root, Sun Sep 2 08:43:46 2007 UTC vs.
Revision 1.517 by root, Thu Apr 15 06:07:51 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines