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.308 by root, Mon Jul 16 14:09:40 2007 UTC vs.
Revision 1.456 by root, Tue Sep 30 04:00:35 2008 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 "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
15use Coro 3.61 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
49use Coro::Util ();
24 50
25use JSON::XS 1.4 (); 51use JSON::XS 2.01 ();
26use BDB (); 52use BDB ();
27use Data::Dumper; 53use Data::Dumper;
28use Digest::MD5; 54use Digest::MD5;
29use Fcntl; 55use Fcntl;
30use YAML::Syck (); 56use YAML ();
31use IO::AIO 2.32 (); 57use IO::AIO ();
32use Time::HiRes; 58use Time::HiRes;
33use Compress::LZF; 59use Compress::LZF;
34use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
35 63
36# configure various modules to our taste 64# configure various modules to our taste
37# 65#
38$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
68
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
40Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
41
42$Event::Eval = 1; # no idea why this is required, but it is
43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 74
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 76
51our %COMMAND = (); 77our %COMMAND = ();
52our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
… …
55our %EXTCMD = (); 81our %EXTCMD = ();
56our %EXTICMD = (); 82our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 83our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
59 85
60our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 87our @EVENT;
62 88
63our $CONFDIR = confdir; 89our $CONFDIR = confdir;
64our $DATADIR = datadir; 90our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 92our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 93our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 94our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 95our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 97our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 98our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 99our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime";
102
103our %RESOURCE;
74 104
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 107our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 108our $USE_FSYNC = 1; # use fsync to write maps - default off
82 109
110our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 112our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 113our $DB_ENV;
85 114
86our %CFG; 115our %CFG;
87 116
88our $UPTIME; $UPTIME ||= time; 117our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 118our $RUNTIME;
119our $NOW;
90 120
91our %PLAYER; # all users 121our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 122our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 123our $LINK_MAP; # the special {link} map, which is always available
94 124
95# used to convert map paths into valid unix filenames by replacing / by ∕ 125# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 126our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 127
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 128our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 129our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 131our $TICK_START; # for load detecting purposes
132
133our @POST_INIT;
101 134
102binmode STDOUT; 135binmode STDOUT;
103binmode STDERR; 136binmode STDERR;
104 137
105# read virtual server time, if available 138# read virtual server time, if available
106unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 139unless ($RUNTIME || !-e $RUNTIMEFILE) {
107 open my $fh, "<", "$LOCALDIR/runtime" 140 open my $fh, "<", $RUNTIMEFILE
108 or die "unable to read runtime file: $!"; 141 or die "unable to read $RUNTIMEFILE file: $!";
109 $RUNTIME = <$fh> + 0.; 142 $RUNTIME = <$fh> + 0.;
110} 143}
111 144
112mkdir $_ 145mkdir $_
113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
158 191
159The raw value load value from the last tick. 192The raw value load value from the last tick.
160 193
161=item %cf::CFG 194=item %cf::CFG
162 195
163Configuration for the server, loaded from C</etc/crossfire/config>, or 196Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 197from wherever your confdir points to.
165 198
166=item cf::wait_for_tick, cf::wait_for_tick_begin 199=item cf::wait_for_tick, cf::wait_for_tick_begin
167 200
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 201These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
169returns directly I<after> the tick processing (and consequently, can only wake one process 202returns directly I<after> the tick processing (and consequently, can only wake one process
170per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 203per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
171 204
205=item @cf::INVOKE_RESULTS
206
207This array contains the results of the last C<invoke ()> call. When
208C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
209that call.
210
172=back 211=back
173 212
174=cut 213=cut
175 214
176BEGIN { 215BEGIN {
… …
180 $msg .= "\n" 219 $msg .= "\n"
181 unless $msg =~ /\n$/; 220 unless $msg =~ /\n$/;
182 221
183 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 222 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
184 223
185 utf8::encode $msg;
186 LOG llevError, $msg; 224 LOG llevError, $msg;
187 }; 225 };
188} 226}
227
228$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "=="
230
231 if ($Coro::current == $Coro::main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d#
234 }#d#
235
236 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate
239};
240
241$SIG{__DIE__} = sub { }; #d#?
189 242
190@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
191@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
192@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
193@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
200for my $pkg (qw( 253for my $pkg (qw(
201 cf::global cf::attachable 254 cf::global cf::attachable
202 cf::object cf::object::player 255 cf::object cf::object::player
203 cf::client cf::player 256 cf::client cf::player
204 cf::arch cf::living 257 cf::arch cf::living
258 cf::map cf::mapspace
205 cf::map cf::party cf::region 259 cf::party cf::region
206)) { 260)) {
207 no strict 'refs';
208 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
209} 262}
210 263
211$Event::DIED = sub { 264$EV::DIED = sub {
212 warn "error in event callback: @_"; 265 warn "error in event callback: @_";
213}; 266};
214 267
215############################################################################# 268#############################################################################
216 269
… …
239 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 292 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
240 $d 293 $d
241 } || "[unable to dump $_[0]: '$@']"; 294 } || "[unable to dump $_[0]: '$@']";
242} 295}
243 296
244=item $ref = cf::from_json $json 297=item $ref = cf::decode_json $json
245 298
246Converts a JSON string into the corresponding perl data structure. 299Converts a JSON string into the corresponding perl data structure.
247 300
248=item $json = cf::to_json $ref 301=item $json = cf::encode_json $ref
249 302
250Converts a perl data structure into its JSON representation. 303Converts a perl data structure into its JSON representation.
251 304
252=cut 305=cut
253 306
254our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 307our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255 308
256sub to_json ($) { $json_coder->encode ($_[0]) } 309sub encode_json($) { $json_coder->encode ($_[0]) }
257sub from_json ($) { $json_coder->decode ($_[0]) } 310sub decode_json($) { $json_coder->decode ($_[0]) }
311
312=item cf::post_init { BLOCK }
313
314Execute the given codeblock, I<after> all extensions have been (re-)loaded,
315but I<before> the server starts ticking again.
316
317The cdoeblock will have a single boolean argument to indicate whether this
318is a reload or not.
319
320=cut
321
322sub post_init(&) {
323 push @POST_INIT, shift;
324}
258 325
259=item cf::lock_wait $string 326=item cf::lock_wait $string
260 327
261Wait until the given lock is available. See cf::lock_acquire. 328Wait until the given lock is available. See cf::lock_acquire.
262 329
… …
265Wait until the given lock is available and then acquires it and returns 332Wait until the given lock is available and then acquires it and returns
266a Coro::guard object. If the guard object gets destroyed (goes out of scope, 333a Coro::guard object. If the guard object gets destroyed (goes out of scope,
267for example when the coroutine gets canceled), the lock is automatically 334for example when the coroutine gets canceled), the lock is automatically
268returned. 335returned.
269 336
337Locks are *not* recursive, locking from the same coro twice results in a
338deadlocked coro.
339
270Lock names should begin with a unique identifier (for example, cf::map::find 340Lock names should begin with a unique identifier (for example, cf::map::find
271uses map_find and cf::map::load uses map_load). 341uses map_find and cf::map::load uses map_load).
272 342
273=item $locked = cf::lock_active $string 343=item $locked = cf::lock_active $string
274 344
275Return true if the lock is currently active, i.e. somebody has locked it. 345Return true if the lock is currently active, i.e. somebody has locked it.
276 346
277=cut 347=cut
278 348
279our %LOCK; 349our %LOCK;
350our %LOCKER;#d#
280 351
281sub lock_wait($) { 352sub lock_wait($) {
282 my ($key) = @_; 353 my ($key) = @_;
283 354
355 if ($LOCKER{$key} == $Coro::current) {#d#
356 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
357 return;#d#
358 }#d#
359
284 # wait for lock, if any 360 # wait for lock, if any
285 while ($LOCK{$key}) { 361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
286 push @{ $LOCK{$key} }, $Coro::current; 363 push @{ $LOCK{$key} }, $Coro::current;
287 Coro::schedule; 364 Coro::schedule;
288 } 365 }
289} 366}
290 367
… …
293 370
294 # wait, to be sure we are not locked 371 # wait, to be sure we are not locked
295 lock_wait $key; 372 lock_wait $key;
296 373
297 $LOCK{$key} = []; 374 $LOCK{$key} = [];
375 $LOCKER{$key} = $Coro::current;#d#
298 376
299 Coro::guard { 377 Coro::guard {
378 delete $LOCKER{$key};#d#
300 # wake up all waiters, to be on the safe side 379 # wake up all waiters, to be on the safe side
301 $_->ready for @{ delete $LOCK{$key} }; 380 $_->ready for @{ delete $LOCK{$key} };
302 } 381 }
303} 382}
304 383
… …
307 386
308 ! ! $LOCK{$key} 387 ! ! $LOCK{$key}
309} 388}
310 389
311sub freeze_mainloop { 390sub freeze_mainloop {
312 return unless $TICK_WATCHER->is_active; 391 tick_inhibit_inc;
313 392
314 my $guard = Coro::guard { 393 Coro::guard \&tick_inhibit_dec;
315 $TICK_WATCHER->start; 394}
395
396=item cf::periodic $interval, $cb
397
398Like EV::periodic, but randomly selects a starting point so that the actions
399get spread over timer.
400
401=cut
402
403sub periodic($$) {
404 my ($interval, $cb) = @_;
405
406 my $start = rand List::Util::min 180, $interval;
407
408 EV::periodic $start, $interval, 0, $cb
409}
410
411=item cf::get_slot $time[, $priority[, $name]]
412
413Allocate $time seconds of blocking CPU time at priority C<$priority>:
414This call blocks and returns only when you have at least C<$time> seconds
415of cpu time till the next tick. The slot is only valid till the next cede.
416
417The optional C<$name> can be used to identify the job to run. It might be
418used for statistical purposes and should identify the same time-class.
419
420Useful for short background jobs.
421
422=cut
423
424our @SLOT_QUEUE;
425our $SLOT_QUEUE;
426
427$SLOT_QUEUE->cancel if $SLOT_QUEUE;
428$SLOT_QUEUE = Coro::async {
429 $Coro::current->desc ("timeslot manager");
430
431 my $signal = new Coro::Signal;
432
433 while () {
434 next_job:
435 my $avail = cf::till_tick;
436 if ($avail > 0.01) {
437 for (0 .. $#SLOT_QUEUE) {
438 if ($SLOT_QUEUE[$_][0] < $avail) {
439 my $job = splice @SLOT_QUEUE, $_, 1, ();
440 $job->[2]->send;
441 Coro::cede;
442 goto next_job;
443 }
444 }
445 }
446
447 if (@SLOT_QUEUE) {
448 # we do not use wait_for_tick() as it returns immediately when tick is inactive
449 push @cf::WAIT_FOR_TICK, $signal;
450 $signal->wait;
451 } else {
452 Coro::schedule;
453 }
316 }; 454 }
317 $TICK_WATCHER->stop; 455};
318 $guard 456
457sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main;
459
460 my ($time, $pri, $name) = @_;
461
462 $time = $TICK * .6 if $time > $TICK * .6;
463 my $sig = new Coro::Signal;
464
465 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
466 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
467 $SLOT_QUEUE->ready;
468 $sig->wait;
319} 469}
320 470
321=item cf::async { BLOCK } 471=item cf::async { BLOCK }
322 472
323Currently the same as Coro::async_pool, meaning you cannot use 473Currently the same as Coro::async_pool, meaning you cannot use
… …
328 478
329BEGIN { *async = \&Coro::async_pool } 479BEGIN { *async = \&Coro::async_pool }
330 480
331=item cf::sync_job { BLOCK } 481=item cf::sync_job { BLOCK }
332 482
333The design of Crossfire TRT requires that the main coroutine ($Coro::main) 483The design of Deliantra requires that the main coroutine ($Coro::main)
334is always able to handle events or runnable, as Crossfire TRT is only 484is always able to handle events or runnable, as Deliantra is only
335partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 485partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
336acceptable. 486acceptable.
337 487
338If it must be done, put the blocking parts into C<sync_job>. This will run 488If it must be done, put the blocking parts into C<sync_job>. This will run
339the given BLOCK in another coroutine while waiting for the result. The 489the given BLOCK in another coroutine while waiting for the result. The
… …
344 494
345sub sync_job(&) { 495sub sync_job(&) {
346 my ($job) = @_; 496 my ($job) = @_;
347 497
348 if ($Coro::current == $Coro::main) { 498 if ($Coro::current == $Coro::main) {
349 my $time = Event::time; 499 my $time = EV::time;
350 500
351 # this is the main coro, too bad, we have to block 501 # this is the main coro, too bad, we have to block
352 # till the operation succeeds, freezing the server :/ 502 # till the operation succeeds, freezing the server :/
353 503
354 # TODO: use suspend/resume instead 504 LOG llevError, Carp::longmess "sync job";#d#
355 # (but this is cancel-safe) 505
356 my $freeze_guard = freeze_mainloop; 506 my $freeze_guard = freeze_mainloop;
357 507
358 my $busy = 1; 508 my $busy = 1;
359 my @res; 509 my @res;
360 510
361 (async { 511 (async {
512 $Coro::current->desc ("sync job coro");
362 @res = eval { $job->() }; 513 @res = eval { $job->() };
363 warn $@ if $@; 514 warn $@ if $@;
364 undef $busy; 515 undef $busy;
365 })->prio (Coro::PRIO_MAX); 516 })->prio (Coro::PRIO_MAX);
366 517
367 while ($busy) { 518 while ($busy) {
368 Coro::cede or Event::one_event; 519 if (Coro::nready) {
520 Coro::cede_notself;
521 } else {
522 EV::loop EV::LOOP_ONESHOT;
369 } 523 }
524 }
370 525
371 $time = Event::time - $time; 526 my $time = EV::time - $time;
372 527
373 LOG llevError | logBacktrace, Carp::longmess "long sync job"
374 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
375
376 $tick_start += $time; # do not account sync jobs to server load 528 $TICK_START += $time; # do not account sync jobs to server load
377 529
378 wantarray ? @res : $res[0] 530 wantarray ? @res : $res[0]
379 } else { 531 } else {
380 # we are in another coroutine, how wonderful, everything just works 532 # we are in another coroutine, how wonderful, everything just works
381 533
… …
406=item fork_call { }, $args 558=item fork_call { }, $args
407 559
408Executes the given code block with the given arguments in a seperate 560Executes the given code block with the given arguments in a seperate
409process, returning the results. Everything must be serialisable with 561process, returning the results. Everything must be serialisable with
410Coro::Storable. May, of course, block. Note that the executed sub may 562Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 563never block itself or use any form of event handling.
412 564
413=cut 565=cut
414
415sub _store_scalar {
416 open my $fh, ">", \my $buf
417 or die "fork_call: cannot open fh-to-buf in child : $!";
418 Storable::store_fd $_[0], $fh;
419 close $fh;
420
421 $buf
422}
423 566
424sub fork_call(&@) { 567sub fork_call(&@) {
425 my ($cb, @args) = @_; 568 my ($cb, @args) = @_;
426 569
427# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 570 # we seemingly have to make a local copy of the whole thing,
428# or die "socketpair: $!"; 571 # otherwise perl prematurely frees the stuff :/
429 pipe my $fh1, my $fh2 572 # TODO: investigate and fix (likely this will be rather laborious)
430 or die "pipe: $!";
431 573
432 if (my $pid = fork) { 574 my @res = Coro::Util::fork_eval {
433 close $fh2;
434
435 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
436 warn "pst<$res>" unless $res =~ /^pst/;
437 $res = Coro::Storable::thaw $res;
438
439 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
440
441 Carp::confess $$res unless "ARRAY" eq ref $res;
442
443 return wantarray ? @$res : $res->[-1];
444 } else {
445 reset_signals; 575 reset_signals;
446 local $SIG{__WARN__}; 576 &$cb
447 local $SIG{__DIE__}; 577 }, @args;
448 # just in case, this hack effectively disables event
449 # in the child. cleaner and slower would be canceling all watchers,
450 # but this works for the time being.
451 local $Coro::idle;
452 $Coro::current->prio (Coro::PRIO_MAX);
453 578
454 eval { 579 wantarray ? @res : $res[-1]
455 close $fh1; 580}
456 581
457 my @res = eval { $cb->(@args) }; 582=item $coin = coin_from_name $name
458 583
459 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 584=cut
460 close $fh2;
461 };
462 585
463 warn $@ if $@; 586our %coin_alias = (
464 _exit 0; 587 "silver" => "silvercoin",
465 } 588 "silvercoin" => "silvercoin",
589 "silvercoins" => "silvercoin",
590 "gold" => "goldcoin",
591 "goldcoin" => "goldcoin",
592 "goldcoins" => "goldcoin",
593 "platinum" => "platinacoin",
594 "platinumcoin" => "platinacoin",
595 "platinumcoins" => "platinacoin",
596 "platina" => "platinacoin",
597 "platinacoin" => "platinacoin",
598 "platinacoins" => "platinacoin",
599 "royalty" => "royalty",
600 "royalties" => "royalty",
601);
602
603sub coin_from_name($) {
604 $coin_alias{$_[0]}
605 ? cf::arch::find $coin_alias{$_[0]}
606 : undef
466} 607}
467 608
468=item $value = cf::db_get $family => $key 609=item $value = cf::db_get $family => $key
469 610
470Returns a single value from the environment database. 611Returns a single value from the environment database.
… …
472=item cf::db_put $family => $key => $value 613=item cf::db_put $family => $key => $value
473 614
474Stores the given C<$value> in the family. It can currently store binary 615Stores the given C<$value> in the family. It can currently store binary
475data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 616data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
476 617
618=item $db = cf::db_table "name"
619
620Create and/or open a new database table. The string must not be "db" and must be unique
621within each server.
622
477=cut 623=cut
624
625sub db_table($) {
626 my ($name) = @_;
627 my $db = BDB::db_create $DB_ENV;
628
629 eval {
630 $db->set_flags (BDB::CHKSUM);
631
632 utf8::encode $name;
633 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
634 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
635 cf::cleanup "db_open(db): $!" if $!;
636 };
637 cf::cleanup "db_open(db): $@" if $@;
638
639 $db
640}
478 641
479our $DB; 642our $DB;
480 643
481sub db_init { 644sub db_init {
482 unless ($DB) {
483 $DB = BDB::db_create $DB_ENV;
484
485 cf::sync_job { 645 cf::sync_job {
486 eval { 646 $DB ||= db_table "db";
487 $DB->set_flags (BDB::CHKSUM);
488
489 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
490 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
491 cf::cleanup "db_open(db): $!" if $!;
492 };
493 cf::cleanup "db_open(db): $@" if $@;
494 };
495 } 647 };
496} 648}
497 649
498sub db_get($$) { 650sub db_get($$) {
499 my $key = "$_[0]/$_[1]"; 651 my $key = "$_[0]/$_[1]";
500 652
… …
550 if (1) { 702 if (1) {
551 $md5 = 703 $md5 =
552 join "\x00", 704 join "\x00",
553 $processversion, 705 $processversion,
554 map { 706 map {
555 Coro::cede; 707 cf::cede_to_tick;
556 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 708 ($src->[$_], Digest::MD5::md5_hex $data[$_])
557 } 0.. $#$src; 709 } 0.. $#$src;
558 710
559 711
560 my $dbmd5 = db_get cache => "$id/md5"; 712 my $dbmd5 = db_get cache => "$id/md5";
… …
598 750
599############################################################################# 751#############################################################################
600 752
601=head2 ATTACHABLE OBJECTS 753=head2 ATTACHABLE OBJECTS
602 754
603Many objects in crossfire are so-called attachable objects. That means you can 755Many objects in deliantra are so-called attachable objects. That means you can
604attach callbacks/event handlers (a collection of which is called an "attachment") 756attach callbacks/event handlers (a collection of which is called an "attachment")
605to it. All such attachable objects support the following methods. 757to it. All such attachable objects support the following methods.
606 758
607In the following description, CLASS can be any of C<global>, C<object> 759In the following description, CLASS can be any of C<global>, C<object>
608C<player>, C<client> or C<map> (i.e. the attachable objects in 760C<player>, C<client> or C<map> (i.e. the attachable objects in
609Crossfire TRT). 761Deliantra).
610 762
611=over 4 763=over 4
612 764
613=item $attachable->attach ($attachment, key => $value...) 765=item $attachable->attach ($attachment, key => $value...)
614 766
… …
658=item cf::CLASS::attachment $name, ... 810=item cf::CLASS::attachment $name, ...
659 811
660Register an attachment by C<$name> through which attachable objects of the 812Register an attachment by C<$name> through which attachable objects of the
661given CLASS can refer to this attachment. 813given CLASS can refer to this attachment.
662 814
663Some classes such as crossfire maps and objects can specify attachments 815Some classes such as deliantra maps and objects can specify attachments
664that are attached at load/instantiate time, thus the need for a name. 816that are attached at load/instantiate time, thus the need for a name.
665 817
666These calls expect any number of the following handler/hook descriptions: 818These calls expect any number of the following handler/hook descriptions:
667 819
668=over 4 820=over 4
… …
866 "; 1018 ";
867 die if $@; 1019 die if $@;
868} 1020}
869 1021
870our $override; 1022our $override;
871our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1023our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
872 1024
873sub override { 1025sub override {
874 $override = 1; 1026 $override = 1;
875 @invoke_results = (); 1027 @INVOKE_RESULTS = (@_);
876} 1028}
877 1029
878sub do_invoke { 1030sub do_invoke {
879 my $event = shift; 1031 my $event = shift;
880 my $callbacks = shift; 1032 my $callbacks = shift;
881 1033
882 @invoke_results = (); 1034 @INVOKE_RESULTS = ();
883 1035
884 local $override; 1036 local $override;
885 1037
886 for (@$callbacks) { 1038 for (@$callbacks) {
887 eval { &{$_->[1]} }; 1039 eval { &{$_->[1]} };
… …
896 } 1048 }
897 1049
898 0 1050 0
899} 1051}
900 1052
901=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1053=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
902 1054
903=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
904 1056
905Generate an object-specific event with the given arguments. 1057Generate an object-specific event with the given arguments.
906 1058
907This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1059This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
908removed in future versions), and there is no public API to access override 1060removed in future versions), and there is no public API to access override
909results (if you must, access C<@cf::invoke_results> directly). 1061results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910 1062
911=back 1063=back
912 1064
913=cut 1065=cut
914 1066
915############################################################################# 1067#############################################################################
916# object support 1068# object support
1069
1070sub _object_equal($$);
1071sub _object_equal($$) {
1072 my ($a, $b) = @_;
1073
1074 return 0 unless (ref $a) eq (ref $b);
1075
1076 if ("HASH" eq ref $a) {
1077 my @ka = keys %$a;
1078 my @kb = keys %$b;
1079
1080 return 0 if @ka != @kb;
1081
1082 for (0 .. $#ka) {
1083 return 0 unless $ka[$_] eq $kb[$_];
1084 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1085 }
1086
1087 } elsif ("ARRAY" eq ref $a) {
1088
1089 return 0 if @$a != @$b;
1090
1091 for (0 .. $#$a) {
1092 return 0 unless _object_equal $a->[$_], $b->[$_];
1093 }
1094
1095 } elsif ($a ne $b) {
1096 return 0;
1097 }
1098
1099 1
1100}
1101
1102our $SLOW_MERGES;#d#
1103sub _can_merge {
1104 my ($ob1, $ob2) = @_;
1105
1106 ++$SLOW_MERGES;#d#
1107
1108 # we do the slow way here
1109 return _object_equal $ob1, $ob2
1110}
917 1111
918sub reattach { 1112sub reattach {
919 # basically do the same as instantiate, without calling instantiate 1113 # basically do the same as instantiate, without calling instantiate
920 my ($obj) = @_; 1114 my ($obj) = @_;
921 1115
1116 # no longer needed after getting rid of delete_package?
922 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1117 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
923 1118
924 my $registry = $obj->registry; 1119 my $registry = $obj->registry;
925 1120
926 @$registry = (); 1121 @$registry = ();
927 1122
… …
942cf::attachable->attach ( 1137cf::attachable->attach (
943 prio => -1000000, 1138 prio => -1000000,
944 on_instantiate => sub { 1139 on_instantiate => sub {
945 my ($obj, $data) = @_; 1140 my ($obj, $data) = @_;
946 1141
947 $data = from_json $data; 1142 $data = decode_json $data;
948 1143
949 for (@$data) { 1144 for (@$data) {
950 my ($name, $args) = @$_; 1145 my ($name, $args) = @$_;
951 1146
952 $obj->attach ($name, %{$args || {} }); 1147 $obj->attach ($name, %{$args || {} });
… …
968sub object_freezer_save { 1163sub object_freezer_save {
969 my ($filename, $rdata, $objs) = @_; 1164 my ($filename, $rdata, $objs) = @_;
970 1165
971 sync_job { 1166 sync_job {
972 if (length $$rdata) { 1167 if (length $$rdata) {
1168 utf8::decode (my $decname = $filename);
973 warn sprintf "saving %s (%d,%d)\n", 1169 warn sprintf "saving %s (%d,%d)\n",
974 $filename, length $$rdata, scalar @$objs; 1170 $decname, length $$rdata, scalar @$objs;
975 1171
976 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
977 chmod SAVE_MODE, $fh; 1173 aio_chmod $fh, SAVE_MODE;
978 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
979 aio_fsync $fh if $cf::USE_FSYNC; 1175 aio_fsync $fh if $cf::USE_FSYNC;
980 close $fh; 1176 aio_close $fh;
981 1177
982 if (@$objs) { 1178 if (@$objs) {
983 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1179 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
984 chmod SAVE_MODE, $fh; 1180 aio_chmod $fh, SAVE_MODE;
985 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
986 aio_write $fh, 0, (length $data), $data, 0; 1182 aio_write $fh, 0, (length $data), $data, 0;
987 aio_fsync $fh if $cf::USE_FSYNC; 1183 aio_fsync $fh if $cf::USE_FSYNC;
988 close $fh; 1184 aio_close $fh;
989 aio_rename "$filename.pst~", "$filename.pst"; 1185 aio_rename "$filename.pst~", "$filename.pst";
990 } 1186 }
991 } else { 1187 } else {
992 aio_unlink "$filename.pst"; 1188 aio_unlink "$filename.pst";
993 } 1189 }
994 1190
995 aio_rename "$filename~", $filename; 1191 aio_rename "$filename~", $filename;
1192
1193 $filename =~ s%/[^/]+$%%;
1194 aio_pathsync $filename;
996 } else { 1195 } else {
997 warn "FATAL: $filename~: $!\n"; 1196 warn "FATAL: $filename~: $!\n";
998 } 1197 }
999 } else { 1198 } else {
1000 aio_unlink $filename; 1199 aio_unlink $filename;
1001 aio_unlink "$filename.pst"; 1200 aio_unlink "$filename.pst";
1002 } 1201 }
1003 } 1202 };
1004} 1203}
1005 1204
1006sub object_freezer_as_string { 1205sub object_freezer_as_string {
1007 my ($rdata, $objs) = @_; 1206 my ($rdata, $objs) = @_;
1008 1207
… …
1020 or return; 1219 or return;
1021 1220
1022 unless (aio_stat "$filename.pst") { 1221 unless (aio_stat "$filename.pst") {
1023 (aio_load "$filename.pst", $av) >= 0 1222 (aio_load "$filename.pst", $av) >= 0
1024 or return; 1223 or return;
1224
1025 $av = eval { (Storable::thaw $av)->{objs} }; 1225 my $st = eval { Coro::Storable::thaw $av };
1226 $av = $st->{objs};
1026 } 1227 }
1027 1228
1229 utf8::decode (my $decname = $filename);
1028 warn sprintf "loading %s (%d)\n", 1230 warn sprintf "loading %s (%d,%d)\n",
1029 $filename, length $data, scalar @{$av || []}; 1231 $decname, length $data, scalar @{$av || []};
1232
1030 return ($data, $av); 1233 ($data, $av)
1031} 1234}
1032 1235
1033=head2 COMMAND CALLBACKS 1236=head2 COMMAND CALLBACKS
1034 1237
1035=over 4 1238=over 4
… …
1108 my ($pl, $buf) = @_; 1311 my ($pl, $buf) = @_;
1109 1312
1110 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1313 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111 1314
1112 if (ref $msg) { 1315 if (ref $msg) {
1316 my ($type, $reply, @payload) =
1317 "ARRAY" eq ref $msg
1318 ? @$msg
1319 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1320
1321 my @reply;
1322
1113 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1323 if (my $cb = $EXTCMD{$type}) {
1114 if (my %reply = $cb->($pl, $msg)) { 1324 @reply = $cb->($pl, @payload);
1115 $pl->ext_reply ($msg->{msgid}, %reply);
1116 }
1117 } 1325 }
1326
1327 $pl->ext_reply ($reply, @reply)
1328 if $reply;
1329
1118 } else { 1330 } else {
1119 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1331 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120 } 1332 }
1121 1333
1122 cf::override; 1334 cf::override;
… …
1149 1361
1150 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1362 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1151 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1363 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1152 1364
1153 $ext{source} = 1365 $ext{source} =
1154 "package $pkg; use strict; use utf8;\n" 1366 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1155 . "#line 1 \"$path\"\n{\n" 1367 . "#line 1 \"$path\"\n{\n"
1156 . $source 1368 . $source
1157 . "\n};\n1"; 1369 . "\n};\n1";
1158 1370
1159 $todo{$base} = \%ext; 1371 $todo{$base} = \%ext;
… …
1175 my $msg = $@ ? "$v->{path}: $@\n" 1387 my $msg = $@ ? "$v->{path}: $@\n"
1176 : "$v->{base}: extension inactive.\n"; 1388 : "$v->{base}: extension inactive.\n";
1177 1389
1178 if (exists $v->{meta}{mandatory}) { 1390 if (exists $v->{meta}{mandatory}) {
1179 warn $msg; 1391 warn $msg;
1180 warn "mandatory extension failed to load, exiting.\n"; 1392 cf::cleanup "mandatory extension failed to load, exiting.";
1181 exit 1;
1182 } 1393 }
1183 1394
1184 warn $msg; 1395 warn $msg;
1185 } 1396 }
1186 1397
… …
1200 1411
1201=back 1412=back
1202 1413
1203=head2 CORE EXTENSIONS 1414=head2 CORE EXTENSIONS
1204 1415
1205Functions and methods that extend core crossfire objects. 1416Functions and methods that extend core deliantra objects.
1206 1417
1207=cut 1418=cut
1208 1419
1209package cf::player; 1420package cf::player;
1210 1421
1211use Coro::AIO; 1422use Coro::AIO;
1212 1423
1213=head3 cf::player 1424=head3 cf::player
1214 1425
1215=over 4 1426=over 4
1427
1428=item cf::player::num_playing
1429
1430Returns the official number of playing players, as per the Crossfire metaserver rules.
1431
1432=cut
1433
1434sub num_playing {
1435 scalar grep
1436 $_->ob->map
1437 && !$_->hidden
1438 && !$_->ob->flag (cf::FLAG_WIZ),
1439 cf::player::list
1440}
1216 1441
1217=item cf::player::find $login 1442=item cf::player::find $login
1218 1443
1219Returns the given player object, loading it if necessary (might block). 1444Returns the given player object, loading it if necessary (might block).
1220 1445
… …
1239 1464
1240sub exists($) { 1465sub exists($) {
1241 my ($login) = @_; 1466 my ($login) = @_;
1242 1467
1243 $cf::PLAYER{$login} 1468 $cf::PLAYER{$login}
1244 or cf::sync_job { !aio_stat path $login } 1469 or !aio_stat path $login
1245} 1470}
1246 1471
1247sub find($) { 1472sub find($) {
1248 return $cf::PLAYER{$_[0]} || do { 1473 return $cf::PLAYER{$_[0]} || do {
1249 my $login = $_[0]; 1474 my $login = $_[0];
… …
1256 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1481 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1257 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1482 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1258 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1483 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1259 aio_unlink +(playerdir $login) . "/$login.pl"; 1484 aio_unlink +(playerdir $login) . "/$login.pl";
1260 1485
1261 my $pl = load_pl path $login 1486 my $f = new_from_file cf::object::thawer path $login
1262 or return; 1487 or return;
1488
1489 my $pl = cf::player::load_pl $f
1490 or return;
1491
1492 local $cf::PLAYER_LOADING{$login} = $pl;
1493 $f->resolve_delayed_derefs;
1263 $cf::PLAYER{$login} = $pl 1494 $cf::PLAYER{$login} = $pl
1264 } 1495 }
1265 } 1496 }
1266} 1497}
1267 1498
… …
1276 return if $pl->{deny_save}; 1507 return if $pl->{deny_save};
1277 1508
1278 aio_mkdir playerdir $pl, 0770; 1509 aio_mkdir playerdir $pl, 0770;
1279 $pl->{last_save} = $cf::RUNTIME; 1510 $pl->{last_save} = $cf::RUNTIME;
1280 1511
1512 cf::get_slot 0.01;
1513
1281 $pl->save_pl ($path); 1514 $pl->save_pl ($path);
1282 Coro::cede; 1515 cf::cede_to_tick;
1283} 1516}
1284 1517
1285sub new($) { 1518sub new($) {
1286 my ($login) = @_; 1519 my ($login) = @_;
1287 1520
… …
1293 $cf::PLAYER{$login} = $self; 1526 $cf::PLAYER{$login} = $self;
1294 1527
1295 $self 1528 $self
1296} 1529}
1297 1530
1531=item $player->send_msg ($channel, $msg, $color, [extra...])
1532
1533=cut
1534
1535sub send_msg {
1536 my $ns = shift->ns
1537 or return;
1538 $ns->send_msg (@_);
1539}
1540
1298=item $pl->quit_character 1541=item $pl->quit_character
1299 1542
1300Nukes the player without looking back. If logged in, the connection will 1543Nukes the player without looking back. If logged in, the connection will
1301be destroyed. May block for a long time. 1544be destroyed. May block for a long time.
1302 1545
… …
1306 my ($pl) = @_; 1549 my ($pl) = @_;
1307 1550
1308 my $name = $pl->ob->name; 1551 my $name = $pl->ob->name;
1309 1552
1310 $pl->{deny_save} = 1; 1553 $pl->{deny_save} = 1;
1311 $pl->password ("*"); # this should lock out the player until we nuked the dir 1554 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1312 1555
1313 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1556 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1314 $pl->deactivate; 1557 $pl->deactivate;
1558 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1559 $pl->ob->check_score;
1315 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1560 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1316 $pl->ns->destroy if $pl->ns; 1561 $pl->ns->destroy if $pl->ns;
1317 1562
1318 my $path = playerdir $pl; 1563 my $path = playerdir $pl;
1319 my $temp = "$path~$cf::RUNTIME~deleting~"; 1564 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1355 or return []; 1600 or return [];
1356 1601
1357 my @logins; 1602 my @logins;
1358 1603
1359 for my $login (@$dirs) { 1604 for my $login (@$dirs) {
1605 my $path = path $login;
1606
1607 # a .pst is a dead give-away for a valid player
1608 # if no pst file found, open and chekc for blocked users
1609 if (aio_stat "$path.pst") {
1360 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1610 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1361 aio_read $fh, 0, 512, my $buf, 0 or next; 1611 aio_read $fh, 0, 512, my $buf, 0 or next;
1362 $buf !~ /^password -------------$/m or next; # official not-valid tag 1612 $buf !~ /^password -------------$/m or next; # official not-valid tag
1613 }
1363 1614
1364 utf8::decode $login; 1615 utf8::decode $login;
1365 push @logins, $login; 1616 push @logins, $login;
1366 } 1617 }
1367 1618
… …
1394 } 1645 }
1395 1646
1396 \@paths 1647 \@paths
1397} 1648}
1398 1649
1399=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1650=item $protocol_xml = $player->expand_cfpod ($cfpod)
1400 1651
1401Expand crossfire pod fragments into protocol xml. 1652Expand deliantra pod fragments into protocol xml.
1402 1653
1403=cut
1404
1405sub expand_cfpod {
1406 ((my $self), (local $_)) = @_;
1407
1408 # escape & and <
1409 s/&/&amp;/g;
1410 s/(?<![BIUGH])</&lt;/g;
1411
1412 # this is buggy, it needs to properly take care of nested <'s
1413
1414 1 while
1415 # replace B<>, I<>, U<> etc.
1416 s/B<([^\>]*)>/<b>$1<\/b>/
1417 || s/I<([^\>]*)>/<i>$1<\/i>/
1418 || s/U<([^\>]*)>/<u>$1<\/u>/
1419 # replace G<male|female> tags
1420 || s{G<([^>|]*)\|([^>]*)>}{
1421 $self->gender ? $2 : $1
1422 }ge
1423 # replace H<hint text>
1424 || s{H<([^\>]*)>}
1425 {
1426 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1427 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1428 "")
1429 [$self->{hintmode}]
1430 }ge;
1431
1432 # create single paragraphs (very hackish)
1433 s/(?<=\S)\n(?=\w)/ /g;
1434
1435 # compress some whitespace
1436 s/\s+\n/\n/g; # ws line-ends
1437 s/\n\n+/\n/g; # double lines
1438 s/^\n+//; # beginning lines
1439 s/\n+$//; # ending lines
1440
1441 $_
1442}
1443
1444sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode}
1447}
1448
1449=item $player->ext_reply ($msgid, %msg) 1654=item $player->ext_reply ($msgid, @msg)
1450 1655
1451Sends an ext reply to the player. 1656Sends an ext reply to the player.
1452 1657
1453=cut 1658=cut
1454 1659
1455sub ext_reply($$%) { 1660sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1661 my ($self, $id, @msg) = @_;
1457 1662
1458 $msg{msgid} = $id; 1663 $self->ns->ext_reply ($id, @msg)
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460} 1664}
1461 1665
1462=item $player->ext_event ($type, %msg) 1666=item $player->ext_msg ($type, @msg)
1463 1667
1464Sends an ext event to the client. 1668Sends an ext event to the client.
1465 1669
1466=cut 1670=cut
1467 1671
1468sub ext_event($$%) { 1672sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1673 my ($self, $type, @msg) = @_;
1470 1674
1471 $self->ns->ext_event ($type, %msg); 1675 $self->ns->ext_msg ($type, @msg);
1472} 1676}
1473 1677
1474=head3 cf::region 1678=head3 cf::region
1475 1679
1476=over 4 1680=over 4
… …
1520our $MAX_RESET = 3600; 1724our $MAX_RESET = 3600;
1521our $DEFAULT_RESET = 3000; 1725our $DEFAULT_RESET = 3000;
1522 1726
1523sub generate_random_map { 1727sub generate_random_map {
1524 my ($self, $rmp) = @_; 1728 my ($self, $rmp) = @_;
1729
1730 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1731
1525 # mit "rum" bekleckern, nicht 1732 # mit "rum" bekleckern, nicht
1526 $self->_create_random_map ( 1733 $self->_create_random_map (
1527 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1528 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1529 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1651 1858
1652# the temporary/swap location 1859# the temporary/swap location
1653sub save_path { 1860sub save_path {
1654 my ($self) = @_; 1861 my ($self) = @_;
1655 1862
1656 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1657 "$TMPDIR/$path.map" 1864 "$TMPDIR/$path.map"
1658} 1865}
1659 1866
1660# the unique path, undef == no special unique path 1867# the unique path, undef == no special unique path
1661sub uniq_path { 1868sub uniq_path {
1662 my ($self) = @_; 1869 my ($self) = @_;
1663 1870
1664 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1665 "$UNIQUEDIR/$path" 1872 "$UNIQUEDIR/$path"
1666} 1873}
1667 1874
1668# and all this just because we cannot iterate over 1875# and all this just because we cannot iterate over
1669# all maps in C++... 1876# all maps in C++...
… …
1692 1899
1693sub load_header_from($) { 1900sub load_header_from($) {
1694 my ($self, $path) = @_; 1901 my ($self, $path) = @_;
1695 1902
1696 utf8::encode $path; 1903 utf8::encode $path;
1697 #aio_open $path, O_RDONLY, 0 1904 my $f = new_from_file cf::object::thawer $path
1698 # or return;
1699
1700 $self->_load_header ($path)
1701 or return; 1905 or return;
1906
1907 $self->_load_header ($f)
1908 or return;
1909
1910 local $MAP_LOADING{$self->{path}} = $self;
1911 $f->resolve_delayed_derefs;
1702 1912
1703 $self->{load_path} = $path; 1913 $self->{load_path} = $path;
1704 1914
1705 1 1915 1
1706} 1916}
… …
1760sub find { 1970sub find {
1761 my ($path, $origin) = @_; 1971 my ($path, $origin) = @_;
1762 1972
1763 $path = normalise $path, $origin && $origin->path; 1973 $path = normalise $path, $origin && $origin->path;
1764 1974
1975 cf::lock_wait "map_data:$path";#d#remove
1765 cf::lock_wait "map_find:$path"; 1976 cf::lock_wait "map_find:$path";
1766 1977
1767 $cf::MAP{$path} || do { 1978 $cf::MAP{$path} || do {
1979 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1768 my $guard = cf::lock_acquire "map_find:$path"; 1980 my $guard2 = cf::lock_acquire "map_find:$path";
1981
1769 my $map = new_from_path cf::map $path 1982 my $map = new_from_path cf::map $path
1770 or return; 1983 or return;
1771 1984
1772 $map->{last_save} = $cf::RUNTIME; 1985 $map->{last_save} = $cf::RUNTIME;
1773 1986
… …
1775 or return; 1988 or return;
1776 1989
1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778 # doing this can freeze the server in a sync job, obviously 1991 # doing this can freeze the server in a sync job, obviously
1779 #$cf::WAIT_FOR_TICK->wait; 1992 #$cf::WAIT_FOR_TICK->wait;
1993 undef $guard2;
1994 undef $guard1;
1780 $map->reset; 1995 $map->reset;
1781 undef $guard;
1782 return find $path; 1996 return find $path;
1783 } 1997 }
1784 1998
1785 $cf::MAP{$path} = $map 1999 $cf::MAP{$path} = $map
1786 } 2000 }
… …
1795 local $self->{deny_reset} = 1; # loading can take a long time 2009 local $self->{deny_reset} = 1; # loading can take a long time
1796 2010
1797 my $path = $self->{path}; 2011 my $path = $self->{path};
1798 2012
1799 { 2013 {
1800 my $guard = cf::lock_acquire "map_load:$path"; 2014 my $guard = cf::lock_acquire "map_data:$path";
1801 2015
2016 return unless $self->valid;
1802 return if $self->in_memory != cf::MAP_SWAPPED; 2017 return unless $self->in_memory == cf::MAP_SWAPPED;
1803 2018
1804 $self->in_memory (cf::MAP_LOADING); 2019 $self->in_memory (cf::MAP_LOADING);
1805 2020
1806 $self->alloc; 2021 $self->alloc;
1807 2022
1808 $self->pre_load; 2023 $self->pre_load;
1809 Coro::cede; 2024 cf::cede_to_tick;
1810 2025
2026 my $f = new_from_file cf::object::thawer $self->{load_path};
2027 $f->skip_block;
1811 $self->_load_objects ($self->{load_path}, 1) 2028 $self->_load_objects ($f)
1812 or return; 2029 or return;
1813 2030
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2031 $self->post_load_original
1815 if delete $self->{load_original}; 2032 if delete $self->{load_original};
1816 2033
1817 if (my $uniq = $self->uniq_path) { 2034 if (my $uniq = $self->uniq_path) {
1818 utf8::encode $uniq; 2035 utf8::encode $uniq;
1819 if (aio_open $uniq, O_RDONLY, 0) { 2036 unless (aio_stat $uniq) {
2037 if (my $f = new_from_file cf::object::thawer $uniq) {
1820 $self->clear_unique_items; 2038 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0); 2039 $self->_load_objects ($f);
2040 $f->resolve_delayed_derefs;
2041 }
1822 } 2042 }
1823 } 2043 }
1824 2044
1825 Coro::cede; 2045 $f->resolve_delayed_derefs;
2046
2047 cf::cede_to_tick;
1826 # now do the right thing for maps 2048 # now do the right thing for maps
1827 $self->link_multipart_objects; 2049 $self->link_multipart_objects;
1828 $self->difficulty ($self->estimate_difficulty) 2050 $self->difficulty ($self->estimate_difficulty)
1829 unless $self->difficulty; 2051 unless $self->difficulty;
1830 Coro::cede; 2052 cf::cede_to_tick;
1831 2053
1832 unless ($self->{deny_activate}) { 2054 unless ($self->{deny_activate}) {
1833 $self->decay_objects; 2055 $self->decay_objects;
1834 $self->fix_auto_apply; 2056 $self->fix_auto_apply;
1835 $self->update_buttons; 2057 $self->update_buttons;
1836 Coro::cede; 2058 cf::cede_to_tick;
1837 $self->set_darkness_map; 2059 $self->set_darkness_map;
1838 Coro::cede; 2060 cf::cede_to_tick;
1839 $self->activate; 2061 $self->activate;
1840 } 2062 }
1841 2063
2064 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME);
2066
1842 $self->in_memory (cf::MAP_IN_MEMORY); 2067 $self->in_memory (cf::MAP_ACTIVE);
1843 } 2068 }
1844 2069
1845 $self->post_load; 2070 $self->post_load;
1846} 2071}
1847 2072
… …
1856 2081
1857 $self 2082 $self
1858} 2083}
1859 2084
1860# find and load all maps in the 3x3 area around a map 2085# find and load all maps in the 3x3 area around a map
1861sub load_diag { 2086sub load_neighbours {
1862 my ($map) = @_; 2087 my ($map) = @_;
1863 2088
1864 my @diag; # diagonal neighbours 2089 my @neigh; # diagonal neighbours
1865 2090
1866 for (0 .. 3) { 2091 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_) 2092 my $neigh = $map->tile_path ($_)
1868 or next; 2093 or next;
1869 $neigh = find $neigh, $map 2094 $neigh = find $neigh, $map
1870 or next; 2095 or next;
1871 $neigh->load; 2096 $neigh->load;
1872 2097
2098 push @neigh,
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2099 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2100 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 } 2101 }
1876 2102
1877 for (@diag) { 2103 for (grep defined $_->[0], @neigh) {
2104 my ($path, $origin) = @$_;
1878 my $neigh = find @$_ 2105 my $neigh = find $path, $origin
1879 or next; 2106 or next;
1880 $neigh->load; 2107 $neigh->load;
1881 } 2108 }
1882} 2109}
1883 2110
… …
1888} 2115}
1889 2116
1890sub do_load_sync { 2117sub do_load_sync {
1891 my ($map) = @_; 2118 my ($map) = @_;
1892 2119
2120 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2121 if $Coro::current == $Coro::main;
2122
1893 cf::sync_job { $map->load }; 2123 cf::sync_job { $map->load };
1894} 2124}
1895 2125
1896our %MAP_PREFETCH; 2126our %MAP_PREFETCH;
1897our $MAP_PREFETCHER = undef; 2127our $MAP_PREFETCHER = undef;
1898 2128
1899sub find_async { 2129sub find_async {
1900 my ($path, $origin) = @_; 2130 my ($path, $origin, $load) = @_;
1901 2131
1902 $path = normalise $path, $origin && $origin->{path}; 2132 $path = normalise $path, $origin && $origin->{path};
1903 2133
1904 if (my $map = $cf::MAP{$path}) { 2134 if (my $map = $cf::MAP{$path}) {
1905 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2135 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1906 } 2136 }
1907 2137
1908 undef $MAP_PREFETCH{$path}; 2138 $MAP_PREFETCH{$path} |= $load;
2139
1909 $MAP_PREFETCHER ||= cf::async { 2140 $MAP_PREFETCHER ||= cf::async {
2141 $Coro::current->{desc} = "map prefetcher";
2142
1910 while (%MAP_PREFETCH) { 2143 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 2144 while (my ($k, $v) = each %MAP_PREFETCH) {
1912 if (my $map = find $path) { 2145 if (my $map = find $k) {
1913 $map->load; 2146 $map->load if $v;
1914 } 2147 }
1915 2148
1916 delete $MAP_PREFETCH{$path}; 2149 delete $MAP_PREFETCH{$k};
1917 } 2150 }
1918 } 2151 }
1919 undef $MAP_PREFETCHER; 2152 undef $MAP_PREFETCHER;
1920 }; 2153 };
1921 $MAP_PREFETCHER->prio (6); 2154 $MAP_PREFETCHER->prio (6);
… …
1924} 2157}
1925 2158
1926sub save { 2159sub save {
1927 my ($self) = @_; 2160 my ($self) = @_;
1928 2161
1929 my $lock = cf::lock_acquire "map_data:" . $self->path; 2162 my $lock = cf::lock_acquire "map_data:$self->{path}";
1930 2163
1931 $self->{last_save} = $cf::RUNTIME; 2164 $self->{last_save} = $cf::RUNTIME;
1932 2165
1933 return unless $self->dirty; 2166 return unless $self->dirty;
1934 2167
… …
1940 return if $self->{deny_save}; 2173 return if $self->{deny_save};
1941 2174
1942 local $self->{last_access} = $self->last_access;#d# 2175 local $self->{last_access} = $self->last_access;#d#
1943 2176
1944 cf::async { 2177 cf::async {
2178 $Coro::current->{desc} = "map player save";
1945 $_->contr->save for $self->players; 2179 $_->contr->save for $self->players;
1946 }; 2180 };
2181
2182 cf::get_slot 0.02;
1947 2183
1948 if ($uniq) { 2184 if ($uniq) {
1949 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2185 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1950 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2186 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1951 } else { 2187 } else {
… …
1957 my ($self) = @_; 2193 my ($self) = @_;
1958 2194
1959 # save first because save cedes 2195 # save first because save cedes
1960 $self->save; 2196 $self->save;
1961 2197
1962 my $lock = cf::lock_acquire "map_data:" . $self->path; 2198 my $lock = cf::lock_acquire "map_data:$self->{path}";
1963 2199
1964 return if $self->players; 2200 return if $self->players;
1965 return if $self->in_memory != cf::MAP_IN_MEMORY; 2201 return if $self->in_memory != cf::MAP_ACTIVE;
1966 return if $self->{deny_save}; 2202 return if $self->{deny_save};
1967 2203
2204 $self->in_memory (cf::MAP_SWAPPED);
2205
2206 $self->deactivate;
2207 $_->clear_links_to ($self) for values %cf::MAP;
1968 $self->clear; 2208 $self->clear;
1969 $self->in_memory (cf::MAP_SWAPPED);
1970} 2209}
1971 2210
1972sub reset_at { 2211sub reset_at {
1973 my ($self) = @_; 2212 my ($self) = @_;
1974 2213
… …
2006 if $uniq; 2245 if $uniq;
2007 } 2246 }
2008 2247
2009 delete $cf::MAP{$self->path}; 2248 delete $cf::MAP{$self->path};
2010 2249
2250 $self->deactivate;
2251 $_->clear_links_to ($self) for values %cf::MAP;
2011 $self->clear; 2252 $self->clear;
2012
2013 $_->clear_links_to ($self) for values %cf::MAP;
2014 2253
2015 $self->unlink_save; 2254 $self->unlink_save;
2016 $self->destroy; 2255 $self->destroy;
2017} 2256}
2018 2257
2019my $nuke_counter = "aaaa"; 2258my $nuke_counter = "aaaa";
2020 2259
2021sub nuke { 2260sub nuke {
2022 my ($self) = @_; 2261 my ($self) = @_;
2023 2262
2263 {
2264 my $lock = cf::lock_acquire "map_data:$self->{path}";
2265
2024 delete $cf::MAP{$self->path}; 2266 delete $cf::MAP{$self->path};
2025 2267
2026 $self->unlink_save; 2268 $self->unlink_save;
2027 2269
2028 bless $self, "cf::map"; 2270 bless $self, "cf::map";
2029 delete $self->{deny_reset}; 2271 delete $self->{deny_reset};
2030 $self->{deny_save} = 1; 2272 $self->{deny_save} = 1;
2031 $self->reset_timeout (1); 2273 $self->reset_timeout (1);
2032 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2274 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033 2275
2034 $cf::MAP{$self->path} = $self; 2276 $cf::MAP{$self->path} = $self;
2277 }
2035 2278
2036 $self->reset; # polite request, might not happen 2279 $self->reset; # polite request, might not happen
2037} 2280}
2038 2281
2039=item $maps = cf::map::tmp_maps 2282=item $maps = cf::map::tmp_maps
… …
2081 2324
2082sub unique_maps() { 2325sub unique_maps() {
2083 [ 2326 [
2084 map { 2327 map {
2085 utf8::decode $_; 2328 utf8::decode $_;
2086 /\.map$/ 2329 s/\.map$//; # TODO future compatibility hack
2330 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2331 ? ()
2087 ? normalise $_ 2332 : normalise $_
2088 : ()
2089 } @{ aio_readdir $UNIQUEDIR or [] } 2333 } @{ aio_readdir $UNIQUEDIR or [] }
2090 ] 2334 ]
2091} 2335}
2092 2336
2093package cf;
2094
2095=back 2337=back
2096 2338
2097=head3 cf::object 2339=head3 cf::object
2098 2340
2099=cut 2341=cut
… …
2102 2344
2103=over 4 2345=over 4
2104 2346
2105=item $ob->inv_recursive 2347=item $ob->inv_recursive
2106 2348
2107Returns the inventory of the object _and_ their inventories, recursively. 2349Returns the inventory of the object I<and> their inventories, recursively,
2350but I<not> the object itself.
2108 2351
2109=cut 2352=cut
2110 2353
2111sub inv_recursive_; 2354sub inv_recursive_;
2112sub inv_recursive_ { 2355sub inv_recursive_ {
… …
2115 2358
2116sub inv_recursive { 2359sub inv_recursive {
2117 inv_recursive_ inv $_[0] 2360 inv_recursive_ inv $_[0]
2118} 2361}
2119 2362
2363=item $ref = $ob->ref
2364
2365Creates and returns a persistent reference to an object that can be stored as a string.
2366
2367=item $ob = cf::object::deref ($refstring)
2368
2369returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2370even if the object actually exists. May block.
2371
2372=cut
2373
2374sub deref {
2375 my ($ref) = @_;
2376
2377 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2378 my ($uuid, $name) = ($1, $2);
2379 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2380 or return;
2381 $pl->ob->uuid eq $uuid
2382 or return;
2383
2384 $pl->ob
2385 } else {
2386 warn "$ref: cannot resolve object reference\n";
2387 undef
2388 }
2389}
2390
2120package cf; 2391package cf;
2121 2392
2122=back 2393=back
2123 2394
2124=head3 cf::object::player 2395=head3 cf::object::player
… …
2130Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2401Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2131can be C<undef>. Does the right thing when the player is currently in a 2402can be C<undef>. Does the right thing when the player is currently in a
2132dialogue with the given NPC character. 2403dialogue with the given NPC character.
2133 2404
2134=cut 2405=cut
2406
2407our $SAY_CHANNEL = {
2408 id => "say",
2409 title => "Map",
2410 reply => "say ",
2411 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2412};
2413
2414our $CHAT_CHANNEL = {
2415 id => "chat",
2416 title => "Chat",
2417 reply => "chat ",
2418 tooltip => "Player chat and shouts, global to the server.",
2419};
2135 2420
2136# rough implementation of a future "reply" method that works 2421# rough implementation of a future "reply" method that works
2137# with dialog boxes. 2422# with dialog boxes.
2138#TODO: the first argument must go, split into a $npc->reply_to ( method 2423#TODO: the first argument must go, split into a $npc->reply_to ( method
2139sub cf::object::player::reply($$$;$) { 2424sub cf::object::player::reply($$$;$) {
… …
2146 2431
2147 } else { 2432 } else {
2148 my $pl = $self->contr; 2433 my $pl = $self->contr;
2149 2434
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2435 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2436 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2437 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158 2438
2159 } else { 2439 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2440 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2441 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2162 } 2442 }
2163 } 2443 }
2444}
2445
2446=item $object->send_msg ($channel, $msg, $color, [extra...])
2447
2448=cut
2449
2450sub cf::object::send_msg {
2451 my $pl = shift->contr
2452 or return;
2453 $pl->send_msg (@_);
2164} 2454}
2165 2455
2166=item $player_object->may ("access") 2456=item $player_object->may ("access")
2167 2457
2168Returns wether the given player is authorized to access resource "access" 2458Returns wether the given player is authorized to access resource "access"
… …
2181 2471
2182=item $player_object->enter_link 2472=item $player_object->enter_link
2183 2473
2184Freezes the player and moves him/her to a special map (C<{link}>). 2474Freezes the player and moves him/her to a special map (C<{link}>).
2185 2475
2186The player should be reasonably safe there for short amounts of time. You 2476The player should be reasonably safe there for short amounts of time (e.g.
2187I<MUST> call C<leave_link> as soon as possible, though. 2477for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2478though, as the palyer cannot control the character while it is on the link
2479map.
2188 2480
2189Will never block. 2481Will never block.
2190 2482
2191=item $player_object->leave_link ($map, $x, $y) 2483=item $player_object->leave_link ($map, $x, $y)
2192 2484
… …
2247 # use -1 or undef as default coordinates, not 0, 0 2539 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2540 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2541 if $x <=0 && $y <= 0;
2250 2542
2251 $map->load; 2543 $map->load;
2252 $map->load_diag; 2544 $map->load_neighbours;
2253 2545
2254 return unless $self->contr->active; 2546 return unless $self->contr->active;
2547 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2255 $self->activate_recursive; 2548 $self->activate_recursive;
2256 2549
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2550 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258 $self->enter_map ($map, $x, $y); 2551 $self->enter_map ($map, $x, $y);
2259} 2552}
… …
2264her, loading and preparing them map, calling the provided $check callback 2557her, loading and preparing them map, calling the provided $check callback
2265that has to return the map if sucecssful, and then unfreezes the player on 2558that has to return the map if sucecssful, and then unfreezes the player on
2266the new (success) or old (failed) map position. In either case, $done will 2559the new (success) or old (failed) map position. In either case, $done will
2267be called at the end of this process. 2560be called at the end of this process.
2268 2561
2562Note that $check will be called with a potentially non-loaded map, so if
2563it needs a loaded map it has to call C<< ->load >>.
2564
2269=cut 2565=cut
2270 2566
2271our $GOTOGEN; 2567our $GOTOGEN;
2272 2568
2273sub cf::object::player::goto { 2569sub cf::object::player::goto {
… …
2277 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2573 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2278 2574
2279 $self->enter_link; 2575 $self->enter_link;
2280 2576
2281 (async { 2577 (async {
2578 $Coro::current->{desc} = "player::goto $path $x $y";
2579
2580 # *tag paths override both path and x|y
2581 if ($path =~ /^\*(.*)$/) {
2582 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2583 my $ob = $obs[rand @obs];
2584
2585 # see if we actually can go there
2586 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2587 $ob = $obs[rand @obs];
2588 } else {
2589 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2590 }
2591 # else put us there anyways for now #d#
2592
2593 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2594 } else {
2595 ($path, $x, $y) = (undef, undef, undef);
2596 }
2597 }
2598
2282 my $map = eval { 2599 my $map = eval {
2283 my $map = cf::map::find $path; 2600 my $map = defined $path ? cf::map::find $path : undef;
2284 2601
2285 if ($map) { 2602 if ($map) {
2286 $map = $map->customise_for ($self); 2603 $map = $map->customise_for ($self);
2287 $map = $check->($map) if $check && $map; 2604 $map = $check->($map) if $check && $map;
2288 } else { 2605 } else {
2289 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2606 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2290 } 2607 }
2291 2608
2292 $map 2609 $map
2293 }; 2610 };
2294 2611
… …
2330} 2647}
2331 2648
2332sub prepare_random_map { 2649sub prepare_random_map {
2333 my ($exit) = @_; 2650 my ($exit) = @_;
2334 2651
2335 my $guard = cf::lock_acquire "exit_prepare:$exit";
2336
2337 # all this does is basically replace the /! path by 2652 # all this does is basically replace the /! path by
2338 # a new random map path (?random/...) with a seed 2653 # a new random map path (?random/...) with a seed
2339 # that depends on the exit object 2654 # that depends on the exit object
2340 2655
2341 my $rmp = parse_random_map_params $exit->msg; 2656 my $rmp = parse_random_map_params $exit->msg;
… …
2343 if ($exit->map) { 2658 if ($exit->map) {
2344 $rmp->{region} = $exit->region->name; 2659 $rmp->{region} = $exit->region->name;
2345 $rmp->{origin_map} = $exit->map->path; 2660 $rmp->{origin_map} = $exit->map->path;
2346 $rmp->{origin_x} = $exit->x; 2661 $rmp->{origin_x} = $exit->x;
2347 $rmp->{origin_y} = $exit->y; 2662 $rmp->{origin_y} = $exit->y;
2663
2664 $exit->map->touch;
2348 } 2665 }
2349 2666
2350 $rmp->{random_seed} ||= $exit->random_seed; 2667 $rmp->{random_seed} ||= $exit->random_seed;
2351 2668
2352 my $data = cf::to_json $rmp; 2669 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2353 my $md5 = Digest::MD5::md5_hex $data; 2670 my $md5 = Digest::MD5::md5_hex $data;
2354 my $meta = "$RANDOMDIR/$md5.meta"; 2671 my $meta = "$RANDOMDIR/$md5.meta";
2355 2672
2356 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2673 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2357 aio_write $fh, 0, (length $data), $data, 0; 2674 aio_write $fh, 0, (length $data), $data, 0;
2358 undef $fh; 2675 undef $fh;
2359 aio_rename "$meta~", $meta; 2676 aio_rename "$meta~", $meta;
2360 2677
2678 my $slaying = "?random/$md5";
2679
2680 if ($exit->valid) {
2361 $exit->slaying ("?random/$md5"); 2681 $exit->slaying ("?random/$md5");
2362 $exit->msg (undef); 2682 $exit->msg (undef);
2683 }
2363 } 2684 }
2364} 2685}
2365 2686
2366sub cf::object::player::enter_exit { 2687sub cf::object::player::enter_exit {
2367 my ($self, $exit) = @_; 2688 my ($self, $exit) = @_;
2368 2689
2369 return unless $self->type == cf::PLAYER; 2690 return unless $self->type == cf::PLAYER;
2370 2691
2371 if ($exit->slaying eq "/!") {
2372 #TODO: this should de-fi-ni-te-ly not be a sync-job
2373 # the problem is that $exit might not survive long enough
2374 # so it needs to be done right now, right here
2375 cf::sync_job { prepare_random_map $exit };
2376 }
2377
2378 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2379 my $hp = $exit->stats->hp;
2380 my $sp = $exit->stats->sp;
2381
2382 $self->enter_link; 2692 $self->enter_link;
2383 2693
2384 # if exit is damned, update players death & WoR home-position
2385 $self->contr->savebed ($slaying, $hp, $sp)
2386 if $exit->flag (FLAG_DAMNED);
2387
2388 (async { 2694 (async {
2389 $self->deactivate_recursive; # just to be sure 2695 $Coro::current->{desc} = "enter_exit";
2696
2390 unless (eval { 2697 unless (eval {
2698 $self->deactivate_recursive; # just to be sure
2699
2700 # random map handling
2701 {
2702 my $guard = cf::lock_acquire "exit_prepare:$exit";
2703
2704 prepare_random_map $exit
2705 if $exit->slaying eq "/!";
2706 }
2707
2708 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2709 my $x = $exit->stats->hp;
2710 my $y = $exit->stats->sp;
2711
2391 $self->goto ($slaying, $hp, $sp); 2712 $self->goto ($map, $x, $y);
2392 2713
2714 # if exit is damned, update players death & WoR home-position
2715 $self->contr->savebed ($map, $x, $y)
2716 if $exit->flag (cf::FLAG_DAMNED);
2717
2393 1; 2718 1
2394 }) { 2719 }) {
2395 $self->message ("Something went wrong deep within the crossfire server. " 2720 $self->message ("Something went wrong deep within the deliantra server. "
2396 . "I'll try to bring you back to the map you were before. " 2721 . "I'll try to bring you back to the map you were before. "
2397 . "Please report this to the dungeon master!", 2722 . "Please report this to the dungeon master!",
2398 cf::NDI_UNIQUE | cf::NDI_RED); 2723 cf::NDI_UNIQUE | cf::NDI_RED);
2399 2724
2400 warn "ERROR in enter_exit: $@"; 2725 warn "ERROR in enter_exit: $@";
… …
2419 2744
2420 utf8::encode $text; 2745 utf8::encode $text;
2421 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2746 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2422} 2747}
2423 2748
2424=item $client->send_msg ($color, $type, $msg, [extra...]) 2749=item $client->send_msg ($channel, $msg, $color, [extra...])
2425 2750
2426Send a drawinfo or msg packet to the client, formatting the msg for the 2751Send a drawinfo or msg packet to the client, formatting the msg for the
2427client if neccessary. C<$type> should be a string identifying the type of 2752client if neccessary. C<$type> should be a string identifying the type of
2428the message, with C<log> being the default. If C<$color> is negative, suppress 2753the message, with C<log> being the default. If C<$color> is negative, suppress
2429the message unless the client supports the msg packet. 2754the message unless the client supports the msg packet.
2430 2755
2431=cut 2756=cut
2432 2757
2758# non-persistent channels (usually the info channel)
2759our %CHANNEL = (
2760 "c/identify" => {
2761 id => "infobox",
2762 title => "Identify",
2763 reply => undef,
2764 tooltip => "Items recently identified",
2765 },
2766 "c/examine" => {
2767 id => "infobox",
2768 title => "Examine",
2769 reply => undef,
2770 tooltip => "Signs and other items you examined",
2771 },
2772 "c/book" => {
2773 id => "infobox",
2774 title => "Book",
2775 reply => undef,
2776 tooltip => "The contents of a note or book",
2777 },
2778 "c/lookat" => {
2779 id => "infobox",
2780 title => "Look",
2781 reply => undef,
2782 tooltip => "What you saw there",
2783 },
2784 "c/who" => {
2785 id => "infobox",
2786 title => "Players",
2787 reply => undef,
2788 tooltip => "Shows players who are currently online",
2789 },
2790 "c/body" => {
2791 id => "infobox",
2792 title => "Body Parts",
2793 reply => undef,
2794 tooltip => "Shows which body parts you posess and are available",
2795 },
2796 "c/skills" => {
2797 id => "infobox",
2798 title => "Skills",
2799 reply => undef,
2800 tooltip => "Shows your experience per skill and item power",
2801 },
2802 "c/uptime" => {
2803 id => "infobox",
2804 title => "Uptime",
2805 reply => undef,
2806 tooltip => "How long the server has been running since last restart",
2807 },
2808 "c/mapinfo" => {
2809 id => "infobox",
2810 title => "Map Info",
2811 reply => undef,
2812 tooltip => "Information related to the maps",
2813 },
2814 "c/party" => {
2815 id => "party",
2816 title => "Party",
2817 reply => "gsay ",
2818 tooltip => "Messages and chat related to your party",
2819 },
2820);
2821
2433sub cf::client::send_msg { 2822sub cf::client::send_msg {
2434 my ($self, $color, $type, $msg, @extra) = @_; 2823 my ($self, $channel, $msg, $color, @extra) = @_;
2435 2824
2436 $msg = $self->pl->expand_cfpod ($msg); 2825 $msg = $self->pl->expand_cfpod ($msg)
2826 unless $color & cf::NDI_VERBATIM;
2827
2828 $color &= cf::NDI_CLIENT_MASK; # just in case...
2829
2830 # check predefined channels, for the benefit of C
2831 if ($CHANNEL{$channel}) {
2832 $channel = $CHANNEL{$channel};
2833
2834 $self->ext_msg (channel_info => $channel)
2835 if $self->can_msg;
2836
2837 $channel = $channel->{id};
2838
2839 } elsif (ref $channel) {
2840 # send meta info to client, if not yet sent
2841 unless (exists $self->{channel}{$channel->{id}}) {
2842 $self->{channel}{$channel->{id}} = $channel;
2843 $self->ext_msg (channel_info => $channel)
2844 if $self->can_msg;
2845 }
2846
2847 $channel = $channel->{id};
2848 }
2437 2849
2438 return unless @extra || length $msg; 2850 return unless @extra || length $msg;
2439 2851
2440 if ($self->can_msg) { 2852 if ($self->can_msg) {
2441 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2853 # default colour, mask it out
2854 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2855 if $color & cf::NDI_DEF;
2856
2857 my $pkt = "msg "
2858 . $self->{json_coder}->encode (
2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2860 );
2861
2862 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf};
2865
2866 # split very large packets
2867 if (8192 < length $pkt and $self->{can_lzf}) {
2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2869 $pkt = "frag";
2870 }
2871
2872 $self->send_packet ($pkt);
2442 } else { 2873 } else {
2443 # replace some tags by gcfclient-compatible ones
2444 for ($msg) {
2445 1 while
2446 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2447 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2448 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2449 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2450 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2451 }
2452
2453 if ($color >= 0) { 2874 if ($color >= 0) {
2875 # replace some tags by gcfclient-compatible ones
2876 for ($msg) {
2877 1 while
2878 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2879 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2880 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2881 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2882 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2883 }
2884
2885 $color &= cf::NDI_COLOR_MASK;
2886
2887 utf8::encode $msg;
2888
2454 if (0 && $msg =~ /\[/) { 2889 if (0 && $msg =~ /\[/) {
2890 # COMMAND/INFO
2455 $self->send_packet ("drawextinfo $color 4 0 $msg") 2891 $self->send_packet ("drawextinfo $color 10 8 $msg")
2456 } else { 2892 } else {
2457 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2893 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2458 $self->send_packet ("drawinfo $color $msg") 2894 $self->send_packet ("drawinfo $color $msg")
2459 } 2895 }
2460 } 2896 }
2461 } 2897 }
2462} 2898}
2463 2899
2464=item $client->ext_event ($type, %msg) 2900=item $client->ext_msg ($type, @msg)
2465 2901
2466Sends an ext event to the client. 2902Sends an ext event to the client.
2467 2903
2468=cut 2904=cut
2469 2905
2470sub cf::client::ext_event($$%) { 2906sub cf::client::ext_msg($$@) {
2471 my ($self, $type, %msg) = @_; 2907 my ($self, $type, @msg) = @_;
2472 2908
2473 return unless $self->extcmd; 2909 if ($self->extcmd == 2) {
2474 2910 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2911 } elsif ($self->extcmd == 1) { # TODO: remove
2475 $msg{msgtype} = "event_$type"; 2912 push @msg, msgtype => "event_$type";
2476 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2913 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2914 }
2915}
2916
2917=item $client->ext_reply ($msgid, @msg)
2918
2919Sends an ext reply to the client.
2920
2921=cut
2922
2923sub cf::client::ext_reply($$@) {
2924 my ($self, $id, @msg) = @_;
2925
2926 if ($self->extcmd == 2) {
2927 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2928 } elsif ($self->extcmd == 1) {
2929 #TODO: version 1, remove
2930 unshift @msg, msgtype => "reply", msgid => $id;
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 }
2477} 2933}
2478 2934
2479=item $success = $client->query ($flags, "text", \&cb) 2935=item $success = $client->query ($flags, "text", \&cb)
2480 2936
2481Queues a query to the client, calling the given callback with 2937Queues a query to the client, calling the given callback with
… …
2536 my ($ns, $buf) = @_; 2992 my ($ns, $buf) = @_;
2537 2993
2538 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2994 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2539 2995
2540 if (ref $msg) { 2996 if (ref $msg) {
2997 my ($type, $reply, @payload) =
2998 "ARRAY" eq ref $msg
2999 ? @$msg
3000 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3001
3002 my @reply;
3003
2541 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3004 if (my $cb = $EXTICMD{$type}) {
2542 if (my %reply = $cb->($ns, $msg)) { 3005 @reply = $cb->($ns, @payload);
2543 $reply{msgid} = $msg->{msgid};
2544 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2545 }
2546 } 3006 }
3007
3008 $ns->ext_reply ($reply, @reply)
3009 if $reply;
3010
2547 } else { 3011 } else {
2548 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3012 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2549 } 3013 }
2550 3014
2551 cf::override; 3015 cf::override;
… …
2598our $safe = new Safe "safe"; 3062our $safe = new Safe "safe";
2599our $safe_hole = new Safe::Hole; 3063our $safe_hole = new Safe::Hole;
2600 3064
2601$SIG{FPE} = 'IGNORE'; 3065$SIG{FPE} = 'IGNORE';
2602 3066
2603$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3067$safe->permit_only (Opcode::opset qw(
3068 :base_core :base_mem :base_orig :base_math
3069 grepstart grepwhile mapstart mapwhile
3070 sort time
3071));
2604 3072
2605# here we export the classes and methods available to script code 3073# here we export the classes and methods available to script code
2606 3074
2607=pod 3075=pod
2608 3076
2609The following functions and methods are available within a safe environment: 3077The following functions and methods are available within a safe environment:
2610 3078
2611 cf::object 3079 cf::object
2612 contr pay_amount pay_player map x y force_find force_add 3080 contr pay_amount pay_player map x y force_find force_add destroy
2613 insert remove 3081 insert remove name archname title slaying race decrease split
2614 3082
2615 cf::object::player 3083 cf::object::player
2616 player 3084 player
2617 3085
2618 cf::player 3086 cf::player
… …
2623 3091
2624=cut 3092=cut
2625 3093
2626for ( 3094for (
2627 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3095 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2628 insert remove)], 3096 insert remove inv nrof name archname title slaying race
3097 decrease split destroy change_exp)],
2629 ["cf::object::player" => qw(player)], 3098 ["cf::object::player" => qw(player)],
2630 ["cf::player" => qw(peaceful)], 3099 ["cf::player" => qw(peaceful)],
2631 ["cf::map" => qw(trigger)], 3100 ["cf::map" => qw(trigger)],
2632) { 3101) {
2633 no strict 'refs'; 3102 no strict 'refs';
… …
2709# the server's init and main functions 3178# the server's init and main functions
2710 3179
2711sub load_facedata($) { 3180sub load_facedata($) {
2712 my ($path) = @_; 3181 my ($path) = @_;
2713 3182
3183 # HACK to clear player env face cache, we need some signal framework
3184 # for this (global event?)
3185 %ext::player_env::MUSIC_FACE_CACHE = ();
3186
3187 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3188
2714 warn "loading facedata from $path\n"; 3189 warn "loading facedata from $path\n";
2715 3190
2716 my $facedata; 3191 my $facedata;
2717 0 < aio_load $path, $facedata 3192 0 < aio_load $path, $facedata
2718 or die "$path: $!"; 3193 or die "$path: $!";
… …
2720 $facedata = Coro::Storable::thaw $facedata; 3195 $facedata = Coro::Storable::thaw $facedata;
2721 3196
2722 $facedata->{version} == 2 3197 $facedata->{version} == 2
2723 or cf::cleanup "$path: version mismatch, cannot proceed."; 3198 or cf::cleanup "$path: version mismatch, cannot proceed.";
2724 3199
3200 # patch in the exptable
3201 $facedata->{resource}{"res/exp_table"} = {
3202 type => FT_RSRC,
3203 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3204 };
3205 cf::cede_to_tick;
3206
2725 { 3207 {
2726 my $faces = $facedata->{faceinfo}; 3208 my $faces = $facedata->{faceinfo};
2727 3209
2728 while (my ($face, $info) = each %$faces) { 3210 while (my ($face, $info) = each %$faces) {
2729 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3211 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3212
2730 cf::face::set_visibility $idx, $info->{visibility}; 3213 cf::face::set_visibility $idx, $info->{visibility};
2731 cf::face::set_magicmap $idx, $info->{magicmap}; 3214 cf::face::set_magicmap $idx, $info->{magicmap};
2732 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3215 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2733 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3216 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2734 3217
2735 cf::cede_to_tick; 3218 cf::cede_to_tick;
2736 } 3219 }
2737 3220
2738 while (my ($face, $info) = each %$faces) { 3221 while (my ($face, $info) = each %$faces) {
2739 next unless $info->{smooth}; 3222 next unless $info->{smooth};
3223
2740 my $idx = cf::face::find $face 3224 my $idx = cf::face::find $face
2741 or next; 3225 or next;
3226
2742 if (my $smooth = cf::face::find $info->{smooth}) { 3227 if (my $smooth = cf::face::find $info->{smooth}) {
2743 cf::face::set_smooth $idx, $smooth; 3228 cf::face::set_smooth $idx, $smooth;
2744 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3229 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2745 } else { 3230 } else {
2746 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3231 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
2763 3248
2764 { 3249 {
2765 # TODO: for gcfclient pleasure, we should give resources 3250 # TODO: for gcfclient pleasure, we should give resources
2766 # that gcfclient doesn't grok a >10000 face index. 3251 # that gcfclient doesn't grok a >10000 face index.
2767 my $res = $facedata->{resource}; 3252 my $res = $facedata->{resource};
2768 my $enc = JSON::XS->new->utf8->canonical;
2769 3253
2770 while (my ($name, $info) = each %$res) { 3254 while (my ($name, $info) = each %$res) {
2771 my $meta = $enc->encode ({ 3255 if (defined $info->{type}) {
2772 name => $name,
2773 type => $info->{type},
2774 copyright => $info->{copyright}, #TODO#
2775 });
2776
2777 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3256 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3257 my $data;
2778 3258
2779 if ($name =~ /\.jpg$/) { 3259 if ($info->{type} & 1) {
2780 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3260 # prepend meta info
2781 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3261
3262 my $meta = $enc->encode ({
3263 name => $name,
3264 %{ $info->{meta} || {} },
3265 });
3266
3267 $data = pack "(w/a*)*", $meta, $info->{data};
3268 } else {
3269 $data = $info->{data};
3270 }
3271
3272 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3273 cf::face::set_type $idx, $info->{type};
2782 } else { 3274 } else {
2783 my $data = pack "(w/a*)*", $meta, $info->{data}; 3275 $RESOURCE{$name} = $info;
2784 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2785
2786 cf::face::set_type $idx, 1;
2787 cf::face::set_data $idx, 0, $data, $chk;
2788 } 3276 }
2789 3277
2790 cf::cede_to_tick; 3278 cf::cede_to_tick;
2791 } 3279 }
2792 } 3280 }
2793 3281
3282 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3283
2794 1 3284 1
2795} 3285}
2796 3286
3287cf::global->attach (on_resource_update => sub {
3288 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3289 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3290
3291 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3292 my $sound = $soundconf->{compat}[$_]
3293 or next;
3294
3295 my $face = cf::face::find "sound/$sound->[1]";
3296 cf::sound::set $sound->[0] => $face;
3297 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3298 }
3299
3300 while (my ($k, $v) = each %{$soundconf->{event}}) {
3301 my $face = cf::face::find "sound/$v";
3302 cf::sound::set $k => $face;
3303 }
3304 }
3305});
3306
3307register_exticmd fx_want => sub {
3308 my ($ns, $want) = @_;
3309
3310 while (my ($k, $v) = each %$want) {
3311 $ns->fx_want ($k, $v);
3312 }
3313};
3314
3315sub load_resource_file($) {
3316 my $guard = lock_acquire "load_resource_file";
3317
3318 my $status = load_resource_file_ $_[0];
3319 get_slot 0.1, 100;
3320 cf::arch::commit_load;
3321
3322 $status
3323}
3324
2797sub reload_regions { 3325sub reload_regions {
3326 # HACK to clear player env face cache, we need some signal framework
3327 # for this (global event?)
3328 %ext::player_env::MUSIC_FACE_CACHE = ();
3329
2798 load_resource_file "$MAPDIR/regions" 3330 load_resource_file "$MAPDIR/regions"
2799 or die "unable to load regions file\n"; 3331 or die "unable to load regions file\n";
2800 3332
2801 for (cf::region::list) { 3333 for (cf::region::list) {
2802 $_->{match} = qr/$_->{match}/ 3334 $_->{match} = qr/$_->{match}/
… …
2810} 3342}
2811 3343
2812sub reload_archetypes { 3344sub reload_archetypes {
2813 load_resource_file "$DATADIR/archetypes" 3345 load_resource_file "$DATADIR/archetypes"
2814 or die "unable to load archetypes\n"; 3346 or die "unable to load archetypes\n";
2815 #d# NEED to laod twice to resolve forward references
2816 # this really needs to be done in an extra post-pass
2817 # (which needs to be synchronous, so solve it differently)
2818 load_resource_file "$DATADIR/archetypes"
2819 or die "unable to load archetypes\n";
2820} 3347}
2821 3348
2822sub reload_treasures { 3349sub reload_treasures {
2823 load_resource_file "$DATADIR/treasures" 3350 load_resource_file "$DATADIR/treasures"
2824 or die "unable to load treasurelists\n"; 3351 or die "unable to load treasurelists\n";
2825} 3352}
2826 3353
2827sub reload_resources { 3354sub reload_resources {
2828 warn "reloading resource files...\n"; 3355 warn "reloading resource files...\n";
2829 3356
3357 reload_facedata;
3358 reload_archetypes;
2830 reload_regions; 3359 reload_regions;
2831 reload_facedata;
2832 #reload_archetypes;#d#
2833 reload_archetypes;
2834 reload_treasures; 3360 reload_treasures;
2835 3361
2836 warn "finished reloading resource files\n"; 3362 warn "finished reloading resource files\n";
2837} 3363}
2838 3364
2839sub init { 3365sub reload_config {
2840 reload_resources;
2841}
2842
2843sub cfg_load {
2844 open my $fh, "<:utf8", "$CONFDIR/config" 3366 open my $fh, "<:utf8", "$CONFDIR/config"
2845 or return; 3367 or return;
2846 3368
2847 local $/; 3369 local $/;
2848 *CFG = YAML::Syck::Load <$fh>; 3370 *CFG = YAML::Load <$fh>;
2849 3371
2850 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2851 3373
2852 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3374 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2853 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3375 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2859 }; 3381 };
2860 warn $@ if $@; 3382 warn $@ if $@;
2861 } 3383 }
2862} 3384}
2863 3385
3386sub pidfile() {
3387 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3388 or die "$PIDFILE: $!";
3389 flock $fh, &Fcntl::LOCK_EX
3390 or die "$PIDFILE: flock: $!";
3391 $fh
3392}
3393
3394# make sure only one server instance is running at any one time
3395sub atomic {
3396 my $fh = pidfile;
3397
3398 my $pid = <$fh>;
3399 kill 9, $pid if $pid > 0;
3400
3401 seek $fh, 0, 0;
3402 print $fh $$;
3403}
3404
2864sub main { 3405sub main {
3406 cf::init_globals; # initialise logging
3407
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3410 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3411 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3412
3413 cf::init_experience;
3414 cf::init_anim;
3415 cf::init_attackmess;
3416 cf::init_dynamic;
3417 cf::init_block;
3418
3419 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3420
2865 # we must not ever block the main coroutine 3421 # we must not ever block the main coroutine
2866 local $Coro::idle = sub { 3422 local $Coro::idle = sub {
2867 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3423 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2868 (async { 3424 (async {
2869 Event::one_event; 3425 $Coro::current->{desc} = "IDLE BUG HANDLER";
3426 EV::loop EV::LOOP_ONESHOT;
2870 })->prio (Coro::PRIO_MAX); 3427 })->prio (Coro::PRIO_MAX);
2871 }; 3428 };
2872 3429
2873 cfg_load; 3430 evthread_start IO::AIO::poll_fileno;
3431
3432 cf::sync_job {
3433 reload_resources;
3434 reload_config;
2874 db_init; 3435 db_init;
3436
3437 cf::load_settings;
3438 cf::load_materials;
3439 cf::init_uuid;
3440 cf::init_signals;
3441 cf::init_commands;
3442 cf::init_skills;
3443
3444 cf::init_beforeplay;
3445
3446 atomic;
3447
2875 load_extensions; 3448 load_extensions;
2876 3449
2877 $TICK_WATCHER->start; 3450 utime time, time, $RUNTIMEFILE;
3451
3452 # no (long-running) fork's whatsoever before this point(!)
3453 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3454
3455 (pop @POST_INIT)->(0) while @POST_INIT;
3456 };
3457
2878 Event::loop; 3458 EV::loop;
2879} 3459}
2880 3460
2881############################################################################# 3461#############################################################################
2882# initialisation and cleanup 3462# initialisation and cleanup
2883 3463
2884# install some emergency cleanup handlers 3464# install some emergency cleanup handlers
2885BEGIN { 3465BEGIN {
3466 our %SIGWATCHER = ();
2886 for my $signal (qw(INT HUP TERM)) { 3467 for my $signal (qw(INT HUP TERM)) {
2887 Event->signal ( 3468 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2888 reentrant => 0,
2889 data => WF_AUTOCANCEL,
2890 signal => $signal,
2891 prio => 0,
2892 cb => sub {
2893 cf::cleanup "SIG$signal"; 3469 cf::cleanup "SIG$signal";
2894 },
2895 ); 3470 };
2896 } 3471 }
2897} 3472}
2898 3473
2899sub write_runtime { 3474sub write_runtime_sync {
2900 my $runtime = "$LOCALDIR/runtime";
2901
2902 # first touch the runtime file to show we are still running: 3475 # first touch the runtime file to show we are still running:
2903 # the fsync below can take a very very long time. 3476 # the fsync below can take a very very long time.
2904 3477
2905 IO::AIO::aio_utime $runtime, undef, undef; 3478 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2906 3479
2907 my $guard = cf::lock_acquire "write_runtime"; 3480 my $guard = cf::lock_acquire "write_runtime";
2908 3481
2909 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3482 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2910 or return; 3483 or return;
2911 3484
2912 my $value = $cf::RUNTIME + 90 + 10; 3485 my $value = $cf::RUNTIME + 90 + 10;
2913 # 10 is the runtime save interval, for a monotonic clock 3486 # 10 is the runtime save interval, for a monotonic clock
2914 # 60 allows for the watchdog to kill the server. 3487 # 60 allows for the watchdog to kill the server.
… …
2924 aio_utime $fh, undef, undef; 3497 aio_utime $fh, undef, undef;
2925 3498
2926 close $fh 3499 close $fh
2927 or return; 3500 or return;
2928 3501
2929 aio_rename "$runtime~", $runtime 3502 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2930 and return; 3503 and return;
2931 3504
2932 warn "runtime file written.\n"; 3505 warn "runtime file written.\n";
2933 3506
2934 1 3507 1
3508}
3509
3510our $uuid_lock;
3511our $uuid_skip;
3512
3513sub write_uuid_sync($) {
3514 $uuid_skip ||= $_[0];
3515
3516 return if $uuid_lock;
3517 local $uuid_lock = 1;
3518
3519 my $uuid = "$LOCALDIR/uuid";
3520
3521 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3522 or return;
3523
3524 my $value = uuid_seq uuid_cur;
3525
3526 unless ($value) {
3527 warn "cowardly refusing to write zero uuid value!\n";
3528 return;
3529 }
3530
3531 my $value = uuid_str $value + $uuid_skip;
3532 $uuid_skip = 0;
3533
3534 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3535 and return;
3536
3537 # always fsync - this file is important
3538 aio_fsync $fh
3539 and return;
3540
3541 close $fh
3542 or return;
3543
3544 aio_rename "$uuid~", $uuid
3545 and return;
3546
3547 warn "uuid file written ($value).\n";
3548
3549 1
3550
3551}
3552
3553sub write_uuid($$) {
3554 my ($skip, $sync) = @_;
3555
3556 $sync ? write_uuid_sync $skip
3557 : async { write_uuid_sync $skip };
2935} 3558}
2936 3559
2937sub emergency_save() { 3560sub emergency_save() {
2938 my $freeze_guard = cf::freeze_mainloop; 3561 my $freeze_guard = cf::freeze_mainloop;
2939 3562
… …
2945 # and maps saved/destroyed asynchronously. 3568 # and maps saved/destroyed asynchronously.
2946 warn "begin emergency player save\n"; 3569 warn "begin emergency player save\n";
2947 for my $login (keys %cf::PLAYER) { 3570 for my $login (keys %cf::PLAYER) {
2948 my $pl = $cf::PLAYER{$login} or next; 3571 my $pl = $cf::PLAYER{$login} or next;
2949 $pl->valid or next; 3572 $pl->valid or next;
3573 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2950 $pl->save; 3574 $pl->save;
2951 } 3575 }
2952 warn "end emergency player save\n"; 3576 warn "end emergency player save\n";
2953 3577
2954 warn "begin emergency map save\n"; 3578 warn "begin emergency map save\n";
… …
2960 warn "end emergency map save\n"; 3584 warn "end emergency map save\n";
2961 3585
2962 warn "begin emergency database checkpoint\n"; 3586 warn "begin emergency database checkpoint\n";
2963 BDB::db_env_txn_checkpoint $DB_ENV; 3587 BDB::db_env_txn_checkpoint $DB_ENV;
2964 warn "end emergency database checkpoint\n"; 3588 warn "end emergency database checkpoint\n";
3589
3590 warn "begin write uuid\n";
3591 write_uuid_sync 1;
3592 warn "end write uuid\n";
2965 }; 3593 };
2966 3594
2967 warn "leave emergency perl save\n"; 3595 warn "leave emergency perl save\n";
2968} 3596}
2969 3597
2970sub post_cleanup { 3598sub post_cleanup {
2971 my ($make_core) = @_; 3599 my ($make_core) = @_;
2972 3600
2973 warn Carp::longmess "post_cleanup backtrace" 3601 warn Carp::longmess "post_cleanup backtrace"
2974 if $make_core; 3602 if $make_core;
3603
3604 my $fh = pidfile;
3605 unlink $PIDFILE if <$fh> == $$;
3606}
3607
3608# a safer delete_package, copied from Symbol
3609sub clear_package($) {
3610 my $pkg = shift;
3611
3612 # expand to full symbol table name if needed
3613 unless ($pkg =~ /^main::.*::$/) {
3614 $pkg = "main$pkg" if $pkg =~ /^::/;
3615 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3616 $pkg .= '::' unless $pkg =~ /::$/;
3617 }
3618
3619 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3620 my $stem_symtab = *{$stem}{HASH};
3621
3622 defined $stem_symtab and exists $stem_symtab->{$leaf}
3623 or return;
3624
3625 # clear all symbols
3626 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3627 for my $name (keys %$leaf_symtab) {
3628 _gv_clear *{"$pkg$name"};
3629# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3630 }
3631 warn "cleared package $pkg\n";#d#
2975} 3632}
2976 3633
2977sub do_reload_perl() { 3634sub do_reload_perl() {
2978 # can/must only be called in main 3635 # can/must only be called in main
2979 if ($Coro::current != $Coro::main) { 3636 if ($Coro::current != $Coro::main) {
2980 warn "can only reload from main coroutine"; 3637 warn "can only reload from main coroutine";
2981 return; 3638 return;
2982 } 3639 }
2983 3640
3641 return if $RELOAD++;
3642
3643 while ($RELOAD) {
2984 warn "reloading..."; 3644 warn "reloading...";
2985 3645
2986 warn "entering sync_job"; 3646 warn "entering sync_job";
2987 3647
2988 cf::sync_job { 3648 cf::sync_job {
2989 cf::write_runtime; # external watchdog should not bark 3649 cf::write_runtime_sync; # external watchdog should not bark
2990 cf::emergency_save; 3650 cf::emergency_save;
2991 cf::write_runtime; # external watchdog should not bark 3651 cf::write_runtime_sync; # external watchdog should not bark
2992 3652
2993 warn "syncing database to disk"; 3653 warn "syncing database to disk";
2994 BDB::db_env_txn_checkpoint $DB_ENV; 3654 BDB::db_env_txn_checkpoint $DB_ENV;
2995 3655
2996 # if anything goes wrong in here, we should simply crash as we already saved 3656 # if anything goes wrong in here, we should simply crash as we already saved
2997 3657
2998 warn "cancelling all WF_AUTOCANCEL watchers";
2999 for (Event::all_watchers) {
3000 $_->cancel if $_->data & WF_AUTOCANCEL;
3001 }
3002
3003 warn "flushing outstanding aio requests"; 3658 warn "flushing outstanding aio requests";
3004 for (;;) {
3005 BDB::flush;
3006 IO::AIO::flush;
3007 Coro::cede;
3008 last unless IO::AIO::nreqs || BDB::nreqs; 3659 while (IO::AIO::nreqs || BDB::nreqs) {
3009 warn "iterate..."; 3660 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3010 }
3011
3012 ++$RELOAD;
3013
3014 warn "cancelling all extension coros";
3015 $_->cancel for values %EXT_CORO;
3016 %EXT_CORO = ();
3017
3018 warn "removing commands";
3019 %COMMAND = ();
3020
3021 warn "removing ext/exti commands";
3022 %EXTCMD = ();
3023 %EXTICMD = ();
3024
3025 warn "unloading/nuking all extensions";
3026 for my $pkg (@EXTS) {
3027 warn "... unloading $pkg";
3028
3029 if (my $cb = $pkg->can ("unload")) {
3030 eval {
3031 $cb->($pkg);
3032 1
3033 } or warn "$pkg unloaded, but with errors: $@";
3034 } 3661 }
3035 3662
3036 warn "... nuking $pkg"; 3663 warn "cancelling all extension coros";
3037 Symbol::delete_package $pkg; 3664 $_->cancel for values %EXT_CORO;
3038 } 3665 %EXT_CORO = ();
3039 3666
3040 warn "unloading all perl modules loaded from $LIBDIR"; 3667 warn "removing commands";
3041 while (my ($k, $v) = each %INC) { 3668 %COMMAND = ();
3042 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3043 3669
3670 warn "removing ext/exti commands";
3671 %EXTCMD = ();
3672 %EXTICMD = ();
3673
3674 warn "unloading/nuking all extensions";
3675 for my $pkg (@EXTS) {
3044 warn "... unloading $k"; 3676 warn "... unloading $pkg";
3045 delete $INC{$k};
3046 3677
3047 $k =~ s/\.pm$//;
3048 $k =~ s/\//::/g;
3049
3050 if (my $cb = $k->can ("unload_module")) { 3678 if (my $cb = $pkg->can ("unload")) {
3679 eval {
3051 $cb->(); 3680 $cb->($pkg);
3681 1
3682 } or warn "$pkg unloaded, but with errors: $@";
3683 }
3684
3685 warn "... clearing $pkg";
3686 clear_package $pkg;
3052 } 3687 }
3053 3688
3054 Symbol::delete_package $k; 3689 warn "unloading all perl modules loaded from $LIBDIR";
3690 while (my ($k, $v) = each %INC) {
3691 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3692
3693 warn "... unloading $k";
3694 delete $INC{$k};
3695
3696 $k =~ s/\.pm$//;
3697 $k =~ s/\//::/g;
3698
3699 if (my $cb = $k->can ("unload_module")) {
3700 $cb->();
3701 }
3702
3703 clear_package $k;
3055 } 3704 }
3056 3705
3057 warn "getting rid of safe::, as good as possible"; 3706 warn "getting rid of safe::, as good as possible";
3058 Symbol::delete_package "safe::$_" 3707 clear_package "safe::$_"
3059 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3708 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3060 3709
3061 warn "unloading cf.pm \"a bit\""; 3710 warn "unloading cf.pm \"a bit\"";
3062 delete $INC{"cf.pm"}; 3711 delete $INC{"cf.pm"};
3063 delete $INC{"cf/pod.pm"}; 3712 delete $INC{"cf/pod.pm"};
3064 3713
3065 # don't, removes xs symbols, too, 3714 # don't, removes xs symbols, too,
3066 # and global variables created in xs 3715 # and global variables created in xs
3067 #Symbol::delete_package __PACKAGE__; 3716 #clear_package __PACKAGE__;
3068 3717
3069 warn "unload completed, starting to reload now"; 3718 warn "unload completed, starting to reload now";
3070 3719
3071 warn "reloading cf.pm"; 3720 warn "reloading cf.pm";
3072 require cf; 3721 require cf;
3073 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3722 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3074 3723
3075 warn "loading config and database again"; 3724 warn "loading config and database again";
3076 cf::cfg_load; 3725 cf::reload_config;
3077 3726
3078 warn "loading extensions"; 3727 warn "loading extensions";
3079 cf::load_extensions; 3728 cf::load_extensions;
3080 3729
3081 warn "reattaching attachments to objects/players"; 3730 warn "reattaching attachments to objects/players";
3082 _global_reattach; # objects, sockets 3731 _global_reattach; # objects, sockets
3083 warn "reattaching attachments to maps"; 3732 warn "reattaching attachments to maps";
3084 reattach $_ for values %MAP; 3733 reattach $_ for values %MAP;
3085 warn "reattaching attachments to players"; 3734 warn "reattaching attachments to players";
3086 reattach $_ for values %PLAYER; 3735 reattach $_ for values %PLAYER;
3087 3736
3737 warn "running post_load";
3738 (pop @POST_INIT)->(1) while @POST_INIT;
3739
3088 warn "leaving sync_job"; 3740 warn "leaving sync_job";
3089 3741
3090 1 3742 1
3091 } or do { 3743 } or do {
3092 warn $@; 3744 warn $@;
3093 warn "error while reloading, exiting."; 3745 cf::cleanup "error while reloading, exiting.";
3094 exit 1;
3095 }; 3746 };
3096 3747
3097 warn "reloaded"; 3748 warn "reloaded";
3749 --$RELOAD;
3750 }
3098}; 3751};
3099 3752
3100our $RELOAD_WATCHER; # used only during reload 3753our $RELOAD_WATCHER; # used only during reload
3101 3754
3102sub reload_perl() { 3755sub reload_perl() {
3103 # doing reload synchronously and two reloads happen back-to-back, 3756 # doing reload synchronously and two reloads happen back-to-back,
3104 # coro crashes during coro_state_free->destroy here. 3757 # coro crashes during coro_state_free->destroy here.
3105 3758
3106 $RELOAD_WATCHER ||= Event->timer ( 3759 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
3107 reentrant => 0,
3108 after => 0,
3109 data => WF_AUTOCANCEL,
3110 cb => sub {
3111 do_reload_perl; 3760 do_reload_perl;
3112 undef $RELOAD_WATCHER; 3761 undef $RELOAD_WATCHER;
3113 },
3114 ); 3762 };
3115} 3763}
3116 3764
3117register_command "reload" => sub { 3765register_command "reload" => sub {
3118 my ($who, $arg) = @_; 3766 my ($who, $arg) = @_;
3119 3767
3120 if ($who->flag (FLAG_WIZ)) { 3768 if ($who->flag (FLAG_WIZ)) {
3121 $who->message ("reloading server."); 3769 $who->message ("reloading server.");
3770 async {
3771 $Coro::current->{desc} = "perl_reload";
3122 async { reload_perl }; 3772 reload_perl;
3773 };
3123 } 3774 }
3124}; 3775};
3125 3776
3126unshift @INC, $LIBDIR; 3777unshift @INC, $LIBDIR;
3127 3778
… …
3129 3780
3130our @WAIT_FOR_TICK; 3781our @WAIT_FOR_TICK;
3131our @WAIT_FOR_TICK_BEGIN; 3782our @WAIT_FOR_TICK_BEGIN;
3132 3783
3133sub wait_for_tick { 3784sub wait_for_tick {
3134 return unless $TICK_WATCHER->is_active;
3135 return if $Coro::current == $Coro::main; 3785 return if tick_inhibit || $Coro::current == $Coro::main;
3136 3786
3137 my $signal = new Coro::Signal; 3787 my $signal = new Coro::Signal;
3138 push @WAIT_FOR_TICK, $signal; 3788 push @WAIT_FOR_TICK, $signal;
3139 $signal->wait; 3789 $signal->wait;
3140} 3790}
3141 3791
3142sub wait_for_tick_begin { 3792sub wait_for_tick_begin {
3143 return unless $TICK_WATCHER->is_active;
3144 return if $Coro::current == $Coro::main; 3793 return if tick_inhibit || $Coro::current == $Coro::main;
3145 3794
3146 my $signal = new Coro::Signal; 3795 my $signal = new Coro::Signal;
3147 push @WAIT_FOR_TICK_BEGIN, $signal; 3796 push @WAIT_FOR_TICK_BEGIN, $signal;
3148 $signal->wait; 3797 $signal->wait;
3149} 3798}
3150 3799
3151 my $min = 1e6;#d# 3800sub tick {
3152 my $avg = 10;
3153$TICK_WATCHER = Event->timer (
3154 reentrant => 0,
3155 parked => 1,
3156 prio => 0,
3157 at => $NEXT_TICK || $TICK,
3158 data => WF_AUTOCANCEL,
3159 cb => sub {
3160 if ($Coro::current != $Coro::main) { 3801 if ($Coro::current != $Coro::main) {
3161 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3802 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3162 unless ++$bug_warning > 10; 3803 unless ++$bug_warning > 10;
3163 return; 3804 return;
3164 } 3805 }
3165 3806
3166 $NOW = $tick_start = Event::time;
3167
3168 cf::server_tick; # one server iteration 3807 cf::server_tick; # one server iteration
3169 3808
3170 0 && sync_job {#d# 3809 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3171 for(1..10) { 3810 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3172 my $t = Event::time; 3811 Coro::async_pool {
3173 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3812 $Coro::current->{desc} = "runtime saver";
3174 or die; 3813 write_runtime_sync
3175 3814 or warn "ERROR: unable to write runtime file: $!";
3176 $map->width (50);
3177 $map->height (50);
3178 $map->alloc;
3179 $map->_load_objects ("/tmp/x.map", 1);
3180 my $t = Event::time - $t;
3181
3182 #next unless $t < 0.0013;#d#
3183 if ($t < $min) {
3184 $min = $t;
3185 }
3186 $avg = $avg * 0.99 + $t * 0.01;
3187 }
3188 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3189 exit 0;
3190 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3191 }; 3815 };
3816 }
3192 3817
3193 $RUNTIME += $TICK;
3194 $NEXT_TICK += $TICK;
3195
3196 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3197 $NEXT_RUNTIME_WRITE = $NOW + 10;
3198 Coro::async_pool {
3199 write_runtime
3200 or warn "ERROR: unable to write runtime file: $!";
3201 };
3202 }
3203
3204# my $AFTER = Event::time;
3205# warn $AFTER - $NOW;#d#
3206
3207 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3818 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3208 $sig->send; 3819 $sig->send;
3209 } 3820 }
3210 while (my $sig = shift @WAIT_FOR_TICK) { 3821 while (my $sig = shift @WAIT_FOR_TICK) {
3211 $sig->send; 3822 $sig->send;
3212 } 3823 }
3213 3824
3214 $NOW = Event::time; 3825 $LOAD = ($NOW - $TICK_START) / $TICK;
3215
3216 # if we are delayed by four ticks or more, skip them all
3217 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3218
3219 $TICK_WATCHER->at ($NEXT_TICK);
3220 $TICK_WATCHER->start;
3221
3222 $LOAD = ($NOW - $tick_start) / $TICK;
3223 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3826 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3224 3827
3225 _post_tick; 3828 if (0) {
3226 3829 if ($NEXT_TICK) {
3227 3830 my $jitter = $TICK_START - $NEXT_TICK;
3831 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3832 warn "jitter $JITTER\n";#d#
3833 }
3228 }, 3834 }
3229); 3835}
3230 3836
3231{ 3837{
3232 BDB::max_poll_time $TICK * 0.1; 3838 # configure BDB
3233 $BDB_POLL_WATCHER = Event->io ( 3839
3234 reentrant => 0,
3235 fd => BDB::poll_fileno,
3236 poll => 'r',
3237 prio => 0,
3238 data => WF_AUTOCANCEL,
3239 cb => \&BDB::poll_cb,
3240 );
3241 BDB::min_parallel 8; 3840 BDB::min_parallel 8;
3242 3841 BDB::max_poll_reqs $TICK * 0.1;
3243 BDB::set_sync_prepare { 3842 $AnyEvent::BDB::WATCHER->priority (1);
3244 my $status;
3245 my $current = $Coro::current;
3246 (
3247 sub {
3248 $status = $!;
3249 $current->ready; undef $current;
3250 },
3251 sub {
3252 Coro::schedule while defined $current;
3253 $! = $status;
3254 },
3255 )
3256 };
3257 3843
3258 unless ($DB_ENV) { 3844 unless ($DB_ENV) {
3259 $DB_ENV = BDB::db_env_create; 3845 $DB_ENV = BDB::db_env_create;
3846 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3847 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3848 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3849 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3850 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3260 3851
3261 cf::sync_job { 3852 cf::sync_job {
3262 eval { 3853 eval {
3263 BDB::db_env_open 3854 BDB::db_env_open
3264 $DB_ENV, 3855 $DB_ENV,
… …
3266 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3857 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3267 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3858 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3268 0666; 3859 0666;
3269 3860
3270 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3861 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3271
3272 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3273 $DB_ENV->set_lk_detect;
3274 }; 3862 };
3275 3863
3276 cf::cleanup "db_env_open(db): $@" if $@; 3864 cf::cleanup "db_env_open(db): $@" if $@;
3277 }; 3865 };
3278 } 3866 }
3867
3868 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3869 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3870 };
3871 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3872 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3873 };
3874 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3875 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3876 };
3279} 3877}
3280 3878
3281{ 3879{
3880 # configure IO::AIO
3881
3282 IO::AIO::min_parallel 8; 3882 IO::AIO::min_parallel 8;
3283
3284 undef $Coro::AIO::WATCHER;
3285 IO::AIO::max_poll_time $TICK * 0.1; 3883 IO::AIO::max_poll_time $TICK * 0.1;
3286 $AIO_POLL_WATCHER = Event->io ( 3884 undef $AnyEvent::AIO::WATCHER;
3287 reentrant => 0,
3288 data => WF_AUTOCANCEL,
3289 fd => IO::AIO::poll_fileno,
3290 poll => 'r',
3291 prio => 6,
3292 cb => \&IO::AIO::poll_cb,
3293 );
3294} 3885}
3295 3886
3296my $_log_backtrace; 3887my $_log_backtrace;
3297 3888
3298sub _log_backtrace { 3889sub _log_backtrace {
… …
3301 $msg =~ s/\n//; 3892 $msg =~ s/\n//;
3302 3893
3303 # limit the # of concurrent backtraces 3894 # limit the # of concurrent backtraces
3304 if ($_log_backtrace < 2) { 3895 if ($_log_backtrace < 2) {
3305 ++$_log_backtrace; 3896 ++$_log_backtrace;
3897 my $perl_bt = Carp::longmess $msg;
3306 async { 3898 async {
3899 $Coro::current->{desc} = "abt $msg";
3900
3307 my @bt = fork_call { 3901 my @bt = fork_call {
3308 @addr = map { sprintf "%x", $_ } @addr; 3902 @addr = map { sprintf "%x", $_ } @addr;
3309 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3903 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3310 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3904 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3311 or die "addr2line: $!"; 3905 or die "addr2line: $!";
… …
3319 } 3913 }
3320 3914
3321 @funcs 3915 @funcs
3322 }; 3916 };
3323 3917
3324 LOG llevInfo, "[ABT] $msg\n"; 3918 LOG llevInfo, "[ABT] $perl_bt\n";
3919 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3325 LOG llevInfo, "[ABT] $_\n" for @bt; 3920 LOG llevInfo, "[ABT] $_\n" for @bt;
3326 --$_log_backtrace; 3921 --$_log_backtrace;
3327 }; 3922 };
3328 } else { 3923 } else {
3329 LOG llevInfo, "[ABT] $msg\n"; 3924 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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