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.349 by root, Fri Aug 31 04:10:43 2007 UTC vs.
Revision 1.513 by root, Mon Apr 12 05:22:38 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 timer.
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
594=item $coin = coin_from_name $name
595
596=cut
597
598our %coin_alias = (
599 "silver" => "silvercoin",
600 "silvercoin" => "silvercoin",
601 "silvercoins" => "silvercoin",
602 "gold" => "goldcoin",
603 "goldcoin" => "goldcoin",
604 "goldcoins" => "goldcoin",
605 "platinum" => "platinacoin",
606 "platinumcoin" => "platinacoin",
607 "platinumcoins" => "platinacoin",
608 "platina" => "platinacoin",
609 "platinacoin" => "platinacoin",
610 "platinacoins" => "platinacoin",
611 "royalty" => "royalty",
612 "royalties" => "royalty",
613);
614
615sub coin_from_name($) {
616 $coin_alias{$_[0]}
617 ? cf::arch::find $coin_alias{$_[0]}
618 : undef
619}
620
496=item $value = cf::db_get $family => $key 621=item $value = cf::db_get $family => $key
497 622
498Returns a single value from the environment database. 623Returns a single value from the environment database.
499 624
500=item cf::db_put $family => $key => $value 625=item cf::db_put $family => $key => $value
501 626
502Stores the given C<$value> in the family. It can currently store binary 627Stores 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). 628data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504 629
630=item $db = cf::db_table "name"
631
632Create and/or open a new database table. The string must not be "db" and must be unique
633within each server.
634
505=cut 635=cut
636
637sub db_table($) {
638 my ($name) = @_;
639 my $db = BDB::db_create $DB_ENV;
640
641 eval {
642 $db->set_flags (BDB::CHKSUM);
643
644 utf8::encode $name;
645 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
646 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
647 cf::cleanup "db_open(db): $!" if $!;
648 };
649 cf::cleanup "db_open(db): $@" if $@;
650
651 $db
652}
506 653
507our $DB; 654our $DB;
508 655
509sub db_init { 656sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job { 657 cf::sync_job {
514 eval { 658 $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 } 659 };
524} 660}
525 661
526sub db_get($$) { 662sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 663 my $key = "$_[0]/$_[1]";
528 664
626 762
627############################################################################# 763#############################################################################
628 764
629=head2 ATTACHABLE OBJECTS 765=head2 ATTACHABLE OBJECTS
630 766
631Many objects in crossfire are so-called attachable objects. That means you can 767Many objects in deliantra are so-called attachable objects. That means you can
632attach callbacks/event handlers (a collection of which is called an "attachment") 768attach callbacks/event handlers (a collection of which is called an "attachment")
633to it. All such attachable objects support the following methods. 769to it. All such attachable objects support the following methods.
634 770
635In the following description, CLASS can be any of C<global>, C<object> 771In 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 772C<player>, C<client> or C<map> (i.e. the attachable objects in
637Crossfire TRT). 773Deliantra).
638 774
639=over 4 775=over 4
640 776
641=item $attachable->attach ($attachment, key => $value...) 777=item $attachable->attach ($attachment, key => $value...)
642 778
686=item cf::CLASS::attachment $name, ... 822=item cf::CLASS::attachment $name, ...
687 823
688Register an attachment by C<$name> through which attachable objects of the 824Register an attachment by C<$name> through which attachable objects of the
689given CLASS can refer to this attachment. 825given CLASS can refer to this attachment.
690 826
691Some classes such as crossfire maps and objects can specify attachments 827Some classes such as deliantra maps and objects can specify attachments
692that are attached at load/instantiate time, thus the need for a name. 828that are attached at load/instantiate time, thus the need for a name.
693 829
694These calls expect any number of the following handler/hook descriptions: 830These calls expect any number of the following handler/hook descriptions:
695 831
696=over 4 832=over 4
924 } 1060 }
925 1061
926 0 1062 0
927} 1063}
928 1064
929=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1065=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
930 1066
931=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1067=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
932 1068
933Generate an object-specific event with the given arguments. 1069Generate an object-specific event with the given arguments.
934 1070
940 1076
941=cut 1077=cut
942 1078
943############################################################################# 1079#############################################################################
944# object support 1080# object support
945#
946 1081
1082sub _object_equal($$);
1083sub _object_equal($$) {
1084 my ($a, $b) = @_;
1085
1086 return 0 unless (ref $a) eq (ref $b);
1087
1088 if ("HASH" eq ref $a) {
1089 my @ka = keys %$a;
1090 my @kb = keys %$b;
1091
1092 return 0 if @ka != @kb;
1093
1094 for (0 .. $#ka) {
1095 return 0 unless $ka[$_] eq $kb[$_];
1096 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1097 }
1098
1099 } elsif ("ARRAY" eq ref $a) {
1100
1101 return 0 if @$a != @$b;
1102
1103 for (0 .. $#$a) {
1104 return 0 unless _object_equal $a->[$_], $b->[$_];
1105 }
1106
1107 } elsif ($a ne $b) {
1108 return 0;
1109 }
1110
1111 1
1112}
1113
1114our $SLOW_MERGES;#d#
947sub _can_merge { 1115sub _can_merge {
948 my ($ob1, $ob2) = @_; 1116 my ($ob1, $ob2) = @_;
949 1117
950 local $Storable::canonical = 1; 1118 ++$SLOW_MERGES;#d#
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953 1119
954 $fob1 eq $fob2 1120 # we do the slow way here
1121 return _object_equal $ob1, $ob2
955} 1122}
956 1123
957sub reattach { 1124sub reattach {
958 # basically do the same as instantiate, without calling instantiate 1125 # basically do the same as instantiate, without calling instantiate
959 my ($obj) = @_; 1126 my ($obj) = @_;
960 1127
1128 # no longer needed after getting rid of delete_package?
961 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1129 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
962 1130
963 my $registry = $obj->registry; 1131 my $registry = $obj->registry;
964 1132
965 @$registry = (); 1133 @$registry = ();
966 1134
981cf::attachable->attach ( 1149cf::attachable->attach (
982 prio => -1000000, 1150 prio => -1000000,
983 on_instantiate => sub { 1151 on_instantiate => sub {
984 my ($obj, $data) = @_; 1152 my ($obj, $data) = @_;
985 1153
986 $data = from_json $data; 1154 $data = decode_json $data;
987 1155
988 for (@$data) { 1156 for (@$data) {
989 my ($name, $args) = @$_; 1157 my ($name, $args) = @$_;
990 1158
991 $obj->attach ($name, %{$args || {} }); 1159 $obj->attach ($name, %{$args || {} });
1007sub object_freezer_save { 1175sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1176 my ($filename, $rdata, $objs) = @_;
1009 1177
1010 sync_job { 1178 sync_job {
1011 if (length $$rdata) { 1179 if (length $$rdata) {
1180 utf8::decode (my $decname = $filename);
1012 warn sprintf "saving %s (%d,%d)\n", 1181 warn sprintf "saving %s (%d,%d)\n",
1013 $filename, length $$rdata, scalar @$objs; 1182 $decname, length $$rdata, scalar @$objs;
1014 1183
1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1184 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1016 chmod SAVE_MODE, $fh; 1185 aio_chmod $fh, SAVE_MODE;
1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1186 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1018 aio_fsync $fh if $cf::USE_FSYNC; 1187 if ($cf::USE_FSYNC) {
1188 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;
1189 aio_fsync $fh;
1190 }
1019 close $fh; 1191 aio_close $fh;
1020 1192
1021 if (@$objs) { 1193 if (@$objs) {
1022 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1194 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1023 chmod SAVE_MODE, $fh; 1195 aio_chmod $fh, SAVE_MODE;
1024 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1196 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1025 aio_write $fh, 0, (length $data), $data, 0; 1197 aio_write $fh, 0, (length $data), $data, 0;
1026 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 }
1027 close $fh; 1202 aio_close $fh;
1028 aio_rename "$filename.pst~", "$filename.pst"; 1203 aio_rename "$filename.pst~", "$filename.pst";
1029 } 1204 }
1030 } else { 1205 } else {
1031 aio_unlink "$filename.pst"; 1206 aio_unlink "$filename.pst";
1032 } 1207 }
1033 1208
1034 aio_rename "$filename~", $filename; 1209 aio_rename "$filename~", $filename;
1210
1211 $filename =~ s%/[^/]+$%%;
1212 aio_pathsync $filename if $cf::USE_FSYNC;
1035 } else { 1213 } else {
1036 warn "FATAL: $filename~: $!\n"; 1214 warn "unable to save objects: $filename~: $!\n";
1037 } 1215 }
1038 } else { 1216 } else {
1039 aio_unlink $filename; 1217 aio_unlink $filename;
1040 aio_unlink "$filename.pst"; 1218 aio_unlink "$filename.pst";
1041 } 1219 }
1042 } 1220 };
1043} 1221}
1044 1222
1045sub object_freezer_as_string { 1223sub object_freezer_as_string {
1046 my ($rdata, $objs) = @_; 1224 my ($rdata, $objs) = @_;
1047 1225
1059 or return; 1237 or return;
1060 1238
1061 unless (aio_stat "$filename.pst") { 1239 unless (aio_stat "$filename.pst") {
1062 (aio_load "$filename.pst", $av) >= 0 1240 (aio_load "$filename.pst", $av) >= 0
1063 or return; 1241 or return;
1242
1064 $av = eval { (Storable::thaw $av)->{objs} }; 1243 my $st = eval { Coro::Storable::thaw $av };
1244 $av = $st->{objs};
1065 } 1245 }
1066 1246
1247 utf8::decode (my $decname = $filename);
1067 warn sprintf "loading %s (%d)\n", 1248 warn sprintf "loading %s (%d,%d)\n",
1068 $filename, length $data, scalar @{$av || []}; 1249 $decname, length $data, scalar @{$av || []};
1250
1069 return ($data, $av); 1251 ($data, $av)
1070} 1252}
1071 1253
1072=head2 COMMAND CALLBACKS 1254=head2 COMMAND CALLBACKS
1073 1255
1074=over 4 1256=over 4
1128 my ($name, $cb) = @_; 1310 my ($name, $cb) = @_;
1129 1311
1130 $EXTICMD{$name} = $cb; 1312 $EXTICMD{$name} = $cb;
1131} 1313}
1132 1314
1315use File::Glob ();
1316
1133cf::player->attach ( 1317cf::player->attach (
1134 on_command => sub { 1318 on_unknown_command => sub {
1135 my ($pl, $name, $params) = @_; 1319 my ($pl, $name, $params) = @_;
1136 1320
1137 my $cb = $COMMAND{$name} 1321 my $cb = $COMMAND{$name}
1138 or return; 1322 or return;
1139 1323
1169 1353
1170 cf::override; 1354 cf::override;
1171 }, 1355 },
1172); 1356);
1173 1357
1358# "readahead" all extensions
1359sub cache_extensions {
1360 my $grp = IO::AIO::aio_group;
1361
1362 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1363 for (grep /\.ext$/, @{$_[0]}) {
1364 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1365 }
1366 };
1367
1368 $grp
1369}
1370
1174sub load_extensions { 1371sub load_extensions {
1175 cf::sync_job { 1372 cf::sync_job {
1176 my %todo; 1373 my %todo;
1177 1374
1178 for my $path (<$LIBDIR/*.ext>) { 1375 for my $path (<$LIBDIR/*.ext>) {
1197 1394
1198 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1395 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1199 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1396 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1200 1397
1201 $ext{source} = 1398 $ext{source} =
1202 "package $pkg; use strict; use utf8;\n" 1399 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1203 . "#line 1 \"$path\"\n{\n" 1400 . "#line 1 \"$path\"\n{\n"
1204 . $source 1401 . $source
1205 . "\n};\n1"; 1402 . "\n};\n1";
1206 1403
1207 $todo{$base} = \%ext; 1404 $todo{$base} = \%ext;
1208 } 1405 }
1209 1406
1407 my $pass = 0;
1210 my %done; 1408 my %done;
1211 while (%todo) { 1409 while (%todo) {
1212 my $progress; 1410 my $progress;
1213 1411
1412 ++$pass;
1413
1414 ext:
1214 while (my ($k, $v) = each %todo) { 1415 while (my ($k, $v) = each %todo) {
1215 for (split /,\s*/, $v->{meta}{depends}) { 1416 for (split /,\s*/, $v->{meta}{depends}) {
1216 goto skip 1417 next ext
1217 unless exists $done{$_}; 1418 unless exists $done{$_};
1218 } 1419 }
1219 1420
1220 warn "... loading '$k' into '$v->{pkg}'\n"; 1421 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1221 1422
1222 unless (eval $v->{source}) { 1423 my $active = eval $v->{source};
1424
1425 if (length $@) {
1223 my $msg = $@ ? "$v->{path}: $@\n" 1426 warn "$v->{path}: $@\n";
1224 : "$v->{base}: extension inactive.\n";
1225 1427
1428 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1226 if (exists $v->{meta}{mandatory}) { 1429 if exists $v->{meta}{mandatory};
1227 warn $msg; 1430 } else {
1228 warn "mandatory extension failed to load, exiting.\n"; 1431 $done{$k} = delete $todo{$k};
1229 exit 1; 1432 push @EXTS, $v->{pkg};
1230 } 1433 $progress = 1;
1231 1434
1232 warn $msg; 1435 warn "$v->{base}: extension inactive.\n"
1436 unless $active;
1233 } 1437 }
1234
1235 $done{$k} = delete $todo{$k};
1236 push @EXTS, $v->{pkg};
1237 $progress = 1;
1238 } 1438 }
1239 1439
1240 skip: 1440 unless ($progress) {
1241 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1441 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1242 unless $progress; 1442
1443 while (my ($k, $v) = each %todo) {
1444 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1445 if exists $v->{meta}{mandatory};
1446 }
1447 }
1243 } 1448 }
1244 }; 1449 };
1245} 1450}
1246 1451
1247############################################################################# 1452#############################################################################
1248 1453
1249=back 1454=back
1250 1455
1251=head2 CORE EXTENSIONS 1456=head2 CORE EXTENSIONS
1252 1457
1253Functions and methods that extend core crossfire objects. 1458Functions and methods that extend core deliantra objects.
1254 1459
1255=cut 1460=cut
1256 1461
1257package cf::player; 1462package cf::player;
1258 1463
1259use Coro::AIO; 1464use Coro::AIO;
1260 1465
1261=head3 cf::player 1466=head3 cf::player
1262 1467
1263=over 4 1468=over 4
1469
1470=item cf::player::num_playing
1471
1472Returns the official number of playing players, as per the Crossfire metaserver rules.
1473
1474=cut
1475
1476sub num_playing {
1477 scalar grep
1478 $_->ob->map
1479 && !$_->hidden
1480 && !$_->ob->flag (cf::FLAG_WIZ),
1481 cf::player::list
1482}
1264 1483
1265=item cf::player::find $login 1484=item cf::player::find $login
1266 1485
1267Returns the given player object, loading it if necessary (might block). 1486Returns the given player object, loading it if necessary (might block).
1268 1487
1287 1506
1288sub exists($) { 1507sub exists($) {
1289 my ($login) = @_; 1508 my ($login) = @_;
1290 1509
1291 $cf::PLAYER{$login} 1510 $cf::PLAYER{$login}
1292 or cf::sync_job { !aio_stat path $login } 1511 or !aio_stat path $login
1293} 1512}
1294 1513
1295sub find($) { 1514sub find($) {
1296 return $cf::PLAYER{$_[0]} || do { 1515 return $cf::PLAYER{$_[0]} || do {
1297 my $login = $_[0]; 1516 my $login = $_[0];
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1523 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1524 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1525 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl"; 1526 aio_unlink +(playerdir $login) . "/$login.pl";
1308 1527
1309 my $pl = load_pl path $login 1528 my $f = new_from_file cf::object::thawer path $login
1310 or return; 1529 or return;
1530
1531 my $pl = cf::player::load_pl $f
1532 or return;
1533
1534 local $cf::PLAYER_LOADING{$login} = $pl;
1535 $f->resolve_delayed_derefs;
1311 $cf::PLAYER{$login} = $pl 1536 $cf::PLAYER{$login} = $pl
1312 } 1537 }
1313 } 1538 }
1314} 1539}
1540
1541cf::player->attach (
1542 on_load => sub {
1543 my ($pl, $path) = @_;
1544
1545 # restore slots saved in save, below
1546 my $slots = delete $pl->{_slots};
1547
1548 $pl->ob->current_weapon ($slots->[0]);
1549 $pl->combat_ob ($slots->[1]);
1550 $pl->ranged_ob ($slots->[2]);
1551 },
1552);
1315 1553
1316sub save($) { 1554sub save($) {
1317 my ($pl) = @_; 1555 my ($pl) = @_;
1318 1556
1319 return if $pl->{deny_save}; 1557 return if $pl->{deny_save};
1323 1561
1324 return if $pl->{deny_save}; 1562 return if $pl->{deny_save};
1325 1563
1326 aio_mkdir playerdir $pl, 0770; 1564 aio_mkdir playerdir $pl, 0770;
1327 $pl->{last_save} = $cf::RUNTIME; 1565 $pl->{last_save} = $cf::RUNTIME;
1566
1567 cf::get_slot 0.01;
1568
1569 # save slots, to be restored later
1570 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1328 1571
1329 $pl->save_pl ($path); 1572 $pl->save_pl ($path);
1330 cf::cede_to_tick; 1573 cf::cede_to_tick;
1331} 1574}
1332 1575
1364 my ($pl) = @_; 1607 my ($pl) = @_;
1365 1608
1366 my $name = $pl->ob->name; 1609 my $name = $pl->ob->name;
1367 1610
1368 $pl->{deny_save} = 1; 1611 $pl->{deny_save} = 1;
1369 $pl->password ("*"); # this should lock out the player until we nuked the dir 1612 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1370 1613
1371 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1614 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1372 $pl->deactivate; 1615 $pl->deactivate;
1616 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1617 $pl->ob->check_score;
1373 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1618 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1374 $pl->ns->destroy if $pl->ns; 1619 $pl->ns->destroy if $pl->ns;
1375 1620
1376 my $path = playerdir $pl; 1621 my $path = playerdir $pl;
1377 my $temp = "$path~$cf::RUNTIME~deleting~"; 1622 my $temp = "$path~$cf::RUNTIME~deleting~";
1413 or return []; 1658 or return [];
1414 1659
1415 my @logins; 1660 my @logins;
1416 1661
1417 for my $login (@$dirs) { 1662 for my $login (@$dirs) {
1663 my $path = path $login;
1664
1665 # a .pst is a dead give-away for a valid player
1666 # if no pst file found, open and chekc for blocked users
1667 if (aio_stat "$path.pst") {
1418 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1668 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1419 aio_read $fh, 0, 512, my $buf, 0 or next; 1669 aio_read $fh, 0, 512, my $buf, 0 or next;
1420 $buf !~ /^password -------------$/m or next; # official not-valid tag 1670 $buf !~ /^password -------------$/m or next; # official not-valid tag
1671 }
1421 1672
1422 utf8::decode $login; 1673 utf8::decode $login;
1423 push @logins, $login; 1674 push @logins, $login;
1424 } 1675 }
1425 1676
1452 } 1703 }
1453 1704
1454 \@paths 1705 \@paths
1455} 1706}
1456 1707
1457=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1708=item $protocol_xml = $player->expand_cfpod ($cfpod)
1458 1709
1459Expand crossfire pod fragments into protocol xml. 1710Expand 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/(?<![BIUGH])</&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 # replace G<male|female> tags
1478 || s{G<([^>|]*)\|([^>]*)>}{
1479 $self->gender ? $2 : $1
1480 }ge
1481 # replace H<hint text>
1482 || s{H<([^\>]*)>}
1483 {
1484 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1485 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1486 "")
1487 [$self->{hintmode}]
1488 }ge;
1489
1490 # create single paragraphs (very hackish)
1491 s/(?<=\S)\n(?=\w)/ /g;
1492
1493 # compress some whitespace
1494 s/\s+\n/\n/g; # ws line-ends
1495 s/\n\n+/\n/g; # double lines
1496 s/^\n+//; # beginning lines
1497 s/\n+$//; # ending lines
1498
1499 $_
1500}
1501
1502sub hintmode {
1503 $_[0]{hintmode} = $_[1] if @_ > 1;
1504 $_[0]{hintmode}
1505}
1506 1711
1507=item $player->ext_reply ($msgid, @msg) 1712=item $player->ext_reply ($msgid, @msg)
1508 1713
1509Sends an ext reply to the player. 1714Sends an ext reply to the player.
1510 1715
1577our $MAX_RESET = 3600; 1782our $MAX_RESET = 3600;
1578our $DEFAULT_RESET = 3000; 1783our $DEFAULT_RESET = 3000;
1579 1784
1580sub generate_random_map { 1785sub generate_random_map {
1581 my ($self, $rmp) = @_; 1786 my ($self, $rmp) = @_;
1787
1788 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1789
1582 # mit "rum" bekleckern, nicht 1790 # mit "rum" bekleckern, nicht
1583 $self->_create_random_map ( 1791 $self->_create_random_map (
1584 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1792 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1585 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1793 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1586 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1794 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1587 $rmp->{exit_on_final_map}, 1795 $rmp->{exit_on_final_map},
1588 $rmp->{xsize}, $rmp->{ysize}, 1796 $rmp->{xsize}, $rmp->{ysize},
1589 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1797 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1590 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1798 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1708 1916
1709# the temporary/swap location 1917# the temporary/swap location
1710sub save_path { 1918sub save_path {
1711 my ($self) = @_; 1919 my ($self) = @_;
1712 1920
1713 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1921 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1714 "$TMPDIR/$path.map" 1922 "$TMPDIR/$path.map"
1715} 1923}
1716 1924
1717# the unique path, undef == no special unique path 1925# the unique path, undef == no special unique path
1718sub uniq_path { 1926sub uniq_path {
1719 my ($self) = @_; 1927 my ($self) = @_;
1720 1928
1721 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1929 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1722 "$UNIQUEDIR/$path" 1930 "$UNIQUEDIR/$path"
1723}
1724
1725# and all this just because we cannot iterate over
1726# all maps in C++...
1727sub change_all_map_light {
1728 my ($change) = @_;
1729
1730 $_->change_map_light ($change)
1731 for grep $_->outdoor, values %cf::MAP;
1732} 1931}
1733 1932
1734sub decay_objects { 1933sub decay_objects {
1735 my ($self) = @_; 1934 my ($self) = @_;
1736 1935
1749 1948
1750sub load_header_from($) { 1949sub load_header_from($) {
1751 my ($self, $path) = @_; 1950 my ($self, $path) = @_;
1752 1951
1753 utf8::encode $path; 1952 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1953 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 or return; 1954 or return;
1955
1956 $self->_load_header ($f)
1957 or return;
1958
1959 local $MAP_LOADING{$self->{path}} = $self;
1960 $f->resolve_delayed_derefs;
1759 1961
1760 $self->{load_path} = $path; 1962 $self->{load_path} = $path;
1761 1963
1762 1 1964 1
1763} 1965}
1817sub find { 2019sub find {
1818 my ($path, $origin) = @_; 2020 my ($path, $origin) = @_;
1819 2021
1820 $path = normalise $path, $origin && $origin->path; 2022 $path = normalise $path, $origin && $origin->path;
1821 2023
2024 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 2025 my $guard2 = cf::lock_acquire "map_find:$path";
1823 2026
1824 $cf::MAP{$path} || do { 2027 $cf::MAP{$path} || do {
1825 my $guard = cf::lock_acquire "map_find:$path";
1826 my $map = new_from_path cf::map $path 2028 my $map = new_from_path cf::map $path
1827 or return; 2029 or return;
1828 2030
1829 $map->{last_save} = $cf::RUNTIME; 2031 $map->{last_save} = $cf::RUNTIME;
1830 2032
1832 or return; 2034 or return;
1833 2035
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2036 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 2037 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 2038 #$cf::WAIT_FOR_TICK->wait;
2039 undef $guard2;
2040 undef $guard1;
1837 $map->reset; 2041 $map->reset;
1838 undef $guard;
1839 return find $path; 2042 return find $path;
1840 } 2043 }
1841 2044
1842 $cf::MAP{$path} = $map 2045 $cf::MAP{$path} = $map
1843 } 2046 }
1844} 2047}
1845 2048
1846sub pre_load { } 2049sub pre_load { }
1847sub post_load { } 2050#sub post_load { } # XS
1848 2051
1849sub load { 2052sub load {
1850 my ($self) = @_; 2053 my ($self) = @_;
1851 2054
1852 local $self->{deny_reset} = 1; # loading can take a long time 2055 local $self->{deny_reset} = 1; # loading can take a long time
1853 2056
1854 my $path = $self->{path}; 2057 my $path = $self->{path};
1855 2058
1856 { 2059 {
1857 my $guard1 = cf::lock_acquire "map_data:$path"; 2060 my $guard = cf::lock_acquire "map_data:$path";
1858 my $guard2 = cf::lock_acquire "map_load:$path";
1859 2061
2062 return unless $self->valid;
1860 return if $self->in_memory != cf::MAP_SWAPPED; 2063 return unless $self->in_memory == cf::MAP_SWAPPED;
1861 2064
1862 $self->in_memory (cf::MAP_LOADING); 2065 $self->in_memory (cf::MAP_LOADING);
1863 2066
1864 $self->alloc; 2067 $self->alloc;
1865 2068
1866 $self->pre_load; 2069 $self->pre_load;
1867 cf::cede_to_tick; 2070 cf::cede_to_tick;
1868 2071
2072 my $f = new_from_file cf::object::thawer $self->{load_path};
2073 $f->skip_block;
1869 $self->_load_objects ($self->{load_path}, 1) 2074 $self->_load_objects ($f)
1870 or return; 2075 or return;
1871 2076
1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2077 $self->post_load_original
1873 if delete $self->{load_original}; 2078 if delete $self->{load_original};
1874 2079
1875 if (my $uniq = $self->uniq_path) { 2080 if (my $uniq = $self->uniq_path) {
1876 utf8::encode $uniq; 2081 utf8::encode $uniq;
1877 if (aio_open $uniq, O_RDONLY, 0) { 2082 unless (aio_stat $uniq) {
2083 if (my $f = new_from_file cf::object::thawer $uniq) {
1878 $self->clear_unique_items; 2084 $self->clear_unique_items;
1879 $self->_load_objects ($uniq, 0); 2085 $self->_load_objects ($f);
2086 $f->resolve_delayed_derefs;
2087 }
1880 } 2088 }
1881 } 2089 }
2090
2091 $f->resolve_delayed_derefs;
1882 2092
1883 cf::cede_to_tick; 2093 cf::cede_to_tick;
1884 # now do the right thing for maps 2094 # now do the right thing for maps
1885 $self->link_multipart_objects; 2095 $self->link_multipart_objects;
1886 $self->difficulty ($self->estimate_difficulty) 2096 $self->difficulty ($self->estimate_difficulty)
1890 unless ($self->{deny_activate}) { 2100 unless ($self->{deny_activate}) {
1891 $self->decay_objects; 2101 $self->decay_objects;
1892 $self->fix_auto_apply; 2102 $self->fix_auto_apply;
1893 $self->update_buttons; 2103 $self->update_buttons;
1894 cf::cede_to_tick; 2104 cf::cede_to_tick;
1895 $self->set_darkness_map;
1896 cf::cede_to_tick;
1897 $self->activate; 2105 $self->activate;
1898 } 2106 }
1899 2107
1900 $self->{last_save} = $cf::RUNTIME; 2108 $self->{last_save} = $cf::RUNTIME;
1901 $self->last_access ($cf::RUNTIME); 2109 $self->last_access ($cf::RUNTIME);
1902 2110
1903 $self->in_memory (cf::MAP_IN_MEMORY); 2111 $self->in_memory (cf::MAP_ACTIVE);
1904 } 2112 }
1905 2113
1906 $self->post_load; 2114 $self->post_load;
1907} 2115}
1908 2116
2117# customize the map for a given player, i.e.
2118# return the _real_ map. used by e.g. per-player
2119# maps to change the path to ~playername/mappath
1909sub customise_for { 2120sub customise_for {
1910 my ($self, $ob) = @_; 2121 my ($self, $ob) = @_;
1911 2122
1912 return find "~" . $ob->name . "/" . $self->{path} 2123 return find "~" . $ob->name . "/" . $self->{path}
1913 if $self->per_player; 2124 if $self->per_player;
1966 my ($path, $origin, $load) = @_; 2177 my ($path, $origin, $load) = @_;
1967 2178
1968 $path = normalise $path, $origin && $origin->{path}; 2179 $path = normalise $path, $origin && $origin->{path};
1969 2180
1970 if (my $map = $cf::MAP{$path}) { 2181 if (my $map = $cf::MAP{$path}) {
1971 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2182 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1972 } 2183 }
1973 2184
1974 $MAP_PREFETCH{$path} |= $load; 2185 $MAP_PREFETCH{$path} |= $load;
1975 2186
1976 $MAP_PREFETCHER ||= cf::async { 2187 $MAP_PREFETCHER ||= cf::async {
2188 $Coro::current->{desc} = "map prefetcher";
2189
1977 while (%MAP_PREFETCH) { 2190 while (%MAP_PREFETCH) {
1978 while (my ($k, $v) = each %MAP_PREFETCH) { 2191 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $k) { 2192 if (my $map = find $k) {
1980 $map->load if $v; 2193 $map->load if $v;
1981 } 2194 }
2007 return if $self->{deny_save}; 2220 return if $self->{deny_save};
2008 2221
2009 local $self->{last_access} = $self->last_access;#d# 2222 local $self->{last_access} = $self->last_access;#d#
2010 2223
2011 cf::async { 2224 cf::async {
2225 $Coro::current->{desc} = "map player save";
2012 $_->contr->save for $self->players; 2226 $_->contr->save for $self->players;
2013 }; 2227 };
2228
2229 cf::get_slot 0.02;
2014 2230
2015 if ($uniq) { 2231 if ($uniq) {
2016 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2232 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2017 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2233 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2018 } else { 2234 } else {
2027 $self->save; 2243 $self->save;
2028 2244
2029 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2245 my $lock = cf::lock_acquire "map_data:$self->{path}";
2030 2246
2031 return if $self->players; 2247 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2248 return if $self->in_memory != cf::MAP_ACTIVE;
2033 return if $self->{deny_save}; 2249 return if $self->{deny_save};
2034 2250
2251 $self->in_memory (cf::MAP_SWAPPED);
2252
2253 $self->deactivate;
2254 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2255 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2256}
2038 2257
2039sub reset_at { 2258sub reset_at {
2040 my ($self) = @_; 2259 my ($self) = @_;
2041 2260
2059 2278
2060 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2279 my $lock = cf::lock_acquire "map_data:$self->{path}";
2061 2280
2062 return if $self->players; 2281 return if $self->players;
2063 2282
2064 warn "resetting map ", $self->path; 2283 warn "resetting map ", $self->path, "\n";
2065 2284
2066 $self->in_memory (cf::MAP_SWAPPED); 2285 $self->in_memory (cf::MAP_SWAPPED);
2067 2286
2068 # need to save uniques path 2287 # need to save uniques path
2069 unless ($self->{deny_save}) { 2288 unless ($self->{deny_save}) {
2073 if $uniq; 2292 if $uniq;
2074 } 2293 }
2075 2294
2076 delete $cf::MAP{$self->path}; 2295 delete $cf::MAP{$self->path};
2077 2296
2297 $self->deactivate;
2298 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2299 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2300
2082 $self->unlink_save; 2301 $self->unlink_save;
2083 $self->destroy; 2302 $self->destroy;
2084} 2303}
2085 2304
2090 2309
2091 { 2310 {
2092 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2311 my $lock = cf::lock_acquire "map_data:$self->{path}";
2093 2312
2094 delete $cf::MAP{$self->path}; 2313 delete $cf::MAP{$self->path};
2314
2315 $self->unlink_save;
2095 2316
2096 bless $self, "cf::map"; 2317 bless $self, "cf::map";
2097 delete $self->{deny_reset}; 2318 delete $self->{deny_reset};
2098 $self->{deny_save} = 1; 2319 $self->{deny_save} = 1;
2099 $self->reset_timeout (1); 2320 $self->reset_timeout (1);
2100 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2321 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2101
2102 $self->unlink_save;
2103 2322
2104 $cf::MAP{$self->path} = $self; 2323 $cf::MAP{$self->path} = $self;
2105 } 2324 }
2106 2325
2107 $self->reset; # polite request, might not happen 2326 $self->reset; # polite request, might not happen
2152 2371
2153sub unique_maps() { 2372sub unique_maps() {
2154 [ 2373 [
2155 map { 2374 map {
2156 utf8::decode $_; 2375 utf8::decode $_;
2157 /\.map$/ 2376 s/\.map$//; # TODO future compatibility hack
2377 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2378 ? ()
2158 ? normalise $_ 2379 : normalise $_
2159 : ()
2160 } @{ aio_readdir $UNIQUEDIR or [] } 2380 } @{ aio_readdir $UNIQUEDIR or [] }
2161 ] 2381 ]
2162} 2382}
2163 2383
2164package cf; 2384=item cf::map::static_maps
2385
2386Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2387file in the shared directory excluding F</styles> and F</editor>). May
2388block.
2389
2390=cut
2391
2392sub static_maps() {
2393 my @dirs = "";
2394 my @maps;
2395
2396 while (@dirs) {
2397 my $dir = shift @dirs;
2398
2399 next if $dir eq "/styles" || $dir eq "/editor";
2400
2401 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2402 or return;
2403
2404 for (@$files) {
2405 s/\.map$// or next;
2406 utf8::decode $_;
2407 push @maps, "$dir/$_";
2408 }
2409
2410 push @dirs, map "$dir/$_", @$dirs;
2411 }
2412
2413 \@maps
2414}
2165 2415
2166=back 2416=back
2167 2417
2168=head3 cf::object 2418=head3 cf::object
2169 2419
2173 2423
2174=over 4 2424=over 4
2175 2425
2176=item $ob->inv_recursive 2426=item $ob->inv_recursive
2177 2427
2178Returns the inventory of the object _and_ their inventories, recursively. 2428Returns the inventory of the object I<and> their inventories, recursively,
2429but I<not> the object itself.
2179 2430
2180=cut 2431=cut
2181 2432
2182sub inv_recursive_; 2433sub inv_recursive_;
2183sub inv_recursive_ { 2434sub inv_recursive_ {
2186 2437
2187sub inv_recursive { 2438sub inv_recursive {
2188 inv_recursive_ inv $_[0] 2439 inv_recursive_ inv $_[0]
2189} 2440}
2190 2441
2442=item $ref = $ob->ref
2443
2444Creates and returns a persistent reference to an object that can be stored as a string.
2445
2446=item $ob = cf::object::deref ($refstring)
2447
2448returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2449even if the object actually exists. May block.
2450
2451=cut
2452
2453sub deref {
2454 my ($ref) = @_;
2455
2456 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2457 my ($uuid, $name) = ($1, $2);
2458 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2459 or return;
2460 $pl->ob->uuid eq $uuid
2461 or return;
2462
2463 $pl->ob
2464 } else {
2465 warn "$ref: cannot resolve object reference\n";
2466 undef
2467 }
2468}
2469
2191package cf; 2470package cf;
2192 2471
2193=back 2472=back
2194 2473
2195=head3 cf::object::player 2474=head3 cf::object::player
2201Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2480Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2202can be C<undef>. Does the right thing when the player is currently in a 2481can be C<undef>. Does the right thing when the player is currently in a
2203dialogue with the given NPC character. 2482dialogue with the given NPC character.
2204 2483
2205=cut 2484=cut
2485
2486our $SAY_CHANNEL = {
2487 id => "say",
2488 title => "Map",
2489 reply => "say ",
2490 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2491};
2492
2493our $CHAT_CHANNEL = {
2494 id => "chat",
2495 title => "Chat",
2496 reply => "chat ",
2497 tooltip => "Player chat and shouts, global to the server.",
2498};
2206 2499
2207# rough implementation of a future "reply" method that works 2500# rough implementation of a future "reply" method that works
2208# with dialog boxes. 2501# with dialog boxes.
2209#TODO: the first argument must go, split into a $npc->reply_to ( method 2502#TODO: the first argument must go, split into a $npc->reply_to ( method
2210sub cf::object::player::reply($$$;$) { 2503sub cf::object::player::reply($$$;$) {
2222 my $dialog = $pl->{npc_dialog}; 2515 my $dialog = $pl->{npc_dialog};
2223 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2516 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2224 2517
2225 } else { 2518 } else {
2226 $msg = $npc->name . " says: $msg" if $npc; 2519 $msg = $npc->name . " says: $msg" if $npc;
2227 $self->message ($msg, $flags); 2520 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2228 } 2521 }
2229 } 2522 }
2230} 2523}
2231 2524
2232=item $object->send_msg ($channel, $msg, $color, [extra...]) 2525=item $object->send_msg ($channel, $msg, $color, [extra...])
2257 2550
2258=item $player_object->enter_link 2551=item $player_object->enter_link
2259 2552
2260Freezes the player and moves him/her to a special map (C<{link}>). 2553Freezes the player and moves him/her to a special map (C<{link}>).
2261 2554
2262The player should be reasonably safe there for short amounts of time. You 2555The player should be reasonably safe there for short amounts of time (e.g.
2263I<MUST> call C<leave_link> as soon as possible, though. 2556for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2557though, as the palyer cannot control the character while it is on the link
2558map.
2264 2559
2265Will never block. 2560Will never block.
2266 2561
2267=item $player_object->leave_link ($map, $x, $y) 2562=item $player_object->leave_link ($map, $x, $y)
2268 2563
2320 ($x, $y) = (-1, -1) 2615 ($x, $y) = (-1, -1)
2321 unless (defined $x) && (defined $y); 2616 unless (defined $x) && (defined $y);
2322 2617
2323 # use -1 or undef as default coordinates, not 0, 0 2618 # use -1 or undef as default coordinates, not 0, 0
2324 ($x, $y) = ($map->enter_x, $map->enter_y) 2619 ($x, $y) = ($map->enter_x, $map->enter_y)
2325 if $x <=0 && $y <= 0; 2620 if $x <= 0 && $y <= 0;
2326 2621
2327 $map->load; 2622 $map->load;
2328 $map->load_neighbours; 2623 $map->load_neighbours;
2329 2624
2330 return unless $self->contr->active; 2625 return unless $self->contr->active;
2331 $self->activate_recursive;
2332 2626
2333 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2627 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2334 $self->enter_map ($map, $x, $y); 2628 $self->enter_map ($map, $x, $y);
2629
2630 # only activate afterwards, to support waiting in hooks
2631 $self->activate_recursive;
2335} 2632}
2336 2633
2337=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2634=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2338 2635
2339Moves the player to the given map-path and coordinates by first freezing 2636Moves the player to the given map-path and coordinates by first freezing
2340her, loading and preparing them map, calling the provided $check callback 2637her, loading and preparing them map, calling the provided $check callback
2341that has to return the map if sucecssful, and then unfreezes the player on 2638that has to return the map if sucecssful, and then unfreezes the player on
2342the new (success) or old (failed) map position. In either case, $done will 2639the new (success) or old (failed) map position. In either case, $done will
2343be called at the end of this process. 2640be called at the end of this process.
2344 2641
2642Note that $check will be called with a potentially non-loaded map, so if
2643it needs a loaded map it has to call C<< ->load >>.
2644
2345=cut 2645=cut
2346 2646
2347our $GOTOGEN; 2647our $GOTOGEN;
2348 2648
2349sub cf::object::player::goto { 2649sub cf::object::player::goto {
2353 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2653 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2354 2654
2355 $self->enter_link; 2655 $self->enter_link;
2356 2656
2357 (async { 2657 (async {
2658 $Coro::current->{desc} = "player::goto $path $x $y";
2659
2660 # *tag paths override both path and x|y
2661 if ($path =~ /^\*(.*)$/) {
2662 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2663 my $ob = $obs[rand @obs];
2664
2665 # see if we actually can go there
2666 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2667 $ob = $obs[rand @obs];
2668 } else {
2669 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2670 }
2671 # else put us there anyways for now #d#
2672
2673 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2674 } else {
2675 ($path, $x, $y) = (undef, undef, undef);
2676 }
2677 }
2678
2358 my $map = eval { 2679 my $map = eval {
2359 my $map = cf::map::find $path; 2680 my $map = defined $path ? cf::map::find $path : undef;
2360 2681
2361 if ($map) { 2682 if ($map) {
2362 $map = $map->customise_for ($self); 2683 $map = $map->customise_for ($self);
2363 $map = $check->($map) if $check && $map; 2684 $map = $check->($map) if $check && $map;
2364 } else { 2685 } else {
2365 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2686 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2366 } 2687 }
2367 2688
2368 $map 2689 $map
2369 }; 2690 };
2370 2691
2406} 2727}
2407 2728
2408sub prepare_random_map { 2729sub prepare_random_map {
2409 my ($exit) = @_; 2730 my ($exit) = @_;
2410 2731
2411 my $guard = cf::lock_acquire "exit_prepare:$exit";
2412
2413 # all this does is basically replace the /! path by 2732 # all this does is basically replace the /! path by
2414 # a new random map path (?random/...) with a seed 2733 # a new random map path (?random/...) with a seed
2415 # that depends on the exit object 2734 # that depends on the exit object
2416 2735
2417 my $rmp = parse_random_map_params $exit->msg; 2736 my $rmp = parse_random_map_params $exit->msg;
2419 if ($exit->map) { 2738 if ($exit->map) {
2420 $rmp->{region} = $exit->region->name; 2739 $rmp->{region} = $exit->region->name;
2421 $rmp->{origin_map} = $exit->map->path; 2740 $rmp->{origin_map} = $exit->map->path;
2422 $rmp->{origin_x} = $exit->x; 2741 $rmp->{origin_x} = $exit->x;
2423 $rmp->{origin_y} = $exit->y; 2742 $rmp->{origin_y} = $exit->y;
2743
2744 $exit->map->touch;
2424 } 2745 }
2425 2746
2426 $rmp->{random_seed} ||= $exit->random_seed; 2747 $rmp->{random_seed} ||= $exit->random_seed;
2427 2748
2428 my $data = cf::to_json $rmp; 2749 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2429 my $md5 = Digest::MD5::md5_hex $data; 2750 my $md5 = Digest::MD5::md5_hex $data;
2430 my $meta = "$RANDOMDIR/$md5.meta"; 2751 my $meta = "$RANDOMDIR/$md5.meta";
2431 2752
2432 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2753 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2433 aio_write $fh, 0, (length $data), $data, 0; 2754 aio_write $fh, 0, (length $data), $data, 0;
2434 undef $fh; 2755 undef $fh;
2435 aio_rename "$meta~", $meta; 2756 aio_rename "$meta~", $meta;
2436 2757
2758 my $slaying = "?random/$md5";
2759
2760 if ($exit->valid) {
2437 $exit->slaying ("?random/$md5"); 2761 $exit->slaying ("?random/$md5");
2438 $exit->msg (undef); 2762 $exit->msg (undef);
2763 }
2439 } 2764 }
2440} 2765}
2441 2766
2442sub cf::object::player::enter_exit { 2767sub cf::object::player::enter_exit {
2443 my ($self, $exit) = @_; 2768 my ($self, $exit) = @_;
2444 2769
2445 return unless $self->type == cf::PLAYER; 2770 return unless $self->type == cf::PLAYER;
2446 2771
2447 if ($exit->slaying eq "/!") {
2448 #TODO: this should de-fi-ni-te-ly not be a sync-job
2449 # the problem is that $exit might not survive long enough
2450 # so it needs to be done right now, right here
2451 cf::sync_job { prepare_random_map $exit };
2452 }
2453
2454 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2455 my $hp = $exit->stats->hp;
2456 my $sp = $exit->stats->sp;
2457
2458 $self->enter_link; 2772 $self->enter_link;
2459 2773
2460 # if exit is damned, update players death & WoR home-position
2461 $self->contr->savebed ($slaying, $hp, $sp)
2462 if $exit->flag (FLAG_DAMNED);
2463
2464 (async { 2774 (async {
2465 $self->deactivate_recursive; # just to be sure 2775 $Coro::current->{desc} = "enter_exit";
2776
2466 unless (eval { 2777 unless (eval {
2778 $self->deactivate_recursive; # just to be sure
2779
2780 # random map handling
2781 {
2782 my $guard = cf::lock_acquire "exit_prepare:$exit";
2783
2784 prepare_random_map $exit
2785 if $exit->slaying eq "/!";
2786 }
2787
2788 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2789 my $x = $exit->stats->hp;
2790 my $y = $exit->stats->sp;
2791
2467 $self->goto ($slaying, $hp, $sp); 2792 $self->goto ($map, $x, $y);
2468 2793
2794 # if exit is damned, update players death & WoR home-position
2795 $self->contr->savebed ($map, $x, $y)
2796 if $exit->flag (cf::FLAG_DAMNED);
2797
2469 1; 2798 1
2470 }) { 2799 }) {
2471 $self->message ("Something went wrong deep within the crossfire server. " 2800 $self->message ("Something went wrong deep within the deliantra server. "
2472 . "I'll try to bring you back to the map you were before. " 2801 . "I'll try to bring you back to the map you were before. "
2473 . "Please report this to the dungeon master!", 2802 . "Please report this to the dungeon master!",
2474 cf::NDI_UNIQUE | cf::NDI_RED); 2803 cf::NDI_UNIQUE | cf::NDI_RED);
2475 2804
2476 warn "ERROR in enter_exit: $@"; 2805 warn "ERROR in enter_exit: $@";
2493sub cf::client::send_drawinfo { 2822sub cf::client::send_drawinfo {
2494 my ($self, $text, $flags) = @_; 2823 my ($self, $text, $flags) = @_;
2495 2824
2496 utf8::encode $text; 2825 utf8::encode $text;
2497 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2826 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2827}
2828
2829=item $client->send_big_packet ($pkt)
2830
2831Like C<send_packet>, but tries to compress large packets, and fragments
2832them as required.
2833
2834=cut
2835
2836our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2837
2838sub cf::client::send_big_packet {
2839 my ($self, $pkt) = @_;
2840
2841 # try lzf for large packets
2842 $pkt = "lzf " . Compress::LZF::compress $pkt
2843 if 1024 <= length $pkt and $self->{can_lzf};
2844
2845 # split very large packets
2846 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2847 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2848 $pkt = "frag";
2849 }
2850
2851 $self->send_packet ($pkt);
2498} 2852}
2499 2853
2500=item $client->send_msg ($channel, $msg, $color, [extra...]) 2854=item $client->send_msg ($channel, $msg, $color, [extra...])
2501 2855
2502Send a drawinfo or msg packet to the client, formatting the msg for the 2856Send a drawinfo or msg packet to the client, formatting the msg for the
2504the message, with C<log> being the default. If C<$color> is negative, suppress 2858the message, with C<log> being the default. If C<$color> is negative, suppress
2505the message unless the client supports the msg packet. 2859the message unless the client supports the msg packet.
2506 2860
2507=cut 2861=cut
2508 2862
2863# non-persistent channels (usually the info channel)
2864our %CHANNEL = (
2865 "c/motd" => {
2866 id => "infobox",
2867 title => "MOTD",
2868 reply => undef,
2869 tooltip => "The message of the day",
2870 },
2871 "c/identify" => {
2872 id => "infobox",
2873 title => "Identify",
2874 reply => undef,
2875 tooltip => "Items recently identified",
2876 },
2877 "c/examine" => {
2878 id => "infobox",
2879 title => "Examine",
2880 reply => undef,
2881 tooltip => "Signs and other items you examined",
2882 },
2883 "c/shopinfo" => {
2884 id => "infobox",
2885 title => "Shop Info",
2886 reply => undef,
2887 tooltip => "What your bargaining skill tells you about the shop",
2888 },
2889 "c/book" => {
2890 id => "infobox",
2891 title => "Book",
2892 reply => undef,
2893 tooltip => "The contents of a note or book",
2894 },
2895 "c/lookat" => {
2896 id => "infobox",
2897 title => "Look",
2898 reply => undef,
2899 tooltip => "What you saw there",
2900 },
2901 "c/who" => {
2902 id => "infobox",
2903 title => "Players",
2904 reply => undef,
2905 tooltip => "Shows players who are currently online",
2906 },
2907 "c/body" => {
2908 id => "infobox",
2909 title => "Body Parts",
2910 reply => undef,
2911 tooltip => "Shows which body parts you posess and are available",
2912 },
2913 "c/statistics" => {
2914 id => "infobox",
2915 title => "Statistics",
2916 reply => undef,
2917 tooltip => "Shows your primary statistics",
2918 },
2919 "c/skills" => {
2920 id => "infobox",
2921 title => "Skills",
2922 reply => undef,
2923 tooltip => "Shows your experience per skill and item power",
2924 },
2925 "c/shopitems" => {
2926 id => "infobox",
2927 title => "Shop Items",
2928 reply => undef,
2929 tooltip => "Shows the items currently for sale in this shop",
2930 },
2931 "c/resistances" => {
2932 id => "infobox",
2933 title => "Resistances",
2934 reply => undef,
2935 tooltip => "Shows your resistances",
2936 },
2937 "c/pets" => {
2938 id => "infobox",
2939 title => "Pets",
2940 reply => undef,
2941 tooltip => "Shows information abotu your pets/a specific pet",
2942 },
2943 "c/perceiveself" => {
2944 id => "infobox",
2945 title => "Perceive Self",
2946 reply => undef,
2947 tooltip => "You gained detailed knowledge about yourself",
2948 },
2949 "c/uptime" => {
2950 id => "infobox",
2951 title => "Uptime",
2952 reply => undef,
2953 tooltip => "How long the server has been running since last restart",
2954 },
2955 "c/mapinfo" => {
2956 id => "infobox",
2957 title => "Map Info",
2958 reply => undef,
2959 tooltip => "Information related to the maps",
2960 },
2961 "c/party" => {
2962 id => "party",
2963 title => "Party",
2964 reply => "gsay ",
2965 tooltip => "Messages and chat related to your party",
2966 },
2967 "c/death" => {
2968 id => "death",
2969 title => "Death",
2970 reply => undef,
2971 tooltip => "Reason for and more info about your most recent death",
2972 },
2973 "c/say" => $SAY_CHANNEL,
2974 "c/chat" => $CHAT_CHANNEL,
2975);
2976
2509sub cf::client::send_msg { 2977sub cf::client::send_msg {
2510 my ($self, $channel, $msg, $color, @extra) = @_; 2978 my ($self, $channel, $msg, $color, @extra) = @_;
2511 2979
2512 $msg = $self->pl->expand_cfpod ($msg); 2980 $msg = $self->pl->expand_cfpod ($msg)
2981 unless $color & cf::NDI_VERBATIM;
2513 2982
2514 $color &= cf::NDI_CLIENT_MASK; # just in case... 2983 $color &= cf::NDI_CLIENT_MASK; # just in case...
2515 2984
2985 # check predefined channels, for the benefit of C
2986 if ($CHANNEL{$channel}) {
2987 $channel = $CHANNEL{$channel};
2988
2989 $self->ext_msg (channel_info => $channel);
2990 $channel = $channel->{id};
2991
2516 if (ref $channel) { 2992 } elsif (ref $channel) {
2517 # send meta info to client, if not yet sent 2993 # send meta info to client, if not yet sent
2518 unless (exists $self->{channel}{$channel->{id}}) { 2994 unless (exists $self->{channel}{$channel->{id}}) {
2519 $self->{channel}{$channel->{id}} = $channel; 2995 $self->{channel}{$channel->{id}} = $channel;
2520 $self->ext_msg (channel_info => $channel); 2996 $self->ext_msg (channel_info => $channel);
2521 } 2997 }
2523 $channel = $channel->{id}; 2999 $channel = $channel->{id};
2524 } 3000 }
2525 3001
2526 return unless @extra || length $msg; 3002 return unless @extra || length $msg;
2527 3003
2528 if ($self->can_msg) {
2529 # default colour, mask it out 3004 # default colour, mask it out
2530 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3005 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2531 if $color & cf::NDI_DEF; 3006 if $color & cf::NDI_DEF;
2532 3007
2533 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3008 my $pkt = "msg "
3009 . $self->{json_coder}->encode (
2534 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3010 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2535 } else { 3011 );
2536 if ($color >= 0) {
2537 # replace some tags by gcfclient-compatible ones
2538 for ($msg) {
2539 1 while
2540 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2541 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2542 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2543 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2544 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2545 }
2546 3012
2547 $color &= cf::NDI_COLOR_MASK; 3013 $self->send_big_packet ($pkt);
2548
2549 utf8::encode $msg;
2550
2551 if (0 && $msg =~ /\[/) {
2552 # COMMAND/INFO
2553 $self->send_packet ("drawextinfo $color 10 8 $msg")
2554 } else {
2555 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2556 $self->send_packet ("drawinfo $color $msg")
2557 }
2558 }
2559 }
2560} 3014}
2561 3015
2562=item $client->ext_msg ($type, @msg) 3016=item $client->ext_msg ($type, @msg)
2563 3017
2564Sends an ext event to the client. 3018Sends an ext event to the client.
2567 3021
2568sub cf::client::ext_msg($$@) { 3022sub cf::client::ext_msg($$@) {
2569 my ($self, $type, @msg) = @_; 3023 my ($self, $type, @msg) = @_;
2570 3024
2571 if ($self->extcmd == 2) { 3025 if ($self->extcmd == 2) {
2572 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3026 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2573 } elsif ($self->extcmd == 1) { # TODO: remove 3027 } elsif ($self->extcmd == 1) { # TODO: remove
2574 push @msg, msgtype => "event_$type"; 3028 push @msg, msgtype => "event_$type";
2575 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3029 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2576 } 3030 }
2577} 3031}
2578 3032
2579=item $client->ext_reply ($msgid, @msg) 3033=item $client->ext_reply ($msgid, @msg)
2580 3034
2584 3038
2585sub cf::client::ext_reply($$@) { 3039sub cf::client::ext_reply($$@) {
2586 my ($self, $id, @msg) = @_; 3040 my ($self, $id, @msg) = @_;
2587 3041
2588 if ($self->extcmd == 2) { 3042 if ($self->extcmd == 2) {
2589 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3043 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2590 } elsif ($self->extcmd == 1) { 3044 } elsif ($self->extcmd == 1) {
2591 #TODO: version 1, remove 3045 #TODO: version 1, remove
2592 unshift @msg, msgtype => "reply", msgid => $id; 3046 unshift @msg, msgtype => "reply", msgid => $id;
2593 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3047 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2594 } 3048 }
2595} 3049}
2596 3050
2597=item $success = $client->query ($flags, "text", \&cb) 3051=item $success = $client->query ($flags, "text", \&cb)
2598 3052
2699 3153
2700 $coro 3154 $coro
2701} 3155}
2702 3156
2703cf::client->attach ( 3157cf::client->attach (
2704 on_destroy => sub { 3158 on_client_destroy => sub {
2705 my ($ns) = @_; 3159 my ($ns) = @_;
2706 3160
2707 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3161 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2708 }, 3162 },
2709); 3163);
2725our $safe_hole = new Safe::Hole; 3179our $safe_hole = new Safe::Hole;
2726 3180
2727$SIG{FPE} = 'IGNORE'; 3181$SIG{FPE} = 'IGNORE';
2728 3182
2729$safe->permit_only (Opcode::opset qw( 3183$safe->permit_only (Opcode::opset qw(
2730 :base_core :base_mem :base_orig :base_math 3184 :base_core :base_mem :base_orig :base_math :base_loop
2731 grepstart grepwhile mapstart mapwhile 3185 grepstart grepwhile mapstart mapwhile
2732 sort time 3186 sort time
2733)); 3187));
2734 3188
2735# here we export the classes and methods available to script code 3189# here we export the classes and methods available to script code
2737=pod 3191=pod
2738 3192
2739The following functions and methods are available within a safe environment: 3193The following functions and methods are available within a safe environment:
2740 3194
2741 cf::object 3195 cf::object
2742 contr pay_amount pay_player map x y force_find force_add 3196 contr pay_amount pay_player map x y force_find force_add destroy
2743 insert remove name archname title slaying race decrease_ob_nr 3197 insert remove name archname title slaying race decrease split
3198 value
2744 3199
2745 cf::object::player 3200 cf::object::player
2746 player 3201 player
2747 3202
2748 cf::player 3203 cf::player
2753 3208
2754=cut 3209=cut
2755 3210
2756for ( 3211for (
2757 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3212 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2758 insert remove inv name archname title slaying race 3213 insert remove inv nrof name archname title slaying race
2759 decrease_ob_nr)], 3214 decrease split destroy change_exp value msg lore send_msg)],
2760 ["cf::object::player" => qw(player)], 3215 ["cf::object::player" => qw(player)],
2761 ["cf::player" => qw(peaceful)], 3216 ["cf::player" => qw(peaceful send_msg)],
2762 ["cf::map" => qw(trigger)], 3217 ["cf::map" => qw(trigger)],
2763) { 3218) {
2764 no strict 'refs'; 3219 no strict 'refs';
2765 my ($pkg, @funs) = @$_; 3220 my ($pkg, @funs) = @$_;
2766 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3221 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2784 3239
2785 my $qcode = $code; 3240 my $qcode = $code;
2786 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3241 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2787 $qcode =~ s/\n/\\n/g; 3242 $qcode =~ s/\n/\\n/g;
2788 3243
3244 %vars = (_dummy => 0) unless %vars;
3245
3246 my @res;
2789 local $_; 3247 local $_;
2790 local @safe::cf::_safe_eval_args = values %vars;
2791 3248
2792 my $eval = 3249 my $eval =
2793 "do {\n" 3250 "do {\n"
2794 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3251 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2795 . "#line 0 \"{$qcode}\"\n" 3252 . "#line 0 \"{$qcode}\"\n"
2796 . $code 3253 . $code
2797 . "\n}" 3254 . "\n}"
2798 ; 3255 ;
2799 3256
3257 if ($CFG{safe_eval}) {
2800 sub_generation_inc; 3258 sub_generation_inc;
3259 local @safe::cf::_safe_eval_args = values %vars;
2801 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3260 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2802 sub_generation_inc; 3261 sub_generation_inc;
3262 } else {
3263 local @cf::_safe_eval_args = values %vars;
3264 @res = wantarray ? eval eval : scalar eval $eval;
3265 }
2803 3266
2804 if ($@) { 3267 if ($@) {
2805 warn "$@"; 3268 warn "$@";
2806 warn "while executing safe code '$code'\n"; 3269 warn "while executing safe code '$code'\n";
2807 warn "with arguments " . (join " ", %vars) . "\n"; 3270 warn "with arguments " . (join " ", %vars) . "\n";
2826=cut 3289=cut
2827 3290
2828sub register_script_function { 3291sub register_script_function {
2829 my ($fun, $cb) = @_; 3292 my ($fun, $cb) = @_;
2830 3293
2831 no strict 'refs'; 3294 $fun = "safe::$fun" if $CFG{safe_eval};
2832 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3295 *$fun = $safe_hole->wrap ($cb);
2833} 3296}
2834 3297
2835=back 3298=back
2836 3299
2837=cut 3300=cut
2858 3321
2859 $facedata->{version} == 2 3322 $facedata->{version} == 2
2860 or cf::cleanup "$path: version mismatch, cannot proceed."; 3323 or cf::cleanup "$path: version mismatch, cannot proceed.";
2861 3324
2862 # patch in the exptable 3325 # patch in the exptable
3326 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
2863 $facedata->{resource}{"res/exp_table"} = { 3327 $facedata->{resource}{"res/exp_table"} = {
2864 type => FT_RSRC, 3328 type => FT_RSRC,
2865 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3329 data => $exp_table,
3330 hash => (Digest::MD5::md5 $exp_table),
2866 }; 3331 };
2867 cf::cede_to_tick; 3332 cf::cede_to_tick;
2868 3333
2869 { 3334 {
2870 my $faces = $facedata->{faceinfo}; 3335 my $faces = $facedata->{faceinfo};
2871 3336
2872 while (my ($face, $info) = each %$faces) { 3337 while (my ($face, $info) = each %$faces) {
2873 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3338 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3339
2874 cf::face::set_visibility $idx, $info->{visibility}; 3340 cf::face::set_visibility $idx, $info->{visibility};
2875 cf::face::set_magicmap $idx, $info->{magicmap}; 3341 cf::face::set_magicmap $idx, $info->{magicmap};
2876 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3342 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2877 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3343 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2878 3344
2879 cf::cede_to_tick; 3345 cf::cede_to_tick;
2880 } 3346 }
2881 3347
2882 while (my ($face, $info) = each %$faces) { 3348 while (my ($face, $info) = each %$faces) {
2883 next unless $info->{smooth}; 3349 next unless $info->{smooth};
3350
2884 my $idx = cf::face::find $face 3351 my $idx = cf::face::find $face
2885 or next; 3352 or next;
3353
2886 if (my $smooth = cf::face::find $info->{smooth}) { 3354 if (my $smooth = cf::face::find $info->{smooth}) {
2887 cf::face::set_smooth $idx, $smooth; 3355 cf::face::set_smooth $idx, $smooth;
2888 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3356 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2889 } else { 3357 } else {
2890 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3358 warn "smooth face '$info->{smooth}' not found for face '$face'";
2904 3372
2905 cf::anim::invalidate_all; # d'oh 3373 cf::anim::invalidate_all; # d'oh
2906 } 3374 }
2907 3375
2908 { 3376 {
2909 # TODO: for gcfclient pleasure, we should give resources
2910 # that gcfclient doesn't grok a >10000 face index.
2911 my $res = $facedata->{resource}; 3377 my $res = $facedata->{resource};
2912 3378
2913 my $soundconf = delete $res->{"res/sound.conf"};
2914
2915 while (my ($name, $info) = each %$res) { 3379 while (my ($name, $info) = each %$res) {
3380 if (defined $info->{type}) {
2916 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3381 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2917 my $data;
2918 3382
2919 if ($info->{type} & 1) { 3383 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
2920 # prepend meta info 3384 cf::face::set_type $idx, $info->{type};
2921
2922 my $meta = $enc->encode ({
2923 name => $name,
2924 %{ $info->{meta} || {} },
2925 });
2926
2927 $data = pack "(w/a*)*", $meta, $info->{data};
2928 } else { 3385 } else {
2929 $data = $info->{data}; 3386 $RESOURCE{$name} = $info;
2930 } 3387 }
2931 3388
2932 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2933 cf::face::set_type $idx, $info->{type};
2934
2935 cf::cede_to_tick; 3389 cf::cede_to_tick;
2936 } 3390 }
2937
2938 if ($soundconf) {
2939 $soundconf = $enc->decode (delete $soundconf->{data});
2940
2941 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2942 my $sound = $soundconf->{compat}[$_]
2943 or next;
2944
2945 my $face = cf::face::find "sound/$sound->[1]";
2946 cf::sound::set $sound->[0] => $face;
2947 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2948 }
2949
2950 while (my ($k, $v) = each %{$soundconf->{event}}) {
2951 my $face = cf::face::find "sound/$v";
2952 cf::sound::set $k => $face;
2953 }
2954 }
2955 } 3391 }
3392
3393 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2956 3394
2957 1 3395 1
2958} 3396}
3397
3398cf::global->attach (on_resource_update => sub {
3399 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3400 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3401
3402 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3403 my $sound = $soundconf->{compat}[$_]
3404 or next;
3405
3406 my $face = cf::face::find "sound/$sound->[1]";
3407 cf::sound::set $sound->[0] => $face;
3408 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3409 }
3410
3411 while (my ($k, $v) = each %{$soundconf->{event}}) {
3412 my $face = cf::face::find "sound/$v";
3413 cf::sound::set $k => $face;
3414 }
3415 }
3416});
2959 3417
2960register_exticmd fx_want => sub { 3418register_exticmd fx_want => sub {
2961 my ($ns, $want) = @_; 3419 my ($ns, $want) = @_;
2962 3420
2963 while (my ($k, $v) = each %$want) { 3421 while (my ($k, $v) = each %$want) {
2964 $ns->fx_want ($k, $v); 3422 $ns->fx_want ($k, $v);
2965 } 3423 }
2966}; 3424};
3425
3426sub load_resource_file($) {
3427 my $guard = lock_acquire "load_resource_file";
3428
3429 my $status = load_resource_file_ $_[0];
3430 get_slot 0.1, 100;
3431 cf::arch::commit_load;
3432
3433 $status
3434}
2967 3435
2968sub reload_regions { 3436sub reload_regions {
2969 # HACK to clear player env face cache, we need some signal framework 3437 # HACK to clear player env face cache, we need some signal framework
2970 # for this (global event?) 3438 # for this (global event?)
2971 %ext::player_env::MUSIC_FACE_CACHE = (); 3439 %ext::player_env::MUSIC_FACE_CACHE = ();
2985} 3453}
2986 3454
2987sub reload_archetypes { 3455sub reload_archetypes {
2988 load_resource_file "$DATADIR/archetypes" 3456 load_resource_file "$DATADIR/archetypes"
2989 or die "unable to load archetypes\n"; 3457 or die "unable to load archetypes\n";
2990 #d# NEED to laod twice to resolve forward references
2991 # this really needs to be done in an extra post-pass
2992 # (which needs to be synchronous, so solve it differently)
2993 load_resource_file "$DATADIR/archetypes"
2994 or die "unable to load archetypes\n";
2995} 3458}
2996 3459
2997sub reload_treasures { 3460sub reload_treasures {
2998 load_resource_file "$DATADIR/treasures" 3461 load_resource_file "$DATADIR/treasures"
2999 or die "unable to load treasurelists\n"; 3462 or die "unable to load treasurelists\n";
3000} 3463}
3001 3464
3002sub reload_resources { 3465sub reload_resources {
3003 warn "reloading resource files...\n"; 3466 warn "reloading resource files...\n";
3004 3467
3468 reload_facedata;
3469 reload_archetypes;
3005 reload_regions; 3470 reload_regions;
3006 reload_facedata;
3007 #reload_archetypes;#d#
3008 reload_archetypes;
3009 reload_treasures; 3471 reload_treasures;
3010 3472
3011 warn "finished reloading resource files\n"; 3473 warn "finished reloading resource files\n";
3012} 3474}
3013 3475
3014sub init {
3015 reload_resources;
3016}
3017
3018sub reload_config { 3476sub reload_config {
3477 warn "reloading config file...\n";
3478
3019 open my $fh, "<:utf8", "$CONFDIR/config" 3479 open my $fh, "<:utf8", "$CONFDIR/config"
3020 or return; 3480 or return;
3021 3481
3022 local $/; 3482 local $/;
3023 *CFG = YAML::Syck::Load <$fh>; 3483 *CFG = YAML::XS::Load scalar <$fh>;
3024 3484
3025 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3485 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3026 3486
3027 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3487 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3028 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3488 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3032 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3492 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3033 and die "WARNING: m(un)lockall failed: $!\n"; 3493 and die "WARNING: m(un)lockall failed: $!\n";
3034 }; 3494 };
3035 warn $@ if $@; 3495 warn $@ if $@;
3036 } 3496 }
3497
3498 warn "finished reloading resource files\n";
3499}
3500
3501sub pidfile() {
3502 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3503 or die "$PIDFILE: $!";
3504 flock $fh, &Fcntl::LOCK_EX
3505 or die "$PIDFILE: flock: $!";
3506 $fh
3507}
3508
3509# make sure only one server instance is running at any one time
3510sub atomic {
3511 my $fh = pidfile;
3512
3513 my $pid = <$fh>;
3514 kill 9, $pid if $pid > 0;
3515
3516 seek $fh, 0, 0;
3517 print $fh $$;
3518}
3519
3520sub main_loop {
3521 warn "EV::loop starting\n";
3522 if (1) {
3523 EV::loop;
3524 }
3525 warn "EV::loop returned\n";
3526 goto &main_loop unless $REALLY_UNLOOP;
3037} 3527}
3038 3528
3039sub main { 3529sub main {
3530 cf::init_globals; # initialise logging
3531
3532 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3533 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3534 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3535 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3536
3537 cf::init_experience;
3538 cf::init_anim;
3539 cf::init_attackmess;
3540 cf::init_dynamic;
3541
3542 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3543
3040 # we must not ever block the main coroutine 3544 # we must not ever block the main coroutine
3041 local $Coro::idle = sub { 3545 local $Coro::idle = sub {
3042 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3546 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3043 (async { 3547 (async {
3044 Event::one_event; 3548 $Coro::current->{desc} = "IDLE BUG HANDLER";
3549 EV::loop EV::LOOP_ONESHOT;
3045 })->prio (Coro::PRIO_MAX); 3550 })->prio (Coro::PRIO_MAX);
3046 }; 3551 };
3047 3552
3553 evthread_start IO::AIO::poll_fileno;
3554
3555 cf::sync_job {
3556 cf::load_settings;
3557 cf::load_materials;
3558
3559 reload_resources;
3048 reload_config; 3560 reload_config;
3049 db_init; 3561 db_init;
3562
3563 cf::init_uuid;
3564 cf::init_signals;
3565 cf::init_skills;
3566
3567 cf::init_beforeplay;
3568
3569 atomic;
3570
3050 load_extensions; 3571 load_extensions;
3051 3572
3052 $TICK_WATCHER->start; 3573 utime time, time, $RUNTIMEFILE;
3053 Event::loop; 3574
3575 # no (long-running) fork's whatsoever before this point(!)
3576 use POSIX ();
3577 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3578
3579 (pop @POST_INIT)->(0) while @POST_INIT;
3580 };
3581
3582 main_loop;
3054} 3583}
3055 3584
3056############################################################################# 3585#############################################################################
3057# initialisation and cleanup 3586# initialisation and cleanup
3058 3587
3059# install some emergency cleanup handlers 3588# install some emergency cleanup handlers
3060BEGIN { 3589BEGIN {
3590 our %SIGWATCHER = ();
3061 for my $signal (qw(INT HUP TERM)) { 3591 for my $signal (qw(INT HUP TERM)) {
3062 Event->signal ( 3592 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3063 reentrant => 0,
3064 data => WF_AUTOCANCEL,
3065 signal => $signal,
3066 prio => 0,
3067 cb => sub {
3068 cf::cleanup "SIG$signal"; 3593 cf::cleanup "SIG$signal";
3069 },
3070 ); 3594 };
3071 } 3595 }
3072} 3596}
3073 3597
3074sub write_runtime { 3598sub write_runtime_sync {
3075 my $runtime = "$LOCALDIR/runtime"; 3599 my $t0 = AE::time;
3076 3600
3077 # first touch the runtime file to show we are still running: 3601 # first touch the runtime file to show we are still running:
3078 # the fsync below can take a very very long time. 3602 # the fsync below can take a very very long time.
3079 3603
3080 IO::AIO::aio_utime $runtime, undef, undef; 3604 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3081 3605
3082 my $guard = cf::lock_acquire "write_runtime"; 3606 my $guard = cf::lock_acquire "write_runtime";
3083 3607
3084 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3608 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3085 or return; 3609 or return;
3086 3610
3087 my $value = $cf::RUNTIME + 90 + 10; 3611 my $value = $cf::RUNTIME + 90 + 10;
3088 # 10 is the runtime save interval, for a monotonic clock 3612 # 10 is the runtime save interval, for a monotonic clock
3089 # 60 allows for the watchdog to kill the server. 3613 # 60 allows for the watchdog to kill the server.
3099 aio_utime $fh, undef, undef; 3623 aio_utime $fh, undef, undef;
3100 3624
3101 close $fh 3625 close $fh
3102 or return; 3626 or return;
3103 3627
3104 aio_rename "$runtime~", $runtime 3628 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3105 and return; 3629 and return;
3106 3630
3107 warn "runtime file written.\n"; 3631 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3108 3632
3109 1 3633 1
3634}
3635
3636our $uuid_lock;
3637our $uuid_skip;
3638
3639sub write_uuid_sync($) {
3640 $uuid_skip ||= $_[0];
3641
3642 return if $uuid_lock;
3643 local $uuid_lock = 1;
3644
3645 my $uuid = "$LOCALDIR/uuid";
3646
3647 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3648 or return;
3649
3650 my $value = uuid_seq uuid_cur;
3651
3652 unless ($value) {
3653 warn "cowardly refusing to write zero uuid value!\n";
3654 return;
3655 }
3656
3657 my $value = uuid_str $value + $uuid_skip;
3658 $uuid_skip = 0;
3659
3660 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3661 and return;
3662
3663 # always fsync - this file is important
3664 aio_fsync $fh
3665 and return;
3666
3667 close $fh
3668 or return;
3669
3670 aio_rename "$uuid~", $uuid
3671 and return;
3672
3673 warn "uuid file written ($value).\n";
3674
3675 1
3676
3677}
3678
3679sub write_uuid($$) {
3680 my ($skip, $sync) = @_;
3681
3682 $sync ? write_uuid_sync $skip
3683 : async { write_uuid_sync $skip };
3110} 3684}
3111 3685
3112sub emergency_save() { 3686sub emergency_save() {
3113 my $freeze_guard = cf::freeze_mainloop; 3687 my $freeze_guard = cf::freeze_mainloop;
3114 3688
3115 warn "enter emergency perl save\n"; 3689 warn "emergency_perl_save: enter\n";
3116 3690
3117 cf::sync_job { 3691 cf::sync_job {
3692 # this is a trade-off: we want to be very quick here, so
3693 # save all maps without fsync, and later call a global sync
3694 # (which in turn might be very very slow)
3695 local $USE_FSYNC = 0;
3696
3118 # use a peculiar iteration method to avoid tripping on perl 3697 # use a peculiar iteration method to avoid tripping on perl
3119 # refcount bugs in for. also avoids problems with players 3698 # refcount bugs in for. also avoids problems with players
3120 # and maps saved/destroyed asynchronously. 3699 # and maps saved/destroyed asynchronously.
3121 warn "begin emergency player save\n"; 3700 warn "emergency_perl_save: begin player save\n";
3122 for my $login (keys %cf::PLAYER) { 3701 for my $login (keys %cf::PLAYER) {
3123 my $pl = $cf::PLAYER{$login} or next; 3702 my $pl = $cf::PLAYER{$login} or next;
3124 $pl->valid or next; 3703 $pl->valid or next;
3704 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3125 $pl->save; 3705 $pl->save;
3126 } 3706 }
3127 warn "end emergency player save\n"; 3707 warn "emergency_perl_save: end player save\n";
3128 3708
3129 warn "begin emergency map save\n"; 3709 warn "emergency_perl_save: begin map save\n";
3130 for my $path (keys %cf::MAP) { 3710 for my $path (keys %cf::MAP) {
3131 my $map = $cf::MAP{$path} or next; 3711 my $map = $cf::MAP{$path} or next;
3132 $map->valid or next; 3712 $map->valid or next;
3133 $map->save; 3713 $map->save;
3134 } 3714 }
3135 warn "end emergency map save\n"; 3715 warn "emergency_perl_save: end map save\n";
3136 3716
3137 warn "begin emergency database checkpoint\n"; 3717 warn "emergency_perl_save: begin database checkpoint\n";
3138 BDB::db_env_txn_checkpoint $DB_ENV; 3718 BDB::db_env_txn_checkpoint $DB_ENV;
3139 warn "end emergency database checkpoint\n"; 3719 warn "emergency_perl_save: end database checkpoint\n";
3720
3721 warn "emergency_perl_save: begin write uuid\n";
3722 write_uuid_sync 1;
3723 warn "emergency_perl_save: end write uuid\n";
3140 }; 3724 };
3141 3725
3726 warn "emergency_perl_save: starting sync()\n";
3727 IO::AIO::aio_sync sub {
3728 warn "emergency_perl_save: finished sync()\n";
3729 };
3730
3142 warn "leave emergency perl save\n"; 3731 warn "emergency_perl_save: leave\n";
3143} 3732}
3144 3733
3145sub post_cleanup { 3734sub post_cleanup {
3146 my ($make_core) = @_; 3735 my ($make_core) = @_;
3147 3736
3148 warn Carp::longmess "post_cleanup backtrace" 3737 warn Carp::longmess "post_cleanup backtrace"
3149 if $make_core; 3738 if $make_core;
3739
3740 my $fh = pidfile;
3741 unlink $PIDFILE if <$fh> == $$;
3742}
3743
3744# a safer delete_package, copied from Symbol
3745sub clear_package($) {
3746 my $pkg = shift;
3747
3748 # expand to full symbol table name if needed
3749 unless ($pkg =~ /^main::.*::$/) {
3750 $pkg = "main$pkg" if $pkg =~ /^::/;
3751 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3752 $pkg .= '::' unless $pkg =~ /::$/;
3753 }
3754
3755 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3756 my $stem_symtab = *{$stem}{HASH};
3757
3758 defined $stem_symtab and exists $stem_symtab->{$leaf}
3759 or return;
3760
3761 # clear all symbols
3762 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3763 for my $name (keys %$leaf_symtab) {
3764 _gv_clear *{"$pkg$name"};
3765# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3766 }
3767 warn "cleared package $pkg\n";#d#
3150} 3768}
3151 3769
3152sub do_reload_perl() { 3770sub do_reload_perl() {
3153 # can/must only be called in main 3771 # can/must only be called in main
3154 if ($Coro::current != $Coro::main) { 3772 if ($Coro::current != $Coro::main) {
3155 warn "can only reload from main coroutine"; 3773 warn "can only reload from main coroutine";
3156 return; 3774 return;
3157 } 3775 }
3158 3776
3777 return if $RELOAD++;
3778
3779 my $t1 = AE::time;
3780
3781 while ($RELOAD) {
3159 warn "reloading..."; 3782 warn "reloading...";
3160 3783
3161 warn "entering sync_job"; 3784 warn "entering sync_job";
3162 3785
3163 cf::sync_job { 3786 cf::sync_job {
3164 cf::write_runtime; # external watchdog should not bark 3787 cf::write_runtime_sync; # external watchdog should not bark
3165 cf::emergency_save; 3788 cf::emergency_save;
3166 cf::write_runtime; # external watchdog should not bark 3789 cf::write_runtime_sync; # external watchdog should not bark
3167 3790
3168 warn "syncing database to disk"; 3791 warn "syncing database to disk";
3169 BDB::db_env_txn_checkpoint $DB_ENV; 3792 BDB::db_env_txn_checkpoint $DB_ENV;
3170 3793
3171 # if anything goes wrong in here, we should simply crash as we already saved 3794 # if anything goes wrong in here, we should simply crash as we already saved
3172 3795
3173 warn "cancelling all WF_AUTOCANCEL watchers";
3174 for (Event::all_watchers) {
3175 $_->cancel if $_->data & WF_AUTOCANCEL;
3176 }
3177
3178 warn "flushing outstanding aio requests"; 3796 warn "flushing outstanding aio requests";
3179 for (;;) {
3180 BDB::flush;
3181 IO::AIO::flush;
3182 Coro::cede;
3183 last unless IO::AIO::nreqs || BDB::nreqs; 3797 while (IO::AIO::nreqs || BDB::nreqs) {
3184 warn "iterate..."; 3798 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3185 }
3186
3187 ++$RELOAD;
3188
3189 warn "cancelling all extension coros";
3190 $_->cancel for values %EXT_CORO;
3191 %EXT_CORO = ();
3192
3193 warn "removing commands";
3194 %COMMAND = ();
3195
3196 warn "removing ext/exti commands";
3197 %EXTCMD = ();
3198 %EXTICMD = ();
3199
3200 warn "unloading/nuking all extensions";
3201 for my $pkg (@EXTS) {
3202 warn "... unloading $pkg";
3203
3204 if (my $cb = $pkg->can ("unload")) {
3205 eval {
3206 $cb->($pkg);
3207 1
3208 } or warn "$pkg unloaded, but with errors: $@";
3209 } 3799 }
3210 3800
3211 warn "... nuking $pkg"; 3801 warn "cancelling all extension coros";
3212 Symbol::delete_package $pkg; 3802 $_->cancel for values %EXT_CORO;
3213 } 3803 %EXT_CORO = ();
3214 3804
3215 warn "unloading all perl modules loaded from $LIBDIR"; 3805 warn "removing commands";
3216 while (my ($k, $v) = each %INC) { 3806 %COMMAND = ();
3217 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3218 3807
3808 warn "removing ext/exti commands";
3809 %EXTCMD = ();
3810 %EXTICMD = ();
3811
3812 warn "unloading/nuking all extensions";
3813 for my $pkg (@EXTS) {
3219 warn "... unloading $k"; 3814 warn "... unloading $pkg";
3220 delete $INC{$k};
3221 3815
3222 $k =~ s/\.pm$//;
3223 $k =~ s/\//::/g;
3224
3225 if (my $cb = $k->can ("unload_module")) { 3816 if (my $cb = $pkg->can ("unload")) {
3817 eval {
3226 $cb->(); 3818 $cb->($pkg);
3819 1
3820 } or warn "$pkg unloaded, but with errors: $@";
3821 }
3822
3823 warn "... clearing $pkg";
3824 clear_package $pkg;
3227 } 3825 }
3228 3826
3229 Symbol::delete_package $k; 3827 warn "unloading all perl modules loaded from $LIBDIR";
3828 while (my ($k, $v) = each %INC) {
3829 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3830
3831 warn "... unloading $k";
3832 delete $INC{$k};
3833
3834 $k =~ s/\.pm$//;
3835 $k =~ s/\//::/g;
3836
3837 if (my $cb = $k->can ("unload_module")) {
3838 $cb->();
3839 }
3840
3841 clear_package $k;
3230 } 3842 }
3231 3843
3232 warn "getting rid of safe::, as good as possible"; 3844 warn "getting rid of safe::, as good as possible";
3233 Symbol::delete_package "safe::$_" 3845 clear_package "safe::$_"
3234 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3846 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3235 3847
3236 warn "unloading cf.pm \"a bit\""; 3848 warn "unloading cf.pm \"a bit\"";
3237 delete $INC{"cf.pm"}; 3849 delete $INC{"cf.pm"};
3238 delete $INC{"cf/pod.pm"}; 3850 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3239 3851
3240 # don't, removes xs symbols, too, 3852 # don't, removes xs symbols, too,
3241 # and global variables created in xs 3853 # and global variables created in xs
3242 #Symbol::delete_package __PACKAGE__; 3854 #clear_package __PACKAGE__;
3243 3855
3244 warn "unload completed, starting to reload now"; 3856 warn "unload completed, starting to reload now";
3245 3857
3246 warn "reloading cf.pm"; 3858 warn "reloading cf.pm";
3247 require cf; 3859 require cf;
3248 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3860 cf::_connect_to_perl_1;
3249 3861
3250 warn "loading config and database again"; 3862 warn "loading config and database again";
3251 cf::reload_config; 3863 cf::reload_config;
3252 3864
3253 warn "loading extensions"; 3865 warn "loading extensions";
3254 cf::load_extensions; 3866 cf::load_extensions;
3255 3867
3868 if ($REATTACH_ON_RELOAD) {
3256 warn "reattaching attachments to objects/players"; 3869 warn "reattaching attachments to objects/players";
3257 _global_reattach; # objects, sockets 3870 _global_reattach; # objects, sockets
3258 warn "reattaching attachments to maps"; 3871 warn "reattaching attachments to maps";
3259 reattach $_ for values %MAP; 3872 reattach $_ for values %MAP;
3260 warn "reattaching attachments to players"; 3873 warn "reattaching attachments to players";
3261 reattach $_ for values %PLAYER; 3874 reattach $_ for values %PLAYER;
3875 }
3262 3876
3877 warn "running post_init jobs";
3878 (pop @POST_INIT)->(1) while @POST_INIT;
3879
3263 warn "leaving sync_job"; 3880 warn "leaving sync_job";
3264 3881
3265 1 3882 1
3266 } or do { 3883 } or do {
3267 warn $@; 3884 warn $@;
3268 warn "error while reloading, exiting."; 3885 cf::cleanup "error while reloading, exiting.";
3269 exit 1;
3270 }; 3886 };
3271 3887
3272 warn "reloaded"; 3888 warn "reloaded";
3889 --$RELOAD;
3890 }
3891
3892 $t1 = AE::time - $t1;
3893 warn "reload completed in ${t1}s\n";
3273}; 3894};
3274 3895
3275our $RELOAD_WATCHER; # used only during reload 3896our $RELOAD_WATCHER; # used only during reload
3276 3897
3277sub reload_perl() { 3898sub reload_perl() {
3278 # doing reload synchronously and two reloads happen back-to-back, 3899 # doing reload synchronously and two reloads happen back-to-back,
3279 # coro crashes during coro_state_free->destroy here. 3900 # coro crashes during coro_state_free->destroy here.
3280 3901
3281 $RELOAD_WATCHER ||= Event->timer ( 3902 $RELOAD_WATCHER ||= cf::async {
3282 reentrant => 0, 3903 Coro::AIO::aio_wait cache_extensions;
3283 after => 0, 3904
3284 data => WF_AUTOCANCEL, 3905 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3285 cb => sub {
3286 do_reload_perl; 3906 do_reload_perl;
3287 undef $RELOAD_WATCHER; 3907 undef $RELOAD_WATCHER;
3288 }, 3908 };
3289 ); 3909 };
3290} 3910}
3291 3911
3292register_command "reload" => sub { 3912register_command "reload" => sub {
3293 my ($who, $arg) = @_; 3913 my ($who, $arg) = @_;
3294 3914
3295 if ($who->flag (FLAG_WIZ)) { 3915 if ($who->flag (FLAG_WIZ)) {
3296 $who->message ("reloading server."); 3916 $who->message ("reloading server.");
3917 async {
3918 $Coro::current->{desc} = "perl_reload";
3297 async { reload_perl }; 3919 reload_perl;
3920 };
3298 } 3921 }
3299}; 3922};
3300 3923
3301unshift @INC, $LIBDIR; 3924unshift @INC, $LIBDIR;
3302 3925
3304 3927
3305our @WAIT_FOR_TICK; 3928our @WAIT_FOR_TICK;
3306our @WAIT_FOR_TICK_BEGIN; 3929our @WAIT_FOR_TICK_BEGIN;
3307 3930
3308sub wait_for_tick { 3931sub wait_for_tick {
3309 return unless $TICK_WATCHER->is_active;
3310 return if $Coro::current == $Coro::main; 3932 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3311 3933
3312 my $signal = new Coro::Signal; 3934 my $signal = new Coro::Signal;
3313 push @WAIT_FOR_TICK, $signal; 3935 push @WAIT_FOR_TICK, $signal;
3314 $signal->wait; 3936 $signal->wait;
3315} 3937}
3316 3938
3317sub wait_for_tick_begin { 3939sub wait_for_tick_begin {
3318 return unless $TICK_WATCHER->is_active;
3319 return if $Coro::current == $Coro::main; 3940 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3320 3941
3321 my $signal = new Coro::Signal; 3942 my $signal = new Coro::Signal;
3322 push @WAIT_FOR_TICK_BEGIN, $signal; 3943 push @WAIT_FOR_TICK_BEGIN, $signal;
3323 $signal->wait; 3944 $signal->wait;
3324} 3945}
3325 3946
3326 my $min = 1e6;#d# 3947sub tick {
3327 my $avg = 10;
3328$TICK_WATCHER = Event->timer (
3329 reentrant => 0,
3330 parked => 1,
3331 prio => 0,
3332 at => $NEXT_TICK || $TICK,
3333 data => WF_AUTOCANCEL,
3334 cb => sub {
3335 if ($Coro::current != $Coro::main) { 3948 if ($Coro::current != $Coro::main) {
3336 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3949 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3337 unless ++$bug_warning > 10; 3950 unless ++$bug_warning > 10;
3338 return; 3951 return;
3339 } 3952 }
3340 3953
3341 $NOW = $tick_start = Event::time;
3342
3343 cf::server_tick; # one server iteration 3954 cf::server_tick; # one server iteration
3344 3955
3345 0 && sync_job {#d# 3956 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3346 for(1..10) {
3347 my $t = Event::time;
3348 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3349 or die;
3350 3957
3351 $map->width (50); 3958 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3352 $map->height (50); 3959 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3353 $map->alloc; 3960 Coro::async_pool {
3354 $map->_load_objects ("/tmp/x.map", 1); 3961 $Coro::current->{desc} = "runtime saver";
3355 my $t = Event::time - $t; 3962 write_runtime_sync
3356 3963 or warn "ERROR: unable to write runtime file: $!";
3357 #next unless $t < 0.0013;#d#
3358 if ($t < $min) {
3359 $min = $t;
3360 }
3361 $avg = $avg * 0.99 + $t * 0.01;
3362 }
3363 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3364 exit 0;
3365 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3366 }; 3964 };
3965 }
3367 3966
3368 $RUNTIME += $TICK;
3369 $NEXT_TICK += $TICK;
3370
3371 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3372 $NEXT_RUNTIME_WRITE = $NOW + 10;
3373 Coro::async_pool {
3374 write_runtime
3375 or warn "ERROR: unable to write runtime file: $!";
3376 };
3377 }
3378
3379# my $AFTER = Event::time;
3380# warn $AFTER - $NOW;#d#
3381
3382 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3967 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3383 $sig->send; 3968 $sig->send;
3384 } 3969 }
3385 while (my $sig = shift @WAIT_FOR_TICK) { 3970 while (my $sig = shift @WAIT_FOR_TICK) {
3386 $sig->send; 3971 $sig->send;
3387 } 3972 }
3388 3973
3389 $NOW = Event::time; 3974 $LOAD = ($NOW - $TICK_START) / $TICK;
3390
3391 # if we are delayed by four ticks or more, skip them all
3392 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3393
3394 $TICK_WATCHER->at ($NEXT_TICK);
3395 $TICK_WATCHER->start;
3396
3397 $LOAD = ($NOW - $tick_start) / $TICK;
3398 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3975 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3399 3976
3400 _post_tick; 3977 if (0) {
3401 3978 if ($NEXT_TICK) {
3402 3979 my $jitter = $TICK_START - $NEXT_TICK;
3980 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3981 warn "jitter $JITTER\n";#d#
3982 }
3403 }, 3983 }
3404); 3984}
3405 3985
3406{ 3986{
3407 BDB::max_poll_time $TICK * 0.1; 3987 # configure BDB
3408 $BDB_POLL_WATCHER = Event->io ( 3988
3409 reentrant => 0,
3410 fd => BDB::poll_fileno,
3411 poll => 'r',
3412 prio => 0,
3413 data => WF_AUTOCANCEL,
3414 cb => \&BDB::poll_cb,
3415 );
3416 BDB::min_parallel 8; 3989 BDB::min_parallel 16;
3417 3990 BDB::max_poll_reqs $TICK * 0.1;
3418 BDB::set_sync_prepare { 3991 $AnyEvent::BDB::WATCHER->priority (1);
3419 my $status;
3420 my $current = $Coro::current;
3421 (
3422 sub {
3423 $status = $!;
3424 $current->ready; undef $current;
3425 },
3426 sub {
3427 Coro::schedule while defined $current;
3428 $! = $status;
3429 },
3430 )
3431 };
3432 3992
3433 unless ($DB_ENV) { 3993 unless ($DB_ENV) {
3434 $DB_ENV = BDB::db_env_create; 3994 $DB_ENV = BDB::db_env_create;
3995 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3996 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3997 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3998 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3999 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3435 4000
3436 cf::sync_job { 4001 cf::sync_job {
3437 eval { 4002 eval {
3438 BDB::db_env_open 4003 BDB::db_env_open
3439 $DB_ENV, 4004 $DB_ENV,
3441 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4006 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3442 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4007 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3443 0666; 4008 0666;
3444 4009
3445 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4010 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3446
3447 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3448 $DB_ENV->set_lk_detect;
3449 }; 4011 };
3450 4012
3451 cf::cleanup "db_env_open(db): $@" if $@; 4013 cf::cleanup "db_env_open(db): $@" if $@;
3452 }; 4014 };
3453 } 4015 }
4016
4017 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4018 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4019 };
4020 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4021 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4022 };
4023 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4024 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4025 };
3454} 4026}
3455 4027
3456{ 4028{
4029 # configure IO::AIO
4030
3457 IO::AIO::min_parallel 8; 4031 IO::AIO::min_parallel 8;
3458
3459 undef $Coro::AIO::WATCHER;
3460 IO::AIO::max_poll_time $TICK * 0.1; 4032 IO::AIO::max_poll_time $TICK * 0.1;
3461 $AIO_POLL_WATCHER = Event->io ( 4033 undef $AnyEvent::AIO::WATCHER;
3462 reentrant => 0,
3463 data => WF_AUTOCANCEL,
3464 fd => IO::AIO::poll_fileno,
3465 poll => 'r',
3466 prio => 6,
3467 cb => \&IO::AIO::poll_cb,
3468 );
3469} 4034}
3470 4035
3471my $_log_backtrace; 4036my $_log_backtrace;
3472 4037
3473sub _log_backtrace { 4038sub _log_backtrace {
3476 $msg =~ s/\n//; 4041 $msg =~ s/\n//;
3477 4042
3478 # limit the # of concurrent backtraces 4043 # limit the # of concurrent backtraces
3479 if ($_log_backtrace < 2) { 4044 if ($_log_backtrace < 2) {
3480 ++$_log_backtrace; 4045 ++$_log_backtrace;
4046 my $perl_bt = Carp::longmess $msg;
3481 async { 4047 async {
4048 $Coro::current->{desc} = "abt $msg";
4049
3482 my @bt = fork_call { 4050 my @bt = fork_call {
3483 @addr = map { sprintf "%x", $_ } @addr; 4051 @addr = map { sprintf "%x", $_ } @addr;
3484 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4052 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3485 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4053 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3486 or die "addr2line: $!"; 4054 or die "addr2line: $!";
3494 } 4062 }
3495 4063
3496 @funcs 4064 @funcs
3497 }; 4065 };
3498 4066
3499 LOG llevInfo, "[ABT] $msg\n"; 4067 LOG llevInfo, "[ABT] $perl_bt\n";
4068 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3500 LOG llevInfo, "[ABT] $_\n" for @bt; 4069 LOG llevInfo, "[ABT] $_\n" for @bt;
3501 --$_log_backtrace; 4070 --$_log_backtrace;
3502 }; 4071 };
3503 } else { 4072 } else {
3504 LOG llevInfo, "[ABT] $msg\n"; 4073 LOG llevInfo, "[ABT] $msg\n";
3505 LOG llevInfo, "[ABT] [suppressed]\n"; 4074 LOG llevInfo, "[ABT] [suppressed]\n";
3506 } 4075 }
3507} 4076}
3508 4077
3509# load additional modules 4078# load additional modules
3510use cf::pod; 4079require "cf/$_.pm" for @EXTRA_MODULES;
4080cf::_connect_to_perl_2;
3511 4081
3512END { cf::emergency_save } 4082END { cf::emergency_save }
3513 4083
35141 40841
3515 4085

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines