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.114 by root, Mon Jan 1 16:00:10 2007 UTC vs.
Revision 1.143 by root, Sun Jan 7 02:39:14 2007 UTC

8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3; 13use Coro 3.3 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 26use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 27
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 29$YAML::Syck::ImplicitUnicode = 1;
30 30
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 34
35our %COMMAND = (); 35our %COMMAND = ();
36our %COMMAND_TIME = (); 36our %COMMAND_TIME = ();
47our %CFG; 47our %CFG;
48 48
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %PLAYER; # all users
52our %MAP; # all maps 53our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 54our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 55our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 56our %EXT_CORO; # coroutines bound to extensions
57 57
58binmode STDOUT; 58binmode STDOUT;
59binmode STDERR; 59binmode STDERR;
60 60
61# read virtual server time, if available 61# read virtual server time, if available
71mkdir cf::localdir . "/" . cf::uniquedir; 71mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 72mkdir $RANDOM_MAPS;
73 73
74# a special map that is always available 74# a special map that is always available
75our $LINK_MAP; 75our $LINK_MAP;
76 76our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 77
79############################################################################# 78#############################################################################
80 79
81=head2 GLOBAL VARIABLES 80=head2 GLOBAL VARIABLES
82 81
181sub to_json($) { 180sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 181 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 182 JSON::Syck::Dump $_[0]
184} 183}
185 184
185=item cf::lock_wait $string
186
187Wait until the given lock is available. See cf::lock_acquire.
188
189=item my $lock = cf::lock_acquire $string
190
191Wait until the given lock is available and then acquires it and returns
192a Coro::guard object. If the guard object gets destroyed (goes out of scope,
193for example when the coroutine gets canceled), the lock is automatically
194returned.
195
196Lock names should begin with a unique identifier (for example, cf::map::find
197uses map_find and cf::map::load uses map_load).
198
199=cut
200
201our %LOCK;
202
203sub lock_wait($) {
204 my ($key) = @_;
205
206 # wait for lock, if any
207 while ($LOCK{$key}) {
208 push @{ $LOCK{$key} }, $Coro::current;
209 Coro::schedule;
210 }
211}
212
213sub lock_acquire($) {
214 my ($key) = @_;
215
216 # wait, to be sure we are not locked
217 lock_wait $key;
218
219 $LOCK{$key} = [];
220
221 Coro::guard {
222 # wake up all waiters, to be on the safe side
223 $_->ready for @{ delete $LOCK{$key} };
224 }
225}
226
227sub freeze_mainloop {
228 return unless $TICK_WATCHER->is_active;
229
230 my $guard = Coro::guard { $TICK_WATCHER->start };
231 $TICK_WATCHER->stop;
232 $guard
233}
234
235=item cf::async { BLOCK }
236
237Currently the same as Coro::async_pool, meaning you cannot use
238C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
239thing you are allowed to do is call C<prio> on it.
240
241=cut
242
243BEGIN { *async = \&Coro::async_pool }
244
186=item cf::sync_job { BLOCK } 245=item cf::sync_job { BLOCK }
187 246
188The design of crossfire+ requires that the main coro ($Coro::main) is 247The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 248always able to handle events or runnable, as crossfire+ is only partly
190reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 249reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.
203 # this is the main coro, too bad, we have to block 262 # this is the main coro, too bad, we have to block
204 # till the operation succeeds, freezing the server :/ 263 # till the operation succeeds, freezing the server :/
205 264
206 # TODO: use suspend/resume instead 265 # TODO: use suspend/resume instead
207 # (but this is cancel-safe) 266 # (but this is cancel-safe)
208 local $FREEZE = 1; 267 my $freeze_guard = freeze_mainloop;
209 268
210 my $busy = 1; 269 my $busy = 1;
211 my @res; 270 my @res;
212 271
213 (Coro::async { 272 (async {
214 @res = eval { $job->() }; 273 @res = eval { $job->() };
215 warn $@ if $@; 274 warn $@ if $@;
216 undef $busy; 275 undef $busy;
217 })->prio (Coro::PRIO_MAX); 276 })->prio (Coro::PRIO_MAX);
218 277
219 while ($busy) { 278 while ($busy) {
220 Coro::cede_notself; 279 Coro::cede or Event::one_event;
221 Event::one_event unless Coro::nready;
222 } 280 }
223 281
224 wantarray ? @res : $res[0] 282 wantarray ? @res : $res[0]
225 } else { 283 } else {
226 # we are in another coroutine, how wonderful, everything just works 284 # we are in another coroutine, how wonderful, everything just works
227 285
228 $job->() 286 $job->()
229 } 287 }
230} 288}
231 289
232=item $coro = cf::coro { BLOCK } 290=item $coro = cf::async_ext { BLOCK }
233 291
234Creates and returns a new coro. This coro is automcatially being canceled 292Like async, but this coro is automcatially being canceled when the
235when the extension calling this is being unloaded. 293extension calling this is being unloaded.
236 294
237=cut 295=cut
238 296
239sub coro(&) { 297sub async_ext(&) {
240 my $cb = shift; 298 my $cb = shift;
241 299
242 my $coro; $coro = async { 300 my $coro = &Coro::async ($cb);
243 eval {
244 $cb->();
245 };
246 warn $@ if $@;
247 };
248 301
249 $coro->on_destroy (sub { 302 $coro->on_destroy (sub {
250 delete $EXT_CORO{$coro+0}; 303 delete $EXT_CORO{$coro+0};
251 }); 304 });
252 $EXT_CORO{$coro+0} = $coro; 305 $EXT_CORO{$coro+0} = $coro;
817 (aio_load "$filename.pst", $av) >= 0 870 (aio_load "$filename.pst", $av) >= 0
818 or return; 871 or return;
819 $av = eval { (Storable::thaw $av)->{objs} }; 872 $av = eval { (Storable::thaw $av)->{objs} };
820 } 873 }
821 874
875 warn sprintf "loading %s (%d)\n",
876 $filename, length $data, scalar @{$av || []};#d#
822 return ($data, $av); 877 return ($data, $av);
823} 878}
824 879
825############################################################################# 880#############################################################################
826# command handling &c 881# command handling &c
1017 1072
1018=head2 CORE EXTENSIONS 1073=head2 CORE EXTENSIONS
1019 1074
1020Functions and methods that extend core crossfire objects. 1075Functions and methods that extend core crossfire objects.
1021 1076
1077=cut
1078
1079package cf::player;
1080
1022=head3 cf::player 1081=head3 cf::player
1023 1082
1024=over 4 1083=over 4
1025 1084
1026=item cf::player::exists $login 1085=item cf::player::find $login
1027 1086
1028Returns true when the given account exists. 1087Returns the given player object, loading it if necessary (might block).
1029 1088
1030=cut 1089=cut
1031 1090
1032sub cf::player::exists($) { 1091sub path($) {
1033 cf::player::find $_[0] 1092 sprintf "%s/%s/%s/%s.pl",
1034 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1093 cf::localdir, cf::playerdir,
1094 (ref $_[0] ? $_[0]->ob->name : $_[0]) x 2
1095}
1096
1097sub find_active($) {
1098 $cf::PLAYER{$_[0]}
1099 and $cf::PLAYER{$_[0]}->active
1100 and $cf::PLAYER{$_[0]}
1101}
1102
1103sub exists($) {
1104 my ($login) = @_;
1105
1106 $cf::PLAYER{$login}
1107 or cf::sync_job { !aio_stat $login }
1108}
1109
1110sub find($) {
1111 return $cf::PLAYER{$_[0]} || do {
1112 my $login = $_[0];
1113
1114 my $guard = cf::lock_acquire "user_find:$login";
1115
1116 $cf::PLAYER{$login} ||= (load_pl path $login or return);
1117 };
1118}
1119
1120sub save($) {
1121 my ($pl) = @_;
1122
1123 return if $pl->{deny_save};
1124
1125 my $path = path $pl;
1126 my $guard = cf::lock_acquire "user_save:$path";
1127
1128 return if $pl->{deny_save};
1129 $pl->{last_save} = $cf::RUNTIME;
1130
1131 Coro::cede;
1132 $pl->save_pl ($path);
1133 Coro::cede;
1134}
1135
1136sub new($) {
1137 my ($login) = @_;
1138
1139 my $self = create;
1140
1141 $self->ob->name ($login);
1142 $self->{deny_save} = 1;
1143
1144 $cf::PLAYER{$login} = $self;
1145
1146 $self
1035} 1147}
1036 1148
1037=item $player->ext_reply ($msgid, $msgtype, %msg) 1149=item $player->ext_reply ($msgid, $msgtype, %msg)
1038 1150
1039Sends an ext reply to the player. 1151Sends an ext reply to the player.
1040 1152
1041=cut 1153=cut
1042 1154
1043sub cf::player::ext_reply($$$%) { 1155sub ext_reply($$$%) {
1044 my ($self, $id, %msg) = @_; 1156 my ($self, $id, %msg) = @_;
1045 1157
1046 $msg{msgid} = $id; 1158 $msg{msgid} = $id;
1047 1159
1048 $self->send ("ext " . to_json \%msg); 1160 $self->send ("ext " . cf::to_json \%msg);
1049} 1161}
1162
1163package cf;
1050 1164
1051=back 1165=back
1052 1166
1053 1167
1054=head3 cf::map 1168=head3 cf::map
1060package cf::map; 1174package cf::map;
1061 1175
1062use Fcntl; 1176use Fcntl;
1063use Coro::AIO; 1177use Coro::AIO;
1064 1178
1065our $MAX_RESET = 7200; 1179our $MAX_RESET = 3600;
1066our $DEFAULT_RESET = 3600; 1180our $DEFAULT_RESET = 3000;
1067 1181
1068sub generate_random_map { 1182sub generate_random_map {
1069 my ($path, $rmp) = @_; 1183 my ($path, $rmp) = @_;
1070 1184
1071 # mit "rum" bekleckern, nicht 1185 # mit "rum" bekleckern, nicht
1087# and all this just because we cannot iterate over 1201# and all this just because we cannot iterate over
1088# all maps in C++... 1202# all maps in C++...
1089sub change_all_map_light { 1203sub change_all_map_light {
1090 my ($change) = @_; 1204 my ($change) = @_;
1091 1205
1092 $_->change_map_light ($change) for values %cf::MAP; 1206 $_->change_map_light ($change)
1207 for grep $_->outdoor, values %cf::MAP;
1093} 1208}
1094 1209
1095sub try_load_header($) { 1210sub try_load_header($) {
1096 my ($path) = @_; 1211 my ($path) = @_;
1097 1212
1100 or return; 1215 or return;
1101 1216
1102 my $map = cf::map::new 1217 my $map = cf::map::new
1103 or return; 1218 or return;
1104 1219
1220 # for better error messages only, will be overwritten
1221 $map->path ($path);
1222
1105 $map->load_header ($path) 1223 $map->load_header ($path)
1106 or return; 1224 or return;
1107 1225
1108 $map->{load_path} = $path; 1226 $map->{load_path} = $path;
1109 1227
1110 $map 1228 $map
1111} 1229}
1112 1230
1231sub find;
1113sub find_map { 1232sub find {
1114 my ($path, $origin) = @_; 1233 my ($path, $origin) = @_;
1115 1234
1116 #warn "find_map<$path,$origin>\n";#d# 1235 #warn "find<$path,$origin>\n";#d#
1117 1236
1118 $path = new cf::path $path, $origin && $origin->path; 1237 $path = new cf::path $path, $origin && $origin->path;
1119 my $key = $path->as_string; 1238 my $key = $path->as_string;
1120 1239
1240 cf::lock_wait "map_find:$key";
1241
1121 $cf::MAP{$key} || do { 1242 $cf::MAP{$key} || do {
1243 my $guard = cf::lock_acquire "map_find:$key";
1244
1122 # do it the slow way 1245 # do it the slow way
1123 my $map = try_load_header $path->save_path; 1246 my $map = try_load_header $path->save_path;
1124 1247
1248 Coro::cede;
1249
1125 if ($map) { 1250 if ($map) {
1251 $map->last_access ((delete $map->{last_access})
1252 || $cf::RUNTIME); #d#
1126 # safety 1253 # safety
1127 $map->{instantiate_time} = $cf::RUNTIME 1254 $map->{instantiate_time} = $cf::RUNTIME
1128 if $map->{instantiate_time} > $cf::RUNTIME; 1255 if $map->{instantiate_time} > $cf::RUNTIME;
1129 } else { 1256 } else {
1130 if (my $rmp = $path->random_map_params) { 1257 if (my $rmp = $path->random_map_params) {
1135 1262
1136 $map or return; 1263 $map or return;
1137 1264
1138 $map->{load_original} = 1; 1265 $map->{load_original} = 1;
1139 $map->{instantiate_time} = $cf::RUNTIME; 1266 $map->{instantiate_time} = $cf::RUNTIME;
1267 $map->last_access ($cf::RUNTIME);
1140 $map->instantiate; 1268 $map->instantiate;
1141 1269
1142 # per-player maps become, after loading, normal maps 1270 # per-player maps become, after loading, normal maps
1143 $map->per_player (0) if $path->{user_rel}; 1271 $map->per_player (0) if $path->{user_rel};
1144 } 1272 }
1145 1273
1146 $map->path ($key); 1274 $map->path ($key);
1147 $map->{path} = $path; 1275 $map->{path} = $path;
1148 $map->last_access ($cf::RUNTIME); 1276 $map->{last_save} = $cf::RUNTIME;
1277
1278 Coro::cede;
1149 1279
1150 if ($map->should_reset) { 1280 if ($map->should_reset) {
1151 $map->reset; 1281 $map->reset;
1282 undef $guard;
1152 $map = find_map $path; 1283 $map = find $path
1284 or return;
1153 } 1285 }
1154 1286
1155 $cf::MAP{$key} = $map 1287 $cf::MAP{$key} = $map
1156 } 1288 }
1157} 1289}
1158 1290
1159sub load { 1291sub load {
1160 my ($self) = @_; 1292 my ($self) = @_;
1161 1293
1294 my $path = $self->{path};
1295 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1296
1162 return if $self->in_memory != cf::MAP_SWAPPED; 1297 return if $self->in_memory != cf::MAP_SWAPPED;
1163 1298
1164 $self->in_memory (cf::MAP_LOADING); 1299 $self->in_memory (cf::MAP_LOADING);
1165
1166 my $path = $self->{path};
1167 1300
1168 $self->alloc; 1301 $self->alloc;
1169 $self->load_objects ($self->{load_path}, 1) 1302 $self->load_objects ($self->{load_path}, 1)
1170 or return; 1303 or return;
1171 1304
1177 if (aio_open $uniq, O_RDONLY, 0) { 1310 if (aio_open $uniq, O_RDONLY, 0) {
1178 $self->clear_unique_items; 1311 $self->clear_unique_items;
1179 $self->load_objects ($uniq, 0); 1312 $self->load_objects ($uniq, 0);
1180 } 1313 }
1181 } 1314 }
1315
1316 Coro::cede;
1182 1317
1183 # now do the right thing for maps 1318 # now do the right thing for maps
1184 $self->link_multipart_objects; 1319 $self->link_multipart_objects;
1185 1320
1186 if ($self->{path}->is_style_map) { 1321 if ($self->{path}->is_style_map) {
1194 $self->difficulty ($self->estimate_difficulty) 1329 $self->difficulty ($self->estimate_difficulty)
1195 unless $self->difficulty; 1330 unless $self->difficulty;
1196 $self->activate; 1331 $self->activate;
1197 } 1332 }
1198 1333
1334 Coro::cede;
1335
1199 $self->in_memory (cf::MAP_IN_MEMORY); 1336 $self->in_memory (cf::MAP_IN_MEMORY);
1200} 1337}
1201 1338
1202sub load_map_sync { 1339sub find_sync {
1203 my ($path, $origin) = @_; 1340 my ($path, $origin) = @_;
1204 1341
1205 #warn "load_map_sync<$path, $origin>\n";#d# 1342 cf::sync_job { cf::map::find $path, $origin }
1343}
1206 1344
1207 cf::sync_job { 1345sub do_load_sync {
1208 my $map = cf::map::find_map $path, $origin 1346 my ($map) = @_;
1209 or return; 1347
1210 $map->load; 1348 cf::sync_job { $map->load };
1211 $map
1212 }
1213} 1349}
1214 1350
1215sub save { 1351sub save {
1216 my ($self) = @_; 1352 my ($self) = @_;
1217 1353
1354 my $lock = cf::lock_acquire "map_data:" . $self->path;
1355
1356 $self->{last_save} = $cf::RUNTIME;
1357
1358 return unless $self->dirty;
1359
1218 my $save = $self->{path}->save_path; utf8::encode $save; 1360 my $save = $self->{path}->save_path; utf8::encode $save;
1219 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1361 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1220 1362
1221 $self->{last_save} = $cf::RUNTIME;
1222
1223 return unless $self->dirty;
1224
1225 $self->{load_path} = $save; 1363 $self->{load_path} = $save;
1226 1364
1227 return if $self->{deny_save}; 1365 return if $self->{deny_save};
1366
1367 local $self->{last_access} = $self->last_access;#d#
1368
1369 cf::async {
1370 $_->contr->save for $self->players;
1371 };
1228 1372
1229 if ($uniq) { 1373 if ($uniq) {
1230 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1374 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1231 $self->save_objects ($uniq, cf::IO_UNIQUES); 1375 $self->save_objects ($uniq, cf::IO_UNIQUES);
1232 } else { 1376 } else {
1235} 1379}
1236 1380
1237sub swap_out { 1381sub swap_out {
1238 my ($self) = @_; 1382 my ($self) = @_;
1239 1383
1384 # save first because save cedes
1385 $self->save;
1386
1387 my $lock = cf::lock_acquire "map_data:" . $self->path;
1388
1240 return if $self->players; 1389 return if $self->players;
1241 return if $self->in_memory != cf::MAP_IN_MEMORY; 1390 return if $self->in_memory != cf::MAP_IN_MEMORY;
1242 return if $self->{deny_save}; 1391 return if $self->{deny_save};
1243 1392
1244 $self->save;
1245 $self->clear; 1393 $self->clear;
1246 $self->in_memory (cf::MAP_SWAPPED); 1394 $self->in_memory (cf::MAP_SWAPPED);
1247} 1395}
1248 1396
1249sub reset_at { 1397sub reset_at {
1287} 1435}
1288 1436
1289sub reset { 1437sub reset {
1290 my ($self) = @_; 1438 my ($self) = @_;
1291 1439
1440 my $lock = cf::lock_acquire "map_data:" . $self->path;
1441
1292 return if $self->players; 1442 return if $self->players;
1293 return if $self->{path}{user_rel};#d# 1443 return if $self->{path}{user_rel};#d#
1294 1444
1295 warn "resetting map ", $self->path;#d# 1445 warn "resetting map ", $self->path;#d#
1296 1446
1315 1465
1316sub customise_for { 1466sub customise_for {
1317 my ($map, $ob) = @_; 1467 my ($map, $ob) = @_;
1318 1468
1319 if ($map->per_player) { 1469 if ($map->per_player) {
1320 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1470 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1321 } 1471 }
1322 1472
1323 $map 1473 $map
1324} 1474}
1325 1475
1326sub emergency_save { 1476sub emergency_save {
1327 local $cf::FREEZE = 1; 1477 my $freeze_guard = cf::freeze_mainloop;
1328 1478
1329 warn "enter emergency map save\n"; 1479 warn "enter emergency map save\n";
1330 1480
1331 cf::sync_job { 1481 cf::sync_job {
1332 warn "begin emergency map save\n"; 1482 warn "begin emergency map save\n";
1383 (ref $cf::CFG{"may_$access"} 1533 (ref $cf::CFG{"may_$access"}
1384 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1534 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1385 : $cf::CFG{"may_$access"}) 1535 : $cf::CFG{"may_$access"})
1386} 1536}
1387 1537
1538=item $player_object->enter_link
1539
1540Freezes the player and moves him/her to a special map (C<{link}>).
1541
1542The player should be reaosnably safe there for short amounts of time. You
1543I<MUST> call C<leave_link> as soon as possible, though.
1544
1545=item $player_object->leave_link ($map, $x, $y)
1546
1547Moves the player out of the specila link map onto the given map. If the
1548map is not valid (or omitted), the player will be moved back to the
1549location he/she was before the call to C<enter_link>, or, if that fails,
1550to the emergency map position.
1551
1552Might block.
1553
1554=cut
1555
1388sub cf::object::player::enter_link { 1556sub cf::object::player::enter_link {
1389 my ($self) = @_; 1557 my ($self) = @_;
1390 1558
1559 $self->deactivate_recursive;
1560
1391 return if $self->map == $LINK_MAP; 1561 return if $self->map == $LINK_MAP;
1392 1562
1393 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1563 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1394 if $self->map; 1564 if $self->map;
1395 1565
1396 $self->enter_map ($LINK_MAP, 20, 20); 1566 $self->enter_map ($LINK_MAP, 20, 20);
1397 $self->deactivate_recursive;
1398} 1567}
1399 1568
1400sub cf::object::player::leave_link { 1569sub cf::object::player::leave_link {
1401 my ($self, $map, $x, $y) = @_; 1570 my ($self, $map, $x, $y) = @_;
1402 1571
1403 my $link_pos = delete $self->{_link_pos}; 1572 my $link_pos = delete $self->{_link_pos};
1404 1573
1405 unless ($map) { 1574 unless ($map) {
1406 $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1407
1408 # restore original map position 1575 # restore original map position
1409 ($map, $x, $y) = @{ $link_pos || [] }; 1576 ($map, $x, $y) = @{ $link_pos || [] };
1410 $map = cf::map::find_map $map; 1577 $map = cf::map::find $map;
1411 1578
1412 unless ($map) { 1579 unless ($map) {
1413 ($map, $x, $y) = @$EMERGENCY_POSITION; 1580 ($map, $x, $y) = @$EMERGENCY_POSITION;
1414 $map = cf::map::find_map $map 1581 $map = cf::map::find $map
1415 or die "FATAL: cannot load emergency map\n"; 1582 or die "FATAL: cannot load emergency map\n";
1416 } 1583 }
1417 } 1584 }
1418 1585
1419 ($x, $y) = (-1, -1) 1586 ($x, $y) = (-1, -1)
1423 ($x, $y) = ($map->enter_x, $map->enter_y) 1590 ($x, $y) = ($map->enter_x, $map->enter_y)
1424 if $x <=0 && $y <= 0; 1591 if $x <=0 && $y <= 0;
1425 1592
1426 $map->load; 1593 $map->load;
1427 1594
1595 return unless $self->contr->active;
1428 $self->activate_recursive; 1596 $self->activate_recursive;
1429 $self->enter_map ($map, $x, $y); 1597 $self->enter_map ($map, $x, $y);
1430} 1598}
1431 1599
1600cf::player->attach (
1601 on_logout => sub {
1602 my ($pl) = @_;
1603
1604 # abort map switching before logout
1605 if ($pl->ob->{_link_pos}) {
1606 cf::sync_job {
1607 $pl->ob->leave_link
1608 };
1609 }
1610 },
1611 on_login => sub {
1612 my ($pl) = @_;
1613
1614 # try to abort aborted map switching on player login :)
1615 # should happen only on crashes
1616 if ($pl->ob->{_link_pos}) {
1617 $pl->ob->enter_link;
1618 (async {
1619 # we need this sleep as the login has a concurrent enter_exit running
1620 # and this sleep increases chances of the player not ending up in scorn
1621 $pl->ob->reply (undef,
1622 "There was an internal problem at your last logout, "
1623 . "the server will try to bring you to your intended destination in a second.",
1624 cf::NDI_RED);
1625 Coro::Timer::sleep 1;
1626 $pl->ob->leave_link;
1627 })->prio (2);
1628 }
1629 },
1630);
1631
1432=item $player_object->goto_map ($map, $x, $y) 1632=item $player_object->goto ($path, $x, $y)
1433 1633
1434=cut 1634=cut
1435 1635
1436sub cf::object::player::goto_map { 1636sub cf::object::player::goto {
1437 my ($self, $path, $x, $y) = @_; 1637 my ($self, $path, $x, $y) = @_;
1438 1638
1439 $self->enter_link; 1639 $self->enter_link;
1440 1640
1441 (Coro::async { 1641 (async {
1442 $path = new cf::path $path; 1642 $path = new cf::path $path;
1443 1643
1444 my $map = cf::map::find_map $path->as_string; 1644 my $map = cf::map::find $path->as_string;
1445 $map = $map->customise_for ($self) if $map; 1645 $map = $map->customise_for ($self) if $map;
1446 1646
1447 warn "entering ", $map->path, " at ($x, $y)\n" 1647# warn "entering ", $map->path, " at ($x, $y)\n"
1448 if $map; 1648# if $map;
1649
1650 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1449 1651
1450 $self->leave_link ($map, $x, $y); 1652 $self->leave_link ($map, $x, $y);
1451 })->prio (1); 1653 })->prio (1);
1452} 1654}
1453 1655
1506 1708
1507 return unless $self->type == cf::PLAYER; 1709 return unless $self->type == cf::PLAYER;
1508 1710
1509 $self->enter_link; 1711 $self->enter_link;
1510 1712
1511 (Coro::async { 1713 (async {
1714 $self->deactivate_recursive; # just to be sure
1512 unless (eval { 1715 unless (eval {
1513
1514 prepare_random_map $exit 1716 prepare_random_map $exit
1515 if $exit->slaying eq "/!"; 1717 if $exit->slaying eq "/!";
1516 1718
1517 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1719 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1518 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1720 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1519 1721
1520 1; 1722 1;
1521 }) { 1723 }) {
1522 $self->message ("Something went wrong deep within the crossfire server. " 1724 $self->message ("Something went wrong deep within the crossfire server. "
1523 . "I'll try to bring you back to the map you were before. " 1725 . "I'll try to bring you back to the map you were before. "
1580 on_reply => sub { 1782 on_reply => sub {
1581 my ($ns, $msg) = @_; 1783 my ($ns, $msg) = @_;
1582 1784
1583 # this weird shuffling is so that direct followup queries 1785 # this weird shuffling is so that direct followup queries
1584 # get handled first 1786 # get handled first
1585 my $queue = delete $ns->{query_queue}; 1787 my $queue = delete $ns->{query_queue}
1788 or return; # be conservative, not sure how that can happen, but we saw a crash here
1586 1789
1587 (shift @$queue)->[1]->($msg); 1790 (shift @$queue)->[1]->($msg);
1588 1791
1589 push @{ $ns->{query_queue} }, @$queue; 1792 push @{ $ns->{query_queue} }, @$queue;
1590 1793
1596 } 1799 }
1597 } 1800 }
1598 }, 1801 },
1599); 1802);
1600 1803
1601=item $client->coro (\&cb) 1804=item $client->async (\&cb)
1602 1805
1603Create a new coroutine, running the specified callback. The coroutine will 1806Create a new coroutine, running the specified callback. The coroutine will
1604be automatically cancelled when the client gets destroyed (e.g. on logout, 1807be automatically cancelled when the client gets destroyed (e.g. on logout,
1605or loss of connection). 1808or loss of connection).
1606 1809
1607=cut 1810=cut
1608 1811
1609sub cf::client::coro { 1812sub cf::client::async {
1610 my ($self, $cb) = @_; 1813 my ($self, $cb) = @_;
1611 1814
1612 my $coro; $coro = async { 1815 my $coro = &Coro::async ($cb);
1613 eval {
1614 $cb->();
1615 };
1616 warn $@ if $@;
1617 };
1618 1816
1619 $coro->on_destroy (sub { 1817 $coro->on_destroy (sub {
1620 delete $self->{_coro}{$coro+0}; 1818 delete $self->{_coro}{$coro+0};
1621 }); 1819 });
1622 1820
1794 1992
1795{ 1993{
1796 my $path = cf::localdir . "/database.pst"; 1994 my $path = cf::localdir . "/database.pst";
1797 1995
1798 sub db_load() { 1996 sub db_load() {
1799 warn "loading database $path\n";#d# remove later
1800 $DB = stat $path ? Storable::retrieve $path : { }; 1997 $DB = stat $path ? Storable::retrieve $path : { };
1801 } 1998 }
1802 1999
1803 my $pid; 2000 my $pid;
1804 2001
1805 sub db_save() { 2002 sub db_save() {
1806 warn "saving database $path\n";#d# remove later
1807 waitpid $pid, 0 if $pid; 2003 waitpid $pid, 0 if $pid;
1808 if (0 == ($pid = fork)) { 2004 if (0 == ($pid = fork)) {
1809 $DB->{_meta}{version} = 1; 2005 $DB->{_meta}{version} = 1;
1810 Storable::nstore $DB, "$path~"; 2006 Storable::nstore $DB, "$path~";
1811 rename "$path~", $path; 2007 rename "$path~", $path;
1859 open my $fh, "<:utf8", cf::confdir . "/config" 2055 open my $fh, "<:utf8", cf::confdir . "/config"
1860 or return; 2056 or return;
1861 2057
1862 local $/; 2058 local $/;
1863 *CFG = YAML::Syck::Load <$fh>; 2059 *CFG = YAML::Syck::Load <$fh>;
2060
2061 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2062
2063 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2064 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2065
2066 if (exists $CFG{mlockall}) {
2067 eval {
2068 $CFG{mlockall} ? &mlockall : &munlockall
2069 and die "WARNING: m(un)lockall failed: $!\n";
2070 };
2071 warn $@ if $@;
2072 }
1864} 2073}
1865 2074
1866sub main { 2075sub main {
1867 # we must not ever block the main coroutine 2076 # we must not ever block the main coroutine
1868 local $Coro::idle = sub { 2077 local $Coro::idle = sub {
1869 Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d# 2078 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1870 (Coro::unblock_sub {
1871 Event::one_event; 2079 async { Event::one_event };
1872 })->();
1873 }; 2080 };
1874 2081
1875 cfg_load; 2082 cfg_load;
1876 db_load; 2083 db_load;
1877 load_extensions; 2084 load_extensions;
1888 return; 2095 return;
1889 } 2096 }
1890 2097
1891 warn "reloading..."; 2098 warn "reloading...";
1892 2099
1893 local $FREEZE = 1; 2100 my $guard = freeze_mainloop;
1894 cf::emergency_save; 2101 cf::emergency_save;
1895 2102
1896 eval { 2103 eval {
1897 # if anything goes wrong in here, we should simply crash as we already saved 2104 # if anything goes wrong in here, we should simply crash as we already saved
1898 2105
1985 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2192 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
1986 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2193 $LINK_MAP->in_memory (MAP_IN_MEMORY);
1987 2194
1988 # dirty hack because... archetypes are not yet loaded 2195 # dirty hack because... archetypes are not yet loaded
1989 Event->timer ( 2196 Event->timer (
1990 after => 2, 2197 after => 10,
1991 cb => sub { 2198 cb => sub {
1992 $_[0]->w->cancel; 2199 $_[0]->w->cancel;
1993 2200
1994 # provide some exits "home" 2201 # provide some exits "home"
1995 my $exit = cf::object::new "exit"; 2202 my $exit = cf::object::new "exit";
2034 reentrant => 0, 2241 reentrant => 0,
2035 prio => 0, 2242 prio => 0,
2036 at => $NEXT_TICK || $TICK, 2243 at => $NEXT_TICK || $TICK,
2037 data => WF_AUTOCANCEL, 2244 data => WF_AUTOCANCEL,
2038 cb => sub { 2245 cb => sub {
2039 unless ($FREEZE) {
2040 cf::server_tick; # one server iteration 2246 cf::server_tick; # one server iteration
2041 $RUNTIME += $TICK; 2247 $RUNTIME += $TICK;
2042 }
2043
2044 $NEXT_TICK += $TICK; 2248 $NEXT_TICK += $TICK;
2045 2249
2046 # if we are delayed by four ticks or more, skip them all 2250 # if we are delayed by four ticks or more, skip them all
2047 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2251 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2048 2252
2071 or warn "ERROR: unable to write runtime file: $!"; 2275 or warn "ERROR: unable to write runtime file: $!";
2072 })->(); 2276 })->();
2073 }, 2277 },
2074); 2278);
2075 2279
2280END { cf::emergency_save }
2281
20761 22821
2077 2283

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines