ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

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

Diff Legend

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