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.334 by root, Mon Aug 20 22:09:04 2007 UTC vs.
Revision 1.487 by root, Fri Oct 16 01:56:41 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines