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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.338 by root, Tue Aug 21 01:07:47 2007 UTC vs.
Revision 1.483 by root, Mon Oct 12 04:02:17 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines