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.220 by root, Sat Feb 17 23:54:35 2007 UTC vs.
Revision 1.352 by root, Sun Sep 2 04:57:14 2007 UTC

3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
10use Event;
9use Opcode; 11use Opcode;
10use Safe; 12use Safe;
11use Safe::Hole; 13use Safe::Hole;
12 14
13use Coro 3.5 (); 15use Coro 3.64 ();
16use Coro::State;
17use Coro::Handle;
14use Coro::Event; 18use Coro::Event;
15use Coro::Timer; 19use Coro::Timer;
16use Coro::Signal; 20use Coro::Signal;
17use Coro::Semaphore; 21use Coro::Semaphore;
18use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
24use Coro::Util ();
19 25
26use JSON::XS ();
20use BDB (); 27use BDB ();
21use Data::Dumper; 28use Data::Dumper;
22use Digest::MD5; 29use Digest::MD5;
23use Fcntl; 30use Fcntl;
31use YAML::Syck ();
24use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
25use YAML::Syck ();
26use Time::HiRes; 33use Time::HiRes;
27use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
28 36
37# configure various modules to our taste
38#
39$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
29Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
30 42
31use Event; $Event::Eval = 1; # no idea why this is required, but it is 43$Event::Eval = 1; # no idea why this is required, but it is
32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 44
35# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
36$YAML::Syck::ImplicitUnicode = 1; 46$YAML::Syck::ImplicitUnicode = 1;
37 47
38$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
39 49
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51
40our %COMMAND = (); 52our %COMMAND = ();
41our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
42 54
43our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
44our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
45our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
46our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
47 60
61our $RELOAD; # number of reloads so far
48our @EVENT; 62our @EVENT;
49our $LIBDIR = datadir . "/ext";
50 63
51our $TICK = MAX_TIME * 1e-6; 64our $CONFDIR = confdir;
65our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db";
75
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
52our $TICK_WATCHER; 77our $TICK_WATCHER;
53our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
54our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
55our $NEXT_TICK; 80our $NEXT_TICK;
56our $NOW; 81our $NOW;
65our $RUNTIME; 90our $RUNTIME;
66 91
67our %PLAYER; # all users 92our %PLAYER; # all users
68our %MAP; # all maps 93our %MAP; # all maps
69our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
70our $RANDOM_MAPS = cf::localdir . "/random";
71our $BDB_ENV_DIR = cf::localdir . "/db";
72
73our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
74our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
75 95
76# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
77our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
78 98
99our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing
101our $tick_start; # for load detecting purposes
102
79binmode STDOUT; 103binmode STDOUT;
80binmode STDERR; 104binmode STDERR;
81 105
82# read virtual server time, if available 106# read virtual server time, if available
83unless ($RUNTIME || !-e cf::localdir . "/runtime") { 107unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
84 open my $fh, "<", cf::localdir . "/runtime" 108 open my $fh, "<", "$LOCALDIR/runtime"
85 or die "unable to read runtime file: $!"; 109 or die "unable to read runtime file: $!";
86 $RUNTIME = <$fh> + 0.; 110 $RUNTIME = <$fh> + 0.;
87} 111}
88 112
89mkdir cf::localdir; 113mkdir $_
90mkdir cf::localdir . "/" . cf::playerdir; 114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
91mkdir cf::localdir . "/" . cf::tmpdir;
92mkdir cf::localdir . "/" . cf::uniquedir;
93mkdir $RANDOM_MAPS;
94mkdir $BDB_ENV_DIR;
95 115
96our $EMERGENCY_POSITION; 116our $EMERGENCY_POSITION;
97 117
98sub cf::map::normalise; 118sub cf::map::normalise;
99 119
110=item $cf::RUNTIME 130=item $cf::RUNTIME
111 131
112The time this server has run, starts at 0 and is increased by $cf::TICK on 132The time this server has run, starts at 0 and is increased by $cf::TICK on
113every server tick. 133every server tick.
114 134
115=item $cf::LIBDIR 135=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
136$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
137$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
116 138
117The perl library directory, where extensions and cf-specific modules can 139Various directories - "/etc", read-only install directory, perl-library
118be found. It will be added to C<@INC> automatically. 140directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
141unique-items directory, player file directory, random maps directory and
142database environment.
119 143
120=item $cf::NOW 144=item $cf::NOW
121 145
122The time of the last (current) server tick. 146The time of the last (current) server tick.
123 147
124=item $cf::TICK 148=item $cf::TICK
125 149
126The interval between server ticks, in seconds. 150The interval between server ticks, in seconds.
151
152=item $cf::LOADAVG
153
154The current CPU load on the server (alpha-smoothed), as a value between 0
155(none) and 1 (overloaded), indicating how much time is spent on processing
156objects per tick. Healthy values are < 0.5.
157
158=item $cf::LOAD
159
160The raw value load value from the last tick.
127 161
128=item %cf::CFG 162=item %cf::CFG
129 163
130Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/crossfire/config>, or
131from wherever your confdir points to. 165from wherever your confdir points to.
132 166
133=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 167=item cf::wait_for_tick, cf::wait_for_tick_begin
134 168
135These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
136or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 170returns directly I<after> the tick processing (and consequently, can only wake one process
137processing has been done. Call C<< ->wait >> on them to maximise the 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
138window of cpu time available, or simply to synchronise to the server tick. 172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
139 178
140=back 179=back
141 180
142=cut 181=cut
143 182
144BEGIN { 183BEGIN {
145 *CORE::GLOBAL::warn = sub { 184 *CORE::GLOBAL::warn = sub {
146 my $msg = join "", @_; 185 my $msg = join "", @_;
147 utf8::encode $msg;
148 186
149 $msg .= "\n" 187 $msg .= "\n"
150 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
151 189
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191
192 utf8::encode $msg;
152 LOG llevError, $msg; 193 LOG llevError, $msg;
153 }; 194 };
154} 195}
155 196
156@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
157@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
158@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
159@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
160@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 201@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
202@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
161@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 203@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
162 204
163# we bless all objects into (empty) derived classes to force a method lookup 205# we bless all objects into (empty) derived classes to force a method lookup
164# within the Safe compartment. 206# within the Safe compartment.
165for my $pkg (qw( 207for my $pkg (qw(
166 cf::global cf::attachable 208 cf::global cf::attachable
174} 216}
175 217
176$Event::DIED = sub { 218$Event::DIED = sub {
177 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
178}; 220};
221
222#############################################################################
179 223
180=head2 UTILITY FUNCTIONS 224=head2 UTILITY FUNCTIONS
181 225
182=over 4 226=over 4
183 227
202 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
203 $d 247 $d
204 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
205} 249}
206 250
207use JSON::Syck (); # TODO# replace by JSON::PC once working
208
209=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
210 252
211Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
212 254
213=cut
214
215sub from_json($) {
216 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
217 JSON::Syck::Load $_[0]
218}
219
220=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
221 256
222Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
223 258
224=cut 259=cut
225 260
226sub to_json($) { 261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
227 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 262
228 JSON::Syck::Dump $_[0] 263sub to_json ($) { $json_coder->encode ($_[0]) }
229} 264sub from_json ($) { $json_coder->decode ($_[0]) }
230 265
231=item cf::lock_wait $string 266=item cf::lock_wait $string
232 267
233Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
234 269
237Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
238a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
239for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
240returned. 275returned.
241 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
242Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
243uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
282
283=item $locked = cf::lock_active $string
284
285Return true if the lock is currently active, i.e. somebody has locked it.
244 286
245=cut 287=cut
246 288
247our %LOCK; 289our %LOCK;
248 290
266 308
267 Coro::guard { 309 Coro::guard {
268 # wake up all waiters, to be on the safe side 310 # wake up all waiters, to be on the safe side
269 $_->ready for @{ delete $LOCK{$key} }; 311 $_->ready for @{ delete $LOCK{$key} };
270 } 312 }
313}
314
315sub lock_active($) {
316 my ($key) = @_;
317
318 ! ! $LOCK{$key}
271} 319}
272 320
273sub freeze_mainloop { 321sub freeze_mainloop {
274 return unless $TICK_WATCHER->is_active; 322 return unless $TICK_WATCHER->is_active;
275 323
278 }; 326 };
279 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
280 $guard 328 $guard
281} 329}
282 330
331=item cf::get_slot $time[, $priority[, $name]]
332
333Allocate $time seconds of blocking CPU time at priority C<$priority>:
334This call blocks and returns only when you have at least C<$time> seconds
335of cpu time till the next tick. The slot is only valid till the next cede.
336
337The optional C<$name> can be used to identify the job to run. It might be
338used for statistical purposes and should identify the same time-class.
339
340Useful for short background jobs.
341
342=cut
343
344our @SLOT_QUEUE;
345our $SLOT_QUEUE;
346
347$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async {
349 my $signal = new Coro::Signal;
350
351 while () {
352 next_job:
353 my $avail = cf::till_tick;
354 if ($avail > 0.01) {
355 for (0 .. $#SLOT_QUEUE) {
356 if ($SLOT_QUEUE[$_][0] < $avail) {
357 my $job = splice @SLOT_QUEUE, $_, 1, ();
358 $job->[2]->send;
359 Coro::cede;
360 goto next_job;
361 }
362 }
363 }
364
365 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait;
369 } else {
370 Coro::schedule;
371 }
372 }
373};
374
375sub get_slot($;$$) {
376 my ($time, $pri, $name) = @_;
377
378 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal;
380
381 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
382 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
383 $SLOT_QUEUE->ready;
384 $sig->wait;
385}
386
283=item cf::async { BLOCK } 387=item cf::async { BLOCK }
284 388
285Currently the same as Coro::async_pool, meaning you cannot use 389Currently the same as Coro::async_pool, meaning you cannot use
286C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 390C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
287thing you are allowed to do is call C<prio> on it. 391thing you are allowed to do is call C<prio> on it.
290 394
291BEGIN { *async = \&Coro::async_pool } 395BEGIN { *async = \&Coro::async_pool }
292 396
293=item cf::sync_job { BLOCK } 397=item cf::sync_job { BLOCK }
294 398
295The design of crossfire+ requires that the main coro ($Coro::main) is 399The design of Crossfire TRT requires that the main coroutine ($Coro::main)
296always able to handle events or runnable, as crossfire+ is only partly 400is always able to handle events or runnable, as Crossfire TRT is only
297reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 401partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
402acceptable.
298 403
299If it must be done, put the blocking parts into C<sync_job>. This will run 404If it must be done, put the blocking parts into C<sync_job>. This will run
300the given BLOCK in another coroutine while waiting for the result. The 405the given BLOCK in another coroutine while waiting for the result. The
301server will be frozen during this time, so the block should either finish 406server will be frozen during this time, so the block should either finish
302fast or be very important. 407fast or be very important.
305 410
306sub sync_job(&) { 411sub sync_job(&) {
307 my ($job) = @_; 412 my ($job) = @_;
308 413
309 if ($Coro::current == $Coro::main) { 414 if ($Coro::current == $Coro::main) {
415 my $time = Event::time;
416
310 # this is the main coro, too bad, we have to block 417 # this is the main coro, too bad, we have to block
311 # till the operation succeeds, freezing the server :/ 418 # till the operation succeeds, freezing the server :/
312 419
313 # TODO: use suspend/resume instead 420 # TODO: use suspend/resume instead
314 # (but this is cancel-safe) 421 # (but this is cancel-safe)
325 432
326 while ($busy) { 433 while ($busy) {
327 Coro::cede or Event::one_event; 434 Coro::cede or Event::one_event;
328 } 435 }
329 436
437 $time = Event::time - $time;
438
439 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441
442 $tick_start += $time; # do not account sync jobs to server load
443
330 wantarray ? @res : $res[0] 444 wantarray ? @res : $res[0]
331 } else { 445 } else {
332 # we are in another coroutine, how wonderful, everything just works 446 # we are in another coroutine, how wonderful, everything just works
333 447
334 $job->() 448 $job->()
353 $EXT_CORO{$coro+0} = $coro; 467 $EXT_CORO{$coro+0} = $coro;
354 468
355 $coro 469 $coro
356} 470}
357 471
358sub write_runtime { 472=item fork_call { }, $args
359 my $guard = cf::lock_acquire "write_runtime";
360 473
361 my $runtime = cf::localdir . "/runtime"; 474Executes the given code block with the given arguments in a seperate
475process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling.
362 478
363 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 479=cut
364 or return;
365 480
366 my $value = $cf::RUNTIME + 90 + 10; 481sub fork_call(&@) {
367 # 10 is the runtime save interval, for a monotonic clock 482 my ($cb, @args) = @_;
368 # 60 allows for the watchdog to kill the server.
369 483
370 (aio_write $fh, 0, (length $value), $value, 0) <= 0 484 # we seemingly have to make a local copy of the whole thing,
371 and return; 485 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious)
372 487
373 # always fsync - this file is important 488 my @res = Coro::Util::fork_eval {
374 aio_fsync $fh 489 reset_signals;
375 and return; 490 &$cb
491 }, @args;
376 492
377 close $fh 493 wantarray ? @res : $res[-1]
378 or return; 494}
379 495
380 aio_rename "$runtime~", $runtime 496=item $value = cf::db_get $family => $key
381 and return;
382 497
498Returns a single value from the environment database.
499
500=item cf::db_put $family => $key => $value
501
502Stores the given C<$value> in the family. It can currently store binary
503data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504
505=cut
506
507our $DB;
508
509sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job {
514 eval {
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
383 1 523 }
524}
525
526sub db_get($$) {
527 my $key = "$_[0]/$_[1]";
528
529 cf::sync_job {
530 BDB::db_get $DB, undef, $key, my $data;
531
532 $! ? ()
533 : $data
534 }
535}
536
537sub db_put($$$) {
538 BDB::dbreq_pri 4;
539 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
540}
541
542=item cf::cache $id => [$paths...], $processversion => $process
543
544Generic caching function that returns the value of the resource $id,
545caching and regenerating as required.
546
547This function can block.
548
549=cut
550
551sub cache {
552 my ($id, $src, $processversion, $process) = @_;
553
554 my $meta =
555 join "\x00",
556 $processversion,
557 map {
558 aio_stat $_
559 and Carp::croak "$_: $!";
560
561 ($_, (stat _)[7,9])
562 } @$src;
563
564 my $dbmeta = db_get cache => "$id/meta";
565 if ($dbmeta ne $meta) {
566 # changed, we may need to process
567
568 my @data;
569 my $md5;
570
571 for (0 .. $#$src) {
572 0 <= aio_load $src->[$_], $data[$_]
573 or Carp::croak "$src->[$_]: $!";
574 }
575
576 # if processing is expensive, check
577 # checksum first
578 if (1) {
579 $md5 =
580 join "\x00",
581 $processversion,
582 map {
583 cf::cede_to_tick;
584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
585 } 0.. $#$src;
586
587
588 my $dbmd5 = db_get cache => "$id/md5";
589 if ($dbmd5 eq $md5) {
590 db_put cache => "$id/meta", $meta;
591
592 return db_get cache => "$id/data";
593 }
594 }
595
596 my $t1 = Time::HiRes::time;
597 my $data = $process->(\@data);
598 my $t2 = Time::HiRes::time;
599
600 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
601
602 db_put cache => "$id/data", $data;
603 db_put cache => "$id/md5" , $md5;
604 db_put cache => "$id/meta", $meta;
605
606 return $data;
607 }
608
609 db_get cache => "$id/data"
610}
611
612=item cf::datalog type => key => value, ...
613
614Log a datalog packet of the given type with the given key-value pairs.
615
616=cut
617
618sub datalog($@) {
619 my ($type, %kv) = @_;
620 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
384} 621}
385 622
386=back 623=back
387 624
388=cut 625=cut
395attach callbacks/event handlers (a collection of which is called an "attachment") 632attach callbacks/event handlers (a collection of which is called an "attachment")
396to it. All such attachable objects support the following methods. 633to it. All such attachable objects support the following methods.
397 634
398In the following description, CLASS can be any of C<global>, C<object> 635In the following description, CLASS can be any of C<global>, C<object>
399C<player>, C<client> or C<map> (i.e. the attachable objects in 636C<player>, C<client> or C<map> (i.e. the attachable objects in
400crossfire+). 637Crossfire TRT).
401 638
402=over 4 639=over 4
403 640
404=item $attachable->attach ($attachment, key => $value...) 641=item $attachable->attach ($attachment, key => $value...)
405 642
568 $registry = $CB_TYPE[$object_type] ||= []; 805 $registry = $CB_TYPE[$object_type] ||= [];
569 806
570 } elsif ($type eq "subtype") { 807 } elsif ($type eq "subtype") {
571 defined $object_type or Carp::croak "subtype specified without type"; 808 defined $object_type or Carp::croak "subtype specified without type";
572 my $object_subtype = shift @arg; 809 my $object_subtype = shift @arg;
573 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 810 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
574 811
575 } elsif ($type eq "package") { 812 } elsif ($type eq "package") {
576 my $pkg = shift @arg; 813 my $pkg = shift @arg;
577 814
578 while (my ($name, $id) = each %cb_id) { 815 while (my ($name, $id) = each %cb_id) {
607 _attach $registry, $klass, @attach; 844 _attach $registry, $klass, @attach;
608 } 845 }
609 846
610 $obj->{$name} = \%arg; 847 $obj->{$name} = \%arg;
611 } else { 848 } else {
612 warn "object uses attachment '$name' that is not available, postponing.\n"; 849 warn "object uses attachment '$name' which is not available, postponing.\n";
613 } 850 }
614 851
615 $obj->{_attachment}{$name} = undef; 852 $obj->{_attachment}{$name} = undef;
616} 853}
617 854
619 if (ref $_[0]) { 856 if (ref $_[0]) {
620 _object_attach @_; 857 _object_attach @_;
621 } else { 858 } else {
622 _attach shift->_attach_registry, @_; 859 _attach shift->_attach_registry, @_;
623 } 860 }
861 _recalc_want;
624}; 862};
625 863
626# all those should be optimised 864# all those should be optimised
627sub cf::attachable::detach { 865sub cf::attachable::detach {
628 my ($obj, $name) = @_; 866 my ($obj, $name) = @_;
631 delete $obj->{_attachment}{$name}; 869 delete $obj->{_attachment}{$name};
632 reattach ($obj); 870 reattach ($obj);
633 } else { 871 } else {
634 Carp::croak "cannot, currently, detach class attachments"; 872 Carp::croak "cannot, currently, detach class attachments";
635 } 873 }
874 _recalc_want;
636}; 875};
637 876
638sub cf::attachable::attached { 877sub cf::attachable::attached {
639 my ($obj, $name) = @_; 878 my ($obj, $name) = @_;
640 879
655 "; 894 ";
656 die if $@; 895 die if $@;
657} 896}
658 897
659our $override; 898our $override;
660our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 899our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
661 900
662sub override { 901sub override {
663 $override = 1; 902 $override = 1;
664 @invoke_results = (); 903 @INVOKE_RESULTS = (@_);
665} 904}
666 905
667sub do_invoke { 906sub do_invoke {
668 my $event = shift; 907 my $event = shift;
669 my $callbacks = shift; 908 my $callbacks = shift;
670 909
671 @invoke_results = (); 910 @INVOKE_RESULTS = ();
672 911
673 local $override; 912 local $override;
674 913
675 for (@$callbacks) { 914 for (@$callbacks) {
676 eval { &{$_->[1]} }; 915 eval { &{$_->[1]} };
693 932
694Generate an object-specific event with the given arguments. 933Generate an object-specific event with the given arguments.
695 934
696This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 935This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
697removed in future versions), and there is no public API to access override 936removed in future versions), and there is no public API to access override
698results (if you must, access C<@cf::invoke_results> directly). 937results (if you must, access C<@cf::INVOKE_RESULTS> directly).
699 938
700=back 939=back
701 940
702=cut 941=cut
703 942
704############################################################################# 943#############################################################################
705# object support 944# object support
945#
946
947sub _can_merge {
948 my ($ob1, $ob2) = @_;
949
950 local $Storable::canonical = 1;
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953
954 $fob1 eq $fob2
955}
706 956
707sub reattach { 957sub reattach {
708 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
709 my ($obj) = @_; 959 my ($obj) = @_;
710 960
813 or return; 1063 or return;
814 $av = eval { (Storable::thaw $av)->{objs} }; 1064 $av = eval { (Storable::thaw $av)->{objs} };
815 } 1065 }
816 1066
817 warn sprintf "loading %s (%d)\n", 1067 warn sprintf "loading %s (%d)\n",
818 $filename, length $data, scalar @{$av || []};#d# 1068 $filename, length $data, scalar @{$av || []};
819 return ($data, $av); 1069 return ($data, $av);
820} 1070}
1071
1072=head2 COMMAND CALLBACKS
1073
1074=over 4
1075
1076=cut
821 1077
822############################################################################# 1078#############################################################################
823# command handling &c 1079# command handling &c
824 1080
825=item cf::register_command $name => \&callback($ob,$args); 1081=item cf::register_command $name => \&callback($ob,$args);
838 push @{ $COMMAND{$name} }, [$caller, $cb]; 1094 push @{ $COMMAND{$name} }, [$caller, $cb];
839} 1095}
840 1096
841=item cf::register_extcmd $name => \&callback($pl,$packet); 1097=item cf::register_extcmd $name => \&callback($pl,$packet);
842 1098
843Register a callbackf ro execution when the client sends an extcmd packet. 1099Register a callback for execution when the client sends an (synchronous)
1100extcmd packet. Ext commands will be processed in the order they are
1101received by the server, like other user commands. The first argument is
1102the logged-in player. Ext commands can only be processed after a player
1103has logged in successfully.
844 1104
845If the callback returns something, it is sent back as if reply was being 1105If the callback returns something, it is sent back as if reply was being
846called. 1106called.
847 1107
1108=item cf::register_exticmd $name => \&callback($ns,$packet);
1109
1110Register a callback for execution when the client sends an (asynchronous)
1111exticmd packet. Exti commands are processed by the server as soon as they
1112are received, i.e. out of order w.r.t. other commands. The first argument
1113is a client socket. Exti commands can be received anytime, even before
1114log-in.
1115
1116If the callback returns something, it is sent back as if reply was being
1117called.
1118
848=cut 1119=cut
849 1120
850sub register_extcmd { 1121sub register_extcmd {
851 my ($name, $cb) = @_; 1122 my ($name, $cb) = @_;
852 1123
853 $EXTCMD{$name} = $cb; 1124 $EXTCMD{$name} = $cb;
1125}
1126
1127sub register_exticmd {
1128 my ($name, $cb) = @_;
1129
1130 $EXTICMD{$name} = $cb;
854} 1131}
855 1132
856cf::player->attach ( 1133cf::player->attach (
857 on_command => sub { 1134 on_command => sub {
858 my ($pl, $name, $params) = @_; 1135 my ($pl, $name, $params) = @_;
867 cf::override; 1144 cf::override;
868 }, 1145 },
869 on_extcmd => sub { 1146 on_extcmd => sub {
870 my ($pl, $buf) = @_; 1147 my ($pl, $buf) = @_;
871 1148
872 my $msg = eval { from_json $buf }; 1149 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
873 1150
874 if (ref $msg) { 1151 if (ref $msg) {
1152 my ($type, $reply, @payload) =
1153 "ARRAY" eq ref $msg
1154 ? @$msg
1155 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1156
1157 my @reply;
1158
875 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1159 if (my $cb = $EXTCMD{$type}) {
876 if (my %reply = $cb->($pl, $msg)) { 1160 @reply = $cb->($pl, @payload);
877 $pl->ext_reply ($msg->{msgid}, %reply);
878 }
879 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
880 } else { 1166 } else {
881 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
882 } 1168 }
883 1169
884 cf::override; 1170 cf::override;
885 }, 1171 },
886); 1172);
887 1173
888sub load_extension {
889 my ($path) = @_;
890
891 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
892 my $base = $1;
893 my $pkg = $1;
894 $pkg =~ s/[^[:word:]]/_/g;
895 $pkg = "ext::$pkg";
896
897 warn "... loading '$path' into '$pkg'\n";
898
899 open my $fh, "<:utf8", $path
900 or die "$path: $!";
901
902 my $source =
903 "package $pkg; use strict; use utf8;\n"
904 . "#line 1 \"$path\"\n{\n"
905 . (do { local $/; <$fh> })
906 . "\n};\n1";
907
908 unless (eval $source) {
909 my $msg = $@ ? "$path: $@\n"
910 : "extension disabled.\n";
911 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
912 warn $@;
913 warn "mandatory extension failed to load, exiting.\n";
914 exit 1;
915 }
916 die $@;
917 }
918
919 push @EXTS, $pkg;
920}
921
922sub load_extensions { 1174sub load_extensions {
1175 cf::sync_job {
1176 my %todo;
1177
923 for my $ext (<$LIBDIR/*.ext>) { 1178 for my $path (<$LIBDIR/*.ext>) {
924 next unless -r $ext; 1179 next unless -r $path;
925 eval { 1180
926 load_extension $ext; 1181 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1182 my $base = $1;
1183 my $pkg = $1;
1184 $pkg =~ s/[^[:word:]]/_/g;
1185 $pkg = "ext::$pkg";
1186
1187 open my $fh, "<:utf8", $path
1188 or die "$path: $!";
1189
1190 my $source = do { local $/; <$fh> };
1191
1192 my %ext = (
1193 path => $path,
1194 base => $base,
1195 pkg => $pkg,
1196 );
1197
1198 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1199 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1200
1201 $ext{source} =
1202 "package $pkg; use strict; use utf8;\n"
1203 . "#line 1 \"$path\"\n{\n"
1204 . $source
1205 . "\n};\n1";
1206
1207 $todo{$base} = \%ext;
1208 }
1209
1210 my %done;
1211 while (%todo) {
1212 my $progress;
1213
1214 while (my ($k, $v) = each %todo) {
1215 for (split /,\s*/, $v->{meta}{depends}) {
1216 goto skip
1217 unless exists $done{$_};
1218 }
1219
1220 warn "... loading '$k' into '$v->{pkg}'\n";
1221
1222 unless (eval $v->{source}) {
1223 my $msg = $@ ? "$v->{path}: $@\n"
1224 : "$v->{base}: extension inactive.\n";
1225
1226 if (exists $v->{meta}{mandatory}) {
1227 warn $msg;
1228 warn "mandatory extension failed to load, exiting.\n";
1229 exit 1;
1230 }
1231
1232 warn $msg;
1233 }
1234
1235 $done{$k} = delete $todo{$k};
1236 push @EXTS, $v->{pkg};
1237 $progress = 1;
927 1 1238 }
928 } or warn "$ext not loaded: $@"; 1239
1240 skip:
1241 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1242 unless $progress;
1243 }
929 } 1244 };
930} 1245}
931 1246
932############################################################################# 1247#############################################################################
933 1248
1249=back
1250
934=head2 CORE EXTENSIONS 1251=head2 CORE EXTENSIONS
935 1252
936Functions and methods that extend core crossfire objects. 1253Functions and methods that extend core crossfire objects.
937 1254
938=cut 1255=cut
950Returns the given player object, loading it if necessary (might block). 1267Returns the given player object, loading it if necessary (might block).
951 1268
952=cut 1269=cut
953 1270
954sub playerdir($) { 1271sub playerdir($) {
955 cf::localdir 1272 "$PLAYERDIR/"
956 . "/"
957 . cf::playerdir
958 . "/"
959 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1273 . (ref $_[0] ? $_[0]->ob->name : $_[0])
960} 1274}
961 1275
962sub path($) { 1276sub path($) {
963 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1277 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
964 1278
965 (playerdir $login) . "/$login.pl" 1279 (playerdir $login) . "/playerdata"
966} 1280}
967 1281
968sub find_active($) { 1282sub find_active($) {
969 $cf::PLAYER{$_[0]} 1283 $cf::PLAYER{$_[0]}
970 and $cf::PLAYER{$_[0]}->active 1284 and $cf::PLAYER{$_[0]}->active
983 my $login = $_[0]; 1297 my $login = $_[0];
984 1298
985 my $guard = cf::lock_acquire "user_find:$login"; 1299 my $guard = cf::lock_acquire "user_find:$login";
986 1300
987 $cf::PLAYER{$_[0]} || do { 1301 $cf::PLAYER{$_[0]} || do {
1302 # rename old playerfiles to new ones
1303 #TODO: remove when no longer required
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl";
1308
988 my $pl = load_pl path $login 1309 my $pl = load_pl path $login
989 or return; 1310 or return;
990 $cf::PLAYER{$login} = $pl 1311 $cf::PLAYER{$login} = $pl
991 } 1312 }
992 } 1313 }
1004 1325
1005 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1006 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1007 1328
1008 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1009 Coro::cede; 1330 cf::cede_to_tick;
1010} 1331}
1011 1332
1012sub new($) { 1333sub new($) {
1013 my ($login) = @_; 1334 my ($login) = @_;
1014 1335
1018 $self->{deny_save} = 1; 1339 $self->{deny_save} = 1;
1019 1340
1020 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
1021 1342
1022 $self 1343 $self
1344}
1345
1346=item $player->send_msg ($channel, $msg, $color, [extra...])
1347
1348=cut
1349
1350sub send_msg {
1351 my $ns = shift->ns
1352 or return;
1353 $ns->send_msg (@_);
1023} 1354}
1024 1355
1025=item $pl->quit_character 1356=item $pl->quit_character
1026 1357
1027Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
1054 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP; 1385 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1055 1386
1056 IO::AIO::aio_rmtree $temp; 1387 IO::AIO::aio_rmtree $temp;
1057} 1388}
1058 1389
1390=item $pl->kick
1391
1392Kicks a player out of the game. This destroys the connection.
1393
1394=cut
1395
1396sub kick {
1397 my ($pl, $kicker) = @_;
1398
1399 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1400 $pl->killer ("kicked");
1401 $pl->ns->destroy;
1402}
1403
1059=item cf::player::list_logins 1404=item cf::player::list_logins
1060 1405
1061Returns am arrayref of all valid playernames in the system, can take a 1406Returns am arrayref of all valid playernames in the system, can take a
1062while and may block, so not sync_job-capable, ever. 1407while and may block, so not sync_job-capable, ever.
1063 1408
1064=cut 1409=cut
1065 1410
1066sub list_logins { 1411sub list_logins {
1067 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1412 my $dirs = aio_readdir $PLAYERDIR
1068 or return []; 1413 or return [];
1069 1414
1070 my @logins; 1415 my @logins;
1071 1416
1072 for my $login (@$dirs) { 1417 for my $login (@$dirs) {
1107 } 1452 }
1108 1453
1109 \@paths 1454 \@paths
1110} 1455}
1111 1456
1457=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1458
1459Expand crossfire pod fragments into protocol xml.
1460
1461=cut
1462
1463sub expand_cfpod {
1464 ((my $self), (local $_)) = @_;
1465
1466 # escape & and <
1467 s/&/&amp;/g;
1468 s/(?<![BIUGHT])</&lt;/g;
1469
1470 # this is buggy, it needs to properly take care of nested <'s
1471
1472 1 while
1473 # replace B<>, I<>, U<> etc.
1474 s/B<([^\>]*)>/<b>$1<\/b>/
1475 || s/I<([^\>]*)>/<i>$1<\/i>/
1476 || s/U<([^\>]*)>/<u>$1<\/u>/
1477 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1478 # replace G<male|female> tags
1479 || s{G<([^>|]*)\|([^>]*)>}{
1480 $self->gender ? $2 : $1
1481 }ge
1482 # replace H<hint text>
1483 || s{H<([^\>]*)>}
1484 {
1485 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1486 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1487 "")
1488 [$self->{hintmode}]
1489 }ge;
1490
1491 # create single paragraphs (very hackish)
1492 s/(?<=\S)\n(?=\w)/ /g;
1493
1494 # compress some whitespace
1495 s/\s+\n/\n/g; # ws line-ends
1496 s/\n\n+/\n/g; # double lines
1497 s/^\n+//; # beginning lines
1498 s/\n+$//; # ending lines
1499
1500 $_
1501}
1502
1503sub hintmode {
1504 $_[0]{hintmode} = $_[1] if @_ > 1;
1505 $_[0]{hintmode}
1506}
1507
1112=item $player->ext_reply ($msgid, $msgtype, %msg) 1508=item $player->ext_reply ($msgid, @msg)
1113 1509
1114Sends an ext reply to the player. 1510Sends an ext reply to the player.
1115 1511
1116=cut 1512=cut
1117 1513
1118sub ext_reply($$$%) { 1514sub ext_reply($$@) {
1119 my ($self, $id, %msg) = @_; 1515 my ($self, $id, @msg) = @_;
1120 1516
1121 $msg{msgid} = $id; 1517 $self->ns->ext_reply ($id, @msg)
1122
1123 $self->send ("ext " . cf::to_json \%msg);
1124} 1518}
1125 1519
1126package cf; 1520=item $player->ext_msg ($type, @msg)
1521
1522Sends an ext event to the client.
1523
1524=cut
1525
1526sub ext_msg($$@) {
1527 my ($self, $type, @msg) = @_;
1528
1529 $self->ns->ext_msg ($type, @msg);
1530}
1531
1532=head3 cf::region
1533
1534=over 4
1535
1536=cut
1537
1538package cf::region;
1539
1540=item cf::region::find_by_path $path
1541
1542Tries to decuce the likely region for a map knowing only its path.
1543
1544=cut
1545
1546sub find_by_path($) {
1547 my ($path) = @_;
1548
1549 my ($match, $specificity);
1550
1551 for my $region (list) {
1552 if ($region->{match} && $path =~ $region->{match}) {
1553 ($match, $specificity) = ($region, $region->specificity)
1554 if $region->specificity > $specificity;
1555 }
1556 }
1557
1558 $match
1559}
1127 1560
1128=back 1561=back
1129
1130 1562
1131=head3 cf::map 1563=head3 cf::map
1132 1564
1133=over 4 1565=over 4
1134 1566
1189 my ($self, $merge) = @_; 1621 my ($self, $merge) = @_;
1190 1622
1191 # we have to keep some variables in memory intact 1623 # we have to keep some variables in memory intact
1192 local $self->{path}; 1624 local $self->{path};
1193 local $self->{load_path}; 1625 local $self->{load_path};
1194 local $self->{deny_save};
1195 local $self->{deny_reset};
1196 1626
1197 $self->SUPER::thawer_merge ($merge); 1627 $self->SUPER::thawer_merge ($merge);
1198} 1628}
1199 1629
1200sub normalise { 1630sub normalise {
1247 $self->init; # pass $1 etc. 1677 $self->init; # pass $1 etc.
1248 return $self; 1678 return $self;
1249 } 1679 }
1250 } 1680 }
1251 1681
1252 Carp::carp "unable to resolve path '$path' (base '$base')."; 1682 Carp::cluck "unable to resolve path '$path' (base '$base').";
1253 () 1683 ()
1254} 1684}
1255 1685
1256sub init { 1686sub init {
1257 my ($self) = @_; 1687 my ($self) = @_;
1272 1702
1273# the original (read-only) location 1703# the original (read-only) location
1274sub load_path { 1704sub load_path {
1275 my ($self) = @_; 1705 my ($self) = @_;
1276 1706
1277 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1707 "$MAPDIR/$self->{path}.map"
1278} 1708}
1279 1709
1280# the temporary/swap location 1710# the temporary/swap location
1281sub save_path { 1711sub save_path {
1282 my ($self) = @_; 1712 my ($self) = @_;
1283 1713
1284 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1714 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1285 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1715 "$TMPDIR/$path.map"
1286} 1716}
1287 1717
1288# the unique path, undef == no special unique path 1718# the unique path, undef == no special unique path
1289sub uniq_path { 1719sub uniq_path {
1290 my ($self) = @_; 1720 my ($self) = @_;
1291 1721
1292 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1722 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1293 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1723 "$UNIQUEDIR/$path"
1294} 1724}
1295 1725
1296# and all this just because we cannot iterate over 1726# and all this just because we cannot iterate over
1297# all maps in C++... 1727# all maps in C++...
1298sub change_all_map_light { 1728sub change_all_map_light {
1299 my ($change) = @_; 1729 my ($change) = @_;
1300 1730
1301 $_->change_map_light ($change) 1731 $_->change_map_light ($change)
1302 for grep $_->outdoor, values %cf::MAP; 1732 for grep $_->outdoor, values %cf::MAP;
1733}
1734
1735sub decay_objects {
1736 my ($self) = @_;
1737
1738 return if $self->{deny_reset};
1739
1740 $self->do_decay_objects;
1303} 1741}
1304 1742
1305sub unlink_save { 1743sub unlink_save {
1306 my ($self) = @_; 1744 my ($self) = @_;
1307 1745
1365 $self->load_header_orig 1803 $self->load_header_orig
1366 or return; 1804 or return;
1367 $self->prepare_orig; 1805 $self->prepare_orig;
1368 } 1806 }
1369 1807
1808 $self->{deny_reset} = 1
1809 if $self->no_reset;
1810
1811 $self->default_region (cf::region::find_by_path $self->{path})
1812 unless $self->default_region;
1813
1370 1 1814 1
1371} 1815}
1372 1816
1373sub find; 1817sub find;
1374sub find { 1818sub find {
1386 $map->{last_save} = $cf::RUNTIME; 1830 $map->{last_save} = $cf::RUNTIME;
1387 1831
1388 $map->load_header 1832 $map->load_header
1389 or return; 1833 or return;
1390 1834
1391 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1835 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1392 # doing this can freeze the server in a sync job, obviously 1836 # doing this can freeze the server in a sync job, obviously
1393 #$cf::WAIT_FOR_TICK->wait; 1837 #$cf::WAIT_FOR_TICK->wait;
1394 $map->reset; 1838 $map->reset;
1395 undef $guard; 1839 undef $guard;
1396 return find $path; 1840 return find $path;
1407 my ($self) = @_; 1851 my ($self) = @_;
1408 1852
1409 local $self->{deny_reset} = 1; # loading can take a long time 1853 local $self->{deny_reset} = 1; # loading can take a long time
1410 1854
1411 my $path = $self->{path}; 1855 my $path = $self->{path};
1856
1857 {
1858 my $guard1 = cf::lock_acquire "map_data:$path";
1412 my $guard = cf::lock_acquire "map_load:$path"; 1859 my $guard2 = cf::lock_acquire "map_load:$path";
1413 1860
1414 return if $self->in_memory != cf::MAP_SWAPPED; 1861 return if $self->in_memory != cf::MAP_SWAPPED;
1415 1862
1416 $self->in_memory (cf::MAP_LOADING); 1863 $self->in_memory (cf::MAP_LOADING);
1417 1864
1418 $self->alloc; 1865 $self->alloc;
1419 1866
1420 $self->pre_load; 1867 $self->pre_load;
1868 cf::cede_to_tick;
1421 1869
1422 $self->_load_objects ($self->{load_path}, 1) 1870 $self->_load_objects ($self->{load_path}, 1)
1423 or return; 1871 or return;
1424 1872
1425 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1426 if delete $self->{load_original}; 1874 if delete $self->{load_original};
1427 1875
1428 if (my $uniq = $self->uniq_path) { 1876 if (my $uniq = $self->uniq_path) {
1429 utf8::encode $uniq; 1877 utf8::encode $uniq;
1430 if (aio_open $uniq, O_RDONLY, 0) { 1878 if (aio_open $uniq, O_RDONLY, 0) {
1431 $self->clear_unique_items; 1879 $self->clear_unique_items;
1432 $self->_load_objects ($uniq, 0); 1880 $self->_load_objects ($uniq, 0);
1433 } 1881 }
1434 } 1882 }
1435 1883
1436 Coro::cede; 1884 cf::cede_to_tick;
1437
1438 # now do the right thing for maps 1885 # now do the right thing for maps
1439 $self->link_multipart_objects; 1886 $self->link_multipart_objects;
1440
1441 unless ($self->{deny_activate}) {
1442 $self->decay_objects;
1443 $self->fix_auto_apply;
1444 $self->update_buttons;
1445 Coro::cede;
1446 $self->set_darkness_map;
1447 $self->difficulty ($self->estimate_difficulty) 1887 $self->difficulty ($self->estimate_difficulty)
1448 unless $self->difficulty; 1888 unless $self->difficulty;
1449 Coro::cede; 1889 cf::cede_to_tick;
1890
1891 unless ($self->{deny_activate}) {
1892 $self->decay_objects;
1893 $self->fix_auto_apply;
1894 $self->update_buttons;
1895 cf::cede_to_tick;
1896 $self->set_darkness_map;
1897 cf::cede_to_tick;
1450 $self->activate; 1898 $self->activate;
1899 }
1900
1901 $self->{last_save} = $cf::RUNTIME;
1902 $self->last_access ($cf::RUNTIME);
1903
1904 $self->in_memory (cf::MAP_IN_MEMORY);
1451 } 1905 }
1452 1906
1453 $self->post_load; 1907 $self->post_load;
1454
1455 $self->in_memory (cf::MAP_IN_MEMORY);
1456} 1908}
1457 1909
1458sub customise_for { 1910sub customise_for {
1459 my ($self, $ob) = @_; 1911 my ($self, $ob) = @_;
1460 1912
1461 return find "~" . $ob->name . "/" . $self->{path} 1913 return find "~" . $ob->name . "/" . $self->{path}
1462 if $self->per_player; 1914 if $self->per_player;
1463 1915
1916# return find "?party/" . $ob->name . "/" . $self->{path}
1917# if $self->per_party;
1918
1464 $self 1919 $self
1465} 1920}
1466 1921
1467# find and load all maps in the 3x3 area around a map 1922# find and load all maps in the 3x3 area around a map
1468sub load_diag { 1923sub load_neighbours {
1469 my ($map) = @_; 1924 my ($map) = @_;
1470 1925
1471 my @diag; # diagonal neighbours 1926 my @neigh; # diagonal neighbours
1472 1927
1473 for (0 .. 3) { 1928 for (0 .. 3) {
1474 my $neigh = $map->tile_path ($_) 1929 my $neigh = $map->tile_path ($_)
1475 or next; 1930 or next;
1476 $neigh = find $neigh, $map 1931 $neigh = find $neigh, $map
1477 or next; 1932 or next;
1478 $neigh->load; 1933 $neigh->load;
1479 1934
1935 push @neigh,
1480 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1936 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1481 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1937 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1482 } 1938 }
1483 1939
1484 for (@diag) { 1940 for (grep defined $_->[0], @neigh) {
1941 my ($path, $origin) = @$_;
1485 my $neigh = find @$_ 1942 my $neigh = find $path, $origin
1486 or next; 1943 or next;
1487 $neigh->load; 1944 $neigh->load;
1488 } 1945 }
1489} 1946}
1490 1947
1495} 1952}
1496 1953
1497sub do_load_sync { 1954sub do_load_sync {
1498 my ($map) = @_; 1955 my ($map) = @_;
1499 1956
1957 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1958 if $Coro::current == $Coro::main;
1959
1500 cf::sync_job { $map->load }; 1960 cf::sync_job { $map->load };
1501} 1961}
1502 1962
1503our %MAP_PREFETCH; 1963our %MAP_PREFETCH;
1504our $MAP_PREFETCHER = undef; 1964our $MAP_PREFETCHER = undef;
1505 1965
1506sub find_async { 1966sub find_async {
1507 my ($path, $origin) = @_; 1967 my ($path, $origin, $load) = @_;
1508 1968
1509 $path = normalise $path, $origin && $origin->{path}; 1969 $path = normalise $path, $origin && $origin->{path};
1510 1970
1511 if (my $map = $cf::MAP{$path}) { 1971 if (my $map = $cf::MAP{$path}) {
1512 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1972 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1513 } 1973 }
1514 1974
1515 undef $MAP_PREFETCH{$path}; 1975 $MAP_PREFETCH{$path} |= $load;
1976
1516 $MAP_PREFETCHER ||= cf::async { 1977 $MAP_PREFETCHER ||= cf::async {
1517 while (%MAP_PREFETCH) { 1978 while (%MAP_PREFETCH) {
1518 for my $path (keys %MAP_PREFETCH) { 1979 while (my ($k, $v) = each %MAP_PREFETCH) {
1519 my $map = find $path 1980 if (my $map = find $k) {
1520 or next;
1521 $map->load; 1981 $map->load if $v;
1982 }
1522 1983
1523 delete $MAP_PREFETCH{$path}; 1984 delete $MAP_PREFETCH{$k};
1524 } 1985 }
1525 } 1986 }
1526 undef $MAP_PREFETCHER; 1987 undef $MAP_PREFETCHER;
1527 }; 1988 };
1528 $MAP_PREFETCHER->prio (6); 1989 $MAP_PREFETCHER->prio (6);
1531} 1992}
1532 1993
1533sub save { 1994sub save {
1534 my ($self) = @_; 1995 my ($self) = @_;
1535 1996
1536 my $lock = cf::lock_acquire "map_data:" . $self->path; 1997 my $lock = cf::lock_acquire "map_data:$self->{path}";
1537 1998
1538 $self->{last_save} = $cf::RUNTIME; 1999 $self->{last_save} = $cf::RUNTIME;
1539 2000
1540 return unless $self->dirty; 2001 return unless $self->dirty;
1541 2002
1564 my ($self) = @_; 2025 my ($self) = @_;
1565 2026
1566 # save first because save cedes 2027 # save first because save cedes
1567 $self->save; 2028 $self->save;
1568 2029
1569 my $lock = cf::lock_acquire "map_data:" . $self->path; 2030 my $lock = cf::lock_acquire "map_data:$self->{path}";
1570 2031
1571 return if $self->players; 2032 return if $self->players;
1572 return if $self->in_memory != cf::MAP_IN_MEMORY; 2033 return if $self->in_memory != cf::MAP_IN_MEMORY;
1573 return if $self->{deny_save}; 2034 return if $self->{deny_save};
1574 2035
1578 2039
1579sub reset_at { 2040sub reset_at {
1580 my ($self) = @_; 2041 my ($self) = @_;
1581 2042
1582 # TODO: safety, remove and allow resettable per-player maps 2043 # TODO: safety, remove and allow resettable per-player maps
1583 return 1e99 if $self->isa ("ext::map_per_player");#d#
1584 return 1e99 if $self->{deny_reset}; 2044 return 1e99 if $self->{deny_reset};
1585 2045
1586 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2046 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1587 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2047 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1588 2048
1599 my ($self) = @_; 2059 my ($self) = @_;
1600 2060
1601 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2061 my $lock = cf::lock_acquire "map_data:$self->{path}";
1602 2062
1603 return if $self->players; 2063 return if $self->players;
1604 return if $self->isa ("ext::map_per_player");#d#
1605 2064
1606 warn "resetting map ", $self->path;#d# 2065 warn "resetting map ", $self->path;
1607 2066
1608 $self->in_memory (cf::MAP_SWAPPED); 2067 $self->in_memory (cf::MAP_SWAPPED);
1609 2068
1610 # need to save uniques path 2069 # need to save uniques path
1611 unless ($self->{deny_save}) { 2070 unless ($self->{deny_save}) {
1628my $nuke_counter = "aaaa"; 2087my $nuke_counter = "aaaa";
1629 2088
1630sub nuke { 2089sub nuke {
1631 my ($self) = @_; 2090 my ($self) = @_;
1632 2091
2092 {
2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094
1633 delete $cf::MAP{$self->path}; 2095 delete $cf::MAP{$self->path};
1634 2096
1635 $self->unlink_save; 2097 $self->unlink_save;
1636 2098
1637 bless $self, "cf::map"; 2099 bless $self, "cf::map";
1638 delete $self->{deny_reset}; 2100 delete $self->{deny_reset};
1639 $self->{deny_save} = 1; 2101 $self->{deny_save} = 1;
1640 $self->reset_timeout (1); 2102 $self->reset_timeout (1);
1641 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2103 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1642 2104
1643 $cf::MAP{$self->path} = $self; 2105 $cf::MAP{$self->path} = $self;
2106 }
1644 2107
1645 $self->reset; # polite request, might not happen 2108 $self->reset; # polite request, might not happen
2109}
2110
2111=item $maps = cf::map::tmp_maps
2112
2113Returns an arrayref with all map paths of currently instantiated and saved
2114maps. May block.
2115
2116=cut
2117
2118sub tmp_maps() {
2119 [
2120 map {
2121 utf8::decode $_;
2122 /\.map$/
2123 ? normalise $_
2124 : ()
2125 } @{ aio_readdir $TMPDIR or [] }
2126 ]
2127}
2128
2129=item $maps = cf::map::random_maps
2130
2131Returns an arrayref with all map paths of currently instantiated and saved
2132random maps. May block.
2133
2134=cut
2135
2136sub random_maps() {
2137 [
2138 map {
2139 utf8::decode $_;
2140 /\.map$/
2141 ? normalise "?random/$_"
2142 : ()
2143 } @{ aio_readdir $RANDOMDIR or [] }
2144 ]
1646} 2145}
1647 2146
1648=item cf::map::unique_maps 2147=item cf::map::unique_maps
1649 2148
1650Returns an arrayref of paths of all shared maps that have 2149Returns an arrayref of paths of all shared maps that have
1651instantiated unique items. May block. 2150instantiated unique items. May block.
1652 2151
1653=cut 2152=cut
1654 2153
1655sub unique_maps() { 2154sub unique_maps() {
1656 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2155 [
1657 or return; 2156 map {
1658
1659 my @paths;
1660
1661 for (@$files) {
1662 utf8::decode $_; 2157 utf8::decode $_;
1663 next if /\.pst$/; 2158 /\.map$/
1664 next unless /^$PATH_SEP/o; 2159 ? normalise $_
1665 2160 : ()
1666 push @paths, cf::map::normalise $_; 2161 } @{ aio_readdir $UNIQUEDIR or [] }
1667 } 2162 ]
1668
1669 \@paths
1670} 2163}
1671 2164
1672package cf; 2165package cf;
1673 2166
1674=back 2167=back
1720 2213
1721 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2214 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1722 2215
1723 if ($self->{record_replies}) { 2216 if ($self->{record_replies}) {
1724 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2217 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2218
1725 } else { 2219 } else {
2220 my $pl = $self->contr;
2221
2222 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2223 my $dialog = $pl->{npc_dialog};
2224 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2225
2226 } else {
1726 $msg = $npc->name . " says: $msg" if $npc; 2227 $msg = $npc->name . " says: $msg" if $npc;
1727 $self->message ($msg, $flags); 2228 $self->message ($msg, $flags);
2229 }
1728 } 2230 }
2231}
2232
2233=item $object->send_msg ($channel, $msg, $color, [extra...])
2234
2235=cut
2236
2237sub cf::object::send_msg {
2238 my $pl = shift->contr
2239 or return;
2240 $pl->send_msg (@_);
1729} 2241}
1730 2242
1731=item $player_object->may ("access") 2243=item $player_object->may ("access")
1732 2244
1733Returns wether the given player is authorized to access resource "access" 2245Returns wether the given player is authorized to access resource "access"
1780 $self->deactivate_recursive; 2292 $self->deactivate_recursive;
1781 2293
1782 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2294 return if UNIVERSAL::isa $self->map, "ext::map_link";
1783 2295
1784 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2296 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1785 if $self->map; 2297 if $self->map && $self->map->{path} ne "{link}";
1786 2298
1787 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2299 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1788} 2300}
1789 2301
1790sub cf::object::player::leave_link { 2302sub cf::object::player::leave_link {
1791 my ($self, $map, $x, $y) = @_; 2303 my ($self, $map, $x, $y) = @_;
2304
2305 return unless $self->contr->active;
1792 2306
1793 my $link_pos = delete $self->{_link_pos}; 2307 my $link_pos = delete $self->{_link_pos};
1794 2308
1795 unless ($map) { 2309 unless ($map) {
1796 # restore original map position 2310 # restore original map position
1810 # use -1 or undef as default coordinates, not 0, 0 2324 # use -1 or undef as default coordinates, not 0, 0
1811 ($x, $y) = ($map->enter_x, $map->enter_y) 2325 ($x, $y) = ($map->enter_x, $map->enter_y)
1812 if $x <=0 && $y <= 0; 2326 if $x <=0 && $y <= 0;
1813 2327
1814 $map->load; 2328 $map->load;
1815 $map->load_diag; 2329 $map->load_neighbours;
1816 2330
1817 return unless $self->contr->active; 2331 return unless $self->contr->active;
1818 $self->activate_recursive; 2332 $self->activate_recursive;
1819 2333
1820 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2334 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1821 $self->enter_map ($map, $x, $y); 2335 $self->enter_map ($map, $x, $y);
1822} 2336}
1823 2337
1824cf::player->attach ( 2338=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1825 on_logout => sub {
1826 my ($pl) = @_;
1827 2339
1828 # abort map switching before logout 2340Moves the player to the given map-path and coordinates by first freezing
1829 if ($pl->ob->{_link_pos}) { 2341her, loading and preparing them map, calling the provided $check callback
1830 cf::sync_job { 2342that has to return the map if sucecssful, and then unfreezes the player on
1831 $pl->ob->leave_link 2343the new (success) or old (failed) map position. In either case, $done will
1832 }; 2344be called at the end of this process.
1833 }
1834 },
1835 on_login => sub {
1836 my ($pl) = @_;
1837 2345
1838 # try to abort aborted map switching on player login :)
1839 # should happen only on crashes
1840 if ($pl->ob->{_link_pos}) {
1841 $pl->ob->enter_link;
1842 (async {
1843 $pl->ob->reply (undef,
1844 "There was an internal problem at your last logout, "
1845 . "the server will try to bring you to your intended destination in a second.",
1846 cf::NDI_RED);
1847 # we need this sleep as the login has a concurrent enter_exit running
1848 # and this sleep increases chances of the player not ending up in scorn
1849 Coro::Timer::sleep 1;
1850 $pl->ob->leave_link;
1851 })->prio (2);
1852 }
1853 },
1854);
1855
1856=item $player_object->goto ($path, $x, $y)
1857
1858=cut 2346=cut
2347
2348our $GOTOGEN;
1859 2349
1860sub cf::object::player::goto { 2350sub cf::object::player::goto {
1861 my ($self, $path, $x, $y) = @_; 2351 my ($self, $path, $x, $y, $check, $done) = @_;
2352
2353 # do generation counting so two concurrent goto's will be executed in-order
2354 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1862 2355
1863 $self->enter_link; 2356 $self->enter_link;
1864 2357
1865 (async { 2358 (async {
1866 my $map = eval { 2359 my $map = eval {
1867 my $map = cf::map::find $path; 2360 my $map = cf::map::find $path;
2361
2362 if ($map) {
1868 $map = $map->customise_for ($self) if $map; 2363 $map = $map->customise_for ($self);
2364 $map = $check->($map) if $check && $map;
2365 } else {
2366 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2367 }
2368
1869 $map 2369 $map
2370 };
2371
2372 if ($@) {
2373 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2374 LOG llevError | logBacktrace, Carp::longmess $@;
1870 } or 2375 }
1871 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1872 2376
2377 if ($gen == $self->{_goto_generation}) {
2378 delete $self->{_goto_generation};
1873 $self->leave_link ($map, $x, $y); 2379 $self->leave_link ($map, $x, $y);
2380 }
2381
2382 $done->() if $done;
1874 })->prio (1); 2383 })->prio (1);
1875} 2384}
1876 2385
1877=item $player_object->enter_exit ($exit_object) 2386=item $player_object->enter_exit ($exit_object)
1878 2387
1917 2426
1918 $rmp->{random_seed} ||= $exit->random_seed; 2427 $rmp->{random_seed} ||= $exit->random_seed;
1919 2428
1920 my $data = cf::to_json $rmp; 2429 my $data = cf::to_json $rmp;
1921 my $md5 = Digest::MD5::md5_hex $data; 2430 my $md5 = Digest::MD5::md5_hex $data;
1922 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2431 my $meta = "$RANDOMDIR/$md5.meta";
1923 2432
1924 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2433 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1925 aio_write $fh, 0, (length $data), $data, 0; 2434 aio_write $fh, 0, (length $data), $data, 0;
1926 undef $fh; 2435 undef $fh;
1927 aio_rename "$meta~", $meta; 2436 aio_rename "$meta~", $meta;
1936 2445
1937 return unless $self->type == cf::PLAYER; 2446 return unless $self->type == cf::PLAYER;
1938 2447
1939 if ($exit->slaying eq "/!") { 2448 if ($exit->slaying eq "/!") {
1940 #TODO: this should de-fi-ni-te-ly not be a sync-job 2449 #TODO: this should de-fi-ni-te-ly not be a sync-job
2450 # the problem is that $exit might not survive long enough
2451 # so it needs to be done right now, right here
1941 cf::sync_job { prepare_random_map $exit }; 2452 cf::sync_job { prepare_random_map $exit };
1942 } 2453 }
1943 2454
1944 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2455 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1945 my $hp = $exit->stats->hp; 2456 my $hp = $exit->stats->hp;
1946 my $sp = $exit->stats->sp; 2457 my $sp = $exit->stats->sp;
1947 2458
1948 $self->enter_link; 2459 $self->enter_link;
2460
2461 # if exit is damned, update players death & WoR home-position
2462 $self->contr->savebed ($slaying, $hp, $sp)
2463 if $exit->flag (FLAG_DAMNED);
1949 2464
1950 (async { 2465 (async {
1951 $self->deactivate_recursive; # just to be sure 2466 $self->deactivate_recursive; # just to be sure
1952 unless (eval { 2467 unless (eval {
1953 $self->goto ($slaying, $hp, $sp); 2468 $self->goto ($slaying, $hp, $sp);
1954 2469
1955 1; 2470 1;
1956 }) { 2471 }) {
1957 $self->message ("Something went wrong deep within the crossfire server. " 2472 $self->message ("Something went wrong deep within the crossfire server. "
1958 . "I'll try to bring you back to the map you were before. " 2473 . "I'll try to bring you back to the map you were before. "
1959 . "Please report this to the dungeon master!", 2474 . "Please report this to the dungeon master!",
1960 cf::NDI_UNIQUE | cf::NDI_RED); 2475 cf::NDI_UNIQUE | cf::NDI_RED);
1961 2476
1962 warn "ERROR in enter_exit: $@"; 2477 warn "ERROR in enter_exit: $@";
1963 $self->leave_link; 2478 $self->leave_link;
1964 } 2479 }
1965 })->prio (1); 2480 })->prio (1);
1978 2493
1979sub cf::client::send_drawinfo { 2494sub cf::client::send_drawinfo {
1980 my ($self, $text, $flags) = @_; 2495 my ($self, $text, $flags) = @_;
1981 2496
1982 utf8::encode $text; 2497 utf8::encode $text;
1983 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2498 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1984} 2499}
1985 2500
2501=item $client->send_msg ($channel, $msg, $color, [extra...])
2502
2503Send a drawinfo or msg packet to the client, formatting the msg for the
2504client if neccessary. C<$type> should be a string identifying the type of
2505the message, with C<log> being the default. If C<$color> is negative, suppress
2506the message unless the client supports the msg packet.
2507
2508=cut
2509
2510our %CHANNEL = (
2511 "c/identify" => {
2512 id => "identify",
2513 title => "Identify",
2514 reply => undef,
2515 tooltip => "Items recently identified",
2516 },
2517 "c/examine" => {
2518 id => "examine",
2519 title => "Examine",
2520 reply => undef,
2521 tooltip => "Signs and other items you examined",
2522 },
2523);
2524
2525sub cf::client::send_msg {
2526 my ($self, $channel, $msg, $color, @extra) = @_;
2527
2528 $msg = $self->pl->expand_cfpod ($msg);
2529
2530 $color &= cf::NDI_CLIENT_MASK; # just in case...
2531
2532 # check predefined channels, for the benefit of C
2533 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2534
2535 if (ref $channel) {
2536 # send meta info to client, if not yet sent
2537 unless (exists $self->{channel}{$channel->{id}}) {
2538 $self->{channel}{$channel->{id}} = $channel;
2539 $self->ext_msg (channel_info => $channel);
2540 }
2541
2542 $channel = $channel->{id};
2543 }
2544
2545 return unless @extra || length $msg;
2546
2547 if ($self->can_msg) {
2548 # default colour, mask it out
2549 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2550 if $color & cf::NDI_DEF;
2551
2552 $self->send_packet ("msg " . $self->{json_coder}->encode (
2553 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2554 } else {
2555 if ($color >= 0) {
2556 # replace some tags by gcfclient-compatible ones
2557 for ($msg) {
2558 1 while
2559 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2560 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2561 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2562 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2563 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2564 }
2565
2566 $color &= cf::NDI_COLOR_MASK;
2567
2568 utf8::encode $msg;
2569
2570 if (0 && $msg =~ /\[/) {
2571 # COMMAND/INFO
2572 $self->send_packet ("drawextinfo $color 10 8 $msg")
2573 } else {
2574 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2575 $self->send_packet ("drawinfo $color $msg")
2576 }
2577 }
2578 }
2579}
2580
2581=item $client->ext_msg ($type, @msg)
2582
2583Sends an ext event to the client.
2584
2585=cut
2586
2587sub cf::client::ext_msg($$@) {
2588 my ($self, $type, @msg) = @_;
2589
2590 if ($self->extcmd == 2) {
2591 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2592 } elsif ($self->extcmd == 1) { # TODO: remove
2593 push @msg, msgtype => "event_$type";
2594 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2595 }
2596}
2597
2598=item $client->ext_reply ($msgid, @msg)
2599
2600Sends an ext reply to the client.
2601
2602=cut
2603
2604sub cf::client::ext_reply($$@) {
2605 my ($self, $id, @msg) = @_;
2606
2607 if ($self->extcmd == 2) {
2608 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2609 } elsif ($self->extcmd == 1) {
2610 #TODO: version 1, remove
2611 unshift @msg, msgtype => "reply", msgid => $id;
2612 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2613 }
2614}
1986 2615
1987=item $success = $client->query ($flags, "text", \&cb) 2616=item $success = $client->query ($flags, "text", \&cb)
1988 2617
1989Queues a query to the client, calling the given callback with 2618Queues a query to the client, calling the given callback with
1990the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2619the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1991C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2620C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
1992 2621
1993Queries can fail, so check the return code. Or don't, as queries will become 2622Queries can fail, so check the return code. Or don't, as queries will
1994reliable at some point in the future. 2623become reliable at some point in the future.
1995 2624
1996=cut 2625=cut
1997 2626
1998sub cf::client::query { 2627sub cf::client::query {
1999 my ($self, $flags, $text, $cb) = @_; 2628 my ($self, $flags, $text, $cb) = @_;
2007 utf8::encode $text; 2636 utf8::encode $text;
2008 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2637 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2009 2638
2010 $self->send_packet ($self->{query_queue}[0][0]) 2639 $self->send_packet ($self->{query_queue}[0][0])
2011 if @{ $self->{query_queue} } == 1; 2640 if @{ $self->{query_queue} } == 1;
2641
2642 1
2012} 2643}
2013 2644
2014cf::client->attach ( 2645cf::client->attach (
2646 on_connect => sub {
2647 my ($ns) = @_;
2648
2649 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2650 },
2015 on_reply => sub { 2651 on_reply => sub {
2016 my ($ns, $msg) = @_; 2652 my ($ns, $msg) = @_;
2017 2653
2018 # this weird shuffling is so that direct followup queries 2654 # this weird shuffling is so that direct followup queries
2019 # get handled first 2655 # get handled first
2031 } else { 2667 } else {
2032 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2668 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2033 } 2669 }
2034 } 2670 }
2035 }, 2671 },
2672 on_exticmd => sub {
2673 my ($ns, $buf) = @_;
2674
2675 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2676
2677 if (ref $msg) {
2678 my ($type, $reply, @payload) =
2679 "ARRAY" eq ref $msg
2680 ? @$msg
2681 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2682
2683 my @reply;
2684
2685 if (my $cb = $EXTICMD{$type}) {
2686 @reply = $cb->($ns, @payload);
2687 }
2688
2689 $ns->ext_reply ($reply, @reply)
2690 if $reply;
2691
2692 } else {
2693 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2694 }
2695
2696 cf::override;
2697 },
2036); 2698);
2037 2699
2038=item $client->async (\&cb) 2700=item $client->async (\&cb)
2039 2701
2040Create a new coroutine, running the specified callback. The coroutine will 2702Create a new coroutine, running the specified callback. The coroutine will
2081our $safe = new Safe "safe"; 2743our $safe = new Safe "safe";
2082our $safe_hole = new Safe::Hole; 2744our $safe_hole = new Safe::Hole;
2083 2745
2084$SIG{FPE} = 'IGNORE'; 2746$SIG{FPE} = 'IGNORE';
2085 2747
2086$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2748$safe->permit_only (Opcode::opset qw(
2749 :base_core :base_mem :base_orig :base_math
2750 grepstart grepwhile mapstart mapwhile
2751 sort time
2752));
2087 2753
2088# here we export the classes and methods available to script code 2754# here we export the classes and methods available to script code
2089 2755
2090=pod 2756=pod
2091 2757
2092The following fucntions and emthods are available within a safe environment: 2758The following functions and methods are available within a safe environment:
2093 2759
2094 cf::object contr pay_amount pay_player map 2760 cf::object
2761 contr pay_amount pay_player map x y force_find force_add
2762 insert remove name archname title slaying race decrease_ob_nr
2763
2095 cf::object::player player 2764 cf::object::player
2096 cf::player peaceful 2765 player
2097 cf::map trigger 2766
2767 cf::player
2768 peaceful
2769
2770 cf::map
2771 trigger
2098 2772
2099=cut 2773=cut
2100 2774
2101for ( 2775for (
2102 ["cf::object" => qw(contr pay_amount pay_player map)], 2776 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2777 insert remove inv name archname title slaying race
2778 decrease_ob_nr)],
2103 ["cf::object::player" => qw(player)], 2779 ["cf::object::player" => qw(player)],
2104 ["cf::player" => qw(peaceful)], 2780 ["cf::player" => qw(peaceful)],
2105 ["cf::map" => qw(trigger)], 2781 ["cf::map" => qw(trigger)],
2106) { 2782) {
2107 no strict 'refs'; 2783 no strict 'refs';
2178=back 2854=back
2179 2855
2180=cut 2856=cut
2181 2857
2182############################################################################# 2858#############################################################################
2183
2184=head2 EXTENSION DATABASE SUPPORT
2185
2186Crossfire maintains a very simple database for extension use. It can
2187currently store anything that can be serialised using Storable, which
2188excludes objects.
2189
2190The parameter C<$family> should best start with the name of the extension
2191using it, it should be unique.
2192
2193=over 4
2194
2195=item $value = cf::db_get $family => $key
2196
2197Returns a single value from the database.
2198
2199=item cf::db_put $family => $key => $value
2200
2201Stores the given C<$value> in the family.
2202
2203=cut
2204
2205our $DB;
2206
2207sub db_init {
2208 unless ($DB) {
2209 $DB = BDB::db_create $DB_ENV;
2210
2211 cf::sync_job {
2212 eval {
2213 $DB->set_flags (BDB::CHKSUM);
2214
2215 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2216 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2217 cf::cleanup "db_open(db): $!" if $!;
2218 };
2219 cf::cleanup "db_open(db): $@" if $@;
2220 };
2221
2222 my $path = cf::localdir . "/database.pst";
2223 if (stat $path) {
2224 cf::sync_job {
2225 my $pst = Storable::retrieve $path;
2226
2227 cf::db_put (board => data => $pst->{board});
2228 cf::db_put (guildrules => data => $pst->{guildrules});
2229 cf::db_put (rent => balance => $pst->{rent}{balance});
2230 BDB::db_env_txn_checkpoint $DB_ENV;
2231
2232 unlink $path;
2233 };
2234 }
2235 }
2236}
2237
2238sub db_get($$) {
2239 my $key = "$_[0]/$_[1]";
2240
2241 cf::sync_job {
2242 BDB::db_get $DB, undef, $key, my $data;
2243
2244 $! ? ()
2245 : Compress::LZF::sthaw $data
2246 }
2247}
2248
2249sub db_put($$$) {
2250 BDB::dbreq_pri 4;
2251 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2252}
2253
2254#############################################################################
2255# the server's init and main functions 2859# the server's init and main functions
2256 2860
2257sub init_resources { 2861sub load_facedata($) {
2258 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2862 my ($path) = @_;
2863
2864 # HACK to clear player env face cache, we need some signal framework
2865 # for this (global event?)
2866 %ext::player_env::MUSIC_FACE_CACHE = ();
2867
2868 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2869
2870 warn "loading facedata from $path\n";
2871
2872 my $facedata;
2873 0 < aio_load $path, $facedata
2874 or die "$path: $!";
2875
2876 $facedata = Coro::Storable::thaw $facedata;
2877
2878 $facedata->{version} == 2
2879 or cf::cleanup "$path: version mismatch, cannot proceed.";
2880
2881 # patch in the exptable
2882 $facedata->{resource}{"res/exp_table"} = {
2883 type => FT_RSRC,
2884 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2885 };
2886 cf::cede_to_tick;
2887
2888 {
2889 my $faces = $facedata->{faceinfo};
2890
2891 while (my ($face, $info) = each %$faces) {
2892 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2893 cf::face::set_visibility $idx, $info->{visibility};
2894 cf::face::set_magicmap $idx, $info->{magicmap};
2895 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2896 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2897
2898 cf::cede_to_tick;
2899 }
2900
2901 while (my ($face, $info) = each %$faces) {
2902 next unless $info->{smooth};
2903 my $idx = cf::face::find $face
2904 or next;
2905 if (my $smooth = cf::face::find $info->{smooth}) {
2906 cf::face::set_smooth $idx, $smooth;
2907 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2908 } else {
2909 warn "smooth face '$info->{smooth}' not found for face '$face'";
2910 }
2911
2912 cf::cede_to_tick;
2913 }
2914 }
2915
2916 {
2917 my $anims = $facedata->{animinfo};
2918
2919 while (my ($anim, $info) = each %$anims) {
2920 cf::anim::set $anim, $info->{frames}, $info->{facings};
2921 cf::cede_to_tick;
2922 }
2923
2924 cf::anim::invalidate_all; # d'oh
2925 }
2926
2927 {
2928 # TODO: for gcfclient pleasure, we should give resources
2929 # that gcfclient doesn't grok a >10000 face index.
2930 my $res = $facedata->{resource};
2931
2932 my $soundconf = delete $res->{"res/sound.conf"};
2933
2934 while (my ($name, $info) = each %$res) {
2935 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2936 my $data;
2937
2938 if ($info->{type} & 1) {
2939 # prepend meta info
2940
2941 my $meta = $enc->encode ({
2942 name => $name,
2943 %{ $info->{meta} || {} },
2944 });
2945
2946 $data = pack "(w/a*)*", $meta, $info->{data};
2947 } else {
2948 $data = $info->{data};
2949 }
2950
2951 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2952 cf::face::set_type $idx, $info->{type};
2953
2954 cf::cede_to_tick;
2955 }
2956
2957 if ($soundconf) {
2958 $soundconf = $enc->decode (delete $soundconf->{data});
2959
2960 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2961 my $sound = $soundconf->{compat}[$_]
2962 or next;
2963
2964 my $face = cf::face::find "sound/$sound->[1]";
2965 cf::sound::set $sound->[0] => $face;
2966 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2967 }
2968
2969 while (my ($k, $v) = each %{$soundconf->{event}}) {
2970 my $face = cf::face::find "sound/$v";
2971 cf::sound::set $k => $face;
2972 }
2973 }
2974 }
2975
2976 1
2977}
2978
2979register_exticmd fx_want => sub {
2980 my ($ns, $want) = @_;
2981
2982 while (my ($k, $v) = each %$want) {
2983 $ns->fx_want ($k, $v);
2984 }
2985};
2986
2987sub reload_regions {
2988 # HACK to clear player env face cache, we need some signal framework
2989 # for this (global event?)
2990 %ext::player_env::MUSIC_FACE_CACHE = ();
2991
2992 load_resource_file "$MAPDIR/regions"
2259 or die "unable to load regions file\n";#d# 2993 or die "unable to load regions file\n";
2260}
2261 2994
2262sub cfg_load { 2995 for (cf::region::list) {
2996 $_->{match} = qr/$_->{match}/
2997 if exists $_->{match};
2998 }
2999}
3000
3001sub reload_facedata {
3002 load_facedata "$DATADIR/facedata"
3003 or die "unable to load facedata\n";
3004}
3005
3006sub reload_archetypes {
3007 load_resource_file "$DATADIR/archetypes"
3008 or die "unable to load archetypes\n";
3009 #d# NEED to laod twice to resolve forward references
3010 # this really needs to be done in an extra post-pass
3011 # (which needs to be synchronous, so solve it differently)
3012 load_resource_file "$DATADIR/archetypes"
3013 or die "unable to load archetypes\n";
3014}
3015
3016sub reload_treasures {
3017 load_resource_file "$DATADIR/treasures"
3018 or die "unable to load treasurelists\n";
3019}
3020
3021sub reload_resources {
3022 warn "reloading resource files...\n";
3023
3024 reload_regions;
3025 reload_facedata;
3026 #reload_archetypes;#d#
3027 reload_archetypes;
3028 reload_treasures;
3029
3030 warn "finished reloading resource files\n";
3031}
3032
3033sub init {
3034 reload_resources;
3035}
3036
3037sub reload_config {
2263 open my $fh, "<:utf8", cf::confdir . "/config" 3038 open my $fh, "<:utf8", "$CONFDIR/config"
2264 or return; 3039 or return;
2265 3040
2266 local $/; 3041 local $/;
2267 *CFG = YAML::Syck::Load <$fh>; 3042 *CFG = YAML::Syck::Load <$fh>;
2268 3043
2276 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3051 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2277 and die "WARNING: m(un)lockall failed: $!\n"; 3052 and die "WARNING: m(un)lockall failed: $!\n";
2278 }; 3053 };
2279 warn $@ if $@; 3054 warn $@ if $@;
2280 } 3055 }
2281}
2282
2283sub init {
2284 init_resources;
2285} 3056}
2286 3057
2287sub main { 3058sub main {
2288 # we must not ever block the main coroutine 3059 # we must not ever block the main coroutine
2289 local $Coro::idle = sub { 3060 local $Coro::idle = sub {
2291 (async { 3062 (async {
2292 Event::one_event; 3063 Event::one_event;
2293 })->prio (Coro::PRIO_MAX); 3064 })->prio (Coro::PRIO_MAX);
2294 }; 3065 };
2295 3066
2296 cfg_load; 3067 reload_config;
2297 db_init; 3068 db_init;
2298 load_extensions; 3069 load_extensions;
2299 3070
2300 $TICK_WATCHER->start; 3071 $TICK_WATCHER->start;
2301 Event::loop; 3072 Event::loop;
2317 }, 3088 },
2318 ); 3089 );
2319 } 3090 }
2320} 3091}
2321 3092
3093sub write_runtime {
3094 my $runtime = "$LOCALDIR/runtime";
3095
3096 # first touch the runtime file to show we are still running:
3097 # the fsync below can take a very very long time.
3098
3099 IO::AIO::aio_utime $runtime, undef, undef;
3100
3101 my $guard = cf::lock_acquire "write_runtime";
3102
3103 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3104 or return;
3105
3106 my $value = $cf::RUNTIME + 90 + 10;
3107 # 10 is the runtime save interval, for a monotonic clock
3108 # 60 allows for the watchdog to kill the server.
3109
3110 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3111 and return;
3112
3113 # always fsync - this file is important
3114 aio_fsync $fh
3115 and return;
3116
3117 # touch it again to show we are up-to-date
3118 aio_utime $fh, undef, undef;
3119
3120 close $fh
3121 or return;
3122
3123 aio_rename "$runtime~", $runtime
3124 and return;
3125
3126 warn "runtime file written.\n";
3127
3128 1
3129}
3130
2322sub emergency_save() { 3131sub emergency_save() {
2323 my $freeze_guard = cf::freeze_mainloop; 3132 my $freeze_guard = cf::freeze_mainloop;
2324 3133
2325 warn "enter emergency perl save\n"; 3134 warn "enter emergency perl save\n";
2326 3135
2357 3166
2358 warn Carp::longmess "post_cleanup backtrace" 3167 warn Carp::longmess "post_cleanup backtrace"
2359 if $make_core; 3168 if $make_core;
2360} 3169}
2361 3170
2362sub reload() { 3171sub do_reload_perl() {
2363 # can/must only be called in main 3172 # can/must only be called in main
2364 if ($Coro::current != $Coro::main) { 3173 if ($Coro::current != $Coro::main) {
2365 warn "can only reload from main coroutine"; 3174 warn "can only reload from main coroutine";
2366 return; 3175 return;
2367 } 3176 }
2392 Coro::cede; 3201 Coro::cede;
2393 last unless IO::AIO::nreqs || BDB::nreqs; 3202 last unless IO::AIO::nreqs || BDB::nreqs;
2394 warn "iterate..."; 3203 warn "iterate...";
2395 } 3204 }
2396 3205
3206 ++$RELOAD;
3207
2397 warn "cancelling all extension coros"; 3208 warn "cancelling all extension coros";
2398 $_->cancel for values %EXT_CORO; 3209 $_->cancel for values %EXT_CORO;
2399 %EXT_CORO = (); 3210 %EXT_CORO = ();
2400 3211
2401 warn "removing commands"; 3212 warn "removing commands";
2402 %COMMAND = (); 3213 %COMMAND = ();
2403 3214
2404 warn "removing ext commands"; 3215 warn "removing ext/exti commands";
2405 %EXTCMD = (); 3216 %EXTCMD = ();
3217 %EXTICMD = ();
2406 3218
2407 warn "unloading/nuking all extensions"; 3219 warn "unloading/nuking all extensions";
2408 for my $pkg (@EXTS) { 3220 for my $pkg (@EXTS) {
2409 warn "... unloading $pkg"; 3221 warn "... unloading $pkg";
2410 3222
2440 Symbol::delete_package "safe::$_" 3252 Symbol::delete_package "safe::$_"
2441 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3253 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2442 3254
2443 warn "unloading cf.pm \"a bit\""; 3255 warn "unloading cf.pm \"a bit\"";
2444 delete $INC{"cf.pm"}; 3256 delete $INC{"cf.pm"};
3257 delete $INC{"cf/pod.pm"};
2445 3258
2446 # don't, removes xs symbols, too, 3259 # don't, removes xs symbols, too,
2447 # and global variables created in xs 3260 # and global variables created in xs
2448 #Symbol::delete_package __PACKAGE__; 3261 #Symbol::delete_package __PACKAGE__;
2449 3262
2452 warn "reloading cf.pm"; 3265 warn "reloading cf.pm";
2453 require cf; 3266 require cf;
2454 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3267 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2455 3268
2456 warn "loading config and database again"; 3269 warn "loading config and database again";
2457 cf::cfg_load; 3270 cf::reload_config;
2458 3271
2459 warn "loading extensions"; 3272 warn "loading extensions";
2460 cf::load_extensions; 3273 cf::load_extensions;
2461 3274
2462 warn "reattaching attachments to objects/players"; 3275 warn "reattaching attachments to objects/players";
2463 _global_reattach; 3276 _global_reattach; # objects, sockets
2464 warn "reattaching attachments to maps"; 3277 warn "reattaching attachments to maps";
2465 reattach $_ for values %MAP; 3278 reattach $_ for values %MAP;
2466 3279 warn "reattaching attachments to players";
2467 warn "loading reloadable resources"; 3280 reattach $_ for values %PLAYER;
2468 init_resources;
2469 3281
2470 warn "leaving sync_job"; 3282 warn "leaving sync_job";
2471 3283
2472 1 3284 1
2473 } or do { 3285 } or do {
2479 warn "reloaded"; 3291 warn "reloaded";
2480}; 3292};
2481 3293
2482our $RELOAD_WATCHER; # used only during reload 3294our $RELOAD_WATCHER; # used only during reload
2483 3295
3296sub reload_perl() {
3297 # doing reload synchronously and two reloads happen back-to-back,
3298 # coro crashes during coro_state_free->destroy here.
3299
3300 $RELOAD_WATCHER ||= Event->timer (
3301 reentrant => 0,
3302 after => 0,
3303 data => WF_AUTOCANCEL,
3304 cb => sub {
3305 do_reload_perl;
3306 undef $RELOAD_WATCHER;
3307 },
3308 );
3309}
3310
2484register_command "reload" => sub { 3311register_command "reload" => sub {
2485 my ($who, $arg) = @_; 3312 my ($who, $arg) = @_;
2486 3313
2487 if ($who->flag (FLAG_WIZ)) { 3314 if ($who->flag (FLAG_WIZ)) {
2488 $who->message ("reloading server."); 3315 $who->message ("reloading server.");
2489 3316 async { reload_perl };
2490 # doing reload synchronously and two reloads happen back-to-back,
2491 # coro crashes during coro_state_free->destroy here.
2492
2493 $RELOAD_WATCHER ||= Event->timer (
2494 reentrant => 0,
2495 after => 0,
2496 data => WF_AUTOCANCEL,
2497 cb => sub {
2498 reload;
2499 undef $RELOAD_WATCHER;
2500 },
2501 );
2502 } 3317 }
2503}; 3318};
2504 3319
2505unshift @INC, $LIBDIR; 3320unshift @INC, $LIBDIR;
2506 3321
2507my $bug_warning = 0; 3322my $bug_warning = 0;
2508 3323
3324our @WAIT_FOR_TICK;
3325our @WAIT_FOR_TICK_BEGIN;
3326
3327sub wait_for_tick {
3328 return unless $TICK_WATCHER->is_active;
3329 return if $Coro::current == $Coro::main;
3330
3331 my $signal = new Coro::Signal;
3332 push @WAIT_FOR_TICK, $signal;
3333 $signal->wait;
3334}
3335
3336sub wait_for_tick_begin {
3337 return unless $TICK_WATCHER->is_active;
3338 return if $Coro::current == $Coro::main;
3339
3340 my $signal = new Coro::Signal;
3341 push @WAIT_FOR_TICK_BEGIN, $signal;
3342 $signal->wait;
3343}
3344
3345 my $min = 1e6;#d#
3346 my $avg = 10;
2509$TICK_WATCHER = Event->timer ( 3347$TICK_WATCHER = Event->timer (
2510 reentrant => 0, 3348 reentrant => 0,
2511 parked => 1, 3349 parked => 1,
2512 prio => 0, 3350 prio => 0,
2513 at => $NEXT_TICK || $TICK, 3351 at => $NEXT_TICK || $TICK,
2517 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3355 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2518 unless ++$bug_warning > 10; 3356 unless ++$bug_warning > 10;
2519 return; 3357 return;
2520 } 3358 }
2521 3359
2522 $NOW = Event::time; 3360 $NOW = $tick_start = Event::time;
2523 3361
2524 cf::server_tick; # one server iteration 3362 cf::server_tick; # one server iteration
3363
3364 0 && sync_job {#d#
3365 for(1..10) {
3366 my $t = Event::time;
3367 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3368 or die;
3369
3370 $map->width (50);
3371 $map->height (50);
3372 $map->alloc;
3373 $map->_load_objects ("/tmp/x.map", 1);
3374 my $t = Event::time - $t;
3375
3376 #next unless $t < 0.0013;#d#
3377 if ($t < $min) {
3378 $min = $t;
3379 }
3380 $avg = $avg * 0.99 + $t * 0.01;
3381 }
3382 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3383 exit 0;
3384 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3385 };
3386
2525 $RUNTIME += $TICK; 3387 $RUNTIME += $TICK;
2526 $NEXT_TICK += $TICK; 3388 $NEXT_TICK += $TICK;
2527 3389
2528 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3390 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2529 $NEXT_RUNTIME_WRITE = $NOW + 10; 3391 $NEXT_RUNTIME_WRITE = $NOW + 10;
2531 write_runtime 3393 write_runtime
2532 or warn "ERROR: unable to write runtime file: $!"; 3394 or warn "ERROR: unable to write runtime file: $!";
2533 }; 3395 };
2534 } 3396 }
2535 3397
2536 $WAIT_FOR_TICK->broadcast;
2537 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2538
2539# my $AFTER = Event::time; 3398# my $AFTER = Event::time;
2540# warn $AFTER - $NOW;#d# 3399# warn $AFTER - $NOW;#d#
2541 3400
3401 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3402 $sig->send;
3403 }
3404 while (my $sig = shift @WAIT_FOR_TICK) {
3405 $sig->send;
3406 }
3407
3408 $NOW = Event::time;
3409
2542 # if we are delayed by four ticks or more, skip them all 3410 # if we are delayed by four ticks or more, skip them all
2543 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3411 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2544 3412
2545 $TICK_WATCHER->at ($NEXT_TICK); 3413 $TICK_WATCHER->at ($NEXT_TICK);
2546 $TICK_WATCHER->start; 3414 $TICK_WATCHER->start;
3415
3416 $LOAD = ($NOW - $tick_start) / $TICK;
3417 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3418
3419 _post_tick;
3420
3421
2547 }, 3422 },
2548); 3423);
2549 3424
2550{ 3425{
2551 BDB::max_poll_time $TICK * 0.1; 3426 BDB::max_poll_time $TICK * 0.1;
2579 3454
2580 cf::sync_job { 3455 cf::sync_job {
2581 eval { 3456 eval {
2582 BDB::db_env_open 3457 BDB::db_env_open
2583 $DB_ENV, 3458 $DB_ENV,
2584 $BDB_ENV_DIR, 3459 $BDBDIR,
2585 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3460 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2586 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3461 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2587 0666; 3462 0666;
2588 3463
2589 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3464 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2590 3465
2591 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3466 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2592 $DB_ENV->set_lk_detect; 3467 $DB_ENV->set_lk_detect;
2593 }; 3468 };
2594 3469
2610 prio => 6, 3485 prio => 6,
2611 cb => \&IO::AIO::poll_cb, 3486 cb => \&IO::AIO::poll_cb,
2612 ); 3487 );
2613} 3488}
2614 3489
3490my $_log_backtrace;
3491
3492sub _log_backtrace {
3493 my ($msg, @addr) = @_;
3494
3495 $msg =~ s/\n//;
3496
3497 # limit the # of concurrent backtraces
3498 if ($_log_backtrace < 2) {
3499 ++$_log_backtrace;
3500 async {
3501 my @bt = fork_call {
3502 @addr = map { sprintf "%x", $_ } @addr;
3503 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3504 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3505 or die "addr2line: $!";
3506
3507 my @funcs;
3508 my @res = <$fh>;
3509 chomp for @res;
3510 while (@res) {
3511 my ($func, $line) = splice @res, 0, 2, ();
3512 push @funcs, "[$func] $line";
3513 }
3514
3515 @funcs
3516 };
3517
3518 LOG llevInfo, "[ABT] $msg\n";
3519 LOG llevInfo, "[ABT] $_\n" for @bt;
3520 --$_log_backtrace;
3521 };
3522 } else {
3523 LOG llevInfo, "[ABT] $msg\n";
3524 LOG llevInfo, "[ABT] [suppressed]\n";
3525 }
3526}
3527
3528# load additional modules
3529use cf::pod;
3530
2615END { cf::emergency_save } 3531END { cf::emergency_save }
2616 3532
26171 35331
2618 3534

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines