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.338 by root, Tue Aug 21 01:07:47 2007 UTC vs.
Revision 1.502 by root, Sat Jan 23 20:24:50 2010 UTC

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

Diff Legend

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