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.344 by root, Mon Aug 27 02:43:38 2007 UTC vs.
Revision 1.499 by root, Sun Jan 10 17:43:46 2010 UTC

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

Diff Legend

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